@cc-component/cc-core 1.2.1 → 1.2.3

package/assets/core/home/ResourceManager.ts

@@ -208,7 +208,7 @@ export class ResourceManager {
                 list.push({ name: asset.name, refCount: asset.refCount })
             }
         });
-        console.warn("资源计数：\n", list)
+        Logger.warn("资源计数：\n", list)
     }
 
     LogAssetsAll() {
@@ -229,10 +229,10 @@ export class ResourceManager {
                 const { asset, refCount } = record;
                 list.push({ bundle_name: record.bundleName, name: asset.name, refCount: refCount, refCountAsset: asset.refCount })
             });
-            console.warn("资源计数：\n", Array.from(bundle_map.values()))
+            Logger.warn("资源计数：\n", Array.from(bundle_map.values()))
 
-            console.warn("资源总数：", assetManager.assets.count)
-            console.warn("资源总数：", assetManager.assets)
+            Logger.warn("资源总数：", assetManager.assets.count)
+            Logger.warn("资源总数：", assetManager.assets)
         }, 500)
 
     }
@@ -294,7 +294,7 @@ export class ResourceManager {
         let asset = bundle.get(path);
 
         if (asset) {
-            //console.log('已加载==', asset.refCount)
+            //Logger.debug('已加载==', asset.refCount)
             // 记录加载的资源
             ResourceManager.instance.trackAsset(path, asset, bundleName);
             ResourceManager.instance.LogAssets(bundleName)
@@ -309,7 +309,7 @@ export class ResourceManager {
                     resolve(null);
                     return;
                 }
-                console.log('--加载', path)
+                Logger.debug('--加载', path)
                 // 记录加载的资源
                 ResourceManager.instance.trackAsset(path, asset, bundleName);
                 ResourceManager.instance.LogAssets(bundleName)
@@ -335,7 +335,7 @@ export class ResourceManager {
                 //加载bundle——预制体
                 assetManager.loadBundle(name, (err, ab: AssetManager.Bundle) => {
                     if (err) {
-                        console.warn(`bundle名称：${name} `, err);
+                        Logger.warn(`bundle名称：${name} `, err);
                         return;
                     }
                     resolve(ab);
@@ -358,7 +358,7 @@ export class ResourceManager {
 
     static async loadDir(bundleName: string, dirName: string, type: any, pre: Function) {
         return new Promise<void>(resolve => {
-            //console.warn(bundleName, dirName)
+            //Logger.warn(bundleName, dirName)
 
             assetManager.getBundle(bundleName).loadDir(dirName, type, (finished: number, total: number, item: any) => {
                 pre(Math.floor((finished / total * 100)));
@@ -366,7 +366,7 @@ export class ResourceManager {
                 // 记录加载的资源
                 assets.forEach(asset => {
                     const asset_info: { uuid: string, path: string } = assetManager.getBundle(bundleName).getAssetInfo(asset.uuid) as { uuid: string, path: string }
-                    //console.warn(asset_info.path)
+                    //Logger.warn(asset_info.path)
                     ResourceManager.instance.trackAsset(asset_info.path, asset, bundleName);
                 });
                 resolve();
@@ -382,7 +382,7 @@ export class ResourceManager {
     static async loadScene(bundleName: string, name: string, pre: Function): Promise<SceneAsset> {
         var promise = new Promise<SceneAsset>(async resolve => {
             let bundle = assetManager.getBundle(bundleName)
-            //   console.warn("-111-加载c错了=", bun);
+            //   Logger.warn("-111-加载c错了=", bun);
             if (!bundle) {
                 bundle = await new Promise<any>(resolve => {
                     assetManager.loadBundle(bundleName, (err, bundle) => {
@@ -395,7 +395,7 @@ export class ResourceManager {
                     pre(Math.floor((finished / total * 100)));
                 }, (err, prefab) => {
                     if (err) {
-                        console.warn("--加载c错了=", bundleName, name, err);
+                        Logger.warn("--加载c错了=", bundleName, name, err);
                     }
                     resolve(prefab);
                 });
@@ -415,7 +415,7 @@ export class ResourceManager {
                     pre(Math.floor((finished / total * 100)));
                 }, (err) => {
                     if (err) {
-                        console.warn("预加载c错了=", bundleName, name, err);
+                        Logger.warn("预加载c错了=", bundleName, name, err);
                     }
                     resolve(null)
                 });

package/assets/core/home/StateMachine.ts

@@ -8,7 +8,7 @@ abstract class GameState {
     abstract enter(): void;
     abstract execute(): void;
     exit(): void {
-        console.log(`${this.constructor.name} 状态退出`);
+        Logger.debug(`${this.constructor.name} 状态退出`);
     }
 }
 export interface IStateMachine {
@@ -50,27 +50,27 @@ export class GameController {
 
 // 具体状态类：开始游戏
 export class StartGameState extends GameState {
-    enter() { console.log("进入游戏..."); }
+    enter() { Logger.debug("进入游戏..."); }
     execute() {
-        console.log("准备开始游戏...");
+        Logger.debug("准备开始游戏...");
         setTimeout(() => this.delegate.next(), 1000); // 自动进入下一个状态
     }
 }
 
 // 具体状态类：游戏中
 export class InGameState extends GameState {
-    enter() { console.log("进入游戏中..."); }
+    enter() { Logger.debug("进入游戏中..."); }
     execute() {
-        console.log("正在游戏中...");
+        Logger.debug("正在游戏中...");
         setTimeout(() => this.delegate.next(), 1000);
     }
 }
 
 // 具体状态类：弹出选择框
 export class PopupState extends GameState {
-    enter() { console.log("弹出选择框..."); }
+    enter() { Logger.debug("弹出选择框..."); }
     execute() {
-        console.log("等待玩家选择...");
+        Logger.debug("等待玩家选择...");
         setTimeout(() => {
             const choice = prompt("请选择 (确认/取消): ");
             this.onUserChoice(choice || "取消");
@@ -88,6 +88,6 @@ export class PopupState extends GameState {
 
 // 具体状态类：结束游戏
 export class EndGameState extends GameState {
-    enter() { console.log("游戏结束..."); }
-    execute() { console.log("感谢您的游玩！"); }
+    enter() { Logger.debug("游戏结束..."); }
+    execute() { Logger.debug("感谢您的游玩！"); }
 }

package/assets/core/home/StorageManager.ts

@@ -50,7 +50,7 @@ export class StorageManager {
             keywords = this.iss.encryptKey(keywords);
         }
         if (null == value) {
-            console.warn("存储的值为空，则直接移除该存储");
+            Logger.warn("存储的值为空，则直接移除该存储");
             this.remove(key);
             return;
         }

package/assets/core/home/ThirdFreeLookCamera.ts

@@ -72,7 +72,7 @@ export class ThirdFreeLookCamera extends Component {
     isDown: boolean = false;
     private MouseDown(e: EventTouch) {
         this.isDown = true;
-        console.log("点击");
+        Logger.debug("点击");
     }
 
     private MouseMove(e: EventTouch) {
@@ -181,7 +181,7 @@ export class ThirdFreeLookCamera extends Component {
         this.angle = Quaternion.GetEulerFromQuat(_quat);
         this.MouseX = this.angle.y;
         this.MouseY = this.angle.x;
-        //console.log(this.MouseX.toFixed(2),this.MouseY.toFixed(2));
+        //Logger.debug(this.MouseX.toFixed(2),this.MouseY.toFixed(2));
     }
 
     /*************************FollowIndependentRotation end***************** */

package/assets/core/home/TimeManager.ts

@@ -98,7 +98,7 @@ export class TimeManager {
     updateCountdownTime(key: string, minutes: number): boolean {
         const countdownInfo = this.countdowns.get(key);
         if (!countdownInfo) {
-            console.warn(`倒计时 ${key} 不存在`);
+            Logger.warn(`倒计时 ${key} 不存在`);
             return false;
         }
 

package/assets/core/home/util/RandomUtil.ts

@@ -12,50 +12,50 @@
  */
 
 
-    /**
-     * 生成[0, max)的随机数
-     * @param max 
-     * @returns 
-     */
-    export function random(min: number, max?: number) {
-        if (!max) {
-            max = min;
-            min = 0;
-        }
-        return min + Math.random() * (max - min);
+/**
+ * 生成[0, max)的随机数
+ * @param max 
+ * @returns 
+ */
+export function random(min: number, max?: number) {
+    if (!max) {
+        max = min;
+        min = 0;
     }
+    return min + Math.random() * (max - min);
+}
 
-    /**
-     * 生成[0, max)的随机整数
-     * @param max 
-     * @returns 
-     */
-    export function randomInt(min: number, max?: number) {
-        return Math.floor(random(min, max));
+/**
+ * 生成[0, max)的随机整数
+ * @param max 
+ * @returns 
+ */
+export function randomInt(min: number, max?: number) {
+    return Math.floor(random(min, max));
+}
+/**
+* 从数组中随机取出不重复的元素
+* @param array 原始数组
+* @param count 要取的元素个数
+* @returns 随机不重复的元素数组
+*/
+export function randomUniqueElements<T>(array: T[], count: number): T[] {
+    // 如果请求的元素数量大于数组长度，则警告并限制为数组长度
+    if (count > array.length) {
+        Logger.warn('请求的元素数量大于数组长度，将返回全部元素');
+        count = array.length;
     }
-    /**
-  * 从数组中随机取出不重复的元素
-  * @param array 原始数组
-  * @param count 要取的元素个数
-  * @returns 随机不重复的元素数组
-  */
-    export function randomUniqueElements<T>(array: T[], count: number): T[] {
-        // 如果请求的元素数量大于数组长度，则警告并限制为数组长度
-        if (count > array.length) {
-            console.warn('请求的元素数量大于数组长度，将返回全部元素');
-            count = array.length;
-        }
-
-        // 创建数组副本，避免修改原始数组
-        const copy = [...array];
-        const result: T[] = [];
 
-        // 使用 Fisher-Yates 洗牌算法打乱数组顺序
-        for (let i = copy.length - 1; i > 0; i--) {
-            const j = Math.floor(Math.random() * (i + 1));
-            [copy[i], copy[j]] = [copy[j], copy[i]];
-        }
+    // 创建数组副本，避免修改原始数组
+    const copy = [...array];
+    const result: T[] = [];
 
-        // 返回打乱后的数组中前 count 个元素
-        return copy.slice(0, count);
+    // 使用 Fisher-Yates 洗牌算法打乱数组顺序
+    for (let i = copy.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [copy[i], copy[j]] = [copy[j], copy[i]];
     }
+
+    // 返回打乱后的数组中前 count 个元素
+    return copy.slice(0, count);
+}

package/assets/core/interface/MainModule.ts

@@ -16,6 +16,7 @@ import { TimeManager } from "../home/TimeManager";
 import { LanguageManager } from "../lib/language/Language";
 import { BundleConfigName, HttpType, IBundleConfig, IExtData, IHttpConfig, IInitConfig, IWindowParam, SystemMessage } from "../config/CommonEnum";
 import { LayerType } from "../config/LayerType";
+import { ELoggerLevel } from "../lib/logger/ELoggerLevel";
 
 
 // const { keepClassName } = keepClass;
@@ -87,13 +88,14 @@ export class MainModule {
         self._gui = new LayerUI();
         self._http = new HttpManager();
         if (!EDITOR) {
+            Logger.setLevel(ELoggerLevel.Error);
             await self._gui.loadConfig(param);
             const config: EnvironmentConfig = self._gui.current_config;
             // 免网络
             self._http.server = config.httpServer;
             self._http.timeout = config.httpTimeout;
         }
-        console.log("初始化完成")
+        Logger.debug("初始化完成")
     }
 
     static OpenLoading(is_show: boolean) {
@@ -113,8 +115,8 @@ export class MainModule {
         let width = node.getComponent(UITransform).contentSize.width;
         let height = node.getComponent(UITransform).contentSize.height;
         let windowSize = view.getVisibleSize();
-        // console.log(windowSize);
-        //  console.log("屏幕：", windowSize);
+        // Logger.debug(windowSize);
+        //  Logger.debug("屏幕：", windowSize);
         let leftRatio = node.worldPosition.x / windowSize.width;
         let topRatio = 1 - (node.worldPosition.y / windowSize.height);
 
@@ -266,22 +268,22 @@ export class MainModule {
     // static async Http<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>> {
     //     return new Promise<HttpReturn<any>>(async (resolve, reject) => {
     //         MainModule.OpenBlockEvents(LayerType.LayerBlockEventsNet, true)
-    //         console.warn(`发起${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${config.url}\n 参数：${params}`,);
+    //         Logger.warn(`发起${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${config.url}\n 参数：${params}`,);
     //         let ret: HttpReturn<any>;
     //         if (config.type == HttpType.GET) {
     //             ret = await MainModule.http.getJson(config.url, params);
     //         } else if (config.type == HttpType.POST) {
     //             ret = await MainModule.http.postJson(config.url, params);
     //         }
-    //         console.warn(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${config.url}\n 参数：${params}`);
-    //         console.warn(`返回结果：${ret}`);
-    //         console.warn(`返回结果：${JSON.stringify(ret.res)}`);
+    //         Logger.warn(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${config.url}\n 参数：${params}`);
+    //         Logger.warn(`返回结果：${ret}`);
+    //         Logger.warn(`返回结果：${JSON.stringify(ret.res)}`);
     //         MainModule.OpenBlockEvents(LayerType.LayerBlockEventsNet, false)
     //         if (ret.isSucc) {
     //             resolve(ret.res)
     //         }
     //         else {
-    //             console.log(ret.err);
+    //             Logger.debug(ret.err);
     //             if (ext && ext.is_show_alert || (ext === undefined || ext.is_show_alert === undefined)) {
     //                 const param = { des: "网络断开,请检查网络!", enterStr: "重试？", cancelStr: "取消", isDestory: false }
     //                 const view = await CommonModule.OpenAlertWindow(param);
@@ -315,7 +317,7 @@ export class MainModule {
                     MainModule.OpenBlockEvents(LayerType.LayerBlockEventsNet, true);
 
                     const url = MainModule.gui.current_config.httpServer + config.url
-                    console.log(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${url} `, `\n 参数：`, params);
+                    Logger.debug(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} url:${url} `, `\n 参数：`, params);
                     let ret: HttpReturn<any>;
                     if (config.type === HttpType.GET) {
                         ret = await MainModule.http.getJson(config.url, params);
@@ -323,9 +325,9 @@ export class MainModule {
                         ret = await MainModule.http.postJson(config.url, params, ext);
                     }
 
-                    console.log(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} 结果 url:${url}\n`, ` 参数：`, params);
-                    console.log(`返回结果：`, ret.res);
-                    //console.warn(`返回结果：${JSON.stringify(ret.res)}`);
+                    Logger.debug(`${config.type === HttpType.GET ? "GET请求" : "POST请求"} 结果 url:${url}\n`, ` 参数：`, params);
+                    Logger.debug(`返回结果：`, ret.res);
+                    //Logger.warn(`返回结果：${JSON.stringify(ret.res)}`);
 
                     MainModule.OpenBlockEvents(LayerType.LayerBlockEventsNet, false);
                     if (ret.isSucc) {
@@ -352,7 +354,7 @@ export class MainModule {
                         });
 
                         if (!userChoice) {
-                            console.log("用户取消请求");
+                            Logger.debug("用户取消请求");
                             originalReject("取消了"); // 用户取消，调用原始 reject
                             return;
                         }
@@ -399,7 +401,7 @@ export class MainModule {
                     return;
                 }
                 else if (MainModule.IsWindowOpen(className)) {
-                    console.warn("重复打开窗口-请检查", config.path)
+                    Logger.warn("重复打开窗口-请检查", config.path)
                     return;
                 }
                 //console.error('打开:', Array.from(MainModule.Instance.openedWindows.keys()), config.path);
@@ -439,7 +441,7 @@ export class MainModule {
                 list.push(className);
                 const layerUI_list = MainModule.Ins.openWindowLayer.get(LayerType.LayerUI)
                 if (layerUI_list && layerUI_list.length > 0) MainModule.gui.GetLayer(LayerType.LayerGame).active = false;
-                console.log('LayerType.LayerUI 打开窗口记录:', className, list);
+                Logger.debug('LayerType.LayerUI 打开窗口记录:', className, list);
                 MainModule.Emit(SystemMessage.OpenWindow, className)
 
                 resolve(view);
@@ -556,7 +558,7 @@ export class MainModule {
                 params?.callback?.()
             }
             else {
-                console.log("图片已销毁")
+                Logger.debug("图片已销毁")
             }
             return;
         }
@@ -567,7 +569,7 @@ export class MainModule {
                     params?.callback?.()
                 }
                 else {
-                    console.log("图片已销毁")
+                    Logger.debug("图片已销毁")
                 }
             }
         })
@@ -594,7 +596,7 @@ export class MainModule {
                     params?.callback?.()
                 }
                 else {
-                    console.log("动画已销毁")
+                    Logger.debug("动画已销毁")
                 }
             }
         })
@@ -626,10 +628,10 @@ export class MainModule {
                 extra: "extra",
                 zoneId: "default",
                 success(res) {
-                    console.log(`排行榜设置成功: ${res}`);
+                    Logger.debug(`排行榜设置成功: ${res}`);
                 },
                 fail(res) {
-                    console.log(`排行榜设置失败: ${res.errMsg}`);
+                    Logger.debug(`排行榜设置失败: ${res.errMsg}`);
                 },
             });
         }
@@ -640,7 +642,7 @@ export class MainModule {
         if (BYTEDANCE) {
             //@ts-ignore
             const info = tt.getSystemInfoSync();
-            console.log('-------抖音', info.appName);
+            Logger.debug('-------抖音', info.appName);
             const appName = info.appName;
             if (appName.toUpperCase() === "DOUYIN") {//抖音
                 // do something
@@ -862,7 +864,7 @@ export class MainModule {
                 return false;
             }
         } else {
-            console.warn(`窗口 ${className} 未找到或未打开`);
+            Logger.warn(`窗口 ${className} 未找到或未打开`);
             return false;
         }
     }
@@ -901,7 +903,7 @@ export class MainModule {
             const list_layer = MainModule.Ins.openWindowLayer.get(config.layer)
             list_layer.pop();//移除最后一个
             this.ShowLayerUI(config, true)
-            console.log('LayerType.LayerUI 移除窗口记录:', className, list_layer);
+            Logger.debug('LayerType.LayerUI 移除窗口记录:', className, list_layer);
         }
 
         this.openedWindows.delete(className);
@@ -930,7 +932,7 @@ export class MainModule {
             }
         }
 
-        console.log(`共关闭 ${closedCount} 个窗口`);
+        Logger.debug(`共关闭 ${closedCount} 个窗口`);
         return closedCount;
     }
 
@@ -985,7 +987,7 @@ export class MainModule {
     //#region 运行补丁
     // 默认实现函数
     static DefaultFunction(param?: any, callBack?: Function) {
-        console.warn('调用了默认方法，可能该方法未实现', param);
+        Logger.warn('调用了默认方法，可能该方法未实现', param);
         callBack?.();
     }
     /**

package/assets/core/lib/language/Language.ts

@@ -1,7 +1,6 @@
 import { sys } from "cc";
 import { LanguageData } from "./LanguageData";
 import { LanguagePack } from "./LanguagePack";
-import { Logger } from "../Logger";
 import { LanguageLabel } from "./LanguageLabel";
 import { LanguageSprite } from "./LanguageSprite";
 import { EDITOR } from "cc/env";
@@ -69,18 +68,18 @@ export class LanguageManager {
 
         let index = this.languages.indexOf(language);
         if (index < 0) {
-            console.log(`当前不支持【${language}】语言，将自动切换到【${this._defaultLanguage}】语言`);
+            Logger.debug(`当前不支持【${language}】语言，将自动切换到【${this._defaultLanguage}】语言`);
             language = this._defaultLanguage;
         }
 
         if (language === LanguageData.current) {
-            console.log(`当前语言【${language}】语言,没有改变`)
+            Logger.debug(`当前语言【${language}】语言,没有改变`)
             callback && callback();
             return;
         }
 
         this.loadLanguageAssets(bundleName, language, (lang: string) => {
-            Logger.logConfig(`当前语言为【${language}】`);
+            Logger.debug(`当前语言为【${language}】`);
             const oldLanguage = LanguageData.current;
             LanguageData.current = language;
             this._languagePack.updateLanguage(language);

package/assets/core/lib/language/LanguageData.ts

@@ -80,7 +80,7 @@ export class LanguageData {
             let url = absoluteUrl.split("://");
             let paths = url[1].split("/");
             dbUrl = url[0] + "://" + paths[0] + "/" + paths[1];
-            //console.log("absoluteUrl112222:", absoluteUrl, dbUrl);
+            //Logger.debug("absoluteUrl112222:", absoluteUrl, dbUrl);
             //label
             return dbUrl
 
@@ -93,7 +93,7 @@ export class LanguageData {
         let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
         await new Promise<void>((resolve) => {
             assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
-                // console.log("2加载表格", jsonAsset, err);
+                // Logger.debug("2加载表格", jsonAsset, err);
                 MainModule.gui.config = jsonAsset.json as IConfig;
                 //console.error(MainModule.gui.config)
                 resolve()

package/assets/core/lib/language/LanguageLabel.ts

@@ -118,7 +118,7 @@ export class LanguageLabel extends Component {
         const richtext = this.getComponent(RichText);
         const font: TTFFont | null = LanguageData.font;
 
-        //   console.log('过呢更新', this.node.name, this.string, LanguageData.current)
+        //   Logger.debug('过呢更新', this.node.name, this.string, LanguageData.current)
         if (label) {
             if (font) {
                 label.font = font;
@@ -156,7 +156,7 @@ export class LanguageLabel extends Component {
 
         let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
         assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
-            //     console.log("加载表格", jsonAsset, err);
+            //     Logger.debug("加载表格", jsonAsset, err);
             if (!jsonAsset) return;
             let labelData = jsonAsset.json;
             LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);

package/assets/core/lib/language/LanguagePack.ts

@@ -12,7 +12,6 @@ import { ResourceManager } from "../../home/ResourceManager";
 import { SpriteFrame } from "cc";
 import { sp } from "cc";
 import { JsonUtil } from "../../home/JsonUtil";
-import { Logger } from "../Logger";
 
 export class LanguagePack {
     /**
@@ -62,7 +61,7 @@ export class LanguagePack {
         return new Promise((resolve, reject) => {
             const path = `${LanguageData.path_texture}/${lang}`;
             MainModule.loadDir(bundleName, path, SpriteFrame, () => { }).then(() => {
-                Logger.logConfig(path, "下载语言包 textures 资源");
+                Logger.debug(path, "下载语言包 textures 资源");
                 resolve();
             });
         });
@@ -75,7 +74,7 @@ export class LanguagePack {
             const jsonAsset = await MainModule.loadAsset(bundleName, path, JsonAsset);
             if (jsonAsset) {
                 LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
-                Logger.logConfig(path, "下载语言包 json 资源");
+                Logger.debug(path, "下载语言包 json 资源");
             }
             else {
                 resolve();
@@ -83,7 +82,7 @@ export class LanguagePack {
             }
 
             MainModule.loadAsset(bundleName, path, TTFFont).then((font: TTFFont) => {
-                Logger.logConfig(path, "下载语言包 ttf 资源");
+                Logger.debug(path, "下载语言包 ttf 资源");
                 LanguageData.font = font;
                 resolve();
             });
@@ -95,7 +94,7 @@ export class LanguagePack {
         return new Promise(async (resolve, reject) => {
             const path = `${LanguageData.path_spine}/${lang}`;
             MainModule.loadDir(bundleName, path, sp.Skeleton, () => { }).then(() => {
-                Logger.logConfig(path, "下载语言包 spine 资源");
+                Logger.debug(path, "下载语言包 spine 资源");
                 resolve();
             });
         });

package/assets/core/lib/language/LanguageSprite.ts

@@ -115,7 +115,7 @@ export class LanguageSprite extends Component {
                 return;
             }
             assetManager.loadAny(uuid, (err, imageAsset: ImageAsset) => {
-                //console.log("加载图片", imageAsset, err);
+                //Logger.debug("加载图片", imageAsset, err);
                 if (!imageAsset) return;
                 let spriteFrame = SpriteFrame.createWithImage(imageAsset);
                 com.updateSpriteEditor(spriteFrame)

package/assets/core/lib/logger/ELoggerLevel.ts

@@ -2,15 +2,3 @@ export enum ELoggerLevel {
     Debug = 1, Info, Warn, Error
 }
 
-export enum EServerUrl {
-    Local = "http://192.168.6.17:8085",
-    OnLine = "https://sx-login.wyx.cn:10005",
-    Web = "http://49.232.130.221:10007",
-    /** 杨敏 */
-    Yang = "http://192.168.1.253:8081",
-    /** 付思佳 */
-    Fu = "http://192.168.1.34:8081",
-    TYF = "http://192.168.1.107:8081",
-    WYY = "http://192.168.1.46:8081",
-    HSJ = "http://192.168.1.78:8081",
-}

package/assets/core/lib/logger/MLogger.ts

@@ -11,7 +11,7 @@ function none(...data) { }
 //不同级别日志Title颜色
 const debugStyle = `color: #17B6C3; font-weight: bold;`;
 const infoStyle = `color: #008000; font-weight: bold;`;
-const warnStyle = `color: #FFFF00; font-weight: bold;`;
+const warnStyle = `color: #ff8800ff; font-weight: bold;`;
 const errorStyle = `color: #C52B2B; font-weight: bold;`;
 
 export class MLogger {
@@ -21,7 +21,7 @@ export class MLogger {
 
     /** 脚本加载时自动执行 */
     private static init = (() => {
-        MLogger.setLevel(ELoggerLevel.Debug);
+        //MLogger.setLevel(ELoggerLevel.Debug);
         game.on(Game.EVENT_RESTART, () => {
             this.startTimeMS.clear();
         });
@@ -58,15 +58,13 @@ export class MLogger {
     //日志打印对象
     private constructor(tag: string, level: ELoggerLevel = ELoggerLevel.Info) {
         this.debug = globalLevel > ELoggerLevel.Debug || level > ELoggerLevel.Debug ?
-            none : console.log.bind(console, `%c[${globalTag} ${tag} Debug]`, debugStyle);
+            none : Logger.debug.bind(console, `%c[${globalTag} ${tag} Debug]`, debugStyle);
         this.info = globalLevel > ELoggerLevel.Info || level > ELoggerLevel.Info ?
-            none : console.log.bind(console, `%c[${globalTag} ${tag} Info]`, infoStyle);
+            none : Logger.debug.bind(console, `%c[${globalTag} ${tag} Info]`, infoStyle);
         this.warn = globalLevel > ELoggerLevel.Warn || level > ELoggerLevel.Warn ?
-            none : console.warn.bind(console, `%c[${globalTag} ${tag} Warn]`, warnStyle);
+            none : Logger.warn.bind(console, `%c[${globalTag} ${tag} Warn]`, warnStyle);
         this.error = globalLevel > ELoggerLevel.Error || level > ELoggerLevel.Error ?
             none : console.error.bind(console, `%c[${globalTag} ${tag} Error]`, errorStyle);
-
-
     }
 
     public debug: (...data) => void;
@@ -82,7 +80,7 @@ export class MLogger {
     /** 给予一个Key，并开始计时 */
     public static time(key: string) {
         if (this.startTimeMS.has(key)) {
-            console.warn("Key已存在", key);
+            Logger.warn("Key已存在", key);
         }
         this.startTimeMS.set(key, Date.now());
     }
@@ -115,4 +113,5 @@ export class MLogger {
 //     /** 日志打印类 */
 //     const Logger: typeof MLogger;
 // }
+//@ts-ignore
 window.Logger = MLogger;