@chiyou/minigame-framework 1.4.9 → 1.4.11

package/package.json

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

package/src/Framework/Definition/AdDefinition.ts

@@ -54,10 +54,10 @@ export type AdPlatformUnitInfo  = {
 }
 
 export type AdPlatformSettingInfo = {
-    launchNoAdInterval_permanentAd: number;
-    launchNoAdInterval_interstitialAd: number;
-    registerUser_interstitialAd_IntervalBase: number;
-    retainUser_interstitialAd_IntervalBase: number;
+    permanentAd_firstShowInterval_registerUser: number;
+    permanentAd_firstShowInterval_retainUser: number;
+    interstitialAd_showIntervalBase_registerUser: number;
+    interstitialAd_showIntervalBase_retainUser: number;
 }
 
 //BannerAd

package/src/Framework/Manager/AdMgr.ts

@@ -67,6 +67,9 @@ export class AdMgr extends BaseMgr {
     /** 内容区域底部 */
     private static contentBottom: number = 0;
 
+    private static interstitialAdIntervalBase: number = 60000;
+    private static permanentAdFirstShowInterval: number = 60000;
+
     private rewardedVideoAdCallbackToBusinessStatusSet: Set<RewardedVideoAd_Callback_Status> = new Set<RewardedVideoAd_Callback_Status>(
         [
             RewardedVideoAd_Callback_Status.Status_LoadError,
@@ -136,7 +139,7 @@ export class AdMgr extends BaseMgr {
         AdMgr.adPlatformSettingMap = adPlatformSettingMap;
 
         let adAdapterImpl: AbsAdAdapter = null;
-        switch (BaseMgr.Instance.getCurrentPlatformID()) {
+        switch (currentPlatformID) {
             case PlatformID.ID_MiniGame_WeiXin:
                 adAdapterImpl = this.node.addComponent(AdAdapterWeiXin);
                 break;
@@ -348,6 +351,24 @@ export class AdMgr extends BaseMgr {
 
     /** 创建所有广告实例 */
     public createAds(): void {
+        if (this.userMgr === null) {
+            this.userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
+        }
+
+        AdMgr.interstitialAdIntervalBase = 60000;
+        AdMgr.permanentAdFirstShowInterval = 60;
+        let currentPlatformID: PlatformID = this.getCurrentPlatformID();
+        if (AdMgr.adPlatformSettingMap.has(currentPlatformID) && AdMgr.adPlatformSettingMap.get(currentPlatformID) !== null) {
+            let adPlatformSettingInfo: AdPlatformSettingInfo = AdMgr.adPlatformSettingMap.get(currentPlatformID);
+            AdMgr.interstitialAdIntervalBase = adPlatformSettingInfo.interstitialAd_showIntervalBase_retainUser;
+            AdMgr.permanentAdFirstShowInterval = adPlatformSettingInfo.permanentAd_firstShowInterval_retainUser;
+
+            if (this.userMgr && this.userMgr.isNewUser()) {
+                AdMgr.interstitialAdIntervalBase = adPlatformSettingInfo.interstitialAd_showIntervalBase_registerUser;
+                AdMgr.permanentAdFirstShowInterval = adPlatformSettingInfo.permanentAd_firstShowInterval_registerUser;
+            }
+        }
+
         this.createInterstitialAd();
         this.createRewardedVideoAd();
         this.createPortalAd();
@@ -535,29 +556,12 @@ export class AdMgr extends BaseMgr {
             return;
         }
 
-        let launchNoAdInterval: number = 0;
-        let interstitialAdIntervalBase: number = 60000;
-        if (AdMgr.adPlatformSettingMap.has(this.getCurrentPlatformID())) {
-            let adPlatformSettingInfo: AdPlatformSettingInfo = AdMgr.adPlatformSettingMap.get(this.getCurrentPlatformID());
-            launchNoAdInterval = adPlatformSettingInfo.launchNoAdInterval_interstitialAd;
-
-            interstitialAdIntervalBase = adPlatformSettingInfo.retainUser_interstitialAd_IntervalBase;
-
-            if (this.userMgr === null) {
-                this.userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
-            }
-
-            if (this.userMgr && this.userMgr.isNewUser()) {
-                interstitialAdIntervalBase = adPlatformSettingInfo.registerUser_interstitialAd_IntervalBase;
-            }
+        if (this.userMgr === null) {
+            this.userMgr = ServiceLocator.Instance.get<UserMgr>("UserMgr");
         }
-        let interstitialAdInterval: number = interstitialAdIntervalBase * AdMgr.interstitialAd_nowIntervalCount;
 
+        let interstitialAdInterval: number = AdMgr.interstitialAdIntervalBase * AdMgr.interstitialAd_nowIntervalCount;
         let now: number = new Date().getTime();
-        if (now - AdMgr.launchTime < launchNoAdInterval) {
-            AdMgr.interstitialAdCallback(InterstitialAd_Callback_Status.Status_InsufficientInterval);
-            return;
-        }
         if (now - AdMgr.lastInterstitialAdTimestamp < interstitialAdInterval) {
             AdMgr.interstitialAdCallback(InterstitialAd_Callback_Status.Status_InsufficientInterval);
             return;
@@ -823,14 +827,9 @@ export class AdMgr extends BaseMgr {
     /** 显示所有常驻广告 */
     public showAllPermanentAd(): void {
         let delay: number = 0;
-
-        let currentPlatformID: PlatformID = this.getCurrentPlatformID();
-        if (AdMgr.adPlatformSettingMap.has(currentPlatformID)) {
-            let launchNoAdInterval: number = AdMgr.adPlatformSettingMap.get(currentPlatformID).launchNoAdInterval_permanentAd;
-            let now: number = new Date().getTime();
-            if (now - AdMgr.launchTime < launchNoAdInterval) {
-                delay = Math.floor((launchNoAdInterval - (now - AdMgr.launchTime)) / 1000);
-            }
+        let now: number = new Date().getTime();
+        if (now - AdMgr.launchTime < AdMgr.permanentAdFirstShowInterval) {
+            delay = Math.floor((AdMgr.permanentAdFirstShowInterval - (now - AdMgr.launchTime)) / 1000);
         }
 
         if (!AdMgr.isPermanentAdShowing) {

package/src/Framework/Manager/LifeCycleMgr.ts

@@ -3,6 +3,7 @@ import { LogUtils } from "../Utils/LogUtils";
 import { ServiceLocator } from "../Utils/ServiceLocator";
 import { BaseMgr } from "./BaseMgr";
 import { EventMgr } from "./EventMgr";
+import { LaunchCategory } from "../Definition/AnalyticsDefinition";
 import type { AnalyticsMgr } from "./AnalyticsMgr";
 
 /** 生命周期管理器 */
@@ -181,7 +182,7 @@ export class LifeCycleMgr extends BaseMgr {
     }
 
     /** 获取冷启动场景信息 */
-    public getColdStartSceneInfo(): { scene: string; category: string } | null {
+    public getColdStartSceneInfo(): { scene: string; category: LaunchCategory } | null {
         if (this.getPlatformAdapter() === null) {
             return null;
         }
@@ -190,7 +191,7 @@ export class LifeCycleMgr extends BaseMgr {
     }
 
     /** 获取热启动场景信息 */
-    public getWarmStartSceneInfo(): { scene: string; category: string } | null {
+    public getWarmStartSceneInfo(): { scene: string; category: LaunchCategory } | null {
         if (this.getPlatformAdapter() === null) {
             return null;
         }
@@ -199,7 +200,7 @@ export class LifeCycleMgr extends BaseMgr {
     }
 
     /** 获取当前启动场景分类（兼容原 isLaunchFromXxx 逻辑） */
-    public getLaunchCategory(): string | null {
+    public getLaunchCategory(): LaunchCategory | null {
         if (this.getPlatformAdapter() === null) {
             return null;
         }
@@ -208,11 +209,11 @@ export class LifeCycleMgr extends BaseMgr {
     }
 
     /** 判断是否从指定分类启动 */
-    public isLaunchFrom(category: string): boolean {
+    public isLaunchFrom(category: LaunchCategory): boolean {
         if (this.getPlatformAdapter() === null) {
             return false;
         }
 
-        return this.getPlatformAdapter().isLaunchFrom(category as any);
+        return this.getPlatformAdapter().isLaunchFrom(category);
     }
 }