@cc-component/cc-core 1.2.8 → 1.2.9

package/assets/core/interface/Interface.ts

@@ -10,15 +10,15 @@ import { ISceneParam } from "./ISceneParam";
 import { StorageManager } from "../home/StorageManager";
 import { Component } from "cc";
 import { MLogger } from "../lib/logger/MLogger";
+import { EventManager } from "../home/EventManager";
+import { AudioUtil } from "../home/AudioUtil";
 
 declare global {
   /** 日志打印类 */
   const Logger: typeof MLogger;
 
   /**工具中间层======================================= */
-  namespace MainModule {
-    /**当前所在bundle名称 */
-    const bundleName: string;
+  namespace App {
     /**ui */
     const gui: LayerUI;
     /**网络 */
@@ -28,71 +28,68 @@ declare global {
     /**场景参数 */
     const scenesParm: ISceneParam;
     /**时间管理 */
-    const timeManager: TimeManager;
+    const time: TimeManager;
     /**多语言 */
     const language: LanguageManager;
-
-    /**=====================================✅✅✅ 初始化======================= */
+    /**消息 */
+    const message: EventManager
+    /**声音 */
+    const sound: AudioUtil
+    /**当前所在bundle名称 */
+    const bundleName: string;
+    /**=====================================⚠️⚠️⚠️ 初始化必须实现的监听======================= */
     /** 初始化配置*/
     function InitGameConfig(param: IInitConfig): Promise<void>;
-    /**打开场景 */
-    function OpenScene(param: ISceneParam)
-    /**打开遮罩 */
-    function OpenBlockEvents(type: LayerType, is_show: boolean)
-
-    /**=====================================✅✅✅ 必须实现的监听======================= */
+    /**=====================================⚠️⚠️⚠️ 必须实现的监听======================= */
     /**监听：打开场景加载进度窗口 -open 回调方法需要执行 finish() 方法 */
     function OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void })
     /**监听：显示加载动画 -open 回调方法需要执行 finish() 方法 */
     function OnLoading(param: { open: (finish: () => void) => void, close: () => void })
     /**监听：是否打开网络接口重连窗口 -open 回调方法需要执行 finish() 方法 */
     function OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void })
+    /**=====================================✅✅Http请求======================= */
+    /**网络接口 */
+    function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>>;
     /**=====================================✅✅消息发送======================= */
     function Emit(eventName: string, params?: any);
     function On(eventName: string, callback: any, target?: any);
     function Off(eventName: string, callback?: any, target?: any);
     function OffAll(target: any);
-    /**=====================================✅✅Http请求======================= */
-    /**网络接口 */
-    function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>>;
 
     /**=====================================✅✅资源加载======================= */
     /**
-     * 加载资源并自动记录
-     * @param bundleName Bundle 名称
-     * @param path 资源路径
-     * @param type 资源类型
-     * @returns 加载的资源
-     */
-    /**
-     * 异步
      * 加载资源并自动记录---
      * @param bundleName Bundle 名称
      * @param path 资源路径
      * @param type 资源类型
      * @returns 加载的资源
      */
-    function loadAsset<T extends Asset>(bundleName: string, path: string, type: AssetsType<T>): Promise<T>;
+    function LoadAsset<T extends Asset>(bundleName: string, path: string, type: AssetsType<T>): Promise<T>;
     /**
      * 获取已经加载过的资源
-     * 获取资源
      * @param bundleName Bundle 名称
      * @param path 资源路径
      * @param type 资源类型
      * @returns 加载的资源
      */
