日志控制

This commit is contained in:
chen wei bo
2025-09-21 19:49:11 +08:00
parent 1e63fc6ab1
commit b94d9527a2
15 changed files with 157 additions and 142 deletions
+4 -3
View File
@@ -18,6 +18,7 @@ import { CommonConfig } from "../Config/CommonConfig";
import ResManager from "../Manager/ResManager"; import ResManager from "../Manager/ResManager";
import Utils from "./Utils"; import Utils from "./Utils";
import { UITransitionHelper } from "../../chat18x/utils/UITransitionHelper"; import { UITransitionHelper } from "../../chat18x/utils/UITransitionHelper";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property, executeInEditMode, disallowMultiple } = _decorator; const { ccclass, property, executeInEditMode, disallowMultiple } = _decorator;
@@ -76,18 +77,18 @@ export default class GameRootUI extends Component {
return; return;
} }
console.log( logger.log(
`GameRootUI: Executing ${transitionType} animation on defaultView` `GameRootUI: Executing ${transitionType} animation on defaultView`
); );
switch (transitionType) { switch (transitionType) {
case "slide_left": case "slide_left":
console.log( logger.log(
"GameRootUI: About to call slideInFromLeft, node valid:", "GameRootUI: About to call slideInFromLeft, node valid:",
this.defaultView.isValid this.defaultView.isValid
); );
UITransitionHelper.slideInFromLeft(this.defaultView, duration, () => { UITransitionHelper.slideInFromLeft(this.defaultView, duration, () => {
console.log("GameRootUI: slideInFromLeft animation completed"); logger.log("GameRootUI: slideInFromLeft animation completed");
callback && callback(); callback && callback();
}); });
break; break;
+65 -64
View File
@@ -5,6 +5,7 @@ import { I_UserInfo } from "../Config/CommonConfig";
import SubManager from "../../Sub/SubManager"; import SubManager from "../../Sub/SubManager";
import Utils from "./Utils"; import Utils from "./Utils";
import { InnerMsgCode } from "../Config/InnerMsgCode"; import { InnerMsgCode } from "../Config/InnerMsgCode";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -80,7 +81,7 @@ export default class HttpUnit {
xhr.onreadystatechange = () => { xhr.onreadystatechange = () => {
if (xhr.readyState == 4) { if (xhr.readyState == 4) {
if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status >= 200 && xhr.status < 300) {
// console.log("[Http] 返回", xhr.response); // logger.log("[Http] 返回", xhr.response);
resolve(JSON.parse(xhr.response)); resolve(JSON.parse(xhr.response));
} else { } else {
reason(xhr.status) reason(xhr.status)
@@ -269,9 +270,9 @@ export default class HttpUnit {
public login(cb: Function = null) { public login(cb: Function = null) {
this.loginCB = cb; this.loginCB = cb;
SDKManager.login((_loginData) => { SDKManager.login((_loginData) => {
console.log("SDK登录成功", _loginData) logger.log("SDK登录成功", _loginData)
SDKManager.getUserInfo((userInfo) => { SDKManager.getUserInfo((userInfo) => {
console.log("SDK获取用户信息成功", userInfo) logger.log("SDK获取用户信息成功", userInfo)
// let serparam = { // let serparam = {
// platform: _loginData.platform, // platform: _loginData.platform,
// code: _loginData.code, // code: _loginData.code,
@@ -282,7 +283,7 @@ export default class HttpUnit {
_loginData.avatar = userInfo.avatarUrl; _loginData.avatar = userInfo.avatarUrl;
if (GlobalValue.IsTest) { if (GlobalValue.IsTest) {
console.log("登录测试环境") logger.log("登录测试环境")
this.loginSer({platform:0, code:12345}, this.initData.bind(this)) this.loginSer({platform:0, code:12345}, this.initData.bind(this))
} else { } else {
if (_loginData.code == null) { if (_loginData.code == null) {
@@ -295,7 +296,7 @@ export default class HttpUnit {
_loginData.platform = 0 _loginData.platform = 0
// _loginData.code = 123455 //测试代码 // _loginData.code = 123455 //测试代码
} }
console.log("登录正式环境 loginData.code: ", _loginData) logger.log("登录正式环境 loginData.code: ", _loginData)
this.loginSer(_loginData, this.initData.bind(this)) this.loginSer(_loginData, this.initData.bind(this))
} }
}) })
@@ -309,12 +310,12 @@ export default class HttpUnit {
//登录服务器 //登录服务器
private async loginSer(msg, cb: Function = null) { private async loginSer(msg, cb: Function = null) {
let data: any = await HttpUnit.ins.api("login", msg, "POST", true); let data: any = await HttpUnit.ins.api("login", msg, "POST", true);
console.log("登录----> 玩家数据:", msg, data) logger.log("登录----> 玩家数据:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.PlayerToken = data.data.token HttpUnit.PlayerToken = data.data.token
HttpUnit.LoginState = 2 HttpUnit.LoginState = 2
console.log("HttpUnit.PlayerToken:", HttpUnit.PlayerToken) logger.log("HttpUnit.PlayerToken:", HttpUnit.PlayerToken)
//获取玩家信息 //获取玩家信息
// this.getUserInfo(cb); // this.getUserInfo(cb);
HttpUnit.UserInfo = data.data.user_info; HttpUnit.UserInfo = data.data.user_info;
@@ -322,7 +323,7 @@ export default class HttpUnit {
this.getCommSetting(); this.getCommSetting();
cb && cb(data.data.user_info); cb && cb(data.data.user_info);
}else{ }else{
console.log("登陆失败:"+ data); logger.log("登陆失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`登陆失败,${data.msg}`); SubManager.ShowPrompt(`登陆失败,${data.msg}`);
} else { } else {
@@ -334,11 +335,11 @@ export default class HttpUnit {
//获取关卡列表数据 //获取关卡列表数据
public async getLevelList(cb: Function = null) { public async getLevelList(cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/levels", {}, "POST", true); let data: any = await HttpUnit.ins.api("game/levels", {}, "POST", true);
console.log("关卡数据:", data) logger.log("关卡数据:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取关卡数据失败:"+ data); logger.log("获取关卡数据失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -347,11 +348,11 @@ export default class HttpUnit {
/**开始关卡*/ /**开始关卡*/
public async levelStart(msg:any, cb: Function = null) { public async levelStart(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/start", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/start", msg, "POST", true);
console.log("开始新关卡:", msg, data) logger.log("开始新关卡:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("开始关卡失败:"+ data); logger.log("开始关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -360,11 +361,11 @@ export default class HttpUnit {
/**推进关卡*/ /**推进关卡*/
public async sendUserTalk(msg:any, cb: Function = null) { public async sendUserTalk(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/propel", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/propel", msg, "POST", true);
console.log("推进关卡:", msg, data) logger.log("推进关卡:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("推进关卡失败:"+ data); logger.log("推进关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -374,11 +375,11 @@ export default class HttpUnit {
/**结束关卡*/ /**结束关卡*/
public async sendLevelFinish(msg:any, cb: Function = null) { public async sendLevelFinish(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/end", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/end", msg, "POST", true);
console.log("结束关卡:", msg, data) logger.log("结束关卡:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("结束关卡失败:"+ data); logger.log("结束关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -387,11 +388,11 @@ export default class HttpUnit {
/**增加次数,更新关卡*/ /**增加次数,更新关卡*/
public async addTalkCnt(msg:any, cb: Function = null) { public async addTalkCnt(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/update", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/update", msg, "POST", true);
console.log("更新关卡:", msg, data) logger.log("更新关卡:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("更新关卡失败:"+ data); logger.log("更新关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -400,11 +401,11 @@ export default class HttpUnit {
/**获取AI语音*/ /**获取AI语音*/
public async getAIVoice(msg:any, cb: Function = null) { public async getAIVoice(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/voice", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/voice", msg, "POST", true);
console.log("获取AI语音:", msg, data) logger.log("获取AI语音:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取AI语音失败:"+ data); logger.log("获取AI语音失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -413,11 +414,11 @@ export default class HttpUnit {
/**获取当前聊天状态*/ /**获取当前聊天状态*/
public async getTalkStage(msg:any, cb: Function = null) { public async getTalkStage(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/status", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/status", msg, "POST", true);
console.log("获取当前聊天状态:", msg, data) logger.log("获取当前聊天状态:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取当前聊天状态失败:"+ data); logger.log("获取当前聊天状态失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -426,11 +427,11 @@ export default class HttpUnit {
//非三星通关时继续关卡 //非三星通关时继续关卡
public async sendGameContinue(msg:any, cb: Function = null) { public async sendGameContinue(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/continue", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/continue", msg, "POST", true);
console.log("非三星通关时继续关卡:", data) logger.log("非三星通关时继续关卡:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("非三星通关时继续关卡失败:"+ data); logger.log("非三星通关时继续关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -440,13 +441,13 @@ export default class HttpUnit {
//重新获取用户信息 //重新获取用户信息
public async getUserData(cb: Function = null) { public async getUserData(cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/info", {}, "GET", true); let data: any = await HttpUnit.ins.api("user/info", {}, "GET", true);
console.log("重新获取用户信息数据:", data) logger.log("重新获取用户信息数据:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {}) Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {})
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("重新获取用户信息数据失败:"+ data); logger.log("重新获取用户信息数据失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -455,12 +456,12 @@ export default class HttpUnit {
//用户看广告 //用户看广告
public async setUserAd(msg:any, cb: Function = null) { public async setUserAd(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/ad", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/ad", msg, "POST", true);
console.log("看广告数据:", data) logger.log("看广告数据:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("看广告数据失败:"+ data); logger.log("看广告数据失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -469,12 +470,12 @@ export default class HttpUnit {
//用户分享 //用户分享
public async setUserShare(msg:any, cb: Function = null) { public async setUserShare(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/share", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/share", msg, "POST", true);
console.log("用户分享数据:", data) logger.log("用户分享数据:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("用户分享数据失败:"+ data); logger.log("用户分享数据失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -483,7 +484,7 @@ export default class HttpUnit {
//获取常用配置 //获取常用配置
public async getCommSetting(cb: Function = null) { public async getCommSetting(cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/setting", {}, "GET", true); let data: any = await HttpUnit.ins.api("user/setting", {}, "GET", true);
console.log("获取常用配置数据:", data) logger.log("获取常用配置数据:", data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.SerSetting = {}; HttpUnit.SerSetting = {};
for (let i = 0; i < data.data.length; i++) { for (let i = 0; i < data.data.length; i++) {
@@ -492,7 +493,7 @@ export default class HttpUnit {
} }
cb && cb(); cb && cb();
}else{ }else{
console.log("获取常用配置数据失败:"+ data); logger.log("获取常用配置数据失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -501,11 +502,11 @@ export default class HttpUnit {
//看广告解锁关卡 //看广告解锁关卡
public async levelUnlock(msg:any, cb: Function = null) { public async levelUnlock(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/unlock_level", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/unlock_level", msg, "POST", true);
console.log("看广告解锁关卡:", msg, data) logger.log("看广告解锁关卡:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("看广告解锁关卡失败:"+ data); logger.log("看广告解锁关卡失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -514,12 +515,12 @@ export default class HttpUnit {
//获取抖音侧边栏奖励 //获取抖音侧边栏奖励
public async getBDSidebarReward(msg:any, cb: Function = null) { public async getBDSidebarReward(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/receive_award", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/receive_award", msg, "POST", true);
console.log("获取抖音侧边栏奖励:", msg, data) logger.log("获取抖音侧边栏奖励:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取抖音侧边栏奖励失败:"+ data); logger.log("获取抖音侧边栏奖励失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -528,12 +529,12 @@ export default class HttpUnit {
//添加友盟关卡记录 //添加友盟关卡记录
public async sendLevelRecord(msg:any, cb: Function = null) { public async sendLevelRecord(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/add_level_record", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/add_level_record", msg, "POST", true);
console.log("添加友盟关卡记录:", msg, data) logger.log("添加友盟关卡记录:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("添加友盟关卡记录失败:"+ data); logger.log("添加友盟关卡记录失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -542,11 +543,11 @@ export default class HttpUnit {
//获得甜蜜暴击效果 //获得甜蜜暴击效果
public async sendTalkStrength(msg:any, cb: Function = null) { public async sendTalkStrength(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/strength", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/strength", msg, "POST", true);
console.log("获得甜蜜暴击效果:", msg, data) logger.log("获得甜蜜暴击效果:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获得甜蜜暴击效果失败:"+ data); logger.log("获得甜蜜暴击效果失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -555,11 +556,11 @@ export default class HttpUnit {
//撤回一次聊天 //撤回一次聊天
public async sendTalkChehui(msg:any, cb: Function = null) { public async sendTalkChehui(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/cancel", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/cancel", msg, "POST", true);
console.log("撤回一次聊天:", msg, data) logger.log("撤回一次聊天:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("撤回一次聊天失败:"+ data); logger.log("撤回一次聊天失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -568,11 +569,11 @@ export default class HttpUnit {
//关卡提示事件上报 //关卡提示事件上报
public async sendTipRecord(msg:any, cb: Function = null) { public async sendTipRecord(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/add_record_tip", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/add_record_tip", msg, "POST", true);
console.log("关卡提示事件上报:", msg, data) logger.log("关卡提示事件上报:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("关卡提示事件上报失败:"+ data); logger.log("关卡提示事件上报失败:"+ data);
// if (data && data.msg) { // if (data && data.msg) {
// SubManager.ShowPrompt(`数据异常,${data.msg}`); // SubManager.ShowPrompt(`数据异常,${data.msg}`);
// } // }
@@ -581,11 +582,11 @@ export default class HttpUnit {
//获取AI回复提示语 //获取AI回复提示语
public async getAIAutoAns(msg:any, cb: Function = null) { public async getAIAutoAns(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/tips", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/tips", msg, "POST", true);
console.log("获取AI回复提示语:", msg, data) logger.log("获取AI回复提示语:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取AI回复提示语失败:"+ data); logger.log("获取AI回复提示语失败:"+ data);
// if (data && data.msg) { // if (data && data.msg) {
// SubManager.ShowPrompt(`数据异常,${data.msg}`); // SubManager.ShowPrompt(`数据异常,${data.msg}`);
// } // }
@@ -594,11 +595,11 @@ export default class HttpUnit {
/**获取历史聊天记录*/ /**获取历史聊天记录*/
public async getTalkJilu(msg:any, cb: Function = null) { public async getTalkJilu(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/get_history", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/get_history", msg, "POST", true);
console.log("获取历史聊天记录:", msg, data) logger.log("获取历史聊天记录:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取历史聊天记录失败:"+ data); logger.log("获取历史聊天记录失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -608,11 +609,11 @@ export default class HttpUnit {
/**私家珍藏上报 */ /**私家珍藏上报 */
public async sendZhencangId(msg:any, cb: Function = null) { public async sendZhencangId(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/set_private_collection", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/set_private_collection", msg, "POST", true);
console.log("私家珍藏上报:", msg, data) logger.log("私家珍藏上报:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("私家珍藏上报失败:"+ data); logger.log("私家珍藏上报失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -621,11 +622,11 @@ export default class HttpUnit {
/**获取私家珍藏列表 limit:每页条数 page:当前页 type:类型 0待领取 1已领取 level_id:关卡ID*/ /**获取私家珍藏列表 limit:每页条数 page:当前页 type:类型 0待领取 1已领取 level_id:关卡ID*/
public async getZhencangList(msg:any, cb: Function = null) { public async getZhencangList(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/get_private_collection", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/get_private_collection", msg, "POST", true);
console.log("获取私家珍藏列表:", msg, data) logger.log("获取私家珍藏列表:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("获取私家珍藏列表失败:"+ data); logger.log("获取私家珍藏列表失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -634,13 +635,13 @@ export default class HttpUnit {
/**领取私家珍藏指定奖励*/ /**领取私家珍藏指定奖励*/
public async getZhencangReward(msg:any, cb: Function = null) { public async getZhencangReward(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/private_collection_award", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/private_collection_award", msg, "POST", true);
console.log("领取私家珍藏指定奖励:", msg, data) logger.log("领取私家珍藏指定奖励:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {}) Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {})
}else{ }else{
console.log("领取私家珍藏指定奖励失败:", data); logger.log("领取私家珍藏指定奖励失败:", data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -649,13 +650,13 @@ export default class HttpUnit {
/**清除私家珍藏红点*/ /**清除私家珍藏红点*/
public async readRedpointZhencang(msg:any, cb: Function = null) { public async readRedpointZhencang(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/clear_private_collection_mark", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/clear_private_collection_mark", msg, "POST", true);
console.log("清除私家珍藏红点:", msg, data) logger.log("清除私家珍藏红点:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {}) Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {})
}else{ }else{
console.log("清除私家珍藏红点失败:"+ data); logger.log("清除私家珍藏红点失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -664,13 +665,13 @@ export default class HttpUnit {
/**清除心动回忆红点*/ /**清除心动回忆红点*/
public async readRedpointHuiyi(msg:any, cb: Function = null) { public async readRedpointHuiyi(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/clear_heartbeat_memories_mark", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/clear_heartbeat_memories_mark", msg, "POST", true);
console.log("清除心动回忆红点:", msg, data) logger.log("清除心动回忆红点:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
HttpUnit.UserInfo = data.data; HttpUnit.UserInfo = data.data;
Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {}) Utils.sendInnerMsg(InnerMsgCode.Data_Redpoint, {})
}else{ }else{
console.log("清除心动回忆红点失败:"+ data); logger.log("清除心动回忆红点失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -679,11 +680,11 @@ export default class HttpUnit {
/**重新开始关卡时,结束上次进度并上报服务器*/ /**重新开始关卡时,结束上次进度并上报服务器*/
public async sendLevelRestartReport(msg:any, cb: Function = null) { public async sendLevelRestartReport(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("game/restart_report", msg, "POST", true); let data: any = await HttpUnit.ins.api("game/restart_report", msg, "POST", true);
console.log("关卡结束上次进度:", msg, data) logger.log("关卡结束上次进度:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("关卡结束上次进度失败:"+ data); logger.log("关卡结束上次进度失败:"+ data);
if (data && data.msg) { if (data && data.msg) {
SubManager.ShowPrompt(`数据异常,${data.msg}`); SubManager.ShowPrompt(`数据异常,${data.msg}`);
} }
@@ -692,11 +693,11 @@ export default class HttpUnit {
/**心动回忆数据埋点*/ /**心动回忆数据埋点*/
public async sendEventTujian(msg:any, cb: Function = null) { public async sendEventTujian(msg:any, cb: Function = null) {
let data: any = await HttpUnit.ins.api("user/click_img_event", msg, "POST", true); let data: any = await HttpUnit.ins.api("user/click_img_event", msg, "POST", true);
console.log("心动回忆数据埋点:", msg, data) logger.log("心动回忆数据埋点:", msg, data)
if (data && data.code == 1) { if (data && data.code == 1) {
cb && cb(data.data); cb && cb(data.data);
}else{ }else{
console.log("心动回忆数据埋点失败:"+ data); logger.log("心动回忆数据埋点失败:"+ data);
// if (data && data.msg) { // if (data && data.msg) {
// SubManager.ShowPrompt(`数据异常,${data.msg}`); // SubManager.ShowPrompt(`数据异常,${data.msg}`);
// } // }
@@ -708,7 +709,7 @@ export default class HttpUnit {
public async api(path: string, data: any, method: "GET" | "POST" | "PUT" = "GET", bLock: boolean = false, isFormData: boolean = false) { public async api(path: string, data: any, method: "GET" | "POST" | "PUT" = "GET", bLock: boolean = false, isFormData: boolean = false) {
let url = HttpUnit.ServerHttpHost + path; let url = HttpUnit.ServerHttpHost + path;
// console.log("[Http] 请求Url:",url, " 方式:", method, " Authorization:", GlobalValue.PlayerToken, " 数据:", JSON.stringify(data) ); // logger.log("[Http] 请求Url:",url, " 方式:", method, " Authorization:", GlobalValue.PlayerToken, " 数据:", JSON.stringify(data) );
bLock && this.lock(); bLock && this.lock();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.timeout = 10000; xhr.timeout = 10000;
@@ -751,7 +752,7 @@ export default class HttpUnit {
* @returns * @returns
*/ */
public async send(url: string, data: any, method: "GET" | "POST" | "PUT" = "GET", bLock: boolean = false, formData: boolean = false) { public async send(url: string, data: any, method: "GET" | "POST" | "PUT" = "GET", bLock: boolean = false, formData: boolean = false) {
// console.log("[Http] 请求Url:",url, " 方式:", method, " 数据:", data); // logger.log("[Http] 请求Url:",url, " 方式:", method, " 数据:", data);
bLock && this.lock(); bLock && this.lock();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.timeout = 10000; xhr.timeout = 10000;
+7 -6
View File
@@ -5,6 +5,7 @@ import { CommonConfig } from "../Config/CommonConfig";
import li_EventManager from "./li_EventManager"; import li_EventManager from "./li_EventManager";
import Utils from "./Utils"; import Utils from "./Utils";
import { InnerMsgCode } from "../Config/InnerMsgCode"; import { InnerMsgCode } from "../Config/InnerMsgCode";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass } = _decorator; const { ccclass } = _decorator;
@@ -49,7 +50,7 @@ export default class LanguageUtils {
} else { } else {
this.detectSystemLanguage(); this.detectSystemLanguage();
} }
console.log( logger.log(
"LanguageUtils initialized with language:", "LanguageUtils initialized with language:",
this.currentLanguage this.currentLanguage
); );
@@ -83,7 +84,7 @@ export default class LanguageUtils {
); );
Utils.sendInnerMsg(InnerMsgCode.LanguageChange, language); Utils.sendInnerMsg(InnerMsgCode.LanguageChange, language);
console.log("Language changed to:", language); logger.log("Language changed to:", language);
} }
public static getText(key: string, defaultText: string = ""): string { public static getText(key: string, defaultText: string = ""): string {
@@ -100,13 +101,13 @@ export default class LanguageUtils {
} }
if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) { if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) {
console.warn("Language table not loaded yet"); logger.warn("Language table not loaded yet");
return defaultText || key; return defaultText || key;
} }
const languageData = ConfigManager.tables.TbLanguage.get(key); const languageData = ConfigManager.tables.TbLanguage.get(key);
if (!languageData) { if (!languageData) {
console.warn(`Language key not found: ${key}`); logger.warn(`Language key not found: ${key}`);
return defaultText || key; return defaultText || key;
} }
@@ -147,13 +148,13 @@ export default class LanguageUtils {
} }
if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) { if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) {
console.warn("Language table not loaded yet"); logger.warn("Language table not loaded yet");
return defaultText || key; return defaultText || key;
} }
const languageData = ConfigManager.tables.TbLanguage.get(key); const languageData = ConfigManager.tables.TbLanguage.get(key);
if (!languageData) { if (!languageData) {
console.warn(`Language key not found: ${key}`); logger.warn(`Language key not found: ${key}`);
return defaultText || key; return defaultText || key;
} }
+10 -9
View File
@@ -1,5 +1,6 @@
import { InnerMsgCode } from "../Config/InnerMsgCode"; import { InnerMsgCode } from "../Config/InnerMsgCode";
import Utils from "./Utils"; import Utils from "./Utils";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
/**长连接*/ /**长连接*/
export default class SocketUnit { export default class SocketUnit {
@@ -18,20 +19,20 @@ export default class SocketUnit {
// 连接到服务器 // 连接到服务器
public connect(url: string): void { public connect(url: string): void {
if (this.isConnected) { if (this.isConnected) {
console.log("SocketUnit: Already connected."); logger.log("SocketUnit: Already connected.");
return; return;
} }
this.url = url; this.url = url;
this.socket = new WebSocket(url); this.socket = new WebSocket(url);
console.log("SocketUnit: Connecting to -> " + url); logger.log("SocketUnit: Connecting to -> " + url);
// 连接成功 // 连接成功
this.socket.onopen = () => { this.socket.onopen = () => {
this.isConnected = true; this.isConnected = true;
console.log("SocketUnit: Connection succ."); logger.log("SocketUnit: Connection succ.");
if (this.reconnetSwt) { if (this.reconnetSwt) {
console.log("SocketUnit: socket重连成功."); logger.log("SocketUnit: socket重连成功.");
this.stopReconnect(); this.stopReconnect();
if (this.reSendData) { if (this.reSendData) {
this.sendData(this.reSendData); this.sendData(this.reSendData);
@@ -42,7 +43,7 @@ export default class SocketUnit {
// 接收到消息 // 接收到消息
this.socket.onmessage = (event) => { this.socket.onmessage = (event) => {
// console.log("SocketUnit: Received data: ", event); // logger.log("SocketUnit: Received data: ", event);
if (this.dataReceivedCallback) { if (this.dataReceivedCallback) {
this.dataReceivedCallback(event); this.dataReceivedCallback(event);
} }
@@ -51,12 +52,12 @@ export default class SocketUnit {
// 连接关闭 // 连接关闭
this.socket.onclose = () => { this.socket.onclose = () => {
this.isConnected = false; this.isConnected = false;
console.log("SocketUnit: Connection closed."); logger.log("SocketUnit: Connection closed.");
}; };
// 发生错误 // 发生错误
this.socket.onerror = (error) => { this.socket.onerror = (error) => {
console.error("SocketUnit: WebSocket error:", error); logger.error("SocketUnit: WebSocket error:", error);
this.isConnected = false; this.isConnected = false;
}; };
@@ -73,11 +74,11 @@ export default class SocketUnit {
// 发送数据 // 发送数据
public sendData(data: string): void { public sendData(data: string): void {
// console.log("SocketUnit: sendData", data); // logger.log("SocketUnit: sendData", data);
if (this.socket && this.isConnected) { if (this.socket && this.isConnected) {
this.socket.send(data); this.socket.send(data);
} else { } else {
console.error("SocketUnit: Socket is not connected."); logger.error("SocketUnit: Socket is not connected.");
this.reSendData = data; this.reSendData = data;
this.beginReconnect() this.beginReconnect()
} }
@@ -2,6 +2,7 @@ import { _decorator, sys } from "cc";
import Utils from "../Common/Utils"; import Utils from "../Common/Utils";
import { CommonConfig } from "../Config/CommonConfig"; import { CommonConfig } from "../Config/CommonConfig";
import AudioManager from "./AudioManager"; import AudioManager from "./AudioManager";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -44,7 +45,7 @@ export default class PlayerDataManager {
this.isSoundOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_SOUND, true) this.isSoundOn = PlayerDataManager.getForKey(CommonConfig.StorageConfig.SETTING_SOUND, true)
this.guideMainFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_MAIN, false) this.guideMainFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_MAIN, false)
this.guideTalkFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_TALK, false) this.guideTalkFinished = PlayerDataManager.getForKey(CommonConfig.StorageConfig.GUIDE_TALK, false)
console.log("InitPlayerData", `music=${this.isMusicOn}, sound=${this.isSoundOn}, guideMain=${this.guideMainFinished}, guideTalk=${this.guideTalkFinished}`) logger.log("InitPlayerData", `music=${this.isMusicOn}, sound=${this.isSoundOn}, guideMain=${this.guideMainFinished}, guideTalk=${this.guideTalkFinished}`)
} }
+31 -30
View File
@@ -22,6 +22,7 @@ import {
VideoClip, VideoClip,
} from "cc"; } from "cc";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
import { logger } from "db://assets/Scripts/Main/Common/Logger";
@ccclass("ResManager") @ccclass("ResManager")
export default class ResManager { export default class ResManager {
@@ -78,7 +79,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.preload(url, Prefab, (err, res) => { bundle.preload(url, Prefab, (err, res) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
cb && cb(); cb && cb();
@@ -88,7 +89,7 @@ export default class ResManager {
"PB", "PB",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.preLoadSubpackagePrefab(url, cb); this.preLoadSubpackagePrefab(url, cb);
@@ -102,7 +103,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.preload(url, ftype, (err, res) => { bundle.preload(url, ftype, (err, res) => {
if (err) { if (err) {
console.log(err); logger.log(err);
failCB && failCB(err); failCB && failCB(err);
return; return;
} }
@@ -113,7 +114,7 @@ export default class ResManager {
pkgName, pkgName,
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
failCB && failCB(err); failCB && failCB(err);
return; return;
} }
@@ -128,7 +129,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url, Prefab, (err, res: Prefab) => { bundle.load(url, Prefab, (err, res: Prefab) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
let cc_N = instantiate(res); let cc_N = instantiate(res);
@@ -139,7 +140,7 @@ export default class ResManager {
"PB", "PB",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.loadSubpackagePrefab(url, cb); this.loadSubpackagePrefab(url, cb);
@@ -165,7 +166,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url, Prefab, (err, res: Prefab) => { bundle.load(url, Prefab, (err, res: Prefab) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
let cc_N = instantiate(res); let cc_N = instantiate(res);
@@ -176,7 +177,7 @@ export default class ResManager {
"Model3D", "Model3D",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.loadSubpackage3DModel(url, cb); this.loadSubpackage3DModel(url, cb);
@@ -199,7 +200,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url, VideoClip, (err, res: VideoClip) => { bundle.load(url, VideoClip, (err, res: VideoClip) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -217,7 +218,7 @@ export default class ResManager {
packageName, packageName,
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.changeBundleVideo(spt, url, packageName, cb); this.changeBundleVideo(spt, url, packageName, cb);
@@ -242,7 +243,7 @@ export default class ResManager {
SpriteFrame, SpriteFrame,
(err, res: SpriteFrame) => { (err, res: SpriteFrame) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -260,7 +261,7 @@ export default class ResManager {
packageName, packageName,
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.changeBundleSpriteFrame(spt, url, packageName, cb); this.changeBundleSpriteFrame(spt, url, packageName, cb);
@@ -280,7 +281,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url + "/texture", Texture2D, (err, res: Texture2D) => { bundle.load(url + "/texture", Texture2D, (err, res: Texture2D) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -296,7 +297,7 @@ export default class ResManager {
packageName, packageName,
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.changeBundleTexture(spt, url, packageName, cb); this.changeBundleTexture(spt, url, packageName, cb);
@@ -311,7 +312,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url, AudioClip, (err, res: AudioClip) => { bundle.load(url, AudioClip, (err, res: AudioClip) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
cb && cb(res); cb && cb(res);
@@ -321,7 +322,7 @@ export default class ResManager {
"Audio", "Audio",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.getBundleAudio(url, cb); this.getBundleAudio(url, cb);
@@ -336,7 +337,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load(url, JsonAsset, (err, res: JsonAsset) => { bundle.load(url, JsonAsset, (err, res: JsonAsset) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
cb && cb(res); cb && cb(res);
@@ -346,7 +347,7 @@ export default class ResManager {
"DataTable", "DataTable",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.loadSubpackagePrefab(url, cb); this.loadSubpackagePrefab(url, cb);
@@ -398,9 +399,9 @@ export default class ResManager {
spttemp.frameUrl = url; spttemp.frameUrl = url;
// 加载 // 加载
assetManager.loadRemote<ImageAsset>(url, (err, res: ImageAsset) => { assetManager.loadRemote<ImageAsset>(url, (err, res: ImageAsset) => {
console.log("changeRemoteSpriteFrame方法加载远程图片: ", url); logger.log("changeRemoteSpriteFrame方法加载远程图片: ", url);
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -427,9 +428,9 @@ export default class ResManager {
// spttemp.frameUrl = url; // spttemp.frameUrl = url;
// // 加载 // // 加载
// assetManager.loadRemote<VideoClip>(url, (err, res: VideoClip) => { // assetManager.loadRemote<VideoClip>(url, (err, res: VideoClip) => {
// console.log("加载远程视频: ", url); // logger.log("加载远程视频: ", url);
// if (err) { // if (err) {
// console.error(err); // logger.error(err);
// return; // return;
// } // }
// if (!spt.isValid) { // if (!spt.isValid) {
@@ -442,7 +443,7 @@ export default class ResManager {
// cb && cb(res); // cb && cb(res);
// }) // })
console.log("loadRemoteVideo方法加载远程视频: ", url); logger.log("loadRemoteVideo方法加载远程视频: ", url);
spt.resourceType = VideoPlayer.ResourceType.REMOTE; spt.resourceType = VideoPlayer.ResourceType.REMOTE;
spt.remoteURL = url; spt.remoteURL = url;
cb && cb(null); cb && cb(null);
@@ -463,7 +464,7 @@ export default class ResManager {
private loadResourceRes(path: string, cb) { private loadResourceRes(path: string, cb) {
resources.load(path, ImageAsset, (err, res: ImageAsset) => { resources.load(path, ImageAsset, (err, res: ImageAsset) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
cb && cb(res); cb && cb(res);
@@ -490,7 +491,7 @@ export default class ResManager {
SpriteFrame, SpriteFrame,
(err, res: SpriteFrame) => { (err, res: SpriteFrame) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -507,7 +508,7 @@ export default class ResManager {
if (!spt || !path) return; if (!spt || !path) return;
resources.load(path + "/texture", Texture2D, (err, res: Texture2D) => { resources.load(path + "/texture", Texture2D, (err, res: Texture2D) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
if (!spt.isValid) { if (!spt.isValid) {
@@ -529,7 +530,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load("ui_sprite_gray", Material, (err, res: Material) => { bundle.load("ui_sprite_gray", Material, (err, res: Material) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
// spt.setSharedMaterial(res, 0) // spt.setSharedMaterial(res, 0)
@@ -540,7 +541,7 @@ export default class ResManager {
"Materials", "Materials",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.SetGray(spt, isGray); this.SetGray(spt, isGray);
@@ -560,7 +561,7 @@ export default class ResManager {
if (bundle) { if (bundle) {
bundle.load("mohu", Material, (err, res: Material) => { bundle.load("mohu", Material, (err, res: Material) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
// spt.setSharedMaterial(res, 0) // spt.setSharedMaterial(res, 0)
@@ -571,7 +572,7 @@ export default class ResManager {
"Materials", "Materials",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
return; return;
} }
this.SetBlur(spt, isBule); this.SetBlur(spt, isBule);
+3 -2
View File
@@ -16,6 +16,7 @@ import Utils from "../Common/Utils";
import GameRootUI from "../Common/GameRootUI"; import GameRootUI from "../Common/GameRootUI";
import ResManager from "./ResManager"; import ResManager from "./ResManager";
import { CommonConfig } from "../Config/CommonConfig"; import { CommonConfig } from "../Config/CommonConfig";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -203,7 +204,7 @@ export class ViewManager extends Component {
type type
); );
} else { } else {
console.log("打开界面:", i_prefab); logger.log("打开界面:", i_prefab);
ResManager.I.getPrefab( ResManager.I.getPrefab(
i_prefab, i_prefab,
(pb: Node) => { (pb: Node) => {
@@ -229,7 +230,7 @@ export class ViewManager extends Component {
"tips" "tips"
); );
} else { } else {
console.log("打开界面:", i_prefab); logger.log("打开界面:", i_prefab);
ResManager.I.getPrefab( ResManager.I.getPrefab(
i_prefab, i_prefab,
(pb: Node) => { (pb: Node) => {
+4 -3
View File
@@ -1,6 +1,7 @@
import { _decorator, Camera, Component, Node } from "cc"; import { _decorator, Camera, Component, Node } from "cc";
import GameRootUI from "../Main/Common/GameRootUI"; import GameRootUI from "../Main/Common/GameRootUI";
import { MainController } from "../chat18x/core/MainController"; import { MainController } from "../chat18x/core/MainController";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -34,11 +35,11 @@ export class MainScene extends Component {
*/ */
private async initMainController(): Promise<void> { private async initMainController(): Promise<void> {
try { try {
console.log("[MainScene] 开始初始化MainController"); logger.log("[MainScene] 开始初始化MainController");
await MainController.I.init(); await MainController.I.init();
console.log("[MainScene] MainController初始化完成"); logger.log("[MainScene] MainController初始化完成");
} catch (error) { } catch (error) {
console.error("[MainScene] MainController初始化失败:", error); logger.error("[MainScene] MainController初始化失败:", error);
} }
} }
} }
+8 -7
View File
@@ -46,6 +46,7 @@ import proto from "db://assets/Scripts/proto/proto.pb.js";
import { ViewManager } from "../../Main/Manager/ViewManager"; import { ViewManager } from "../../Main/Manager/ViewManager";
import { MainScene } from "../MainScene"; import { MainScene } from "../MainScene";
import { prodConfig } from "../../chat18x/config/env/prod"; import { prodConfig } from "../../chat18x/config/env/prod";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -100,7 +101,7 @@ export class PreloadUI extends Component {
// 初始化配置 // 初始化配置
ConfigManager.I.init(); ConfigManager.I.init();
//console.log(ConfigManager.tables.TbGlobalConfig.GameName); //logger.log(ConfigManager.tables.TbGlobalConfig.GameName);
// 初始化环境配置 // 初始化环境配置
AppConfig.I; AppConfig.I;
// 初始化数据层 // 初始化数据层
@@ -116,7 +117,7 @@ export class PreloadUI extends Component {
protected onDestroy(): void {} protected onDestroy(): void {}
onVideoReadyToPlay() { onVideoReadyToPlay() {
console.log("Video Ready"); logger.log("Video Ready");
this._nodeTab.VideoPlayer.getComponent(VideoPlayer).play(); this._nodeTab.VideoPlayer.getComponent(VideoPlayer).play();
} }
update(deltaTime: number) { update(deltaTime: number) {
@@ -155,12 +156,12 @@ export class PreloadUI extends Component {
num_succeed++; num_succeed++;
let percent = 0.45 * (num_prefab / preloadTab.length); let percent = 0.45 * (num_prefab / preloadTab.length);
this.showLoadProgress(0.55 + percent); this.showLoadProgress(0.55 + percent);
console.log("加载成功:", cfg.path); logger.log("加载成功:", cfg.path);
preloadFunc(); preloadFunc();
}, },
(err) => { (err) => {
num_prefab++; num_prefab++;
console.log("加载失败:", err); logger.log("加载失败:", err);
} }
); );
} else { } else {
@@ -199,9 +200,9 @@ export class PreloadUI extends Component {
device: deviceId, device: deviceId,
os, os,
}; };
console.log("登录请求数据:", reqData); logger.log("登录请求数据:", reqData);
let res = await AuthService.I.login(reqData); let res = await AuthService.I.login(reqData);
console.log("登录响应数据:", res); logger.log("登录响应数据:", res);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
const resData = res.data; const resData = res.data;
const loginData = DataManager.I.getDataById<LoginData>(DataId.Login); const loginData = DataManager.I.getDataById<LoginData>(DataId.Login);
@@ -228,7 +229,7 @@ export class PreloadUI extends Component {
private async reqMyInfo() { private async reqMyInfo() {
const reqData = {}; const reqData = {};
let res = await PlayerDataService.I.reqMyInfo(reqData); let res = await PlayerDataService.I.reqMyInfo(reqData);
console.log("个人信息响应数据:", res); logger.log("个人信息响应数据:", res);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
const resData = res.data; const resData = res.data;
const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet); const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
@@ -3,6 +3,7 @@ import { AiCharacterConfig } from "../config/AiCharacterConfig";
import { DataId, DataManager } from "../data/DataManager"; import { DataId, DataManager } from "../data/DataManager";
import { GlobalData } from "../data/GlobalData"; import { GlobalData } from "../data/GlobalData";
import { ConfigId, ConfigManager } from "../manager/ConfigManager"; import { ConfigId, ConfigManager } from "../manager/ConfigManager";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
/** /**
* 角色配置映射 * 角色配置映射
@@ -25,8 +26,8 @@ export class RoleConfigLoader {
const globalPrompt = globalConfig.getGirlBasePrompt(); const globalPrompt = globalConfig.getGirlBasePrompt();
const prompt = globalPrompt + "\n" + basePrompt + "\n" + additionPrompt; const prompt = globalPrompt + "\n" + basePrompt + "\n" + additionPrompt;
console.log(basePrompt); logger.log(basePrompt);
console.log(additionPrompt); logger.log(additionPrompt);
return prompt; return prompt;
} }
+2 -1
View File
@@ -16,6 +16,7 @@ import { GirlData } from "./GirlData";
import { EnvData } from "./EnvData"; import { EnvData } from "./EnvData";
import { GlobalData } from "./GlobalData"; import { GlobalData } from "./GlobalData";
import { AiCharacterData } from "./AiCharacterData"; import { AiCharacterData } from "./AiCharacterData";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
/** /**
* 集中定义数据ID,避免写错字符串 * 集中定义数据ID,避免写错字符串
@@ -63,7 +64,7 @@ export class DataManager {
* 初始化:注册 数据ID → 构造器 * 初始化:注册 数据ID → 构造器
*/ */
public init(): void { public init(): void {
console.log("[DataManager] 数据管理器初始化"); logger.log("[DataManager] 数据管理器初始化");
this.registerAll(); this.registerAll();
} }
+4 -3
View File
@@ -10,6 +10,7 @@ import { GirlFavorabilityData } from "./GirlFavorabilityData";
import { DataId } from "./DataManager"; import { DataId } from "./DataManager";
import proto from "db://assets/Scripts/proto/proto.pb.js"; import proto from "db://assets/Scripts/proto/proto.pb.js";
import { PriceType } from "../../schema/schema"; import { PriceType } from "../../schema/schema";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
// 分类的数据结构 // 分类的数据结构
interface CategoryBucket { interface CategoryBucket {
@@ -90,7 +91,7 @@ export class GirlData extends BaseData {
this.setGirlFavorability(categoryId, data.girls); this.setGirlFavorability(categoryId, data.girls);
const bucket = this.ensureBucket(categoryId); const bucket = this.ensureBucket(categoryId);
console.log("保存类别 ", categoryId, " 的技师列表: ", bucket); logger.log("保存类别 ", categoryId, " 的技师列表: ", bucket);
} }
/** 保存技师详细数据 */ /** 保存技师详细数据 */
@@ -108,7 +109,7 @@ export class GirlData extends BaseData {
this.setGirlFavorability(categoryId, details); this.setGirlFavorability(categoryId, details);
const bucket = this.ensureBucket(categoryId); const bucket = this.ensureBucket(categoryId);
console.log("保存类别 ", categoryId, " 的详细数据: ", bucket); logger.log("保存类别 ", categoryId, " 的详细数据: ", bucket);
} }
/** --------------------------------------------------------- 技师的简要数据 --------------------------------------------------------- */ /** --------------------------------------------------------- 技师的简要数据 --------------------------------------------------------- */
@@ -967,7 +968,7 @@ export class GirlData extends BaseData {
if (!data) return; if (!data) return;
this.mergeOneBrief(DAILY_BUCKET, data.girl); this.mergeOneBrief(DAILY_BUCKET, data.girl);
const bucket = this.ensureBucket(DAILY_BUCKET); const bucket = this.ensureBucket(DAILY_BUCKET);
console.log("保存每日推荐: ", bucket); logger.log("保存每日推荐: ", bucket);
} }
/** 判断每日推荐是否存在 */ /** 判断每日推荐是否存在 */
@@ -3,6 +3,7 @@
*/ */
import { BaseData } from "./BaseData"; import { BaseData } from "./BaseData";
import proto from 'db://assets/Scripts/proto/proto.pb.js'; import proto from 'db://assets/Scripts/proto/proto.pb.js';
import { logger } from "db://assets/Scripts/Main/Common/Logger";
export class GirlUnlockData extends BaseData { export class GirlUnlockData extends BaseData {
// id // id
@@ -81,7 +82,7 @@ export class GirlUnlockData extends BaseData {
if (!exists) { if (!exists) {
this.unlockedImageIds.push(id); this.unlockedImageIds.push(id);
} }
console.log("技师 ", this.id, " 当前解锁图片的所有id",this.unlockedImageIds); logger.log("技师 ", this.id, " 当前解锁图片的所有id",this.unlockedImageIds);
} }
/** 获取所有解锁图片的 id */ /** 获取所有解锁图片的 id */
@@ -113,7 +114,7 @@ export class GirlUnlockData extends BaseData {
if (!exists) { if (!exists) {
this.unlockedVideoIds.push(id); this.unlockedVideoIds.push(id);
} }
console.log("技师 ", this.id, " 当前解锁视频的所有id",this.unlockedVideoIds); logger.log("技师 ", this.id, " 当前解锁视频的所有id",this.unlockedVideoIds);
} }
/** 获取所有解锁视频的 id */ /** 获取所有解锁视频的 id */
+7 -6
View File
@@ -6,6 +6,7 @@ import proto from 'db://assets/Scripts/proto/proto.pb.js';
import type { OrderVO, OrderStatus } from 'db://assets/Scripts/chat18x/payment/types'; import type { OrderVO, OrderStatus } from 'db://assets/Scripts/chat18x/payment/types';
import { mapQueryOrderStatus, shouldPoll } from 'db://assets/Scripts/chat18x/payment/PaymentUtil'; import { mapQueryOrderStatus, shouldPoll } from 'db://assets/Scripts/chat18x/payment/PaymentUtil';
import { sys } from "cc"; import { sys } from "cc";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
const ORDER_STORAGE_KEY = "order_data_v1"; const ORDER_STORAGE_KEY = "order_data_v1";
@@ -44,7 +45,7 @@ export class OrderData extends BaseData {
createdAt: Date.now(), // 订单创建时间,毫秒 createdAt: Date.now(), // 订单创建时间,毫秒
}; };
this._orders.set(orderId, vo); this._orders.set(orderId, vo);
console.log("保存订单数据:", this._orders); logger.log("保存订单数据:", this._orders);
} }
/** 根据订单 id 获取订单数据 */ /** 根据订单 id 获取订单数据 */
@@ -68,7 +69,7 @@ export class OrderData extends BaseData {
vo.status = mapQueryOrderStatus(res.status); vo.status = mapQueryOrderStatus(res.status);
vo.retCode = res.retCode ?? 0; vo.retCode = res.retCode ?? 0;
this._orders.set(orderId, vo); this._orders.set(orderId, vo);
console.log("更新订单数据:", vo); logger.log("更新订单数据:", vo);
} }
/** 获取所有需要继续轮询查询的订单 id */ /** 获取所有需要继续轮询查询的订单 id */
@@ -172,9 +173,9 @@ export class OrderData extends BaseData {
map.set(vo.orderId, vo); map.set(vo.orderId, vo);
} }
} }
console.log("加载本地订单数据:", map); logger.log("加载本地订单数据:", map);
} catch (e) { } catch (e) {
console.warn("[OrderData] loadStorage parse error:", e); logger.warn("[OrderData] loadStorage parse error:", e);
this.ensureMap().clear(); this.ensureMap().clear();
} }
} }
@@ -190,9 +191,9 @@ export class OrderData extends BaseData {
orders, orders,
}; };
sys.localStorage.setItem(ORDER_STORAGE_KEY, JSON.stringify(payload)); sys.localStorage.setItem(ORDER_STORAGE_KEY, JSON.stringify(payload));
console.log("保存本地订单数据:", payload); logger.log("保存本地订单数据:", payload);
} catch (e) { } catch (e) {
console.warn("[OrderData] saveStorage error:", e); logger.warn("[OrderData] saveStorage error:", e);
} }
} }
@@ -8,6 +8,7 @@ import { GlobalConfig } from "../config/GlobalConfig";
import { GirlConfig } from "../config/GirlConfig"; import { GirlConfig } from "../config/GirlConfig";
import { GirlDetailConfig } from "../config/GirlDetailConfig"; import { GirlDetailConfig } from "../config/GirlDetailConfig";
import { AiCharacterConfig } from "../config/AiCharacterConfig"; import { AiCharacterConfig } from "../config/AiCharacterConfig";
import { logger } from "db://assets/Scripts/Main/Common/Logger";
/** /**
* ID * ID
@@ -68,7 +69,7 @@ export class ConfigManager {
"DataTable", "DataTable",
(err: Error, _bundle: AssetManager.Bundle) => { (err: Error, _bundle: AssetManager.Bundle) => {
if (err) { if (err) {
console.log(err); logger.log(err);
reject && reject(err); reject && reject(err);
return; return;
} else { } else {
@@ -87,13 +88,13 @@ export class ConfigManager {
new Uint8Array(data.buffer().slice(0, data.buffer().byteLength)) new Uint8Array(data.buffer().slice(0, data.buffer().byteLength))
); );
} else { } else {
console.error("静态配置加载失败" + curFileName); logger.error("静态配置加载失败" + curFileName);
} }
}); });
promises.push(promise); promises.push(promise);
} }
Promise.all(promises).then((values) => { Promise.all(promises).then((values) => {
console.log("静态配置加载完成"); logger.log("静态配置加载完成");
ConfigManager.tables = new cfg.Tables(ConfigManager.I.getFileData); ConfigManager.tables = new cfg.Tables(ConfigManager.I.getFileData);
}); });
} }