@chiyou/minigame-framework 1.2.62 → 1.2.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chiyou/minigame-framework",
-  "version": "1.2.62",
+  "version": "1.2.64",
   "description": "基于 Cocos Creator 3.x 的小游戏开发框架，支持多平台发布",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/Framework/Manager/AdMgr.ts

@@ -69,6 +69,9 @@ export class AdMgr extends BaseMgr {
     /** 内容区域底部 */
     private static contentBottom: number = 0;
 
+    private audioMgr: AudioMgr = null;
+    private userMgr: UserMgr = null;
+
     onLoad(): void {
         super.onLoad();
 
@@ -278,18 +281,26 @@ export class AdMgr extends BaseMgr {
             }
 
             if (res === RewardedVideoAd_Callback_Status.Status_Watching) {
-                let audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
-                if (audioMgr) {
-                    audioMgr.pauseMusic();
+                if (AdMgr.Instance.audioMgr === null) {
+                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+                }
+
+                if (AdMgr.Instance.audioMgr) {
+                    AdMgr.Instance.audioMgr.pauseMusic();
                 }
+
                 AdMgr.Instance.hideAllPermanentAd();
             } else if (res === RewardedVideoAd_Callback_Status.Status_Complete ||
                 res === RewardedVideoAd_Callback_Status.Status_Giveup ||
                 res === RewardedVideoAd_Callback_Status.Status_Error) {
-                let audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
-                if (audioMgr) {
-                    audioMgr.resumeMusic();
+                if (AdMgr.Instance.audioMgr === null) {
+                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
                 }
+
+                if (AdMgr.Instance.audioMgr) {
+                    AdMgr.Instance.audioMgr.resumeMusic();
+                }
+
                 AdMgr.Instance.showAllPermanentAd();
             }
 
@@ -531,10 +542,13 @@ export class AdMgr extends BaseMgr {
             let adPlatformSettingInfo: AdPlatformSettingInfo = AdMgr.adPlatformSettingMap.get(this.getCurrentPlatformID());
             launchNoAdInterval = adPlatformSettingInfo.launchNoAdInterval_interstitialAd;
 
-            interstitialAdIntervalBase = adPlatformSettingInfo.registerUser_interstitialAd_IntervalBase;
+            interstitialAdIntervalBase = adPlatformSettingInfo.retainUser_interstitialAd_IntervalBase;
+
+            if (this.userMgr === null) {
+                this.userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
+            }
 
-            const userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
-            if (userMgr && userMgr.isNewUser()) {
+            if (this.userMgr && this.userMgr.isNewUser()) {
                 interstitialAdIntervalBase = adPlatformSettingInfo.registerUser_interstitialAd_IntervalBase;
             }
         }

package/src/Framework/Manager/AudioMgr.ts

@@ -20,6 +20,8 @@ export class AudioMgr extends BaseMgr {
     private musicSwitch: boolean = false;
     private musicAudioSource: AudioSource = null;
 
+    private resMgr: ResMgr = null;
+
     onLoad(): void {
         super.onLoad();
 
@@ -185,9 +187,12 @@ export class AudioMgr extends BaseMgr {
             return;
         }
 
-        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
-        if (resMgr) {
-            let audioClip: AudioClip = resMgr.getAsset("Sounds", url);
+        if (this.resMgr === null) {
+            this.resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        }
+
+        if (this.resMgr) {
+            let audioClip: AudioClip = this.resMgr.getAsset("Sounds", url);
             if (audioClip == null) {
                 LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
                     operation: "playEffect",
@@ -281,9 +286,12 @@ export class AudioMgr extends BaseMgr {
             return;
         }
 
-        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
-        if (resMgr) {
-            let audioClip: AudioClip = resMgr.getAsset("Sounds", url);
+        if (this.resMgr === null) {
+            this.resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        }
+
+        if (this.resMgr) {
+            let audioClip: AudioClip = this.resMgr.getAsset("Sounds", url);
             if (audioClip == null) {
                 LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
                     operation: "playMusic",

package/src/Framework/Manager/ExcelMgr.ts

@@ -2,6 +2,7 @@ import CSV from '../Utils/CSVUtils';
 import { LogUtils } from '../Utils/LogUtils';
 import { BaseMgr } from './BaseMgr';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
+import { ServiceLocator } from '../Utils/ServiceLocator';
 
 /** Excel/CSV 配置表管理器 */
 export class ExcelMgr extends BaseMgr {
@@ -20,6 +21,8 @@ export class ExcelMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("ExcelMgr", this);
     }
 
     /** 初始化配置表管理器 */

package/src/Framework/Manager/NodePoolMgr.ts

@@ -69,6 +69,8 @@ export class NodePoolMgr extends BaseMgr {
         enableDebug: false,
     };
 
+    private uiMgr: UIMgr = null;
+
     onLoad(): void {
         super.onLoad();
 
@@ -424,12 +426,15 @@ export class NodePoolMgr extends BaseMgr {
             return null;
         }
 
-        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
-        if (!uiMgr) {
+        if (this.uiMgr === null) {
+            this.uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+        }
+
+        if (!this.uiMgr) {
             return null;
         }
 
-        let node: Node = uiMgr.create_ui(poolInfo.poolConfig.prefabUiName);
+        let node: Node = this.uiMgr.create_ui(poolInfo.poolConfig.prefabUiName);
         if (!node) {
             LogUtils.Instance.error(NodePoolMgr.TAG, FwkErrorCode.NodePool.CreateFailed, {
                 operation: "_createNode",
@@ -462,9 +467,12 @@ export class NodePoolMgr extends BaseMgr {
 
         let poolInfo: PoolInfo = this._poolInfoMap.get(poolName);
 
-        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
-        if (uiMgr) {
-            uiMgr.destroy_ui(poolName, node);
+        if (this.uiMgr === null) {
+            this.uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+        }
+
+        if (this.uiMgr) {
+            this.uiMgr.destroy_ui(poolName, node);
         }
 
         if (poolInfo.poolConfig && poolInfo.poolConfig.enableDebug) {

package/src/Framework/Manager/PrivacyMgr.ts

@@ -20,6 +20,8 @@ export class PrivacyMgr extends BaseMgr {
     /** 已同意的版本号 */
     private kindReminderAgreeVersion: string = "";
 
+    private uiMgr: UIMgr = null;
+
     onLoad(): void {
         super.onLoad();
 
@@ -175,13 +177,9 @@ export class PrivacyMgr extends BaseMgr {
             return;
         }
 
-        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
-
         this.getPlatformAdapter().requirePrivacyAuthorize((result) => {
             if (!result) {
-                if (uiMgr) {
-                    uiMgr.showToast("未同意隐私协议，无法使用" + featureName);
-                }
+                this.showToast("未同意隐私协议，无法使用" + featureName);
                 
                 LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝隐私授权", {
                     featureName: featureName,
@@ -195,9 +193,7 @@ export class PrivacyMgr extends BaseMgr {
             let privacyPlatformInfo: PrivacyPlatformInfo = privacyInfo.privacyPlatformMap.get(this.getCurrentPlatformID());
             let scopeDescription: string = privacyPlatformInfo?.scopeDescription || "未知";
             if (privacyPlatformInfo === null || privacyPlatformInfo.scopeDisable) {
-                if (uiMgr) {
-                    uiMgr.showToast("不支持[" + scopeDescription + "]，无法使用" + featureName);
-                }
+                this.showToast("不支持[" + scopeDescription + "]，无法使用" + featureName);
 
                 LogUtils.Instance.info(PrivacyMgr.TAG, "隐私功能不支持", {
                     featureName: featureName,
@@ -221,9 +217,7 @@ export class PrivacyMgr extends BaseMgr {
             let scopeName: string = privacyPlatformInfo.scopeName;
             this.getPlatformAdapter().getSetting(scopeName, (result: GetSettingResult) => {
                 if (result === GetSettingResult.Result_SettingNotAvailable) {
-                    if (uiMgr) {
-                        uiMgr.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
-                    }
+                    this.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
 
                     LogUtils.Instance.info(PrivacyMgr.TAG, "隐私授权失败（版本不支持）", {
                         featureName: featureName,
@@ -233,9 +227,7 @@ export class PrivacyMgr extends BaseMgr {
                     callback(QueryPrivacyResult.Result_Invalid);
                     return;
                 } else if (result === GetSettingResult.Result_Rejected) {
-                    if (uiMgr) {
-                        uiMgr.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
-                    }
+                    this.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
 
                     LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝权限授权", {
                         featureName: featureName,
@@ -248,9 +240,7 @@ export class PrivacyMgr extends BaseMgr {
                 } else if (result === GetSettingResult.Result_NotExist_AuthorizeAvailable) {
                     this.getPlatformAdapter().authorize(scopeName, (result3) => {
                         if (result3 === AuthorizeResult.Result_AuthorizeNotAvailable) {
-                            if (uiMgr) {
-                                uiMgr.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
-                            }
+                            this.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
 
                             LogUtils.Instance.info(PrivacyMgr.TAG, "授权失败（功能不可用）", {
                                 featureName: featureName,
@@ -260,9 +250,7 @@ export class PrivacyMgr extends BaseMgr {
                             callback(QueryPrivacyResult.Result_Invalid);
                             return;
                         } else if (result3 === AuthorizeResult.Result_Rejected) {
-                            if (uiMgr) {
-                                uiMgr.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
-                            }
+                            this.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
 
                             LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝授权请求", {
                                 featureName: featureName,
@@ -302,4 +290,14 @@ export class PrivacyMgr extends BaseMgr {
             });
         });
     }
+
+    private showToast(msg: string, duration?: ToastDuration) {
+        if (this.uiMgr === null) {
+            this.uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+        }
+
+        if (this.uiMgr) {
+            this.uiMgr.showToast(msg, duration);
+        }
+    }
 }

package/src/Framework/Manager/UIMgr.ts

@@ -110,6 +110,8 @@ export class UIMgr extends BaseMgr {
     /** Toast 历史最大记录数 */
     private toastHistoryMaxCount: number = 10;
 
+    private resMgr: ResMgr = null;
+
     /** 打印 UI 映射（调试用） */
     public print(): void {
         LogUtils.Instance.info(UIMgr.TAG, "UI映射表", {
@@ -263,12 +265,15 @@ export class UIMgr extends BaseMgr {
      * @return UI 节点
      */
     public create_ui(ui_name: string, parent?: Node): Node {
-        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
-        if (!resMgr) {
+        if (this.resMgr === null) {
+            this.resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        }
+
+        if (!this.resMgr) {
             return null;
         }
 
-        let uiPrefab: Prefab = resMgr.getAsset("GUI", "UIPrefabs/" + ui_name);
+        let uiPrefab: Prefab = this.resMgr.getAsset("GUI", "UIPrefabs/" + ui_name);
         if (!uiPrefab) {
             LogUtils.Instance.error(UIMgr.TAG, FwkErrorCode.UI.PrefabNotFound, {
                 operation: "create_ui",

package/src/Framework/Manager/UserMgr.ts

@@ -50,6 +50,10 @@ export class UserMgr extends BaseMgr {
     private lastUpdateFullUserData: any = null;
     private lastOnHideUpdateTimestampInSecond: number = 0;
 
+    private adMgr: AdMgr = null;
+    private socialMgr: SocialMgr = null;
+    private timerMgr: TimerMgr = null;
+
     onLoad(): void {
         super.onLoad();
 
@@ -68,9 +72,12 @@ export class UserMgr extends BaseMgr {
     protected onDestroy(): void {
         EventMgr.Instance.off(FrameworkBase.Message.LifeCycle_onGameHide, this.onGameHideCallback, this);
 
-        let timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
-        if (timerMgr) {
-            timerMgr.removeTimer(this.autoSaveUserDataExecute, this);
+        if (this.timerMgr === null) {
+            this.timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
+        }
+
+        if (this.timerMgr) {
+            this.timerMgr.removeTimer(this.autoSaveUserDataExecute, this);
         }
     }
 
@@ -111,9 +118,12 @@ export class UserMgr extends BaseMgr {
         }
 
         if (this.userBehaviorPlatformInfo.autoSaveInterval > 0 && this.userBehaviorPlatformInfo.supportServerUserData) {
-            let timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
-            if (timerMgr) {
-                timerMgr.addTimer(0, this.userBehaviorPlatformInfo.autoSaveInterval, -1, this.autoSaveUserDataExecute, this);
+            if (this.timerMgr === null) {
+                this.timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
+            }
+
+            if (this.timerMgr) {
+                this.timerMgr.addTimer(0, this.userBehaviorPlatformInfo.autoSaveInterval, -1, this.autoSaveUserDataExecute, this);
             }
         }
 
@@ -816,10 +826,15 @@ export class UserMgr extends BaseMgr {
             return;
         }
 
-        let adMgr = ServiceLocator.Instance.get<AdMgr>("AdMgr");
-        let socialMgr = ServiceLocator.Instance.get<SocialMgr>("SocialMgr");
-        if (adMgr && socialMgr) {
-            if (adMgr.isRewardedVideoAdShowing() && socialMgr.isSharing()) {
+        if (this.adMgr === null) {
+            this.adMgr = ServiceLocator.Instance.get<AdMgr>("AdMgr");
+        }
+        if (this.socialMgr === null) {
+            this.socialMgr = ServiceLocator.Instance.get<SocialMgr>("SocialMgr");
+        }
+
+        if (this.adMgr && this.socialMgr) {
+            if (this.adMgr.isRewardedVideoAdShowing() && this.socialMgr.isSharing()) {
                 return;
             }
         }