@chiyou/minigame-framework 1.2.61 → 1.2.62

package/package.json

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

package/src/Framework/Manager/AdMgr.ts

@@ -1,10 +1,8 @@
 import { math, randomRangeInt, view } from 'cc';
 import { LogUtils } from '../Utils/LogUtils';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
-import { AudioMgr } from './AudioMgr';
 import { AdCallback, Ad_Record, InterstitialAd_Callback_Status, InterstitialAd_Record, RewardedVideoAd_Callback_Status, RewardedVideoAd_Record, AdSwitchType, AdType, BannerAd_Info, CustomAd_Info, BannerAd_PlatformInfo, CustomAd_PlatformInfo, InterstitialAd_Scene, RewardedVideoAd_Scene, AdPlatformSettingInfo, AdPlatformUnitInfo, AdDefinition } from '../Definition/AdDefinition';
 import { PlatformID } from '../Definition/SystemDefinition';
-import { UserMgr } from './UserMgr';
 import { BaseMgr } from './BaseMgr';
 import { AbsAdAdapter } from '../Adapter/AdAdapter/AbsAdAdapter';
 import { AdAdapterWeiXin } from '../Adapter/AdAdapter/AdAdapterWeiXin';
@@ -18,6 +16,9 @@ import { AdAdapterTapTap } from '../Adapter/AdAdapter/AdAdapterTapTap';
 import { AdAdapterVivo } from '../Adapter/AdAdapter/AdAdapterVivo';
 import { AdAdapterXiaoMi } from '../Adapter/AdAdapter/AdAdapterXiaoMi';
 import { AdAdapterZhiFuBao } from '../Adapter/AdAdapter/AdAdapterZhiFuBao';
+import { ServiceLocator } from '../Utils/ServiceLocator';
+import type { UserMgr } from './UserMgr';
+import type { AudioMgr } from './AudioMgr';
 
 /** 广告管理器 */
 export class AdMgr extends BaseMgr {
@@ -77,6 +78,8 @@ export class AdMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("AdMgr", this);
     }
 
     /**
@@ -275,12 +278,18 @@ export class AdMgr extends BaseMgr {
             }
 
             if (res === RewardedVideoAd_Callback_Status.Status_Watching) {
-                AudioMgr.Instance.pauseMusic();
+                let audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+                if (audioMgr) {
+                    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) {
-                AudioMgr.Instance.resumeMusic();
+                let audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+                if (audioMgr) {
+                    audioMgr.resumeMusic();
+                }
                 AdMgr.Instance.showAllPermanentAd();
             }
 
@@ -523,7 +532,9 @@ export class AdMgr extends BaseMgr {
             launchNoAdInterval = adPlatformSettingInfo.launchNoAdInterval_interstitialAd;
 
             interstitialAdIntervalBase = adPlatformSettingInfo.registerUser_interstitialAd_IntervalBase;
-            if (UserMgr.Instance.isNewUser()) {
+
+            const userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
+            if (userMgr && userMgr.isNewUser()) {
                 interstitialAdIntervalBase = adPlatformSettingInfo.registerUser_interstitialAd_IntervalBase;
             }
         }

package/src/Framework/Manager/AudioMgr.ts

@@ -1,10 +1,11 @@
 import { AudioClip, AudioSource } from "cc";
 import { LogUtils } from "../Utils/LogUtils";
-import { ResMgr } from "./ResMgr";
 import { PlatformID } from "../Definition/SystemDefinition";
 import { FrameworkBase } from "../Definition/FrameworkBase";
 import { BaseMgr } from "./BaseMgr";
 import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
+import { ServiceLocator } from "../Utils/ServiceLocator";
+import type { ResMgr } from "./ResMgr";
 
 /** 音频管理器 */
 export class AudioMgr extends BaseMgr {
@@ -28,6 +29,8 @@ export class AudioMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("AudioMgr", this);
     }
 
     /**
@@ -182,16 +185,19 @@ export class AudioMgr extends BaseMgr {
             return;
         }
 
-        let audioClip: AudioClip = ResMgr.Instance.getAsset("Sounds", url);
-        if (audioClip == null) {
-            LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
-                operation: "playEffect",
-                url: url,
-                reason: "资源未加载"
-            });
-            return;
+        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        if (resMgr) {
+            let audioClip: AudioClip = resMgr.getAsset("Sounds", url);
+            if (audioClip == null) {
+                LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
+                    operation: "playEffect",
+                    url: url,
+                    reason: "资源未加载"
+                });
+                return;
+            }
+            this.effectAudioSource.playOneShot(audioClip);
         }
-        this.effectAudioSource.playOneShot(audioClip);
     }
 
     /**
@@ -275,18 +281,21 @@ export class AudioMgr extends BaseMgr {
             return;
         }
 
-        let audioClip: AudioClip = ResMgr.Instance.getAsset("Sounds", url);
-        if (audioClip == null) {
-            LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
-                operation: "playMusic",
-                url: url,
-                reason: "资源未加载"
-            });
-            return;
-        }
-        this.musicAudioSource.clip = audioClip;
+        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        if (resMgr) {
+            let audioClip: AudioClip = resMgr.getAsset("Sounds", url);
+            if (audioClip == null) {
+                LogUtils.Instance.error(AudioMgr.TAG, FwkErrorCode.Audio.LoadFailed, {
+                    operation: "playMusic",
+                    url: url,
+                    reason: "资源未加载"
+                });
+                return;
+            }
+            this.musicAudioSource.clip = audioClip;
 
-        this._playMusic();
+            this._playMusic();
+        }
     }
 
     /** 播放音乐（内部方法） */