-    function getAsset<T extends Asset>(bundleName: string, path: string, type?: { new(): T }): T;
-    function releaseAssetsByBundle(bundleName: string)
-    function releaseAsset(bundleName: string, node: any)
-    function releaseAssetPath(path: string, bundleName: string): void
-    function preloadDir(bundleName: string, dirName: string, pre: Function): Promise<void>;
-    function loadDir(bundleName: string, dirName: string, type: any, pre: Function): Promise<void>;
+    function GetAsset<T extends Asset>(bundleName: string, path: string, type?: { new(): T }): T;
+    function ReleaseAssetsByBundle(bundleName: string)
+    function ReleaseAsset(bundleName: string, node: any)
+    function ReleaseAssetPath(path: string, bundleName: string): void
+    function PreloadDir(bundleName: string, dirName: string, pre: Function): Promise<void>;
+    function LoadDir(bundleName: string, dirName: string, type: any, pre: Function): Promise<void>;
     /**加载图片 */
     function LoadSprite(sp: Sprite, params: { path: string, bundle?: string, callback?: () => void })
     /**加载spine骨骼动画 */
     function LoadSpine(spine: sp.Skeleton, params: { path: string, bundle?: string, callback?: () => void })
+    /**播放skpine动画 */
+    function PlaySpine(skeleton: sp.Skeleton, animations: { name: string, loop?: boolean, call?: (name?: string) => void, event?: (name?: string) => void }[])
 
     /**=======================================✅✅打开Window======================= */
+    /**打开场景 */
+    function OpenScene(param: ISceneParam)
+    /**打开遮罩 */
+    function OpenBlockEvents(type: LayerType, is_show: boolean)
     /**加载窗口 */
     function LoadWindow<T extends Component>(config: IBundleConfig, param?: IWindowParam): Promise<T>
     /**打开窗口 */
@@ -104,57 +101,49 @@ declare global {
     /**为 target 补全缺失的方法 */
     function RegisterModule(target: any)
     /**✅✅✅监听窗口的打开 */
-    //MainModule.On(SystemMessage.OpenWindow)
+    //App.On(SystemMessage.OpenWindow)
     /**✅✅✅监听窗口的关闭 */
-    //MainModule.On(SystemMessage.CloseWindow)
-    /**
-     * 显示加载转圈
-     */
+    //App.On(SystemMessage.CloseWindow)
+    /**获取所有已打开的窗口名称 */
+    function GetOpenedWindowNames(): string[]
+    /**获取已打开的窗口实例*/
+    function GetOpenWindow<T extends Component>(config: IBundleConfig): T;
+    // 获取已打开的窗口实例-对象
+    function GetOpenWindows<T extends Component>(): T[]
+    // 获取已打开的窗口实例-配置
+    function GetOpenWindowsConfig(): IBundleConfig[];
+    /** 显示加载转圈*/
     function OpenLoading(is_show: boolean);
     /**=======================================✅✅音乐======================= */
-    function playOneShot(sound: string, volume?: number);
-    function play(sound: string, volume?: number);
-    function stop();
-    function pause();
-    function resume();
-    function musicVolume(volume: number);
-    function soundVolume(volume: number);
-    function getMusicVolume(): number;
-    function getSoundVolume(): number;
-    /**=======================================✅✅抖音======================= */
-
-    function UpdatePlayerRankData_tt(param);//抖音排行榜
-    function IsDouYin();
-    /**=======================================微信======================= */
-    function GetWxRatio(param);
+    function PlayOneShot(sound: string, volume?: number);
+    function Play(sound: string, volume?: number);
+    function Stop();
+    function Pause();
+    function Resume();
+    function MusicVolume(volume: number);
+    function SoundVolume(volume: number);
+    function GetMusicVolume(): number;
+    function GetSoundVolume(): number;
 
     /**=======================================✅✅常用工具======================= */
-    function twoBezier(param1, param2, param3, param4);
-    function customEaseOutInWithSpeed(param)
-    function Collision(param1, param2)
-    function CalculateAngle(param1, param2)
-    function LookAtTarget(param1, param2)
-    /**向量的新的位置 */
-    function DirectionPosition(start: Vec3, endPos: Vec3, scalar: number)
-    function DateNow();
-    function DeepCopy<T>(obj: T): T;
-    /**
-     * 开始抛物线缓动
-     * @param item 运动节点
-     * @param target_postion 目标位置
-     * @param update 更新 运动中回调
-     * @param offset_ratio 最高点 的偏移量
-     * @param time 动画时间
-     */
-    function RunParabolaTween(item: any, target_postion: Vec3, update: (ratio: number) => void, param?: { offset_ratio?: number, is_random?: boolean, time?: number, start_position?: Vec3 })
-
-    /**任务进度队列 */
-    function PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]>
-    /**播放skpine动画 */
-    function PlaySpine(skeleton: sp.Skeleton, animations: { name: string, loop?: boolean, call?: (name?: string) => void, event?: (name?: string) => void }[])
+    // function TwoBezier(param1, param2, param3, param4);
+    // function CustomEaseOutInWithSpeed(param)
+    // function Collision(param1, param2)
+    // function CalculateAngle(param1, param2)
+    // function LookAtTarget(param1, param2)
+    // /**向量的新的位置 */
+    // function DirectionPosition(start: Vec3, endPos: Vec3, scalar: number)
+    // /**
+    //  * 开始抛物线缓动
+    //  * @param item 运动节点
+    //  * @param target_postion 目标位置
+    //  * @param update 更新 运动中回调
+    //  * @param offset_ratio 最高点 的偏移量
+    //  * @param time 动画时间
+    //  */
+    // function RunParabolaTween(item: any, target_postion: Vec3, update: (ratio: number) => void, param?: { offset_ratio?: number, is_random?: boolean, time?: number, start_position?: Vec3 })
+    // /**任务进度队列 */
+    // function PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]>
   }
-
-
-
 }
 

package/assets/core/interface/Interface.ts.meta

@@ -1 +1 @@
-{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"7be443b6-0cd5-4d13-85fd-bf3be2360076","files":[],"subMetas":{},"userData":{}}
+{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"3b5d9f64-db0d-470b-8f5f-37e290b09cbe","files":[],"subMetas":{},"userData":{}}

package/assets/core/interface.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "b05086b8-fc86-4ae0-ac03-a2eba5a8f197",
+  "uuid": "d667ff12-8247-45cf-a3ed-e97a36acc1cf",
   "files": [],
   "subMetas": {},
   "userData": {}

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/Language.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "3757cc59-a8b6-4e6c-876f-3ff810e98ba3",
+  "uuid": "fe9e59c3-1cd7-40fe-87b9-83decace15ff",
   "files": [],
   "subMetas": {},
   "userData": {

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,9 +93,9 @@ 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);
-                MainModule.gui.config = jsonAsset.json as IConfig;
-                //console.error(MainModule.gui.config)
+                // Logger.debug("2加载表格", jsonAsset, err);
+                App.gui.config = jsonAsset.json as IConfig;
+                //console.error(App.gui.config)
                 resolve()
             });
         })

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "27fb3b23-0fcd-4994-83f6-2854d2594a78",
+  "uuid": "26465138-9190-49fc-a052-02d30f9234e8",
   "files": [],
   "subMetas": {},
   "userData": {}

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;
@@ -140,8 +140,8 @@ export class LanguageLabel extends Component {
 
     async addEditor() {
         if (EDITOR) {
-            await MainModule.InitGameConfig()
-            MainModule.language.addEditorLabel(this);
+            await App.InitGameConfig({ bundleName: 'resources', launchComponent: null })
+            App.language.addEditorLabel(this);
             this.changeLabelEditor()
         } else {
             LanguageData.updateLanguage();
@@ -152,15 +152,15 @@ export class LanguageLabel extends Component {
     public async changeLabelEditor() {
         const dbUrl = await LanguageData.loadDBEditor(this.node)
         await LanguageData.loadConfig()
-        const db_json = dbUrl + `/${MainModule.gui.config.language.path.json}/${LanguageData.current}.json`
+        const db_json = dbUrl + `/${App.gui.config.language.path.json}/${LanguageData.current}.json`
 
         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);
-            MainModule.language.labelArr.forEach((com) => {
+            App.language.labelArr.forEach((com) => {
                 com.updateContent()
             })
         });

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "110c8bc4-7793-443c-bfcd-f66786427697",
+  "uuid": "a230c4a9-9ed0-4abd-8f29-902a1f574f80",
   "files": [],
   "subMetas": {},
   "userData": {

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 {
     /**
@@ -61,8 +60,8 @@ export class LanguagePack {
     private loadTexture(bundleName: string, lang: string): Promise<void> {
         return new Promise((resolve, reject) => {
             const path = `${LanguageData.path_texture}/${lang}`;
-            MainModule.loadDir(bundleName, path, SpriteFrame, () => { }).then(() => {
-                Logger.logConfig(path, "下载语言包 textures 资源");
+            App.LoadDir(bundleName, path, SpriteFrame, () => { }).then(() => {
+                Logger.debug(path, "下载语言包 textures 资源");
                 resolve();
             });
         });
@@ -72,18 +71,18 @@ export class LanguagePack {
     private loadJson(bundleName: string, lang: string): Promise<void> {
         return new Promise(async (resolve, reject) => {
             const path = `${LanguageData.path_json}/${lang}`;
-            const jsonAsset = await MainModule.loadAsset(bundleName, path, JsonAsset);
+            const jsonAsset = await App.LoadAsset(bundleName, path, JsonAsset);
             if (jsonAsset) {
                 LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
-                Logger.logConfig(path, "下载语言包 json 资源");
+                Logger.debug(path, "下载语言包 json 资源");
             }
             else {
                 resolve();
                 return;
             }
 
-            MainModule.loadAsset(bundleName, path, TTFFont).then((font: TTFFont) => {
-                Logger.logConfig(path, "下载语言包 ttf 资源");
+            App.LoadAsset(bundleName, path, TTFFont).then((font: TTFFont) => {
+                Logger.debug(path, "下载语言包 ttf 资源");
                 LanguageData.font = font;
                 resolve();
             });
@@ -94,8 +93,8 @@ export class LanguagePack {
     private loadSpine(bundleName: string, lang: string): Promise<void> {
         return new Promise(async (resolve, reject) => {
             const path = `${LanguageData.path_spine}/${lang}`;
-            MainModule.loadDir(bundleName, path, sp.Skeleton, () => { }).then(() => {
-                Logger.logConfig(path, "下载语言包 spine 资源");
+            App.LoadDir(bundleName, path, sp.Skeleton, () => { }).then(() => {
+                Logger.debug(path, "下载语言包 spine 资源");
                 resolve();
             });
         });

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "2ffebca3-e7dc-4873-8bf8-059b72f120e6",
+  "uuid": "1970858f-789e-47d3-b8b1-b2ca15ed6e76",
   "files": [],
   "subMetas": {},
   "userData": {

package/assets/core/lib/language/LanguagePointLabel.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.1",
   "importer": "typescript",
   "imported": true,
-  "uuid": "a1bd53a3-66a7-4477-8c18-9254dc5983bf",
+  "uuid": "4ff266c8-c612-41d5-87b5-f2f722dd129b",
   "files": [
     ".js",
     ".trans"

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

@@ -47,7 +47,7 @@ export class LanguageSpine extends Component {
     private updateSpine() {
         // 获取语言标记
         let path = `language/spine/${LanguageData.current}/${this.dataID}`;
-        let res: sp.SkeletonData | null = MainModule.getAsset(MainModule.bundleName, path, sp.SkeletonData);
+        let res: sp.SkeletonData | null = App.GetAsset(App.bundleName, path, sp.SkeletonData);
         if (res) {
             let spine: sp.Skeleton = this.getComponent(sp.Skeleton)!;
             spine.skeletonData = res;

package/assets/core/lib/language/LanguageSpine.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "53e2586a-57a5-4426-a6b2-5dfcfa41a9b6",
+  "uuid": "4da22b4f-3e1f-4830-9045-bba249a1ff00",
   "files": [],
   "subMetas": {},
   "userData": {}

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

@@ -60,9 +60,9 @@ export class LanguageSprite extends Component {
         let path = `language/texture/${LanguageData.current}/${this.dataID}/spriteFrame`;
         let res: SpriteFrame | null
         // 获取语言标记
-        res = MainModule.getAsset(MainModule.bundleName, path, SpriteFrame);
+        res = App.GetAsset(App.bundleName, path, SpriteFrame);
         if (!res) {
-            res = await MainModule.loadAsset(MainModule.bundleName, path, SpriteFrame)
+            res = await App.LoadAsset(App.bundleName, path, SpriteFrame)
         }
 
         if (res) {
@@ -85,8 +85,8 @@ export class LanguageSprite extends Component {
     //#endregion编辑器
     async addEditor() {
         if (EDITOR) {
-            await MainModule.InitGameConfig()
-            MainModule.language.addEditorSprite(this);
+            await App.InitGameConfig({ bundleName: 'resources', launchComponent: null })
+            App.language.addEditorSprite(this);
             this.changeSpriteEditor()
         } else {
             LanguageData.updateLanguage();
@@ -98,8 +98,8 @@ export class LanguageSprite extends Component {
         const dbUrl = await LanguageData.loadDBEditor(this.node)
         await LanguageData.loadConfig()
         //  console.error('-----', dbUrl)
-        const db_json = dbUrl + `/${MainModule.gui.config.language.path.texture}/${LanguageData.current}/`
-        MainModule.language.spriteArr.forEach(async (com) => {
+        const db_json = dbUrl + `/${App.gui.config.language.path.texture}/${LanguageData.current}/`
+        App.language.spriteArr.forEach(async (com) => {
             const path_jpg = db_json + com.dataID + ".jpg"
             const path_png = db_json + com.dataID + ".png"
             const path_wep = db_json + com.dataID + ".webp"
@@ -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/language/LanguageSprite.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "11b9693f-4486-45e7-b2e8-7a1c7297a1ec",
+  "uuid": "965904ec-c4bd-483b-8e46-c1832704066b",
   "files": [],
   "subMetas": {},
   "userData": {

package/assets/core/lib/language.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "722d249c-2ba7-494f-9832-64e282d14c02",
+  "uuid": "de8f241d-f827-4345-9c54-97a67ba20846",
   "files": [],
   "subMetas": {},
   "userData": {}

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/ELoggerLevel.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "24c2e3c8-3ade-4343-af15-9a1218bc621f",
+  "uuid": "107e2104-325b-45dd-9b9d-668104cb5847",
   "files": [],
   "subMetas": {},
   "userData": {}

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;

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "49563c26-0a41-416f-bb25-4352d292a3a5",
+  "uuid": "899ff66f-23cd-45d3-b9ad-a84e791940aa",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/lib/logger.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "07a5fd3f-8307-4942-9e4e-21e7f6c59419",
+  "uuid": "776f9b79-e928-4a6e-86c0-6084e9e7095d",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/lib/net/libs/proto/output/protobuf.d.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "f233e226-058a-46f8-b25d-389fe543d98a",
+  "uuid": "8d723bac-4ccd-4f30-8c62-ba8419a41c60",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/lib/net/libs/proto/output/protobuf.min.js.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "javascript",
   "imported": true,
-  "uuid": "e9228609-1489-4f1f-a41c-0b5059e0dd78",
+  "uuid": "042a03d2-1744-495d-8591-5c2d36389c94",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/lib/net/libs/proto/output/protobuf_custom.d.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "9105bd62-64e7-4460-b096-3e6f8b3fb445",
+  "uuid": "6fc3137d-408a-4395-99f4-756637ce6ea6",
   "files": [],
   "subMetas": {},
   "userData": {}