package/src/Framework/Manager/InputMgr.ts

@@ -3,6 +3,7 @@ import { BaseMgr } from './BaseMgr';
 import { LogUtils } from '../Utils/LogUtils';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
 import { TimeUtils } from '../Utils/TimeUtils';
+import { ServiceLocator } from '../Utils/ServiceLocator';
 
 /** 键盘事件项 */
 interface KeyboardEventItem {
@@ -201,6 +202,8 @@ export class InputMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("InputMgr", this);
     }
 
     /**

package/src/Framework/Manager/LifeCycleMgr.ts

@@ -1,5 +1,6 @@
 import { FrameworkBase } from "../Definition/FrameworkBase";
 import { LogUtils } from "../Utils/LogUtils";
+import { ServiceLocator } from "../Utils/ServiceLocator";
 import { BaseMgr } from "./BaseMgr";
 import { EventMgr } from "./EventMgr";
 
@@ -19,6 +20,8 @@ export class LifeCycleMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("LifeCycleMgr", this);
     }
 
     /**

package/src/Framework/Manager/NodePoolMgr.ts

@@ -1,8 +1,9 @@
 import { CCObject, Node, NodePool, Vec3 } from 'cc';
 import { BaseMgr } from './BaseMgr';
 import { LogUtils } from '../Utils/LogUtils';
-import { UIMgr } from './UIMgr';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
+import { ServiceLocator } from '../Utils/ServiceLocator';
+import type { UIMgr } from './UIMgr';
 
 /** 节点池配置接口 */
 export interface IPoolConfig {
@@ -77,6 +78,8 @@ export class NodePoolMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("NodePoolMgr", this);
     }
 
     /**
@@ -421,7 +424,12 @@ export class NodePoolMgr extends BaseMgr {
             return null;
         }
 
-        let node: Node = UIMgr.Instance.create_ui(poolInfo.poolConfig.prefabUiName);
+        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+        if (!uiMgr) {
+            return null;
+        }
+
+        let node: Node = uiMgr.create_ui(poolInfo.poolConfig.prefabUiName);
         if (!node) {
             LogUtils.Instance.error(NodePoolMgr.TAG, FwkErrorCode.NodePool.CreateFailed, {
                 operation: "_createNode",
@@ -454,7 +462,10 @@ export class NodePoolMgr extends BaseMgr {
 
         let poolInfo: PoolInfo = this._poolInfoMap.get(poolName);
 
-        UIMgr.Instance.destroy_ui(poolName, node);
+        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+        if (uiMgr) {
+            uiMgr.destroy_ui(poolName, node);
+        }
 
         if (poolInfo.poolConfig && poolInfo.poolConfig.enableDebug) {
             this._printPoolState(poolName);

package/src/Framework/Manager/PrivacyMgr.ts

@@ -1,11 +1,12 @@
 import { LogUtils } from '../Utils/LogUtils';
 import { AuthorizeResult, GetSettingResult, KindReminder, KindReminderType, PrivacyDefinition, PrivacyInfo, PrivacyPlatformInfo, PrivacyType, QueryPrivacyResult } from '../Definition/PrivacyDefinition';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
-import { UIMgr } from './UIMgr';
 import { ToastDuration } from '../Definition/UIDefinition';
 import { PlatformID } from '../Definition/SystemDefinition';
 import { BaseMgr } from './BaseMgr';
 import { FrameworkBase } from '../Definition/FrameworkBase';
+import { ServiceLocator } from '../Utils/ServiceLocator';
+import type { UIMgr } from './UIMgr';
 
 /** 隐私协议管理器 */
 export class PrivacyMgr extends BaseMgr {
@@ -28,6 +29,8 @@ export class PrivacyMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("PrivacyMgr", this);
     }
 
     /**
@@ -172,9 +175,14 @@ export class PrivacyMgr extends BaseMgr {
             return;
         }
 
+        let uiMgr = ServiceLocator.Instance.get<UIMgr>("UIMgr");
+
         this.getPlatformAdapter().requirePrivacyAuthorize((result) => {
             if (!result) {
-                UIMgr.Instance.showToast("未同意隐私协议，无法使用" + featureName);
+                if (uiMgr) {
+                    uiMgr.showToast("未同意隐私协议，无法使用" + featureName);
+                }
+                
                 LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝隐私授权", {
                     featureName: featureName,
                     privacyType: PrivacyType[privacyType],
@@ -187,7 +195,10 @@ export class PrivacyMgr extends BaseMgr {
             let privacyPlatformInfo: PrivacyPlatformInfo = privacyInfo.privacyPlatformMap.get(this.getCurrentPlatformID());
             let scopeDescription: string = privacyPlatformInfo?.scopeDescription || "未知";
             if (privacyPlatformInfo === null || privacyPlatformInfo.scopeDisable) {
-                UIMgr.Instance.showToast("不支持[" + scopeDescription + "]，无法使用" + featureName);
+                if (uiMgr) {
+                    uiMgr.showToast("不支持[" + scopeDescription + "]，无法使用" + featureName);
+                }
+
                 LogUtils.Instance.info(PrivacyMgr.TAG, "隐私功能不支持", {
                     featureName: featureName,
                     privacyType: PrivacyType[privacyType],
@@ -210,7 +221,10 @@ export class PrivacyMgr extends BaseMgr {
             let scopeName: string = privacyPlatformInfo.scopeName;
             this.getPlatformAdapter().getSetting(scopeName, (result: GetSettingResult) => {
                 if (result === GetSettingResult.Result_SettingNotAvailable) {
-                    UIMgr.Instance.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
+                    if (uiMgr) {
+                        uiMgr.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
+                    }
+
                     LogUtils.Instance.info(PrivacyMgr.TAG, "隐私授权失败（版本不支持）", {
                         featureName: featureName,
                         privacyType: PrivacyType[privacyType],
@@ -219,7 +233,10 @@ export class PrivacyMgr extends BaseMgr {
                     callback(QueryPrivacyResult.Result_Invalid);
                     return;
                 } else if (result === GetSettingResult.Result_Rejected) {
-                    UIMgr.Instance.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
+                    if (uiMgr) {
+                        uiMgr.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
+                    }
+
                     LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝权限授权", {
                         featureName: featureName,
                         privacyType: PrivacyType[privacyType],
@@ -231,7 +248,10 @@ export class PrivacyMgr extends BaseMgr {
                 } else if (result === GetSettingResult.Result_NotExist_AuthorizeAvailable) {
                     this.getPlatformAdapter().authorize(scopeName, (result3) => {
                         if (result3 === AuthorizeResult.Result_AuthorizeNotAvailable) {
-                            UIMgr.Instance.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
+                            if (uiMgr) {
+                                uiMgr.showToast("App版本过低，无法使用" + featureName, ToastDuration.Duration_Long);
+                            }
+
                             LogUtils.Instance.info(PrivacyMgr.TAG, "授权失败（功能不可用）", {
                                 featureName: featureName,
                                 privacyType: PrivacyType[privacyType],
@@ -240,7 +260,10 @@ export class PrivacyMgr extends BaseMgr {
                             callback(QueryPrivacyResult.Result_Invalid);
                             return;
                         } else if (result3 === AuthorizeResult.Result_Rejected) {
-                            UIMgr.Instance.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
+                            if (uiMgr) {
+                                uiMgr.showToast("右上角...设置，开启[" + scopeDescription + "]权限，即可使用" + featureName, ToastDuration.Duration_Long);
+                            }
+
                             LogUtils.Instance.info(PrivacyMgr.TAG, "用户拒绝授权请求", {
                                 featureName: featureName,
                                 privacyType: PrivacyType[privacyType],

package/src/Framework/Manager/ResMgr.ts

@@ -2,6 +2,7 @@ import { Asset, assetManager, AssetManager, ImageAsset } from 'cc';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
 import { LogUtils } from '../Utils/LogUtils';
 import { BaseMgr } from './BaseMgr';
+import { ServiceLocator } from '../Utils/ServiceLocator';
 
 export type ResBatch = string;
 
@@ -130,6 +131,8 @@ export class ResMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("ResMgr", this);
     }
 
     /**

package/src/Framework/Manager/SocialMgr.ts

@@ -3,6 +3,7 @@ import { PlatformID } from "../Definition/SystemDefinition";
 import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
 import { LogUtils } from "../Utils/LogUtils";
 import { BaseMgr } from "./BaseMgr";
+import { ServiceLocator } from "../Utils/ServiceLocator";
 
 /** 社交功能管理器 */
 export class SocialMgr extends BaseMgr {
@@ -23,6 +24,8 @@ export class SocialMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("SocialMgr", this);
     }
 
     /**

package/src/Framework/Manager/SystemMgr.ts

@@ -15,6 +15,7 @@ import { AppItem, CopyrightInfo, ICPItem, PlatformID } from "../Definition/Syste
 import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
 import { LogUtils } from "../Utils/LogUtils";
 import { BaseMgr } from "./BaseMgr";
+import { ServiceLocator } from "../Utils/ServiceLocator";
 
 /** 系统管理器 */
 export class SystemMgr extends BaseMgr {
@@ -39,6 +40,8 @@ export class SystemMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("SystemMgr", this);
     }
 
     /**

package/src/Framework/Manager/TimerMgr.ts

@@ -1,5 +1,6 @@
 import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
 import { LogUtils } from "../Utils/LogUtils";
+import { ServiceLocator } from "../Utils/ServiceLocator";
 import { BaseMgr } from "./BaseMgr";
 
 interface ITimer {
@@ -27,6 +28,8 @@ export class TimerMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("TimerMgr", this);
     }
 
     /**

package/src/Framework/Manager/UIMgr.ts

@@ -1,9 +1,10 @@
 import { Component, Node, Button, Prefab, instantiate, screen, UITransform, v3, view, ResolutionPolicy, math, Tween, tween, Label, Color, Sprite, SpriteFrame, BlockInputEvents, Texture2D } from 'cc';
-import { ResMgr } from './ResMgr';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
 import { LogUtils } from '../Utils/LogUtils';
 import { ToastDuration } from '../Definition/UIDefinition';
 import { BaseMgr } from './BaseMgr';
+import { ServiceLocator } from '../Utils/ServiceLocator';
+import type { ResMgr } from './ResMgr';
 
 /** UI 控制器基类 */
 export class UICtrl extends Component {
@@ -230,6 +231,8 @@ export class UIMgr extends BaseMgr {
             this.destroy();
             return;
         }
+
+        ServiceLocator.Instance.register("UIMgr", this);
     }
 
     /**
@@ -260,7 +263,12 @@ export class UIMgr extends BaseMgr {
      * @return UI 节点
      */
     public create_ui(ui_name: string, parent?: Node): Node {
-        let uiPrefab: Prefab = ResMgr.Instance.getAsset("GUI", "UIPrefabs/" + ui_name);
+        let resMgr = ServiceLocator.Instance.get<ResMgr>("ResMgr");
+        if (!resMgr) {
+            return null;
+        }
+
+        let uiPrefab: Prefab = 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

@@ -5,12 +5,13 @@ import { LogUtils } from "../Utils/LogUtils";
 import { BaseMgr } from "./BaseMgr";
 import { PlatformID } from "../Definition/SystemDefinition";
 import { AbsPlatformAdapter } from "../Adapter/PlatformAdapter/AbsPlatformAdapter";
-import { TimerMgr } from "./TimerMgr";
 import { ObjectUtils } from "../Utils/ObjectUtils";
 import { EventMgr } from "./EventMgr";
 import { TimeUtils } from "../Utils/TimeUtils";
-import { AdMgr } from "./AdMgr";
-import { SocialMgr } from "./SocialMgr";
+import { ServiceLocator } from "../Utils/ServiceLocator";
+import type { AdMgr } from "./AdMgr";
+import type { SocialMgr } from "./SocialMgr";
+import type { TimerMgr } from "./TimerMgr";
 
 /** 用户管理器 */
 export class UserMgr extends BaseMgr {
@@ -59,13 +60,18 @@ export class UserMgr extends BaseMgr {
             return;
         }
 
+        ServiceLocator.Instance.register("UserMgr", this);
+
         EventMgr.Instance.on(FrameworkBase.Message.LifeCycle_onGameHide, this.onGameHideCallback, this);
     }
 
     protected onDestroy(): void {
         EventMgr.Instance.off(FrameworkBase.Message.LifeCycle_onGameHide, this.onGameHideCallback, this);
 
-        TimerMgr.Instance.removeTimer(this.autoSaveUserDataExecute, this);
+        let timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
+        if (timerMgr) {
+            timerMgr.removeTimer(this.autoSaveUserDataExecute, this);
+        }
     }
 
     /**
@@ -105,7 +111,10 @@ export class UserMgr extends BaseMgr {
         }
 
         if (this.userBehaviorPlatformInfo.autoSaveInterval > 0 && this.userBehaviorPlatformInfo.supportServerUserData) {
-            TimerMgr.Instance.addTimer(0, this.userBehaviorPlatformInfo.autoSaveInterval, -1, this.autoSaveUserDataExecute, this);
+            let timerMgr = ServiceLocator.Instance.get<TimerMgr>("TimerMgr");
+            if (timerMgr) {
+                timerMgr.addTimer(0, this.userBehaviorPlatformInfo.autoSaveInterval, -1, this.autoSaveUserDataExecute, this);
+            }
         }
 
         LogUtils.Instance.info(UserMgr.TAG, "初始化完成");
@@ -807,8 +816,12 @@ export class UserMgr extends BaseMgr {
             return;
         }
 
-        if (AdMgr.Instance.isRewardedVideoAdShowing() || SocialMgr.Instance.isSharing()) {
-            return;
+        let adMgr = ServiceLocator.Instance.get<AdMgr>("AdMgr");
+        let socialMgr = ServiceLocator.Instance.get<SocialMgr>("SocialMgr");
+        if (adMgr && socialMgr) {
+            if (adMgr.isRewardedVideoAdShowing() && socialMgr.isSharing()) {
+                return;
+            }
         }
 
         LogUtils.Instance.info(UserMgr.TAG, "onGameHide 保存用户数据");

package/src/Framework/Utils/ServiceLocator.ts

@@ -0,0 +1,18 @@
+
+export class ServiceLocator {
+    private static _instance: ServiceLocator = new ServiceLocator();
+
+    public static get Instance(): ServiceLocator {
+        return this._instance;
+    }
+
+    private _services: Map<string, any> = new Map();
+
+    public register(name: string, service: any): void {
+        this._services.set(name, service);
+    }
+
+    public get<T>(name: string): T {
+        return this._services.get(name) as T;
+    }
+}

package/src/index.ts

@@ -29,6 +29,7 @@ export { NumberUtils } from './Framework/Utils/NumberUtils';
 export { ObjectUtils } from './Framework/Utils/ObjectUtils';
 export { TimeUtils } from './Framework/Utils/TimeUtils';
 export { TweenUtils, type AnimOptions, type EasingType, TweenSequence, TweenParallel } from './Framework/Utils/TweenUtils';
+export { ServiceLocator } from './Framework/Utils/ServiceLocator';
 
 /**
  * TweenChain 使用示例：