zh 6 months ago
parent
commit
5673727b1a
29 changed files with 1321 additions and 869 deletions
  1. 16 1
      assets/common-plugin/Scripts/AldUtils.ts
  2. 11 2
      assets/scripts/ATAndroidJS2.ts
  3. 3 145
      assets/scripts/Framework/CocosZ.ts
  4. 64 0
      assets/scripts/UI/UIADPanel.ts
  5. 64 14
      assets/scripts/UI/UIGamePage.ts
  6. 191 95
      assets/scripts/UI/UIHomePage.ts
  7. 42 2
      assets/scripts/UI/UIRevivePanel.ts
  8. 87 3
      assets/scripts/UI/UISignPage.ts
  9. 43 1
      assets/scripts/UI/UITurntablePage.ts
  10. 44 0
      library/imports/00/003c244b-ccbb-48c9-afed-cb434d616083.js
  11. 0 0
      library/imports/00/003c244b-ccbb-48c9-afed-cb434d616083.js.map
  12. 141 59
      library/imports/1b/1b644b27-cab1-4118-a8bc-e494bdd06dce.js
  13. 0 0
      library/imports/1b/1b644b27-cab1-4118-a8bc-e494bdd06dce.js.map
  14. 0 131
      library/imports/54/54a8b719-008d-4a30-9763-43908c251a9d.js
  15. 0 0
      library/imports/54/54a8b719-008d-4a30-9763-43908c251a9d.js.map
  16. 80 1
      library/imports/60/602c3aa8-0ee0-4fbb-8dcd-5d18712773c9.js
  17. 0 0
      library/imports/60/602c3aa8-0ee0-4fbb-8dcd-5d18712773c9.js.map
  18. 14 1
      library/imports/7e/7efdfd8c-6133-4167-8bdd-600f9fcf5ad2.js
  19. 0 0
      library/imports/7e/7efdfd8c-6133-4167-8bdd-600f9fcf5ad2.js.map
  20. 29 1
      library/imports/a2/a2b2a434-387b-4818-85b4-4626c8ca3b64.js
  21. 0 0
      library/imports/a2/a2b2a434-387b-4818-85b4-4626c8ca3b64.js.map
  22. 60 12
      library/imports/ca/ca02e1d7-13ef-44f9-8ae9-f15f6ec532f1.js
  23. 0 0
      library/imports/ca/ca02e1d7-13ef-44f9-8ae9-f15f6ec532f1.js.map
  24. 30 0
      library/imports/f6/f624a1a2-fd09-48b9-90db-4c5187409b97.js
  25. 0 0
      library/imports/f6/f624a1a2-fd09-48b9-90db-4c5187409b97.js.map
  26. 46 46
      library/uuid-to-mtime.json
  27. 24 23
      local/layout.editor.json
  28. 51 51
      local/local.json
  29. 281 281
      local/node-tree-state.json

+ 16 - 1
assets/common-plugin/Scripts/AldUtils.ts

@@ -87,9 +87,24 @@ export default class AldUtils {
      * 事件上报
      * @param eventName 事件名称
      */
-    public static SendEvent(eventName: string) {
+    public static SendEvent22(eventName: string) {
         utils.showLog(`事件上报:${eventName}`);
         utils.cur_tool && utils.cur_tool.sendEvent && utils.cur_tool.sendEvent(eventName);
     }
 
+    /**
+     * 事件上报
+     * 
+     * @param eventName 事件名称
+     */
+    public static SendEvent(eventName: string): void {
+        // 记录事件上报的日志信息
+        utils.showLog(`事件上报: ${eventName}`);
+
+        // 如果当前工具有sendEvent方法,则调用之
+        // if (utils.cur_tool && utils.cur_tool.sendEvent) {
+        //     utils.cur_tool.sendEvent(eventName);
+        // }
+    }
+
 }

+ 11 - 2
assets/scripts/ATAndroidJS2.ts

@@ -10,6 +10,11 @@ const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
 
 const placementId="n1g03bq8qkeckn";//正式的
 const testPlacementId="n66f7c61b71d4c";//测试专用
+
+/**
+ * 正式的货柜1
+ */
+const hg_placementID = "n1g3kdafg5igg0";
 /**
  * 打砖块的
  */
@@ -172,15 +177,19 @@ const ATAndroidJS: ATAndroidJS = {
     },
     getPlacementId: function(){
       //    return placementId;
-         return testPlacementId;
+        return testPlacementId;
        //  return testPlacementIdForDzk;
+      // return hg_placementID;
     },
     appVibrateShort:function(){
         jsb.reflection.callStaticMethod(classJavaParamName, "appVibrateShort", "()V");
     },
     appVibrateLong:function(){
+        if (cc.sys.os!= cc.sys.OS_ANDROID) {
+            return;
+        }
         jsb.reflection.callStaticMethod(classJavaParamName, "appVibrateLong", "()V");
-    }
+    },
     
     
     /**

+ 3 - 145
assets/scripts/Framework/CocosZ.ts

@@ -71,44 +71,8 @@ enum Languages { zh, en }
 export let cocosz: CocosZ = null;
 
 @ccclass
-export default class CocosZ extends cc.Component  implements AdDeveloperCallback {
-    onRewardedVideoAdLoaded(placementId: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
-	}
-	onRewardedVideoAdFailed(placementId: any, errorInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
-	}
-	onRewardedVideoAdPlayStart(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
-		let deviceId = AAJS2.getDeviceUserId();
-		var setting = {};
-		setting[ATRewardedVideoSDK.userIdKey] = deviceId;
-		ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
-	}
-	onRewardedVideoAdPlayEnd(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-
-		console.log('zh: ad over 开始发送事件11')
-		//this.node.emit("handleCustomEvent");
-		this.handleCustomEvent()
-		console.log('zh: ad over 开始发送事件OVER22')
-	}
-	onRewardedVideoAdPlayFailed(placementId: any, errorInfo: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
-
-	}
-	onRewardedVideoAdClosed(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
-
-	}
-	onRewardedVideoAdPlayClicked(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
-	}
-
-	onReward(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-
-	}
+export default class CocosZ extends cc.Component  {
+
 
     private _gameMgr: GameMgr = null;
     private _dataMgr: DataMgr = null;
@@ -284,120 +248,14 @@ export default class CocosZ extends cc.Component  implements AdDeveloperCallback
             }
         })
 
-      //  this.initAd();
-       // this.initAdForPage();
+
     }
 
     
 
-    /**
-     * AD播放完毕的事件处理
-     */
-    handleCustomEvent() {
-        console.log('zh:00收到发送的事件')
-        let adKey = "zh_ad_type"
-        let idx = cc.sys.localStorage.getItem(adKey);//0,1,2,3 
-        console.log('zh:onAdOverEve idx =' + idx)
-        let adKeyTemp = '';//初始化一下,随便
-        // switch (idx) {
-        // 	case 'doGetForAdEvent':
-        // 		adKeyTemp = 'doGetForAdEvent_monthParams';
-        // 		let mpStr = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		let mpJosn = JSON.parse(mpStr);
-        // 		console.log('zh:#############幸存者 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEvent', mpJosn.result, mpJosn.type);
-        // 		break;
-        // 	case 'doSearchForAdEvent':
-        // 		console.log('zh:#############商店搜集 奖励')
-        // 		GlobalManager.getInstance().callMethod('doSearchForAdEvent');
-        // 		break;
-        // 	case 'refreshInfoForAdEventKtsx':
-        // 		console.log('zh:#############呼叫空投-刷新物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('refreshInfoForAdEventKtsx');
-        // 		break;
-        // 	case 'doGetForAdEventKt':
-        // 		console.log('zh:#############呼叫空投-获取物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEventKt');
-        // 		break;
-        // 	case 'doubleRewardForAdEventQd':
-        // 		console.log('zh:#############签到奖励 奖励')
-        // 		GlobalManager.getInstance().callMethod('doubleRewardForAdEventQd');
-        // 		break;
-        // 	case 'sendBtnEventForAdEventFuHuo'://复活
-        // 		adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
-        // 		let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		console.log('zh:#############复活 奖励',mpStr2)
-        // 		GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo',mpStr2);
-        // 		break;
-
-        // 	default:
-        // 		console.log('zh:未知的道具类型AD' + idx)
-        // }
-        cc.sys.localStorage.setItem(adKey, '');
-        cc.sys.localStorage.setItem(adKeyTemp, '');
-        console.log('zh:清理adKey ')
-
-    }
-
-
-
-
-
-    initAd() {
-
-        if (cc.sys.os != cc.sys.OS_ANDROID) {
-            console.log('zh:不支持的OS');
-            return;
-        }
-        let adKey = "zh_ad_type"
-        cc.sys.localStorage.setItem(adKey, "");
-        let placementId = AAJS2.getPlacementId();
-        let deviceId = AAJS2.getDeviceUserId();
-        var setting = {};
-        setting[ATRewardedVideoSDK.userIdKey] = deviceId;
-        ATRewardedVideoSDK.loadRewardedVideo(placementId, setting);
-        //console.log('zh:bbb222')
-
-        var customPlacementId = "";
-        if (cc.sys.os === cc.sys.OS_IOS) {
-            customPlacementId = placementId;
-        } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-            customPlacementId = placementId;
-        }
-        // 初始化SDK
-        //  ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//正式的,发布提交go0gle play
-        ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用,可以显示广告       
-      //  ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
-
 
-        ATSDK.setLogDebug(true);//zh:diy
-        var GDPRLevel = ATSDK.getGDPRLevel();
 
 
-        // 针对欧盟地区初始化时做的处理,按需求打开,不在欧盟地区发布的不用使用。
-        ATSDK.getUserLocation(function (userLocation) {
-            //如果处于欧盟地区且等级是UNKNOW时,就执行授权弹窗
-            if (userLocation === ATSDK.kATUserLocationInEU) {
-                if (ATSDK.getGDPRLevel() === ATSDK.UNKNOWN) {
-                    ATSDK.showGDPRAuth();
-                }
-            }
-        });
-        ATRewardedVideoSDK.setAdListener(this);
-        if (cc.sys.os === cc.sys.OS_ANDROID) {
-            setTimeout(() => {
-                var allInfo = AAJS2.allInfo();
-                ATSDK.printLog("zh:allInfo=" + allInfo);
-                let key = "US2%*c3lv8sYkUe(!e-6g$E*RJg)dzn@";
-                let iv = "Jn0.aWsOu$y-Dbqb";
-                let data = { data: AESUtil.AESencrypt(allInfo, key, iv) };
-                ATSDK.printLog("zh:allInfo-jm=" + JSON.stringify(data));
-                console.log('zh:ad_allInfo', data);
-                AAJS2.makePostRequestWithXhr(JSON.stringify(data));
-            }, 200);
-        }
-    }
-
     initAdForPage() {
         if (cc.sys.os === cc.sys.OS_ANDROID) {
             let deviceId = AAJS2.getDeviceUserId();

+ 64 - 0
assets/scripts/UI/UIADPanel.ts

@@ -2,6 +2,14 @@
 import { utils } from "../../common-plugin/Scripts/Utils";
 import { cocosz } from "../Framework/CocosZ";
 import Msg from "../Framework/Msg";
+
+import AESUtil from "../AESUtil"
+import ATSDK from "../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../ATAndroidJS2";
+import GlobalManager from '../GlobalManager';
+
+
 // @ts-ignore
 const i18n = require('LanguageData');
 
@@ -15,7 +23,9 @@ export default class NewClass extends cc.Component {
     @property(cc.Node)
     btnSkip: cc.Node = null;
 
+    adKey: string = "zh_ad_type";
     start() {
+        console.log('zh:uiadpanel start ')
         if (cocosz.isADON) {
             this.node.scale = 0;
             cc.tween(this.node).to(0.3, { scale: 1 }, { easing: "backOut" }).start();
@@ -23,7 +33,21 @@ export default class NewClass extends cc.Component {
         } else {
             this.node.destroy();
         }
+        this.initAdForPage();
     }
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
+    }
+
+
+
+
 
     isDiamond: boolean = false;
     setDiamond() {
@@ -34,6 +58,23 @@ export default class NewClass extends cc.Component {
 
     watchAD() {
         utils.SendEvent(`视频-${this.isDiamond ? "钻石购买" : "金币购买"}-播放`)
+
+
+        // 注册方法 , this.ClickClose.bind(this));
+        GlobalManager.getInstance().registerMethod('event_UIADPanel_forAd', this.event_UIADPanel_forAd.bind(this));
+       // cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq');//
+        if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+            console.log('zh:AD  ready for idx2')
+            ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+        } else {
+            console.log('zh:AD not ready  for idx2')
+            this.event_UIADPanel_forAd();
+        }
+        if (2 > 1) {
+            return;//下面是原始的代码
+        }
+
+
         cocosz.watchAD(() => {
             utils.SendEvent(`视频-${this.isDiamond ? "钻石购买" : "金币购买"}-成功`)
             if (this.isDiamond) {
@@ -52,6 +93,29 @@ export default class NewClass extends cc.Component {
         })
     }
 
+    
+
+    //zh:
+    event_UIADPanel_forAd(){
+        console.log('zh:event_UIADPanel_forAd 被触发')
+        
+        if (this.isDiamond) {
+            let num = cocosz.isDeBug ? 10000 : 200;
+            cocosz.dataMgr.DiamondCount += num;
+            Msg.Show(i18n.t("msg.gxhdzs") + num);//恭喜获得钻石
+        }
+        else {
+            let num = cocosz.isDeBug ? 10000 : 500;
+            cocosz.dataMgr.CoinCount += num;
+            Msg.Show(i18n.t("msg.gxhdjb") + num);//恭喜获得金币
+        }
+        this.node.destroy();
+    }
+
+
+
+
+
     exit() {
         cocosz.audioMgr.playBtnEffect();
         this.node.destroy();

+ 64 - 14
assets/scripts/UI/UIGamePage.ts

@@ -32,7 +32,7 @@ export default class UIGamePage extends UIPage  {
     private _handAni: cc.Node = null;
     private _btnCt: cc.Node = null;
     private _btnQpbz: cc.Node = null;
-
+    adKey: string = "zh_ad_type";
     constructor() {
         super(PageName.UIGamePage);
         this.isValid() && this.onLoad();
@@ -91,7 +91,7 @@ export default class UIGamePage extends UIPage  {
                 }
             }
         })
-
+        this.initAdForPage();
       
     }
 
@@ -310,6 +310,24 @@ export default class UIGamePage extends UIPage  {
                     let adIcon = gameMgr.rangedWeaponAdMess.getChildByName("adIcon");
                     if (adIcon && adIcon.active) {
                         utils.SendEvent("视频-高级武器-播放")
+
+   
+                    // 注册方法 , this.ClickClose.bind(this));
+                    GlobalManager.getInstance().registerMethod('event_gaoJiWuQi', this.event_gaoJiWuQi.bind(this));
+                    cc.sys.localStorage.setItem(this.adKey, 'event_gaoJiWuQi');
+                    if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                        console.log('zh:AD  ready for idx2')
+                        ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                    } else {
+                        console.log('zh:AD not ready  for idx2')
+                        this.event_gaoJiWuQi();
+                    }
+                    if (2 > 1) {
+                        return;
+                    }
+                    //下面是原先的
+                       // 
+
                         cocosz.watchAD(() => {
                             utils.SendEvent("视频-高级武器-成功")
                             adIcon.active = false;
@@ -366,6 +384,25 @@ export default class UIGamePage extends UIPage  {
                     });
                 } else if (this._btnCt && this._btnCt.getChildByName("video") && this._btnCt.getChildByName("video").active) {
                     utils.SendEvent("视频-磁铁-播放")
+
+
+                    
+                    // 注册方法 , this.ClickClose.bind(this));
+                    GlobalManager.getInstance().registerMethod('event_ciTie', this.event_ciTie.bind(this));
+                    cc.sys.localStorage.setItem(this.adKey, 'event_ciTie');
+                    if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                        console.log('zh:AD  ready for idx2')
+                        ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                    } else {
+                        console.log('zh:AD not ready  for idx2')
+                        cc.game.emit(Constant.E_Skill_Citie);
+                    }
+                    if (2 > 1) {
+                        return;
+                    }
+                    //下面是原先的
+
+                    
                     cocosz.watchAD(() => {
                         utils.SendEvent("视频-磁铁-成功")
                         // 磁铁事件
@@ -393,18 +430,18 @@ export default class UIGamePage extends UIPage  {
 
 
                     // 注册方法 , this.ClickClose.bind(this));
-                    //  GlobalManager.getInstance().registerMethod('event_duoBeiJieSuan', this.event_duoBeiJieSuan.bind(this));
-                    //cc.sys.localStorage.setItem(adKey, 'duoBeiJieSuan');//1==消除道具
-                    // if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
-                    //     console.log('zh:AD  ready for idx2')
-                    //     ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
-                    // } else {
-                    //     console.log('zh:AD not ready  for idx2')
-                    //     this.event_quanPinHongZha();
-                    // }
-                    // if (2 > 1) {
-                    //     return;
-                    // }
+                    GlobalManager.getInstance().registerMethod('event_quanPinHongZha', this.event_quanPinHongZha.bind(this));
+                    cc.sys.localStorage.setItem(this.adKey, 'event_quanPinHongZha');//1==消除道具
+                    if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                        console.log('zh:AD  ready for idx2')
+                        ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                    } else {
+                        console.log('zh:AD not ready  for idx2')
+                        this.event_quanPinHongZha();
+                    }
+                    if (2 > 1) {
+                        return;
+                    }
                     //下面是原先的
                     utils.SendEvent("视频-全屏轰炸-播放11")
                     cocosz.watchAD(() => {
@@ -424,11 +461,24 @@ export default class UIGamePage extends UIPage  {
     }
 
     public event_quanPinHongZha() {
+        console.log('zh:event_quanPinHongZha 被触发')
         // 全屏轰炸动画
         this.effect_qpbz();
     }
 
+    public event_ciTie(){
+        console.log('zh:event_ciTie 被触发')
+        cc.game.emit(Constant.E_Skill_Citie);
+    }
 
+    public event_gaoJiWuQi(){
+        console.log('zh:event_gaoJiWuQi 被触发')
+        let adIcon = gameMgr.rangedWeaponAdMess.getChildByName("adIcon");
+        utils.SendEvent("视频-高级武器-成功")
+        adIcon.active = false;
+        gameMgr.useRangedWeaponAd();
+        gameMgr.rangedWeaponAdMess.stopAllActions();
+    }
 
 
 

+ 191 - 95
assets/scripts/UI/UIHomePage.ts

@@ -30,43 +30,56 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
         super(PageName.UIHomePage);
         this.isValid() && this.onLoad();
     }
+
+
+    adState: boolean = false;
+    adKey: string = "zh_ad_type";
+
     onRewardedVideoAdLoaded(placementId: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
-	}
-	onRewardedVideoAdFailed(placementId: any, errorInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
-	}
-	onRewardedVideoAdPlayStart(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
-		let deviceId = AAJS2.getDeviceUserId();
-		var setting = {};
-		setting[ATRewardedVideoSDK.userIdKey] = deviceId;
-		ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
-	}
-	onRewardedVideoAdPlayEnd(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-
-		console.log('zh: ad over 开始发送事件11')
-		//this.node.emit("handleCustomEvent");
-		this.handleCustomEvent()
-		console.log('zh: ad over 开始发送事件OVER22')
-	}
-	onRewardedVideoAdPlayFailed(placementId: any, errorInfo: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
-
-	}
-	onRewardedVideoAdClosed(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
-
-	}
-	onRewardedVideoAdPlayClicked(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
-	}
-
-	onReward(placementId: any, callbackInfo: any): void {
-		ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-
-	}
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
+    }
+    onRewardedVideoAdFailed(placementId: any, errorInfo: any): void {
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+    }
+    onRewardedVideoAdPlayStart(placementId: any, callbackInfo: any): void {
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
+        let deviceId = AAJS2.getDeviceUserId();
+        var setting = {};
+        setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+        ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+    }
+    onRewardedVideoAdPlayEnd(placementId: any, callbackInfo: any): void {
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
+
+        console.log('zh: ad PlayEnd')
+        //this.node.emit("handleCustomEvent");
+
+    }
+    onRewardedVideoAdPlayFailed(placementId: any, errorInfo: any, callbackInfo: any): void {
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
+
+    }
+    onRewardedVideoAdClosed(placementId: any, callbackInfo: any): void {
+
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::AdClosed(" + placementId + ", " + callbackInfo + ")");
+
+        if (this.adState == true) {
+            this.adState = false;
+            console.log('zh: ad奖励OK,开始处理奖励')
+            this.handleCustomEvent()
+        } else {
+            console.log('zh: ad奖励标识 NO OK ')
+        }
+    }
+    onRewardedVideoAdPlayClicked(placementId: any, callbackInfo: any): void {
+        ATSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    onReward(placementId: any, callbackInfo: any): void {
+        ATSDK.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
+        console.log('zh:onReward AD奖励标志OK')
+        this.adState = true;
+    }
 
 
     private _icon_set: cc.Node = null;
@@ -188,52 +201,74 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
     }
 
 
-    
+
 
     /**
      * AD播放完毕的事件处理
      */
     handleCustomEvent() {
         console.log('zh:00收到发送的事件')
-        let adKey = "zh_ad_type"
-        let idx = cc.sys.localStorage.getItem(adKey);//0,1,2,3 
+        //let adKey = "zh_ad_type"
+        let idx = cc.sys.localStorage.getItem(this.adKey);
         console.log('zh:onAdOverEve idx =' + idx)
         let adKeyTemp = '';//初始化一下,随便
-        // switch (idx) {
-        // 	case 'doGetForAdEvent':
-        // 		adKeyTemp = 'doGetForAdEvent_monthParams';
-        // 		let mpStr = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		let mpJosn = JSON.parse(mpStr);
-        // 		console.log('zh:#############幸存者 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEvent', mpJosn.result, mpJosn.type);
-        // 		break;
-        // 	case 'doSearchForAdEvent':
-        // 		console.log('zh:#############商店搜集 奖励')
-        // 		GlobalManager.getInstance().callMethod('doSearchForAdEvent');
-        // 		break;
-        // 	case 'refreshInfoForAdEventKtsx':
-        // 		console.log('zh:#############呼叫空投-刷新物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('refreshInfoForAdEventKtsx');
-        // 		break;
-        // 	case 'doGetForAdEventKt':
-        // 		console.log('zh:#############呼叫空投-获取物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEventKt');
-        // 		break;
-        // 	case 'doubleRewardForAdEventQd':
-        // 		console.log('zh:#############签到奖励 奖励')
-        // 		GlobalManager.getInstance().callMethod('doubleRewardForAdEventQd');
-        // 		break;
-        // 	case 'sendBtnEventForAdEventFuHuo'://复活
-        // 		adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
-        // 		let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		console.log('zh:#############复活 奖励',mpStr2)
-        // 		GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo',mpStr2);
-        // 		break;
-
-        // 	default:
-        // 		console.log('zh:未知的道具类型AD' + idx)
-        // }
-        cc.sys.localStorage.setItem(adKey, '');
+        switch (idx) {
+            case '_getReward_eventForAd':
+                console.log('zh:#############签到奖励 奖励')
+                GlobalManager.getInstance().callMethod('_getReward_eventForAd', true);
+                break;
+            case 'event_UIADPanel_forAd':
+                console.log('zh:#############钻石,金币 奖励')
+                GlobalManager.getInstance().callMethod('event_UIADPanel_forAd', true);
+                break;
+            case 'event_UITurntablePage_forAd':
+                console.log('zh:#############抽奖 奖励')
+                GlobalManager.getInstance().callMethod('event_UITurntablePage_forAd', true);
+                break;
+            case 'event_wuqi_unlook':
+                console.log('zh:#############武器解锁 奖励')
+                //  GlobalManager.getInstance().callMethod('event_wuqi_unlook', true);
+                this.event_wuqi_unlook();
+                break;
+            case 'event_pifu_unlook':
+                console.log('zh:#############皮肤解锁 奖励')
+                //  GlobalManager.getInstance().callMethod('event_pifu_unlook', true);
+                this.event_pifu_unlook();
+                break;
+            case 'event_ciTie':
+                console.log('zh:#############磁铁 奖励')
+                GlobalManager.getInstance().callMethod('event_ciTie', true);
+
+                break;
+            case 'event_fuHuo':
+                console.log('zh:#############复活 奖励')
+                GlobalManager.getInstance().callMethod('event_fuHuo', true);
+
+                break;
+            case 'event_gaoJiWuQi':
+                console.log('zh:#############高级武器 奖励')
+                GlobalManager.getInstance().callMethod('event_gaoJiWuQi', true);
+
+                break;
+
+            case 'event_quanPinHongZha':
+                console.log('zh:#############轰炸 奖励')
+                GlobalManager.getInstance().callMethod('event_quanPinHongZha', true);
+
+                break;
+
+
+            case 'xxxxxxx'://复活
+                adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
+                let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
+                console.log('zh:#############复活 奖励', mpStr2)
+                GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo', mpStr2);
+                break;
+
+            default:
+                console.log('zh:未知的道具类型AD==' + idx)
+        }
+        cc.sys.localStorage.setItem(this.adKey, '');
         cc.sys.localStorage.setItem(adKeyTemp, '');
         console.log('zh:清理adKey ')
 
@@ -248,8 +283,8 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
         if (cc.sys.os != cc.sys.OS_ANDROID) {
             return;
         }
-        let adKey = "zh_ad_type"
-        cc.sys.localStorage.setItem(adKey, "");
+        //let adKey = "zh_ad_type"
+        cc.sys.localStorage.setItem(this.adKey, "");
         let placementId = AAJS2.getPlacementId();
         let deviceId = AAJS2.getDeviceUserId();
         var setting = {};
@@ -265,10 +300,10 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
         }
         // 初始化SDK
         //  ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//正式的,发布提交go0gle play
-       ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用,可以显示广告       
-      //  ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
-
+        ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用,可以显示广告       
+        //  ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
 
+        //   ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//货柜1 正式的,发布提交go0gle play
         ATSDK.setLogDebug(true);//zh:diy
         var GDPRLevel = ATSDK.getGDPRLevel();
 
@@ -557,6 +592,23 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
             case "BtnSkinAd": {
                 console.log('zh:BtnSkinAd');
                 utils.SendEvent("视频-皮肤解锁-播放")
+
+
+                // 注册方法 , this.ClickClose.bind(this));
+                //GlobalManager.getInstance().registerMethod('event_wuqi_unlook', this.event_wuqi_unlook.bind(this));
+                cc.sys.localStorage.setItem(this.adKey, 'event_pifu_unlook');//
+                if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                    console.log('zh:AD  ready for idx2')
+                    ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                } else {
+                    console.log('zh:AD not ready  for idx2')
+                    this.event_pifu_unlook();
+                }
+                if (2 > 1) {
+                    return;//下面是原始的代码
+                }
+
+
                 cocosz.watchAD(() => {
                     // 视频成功 
                     utils.SendEvent("视频-皮肤解锁-成功")
@@ -584,25 +636,26 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
             case "BtnWeaponAd": {
                 console.log('zh:BtnWeaponAd');
                 utils.SendEvent("视频-武器解锁-播放")
+
+
+                // 注册方法 , this.ClickClose.bind(this));
+                //GlobalManager.getInstance().registerMethod('event_wuqi_unlook', this.event_wuqi_unlook.bind(this));
+                cc.sys.localStorage.setItem(this.adKey, 'event_wuqi_unlook');//
+                if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                    console.log('zh:AD  ready for idx2')
+                    ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                } else {
+                    console.log('zh:AD not ready  for idx2')
+                    this.event_wuqi_unlook();
+                }
+                if (2 > 1) {
+                    return;//下面是原始的代码
+                }
+
                 cocosz.watchAD(() => {
                     // 视频成功 
                     utils.SendEvent("视频-武器解锁-成功")
-                    let showWeaponInfo = cocosz.dataMgr.getGunInfo(this._showWeaponId);
-                    let showWeaponKey: string = Weapon.WeaponName[this._showWeaponId];
-                    if (!!showWeaponInfo && !!GameDate.Weapon[showWeaponKey] && !!GameDate.Weapon[showWeaponKey].videoCount) {
-                        showWeaponInfo.VideoCount++;
-                        cocosz.dataMgr.setGunInfo(this._showWeaponId, showWeaponInfo);
-                        if (showWeaponInfo.VideoCount >= GameDate.Weapon[showWeaponKey].videoCount) {
-                            Msg.Show(i18n.t("msg.gxhdxwq"));
-                            cocosz.dataMgr.curWeapon = this._showWeaponId;
-                            this._aniEffect(2);
-                        } else {
-                            Msg.Show(i18n.t("msg.jswc") + showWeaponInfo.VideoCount + "/" + GameDate.Weapon[showWeaponKey].videoCount);
-                        }
-                        // 更新武器信息
-                        this._updateWeapon();
-                        this._updateWeaponFrame();
-                    }
+                    this.event_wuqi_unlook();
                 }, () => {
                     // 视频失败
                     utils.SendEvent("视频-武器解锁-失败")
@@ -652,6 +705,49 @@ export default class UIHomePage extends UIPage implements AdDeveloperCallback {
         }
     }
 
+    //武器结算
+    public event_wuqi_unlook() {
+        console.log('zh:event_wuqi_unlook 被触发');
+        let showWeaponInfo = cocosz.dataMgr.getGunInfo(this._showWeaponId);
+        let showWeaponKey: string = Weapon.WeaponName[this._showWeaponId];
+        if (!!showWeaponInfo && !!GameDate.Weapon[showWeaponKey] && !!GameDate.Weapon[showWeaponKey].videoCount) {
+            showWeaponInfo.VideoCount++;
+            cocosz.dataMgr.setGunInfo(this._showWeaponId, showWeaponInfo);
+            if (showWeaponInfo.VideoCount >= GameDate.Weapon[showWeaponKey].videoCount) {
+                Msg.Show(i18n.t("msg.gxhdxwq"));
+                cocosz.dataMgr.curWeapon = this._showWeaponId;
+                this._aniEffect(2);
+            } else {
+                Msg.Show(i18n.t("msg.jswc") + showWeaponInfo.VideoCount + "/" + GameDate.Weapon[showWeaponKey].videoCount);
+            }
+            // 更新武器信息
+            this._updateWeapon();
+            this._updateWeaponFrame();
+        }
+    }
+    //皮肤解锁
+    private event_pifu_unlook() {
+        console.log('zh:event_pifu_unlook 被触发');
+        // 视频成功 
+        utils.SendEvent("视频-皮肤解锁-成功")
+        let showSkinInfo = cocosz.dataMgr.getSkinInfo(this._showSkinId);
+        let showSkinKey: string = `${this._showSkinId + 1}`;
+        if (!!showSkinInfo && !!GameDate.SkinMess[showSkinKey] && !!GameDate.SkinMess[showSkinKey].videoCount) {
+            showSkinInfo.VideoCount++;
+            cocosz.dataMgr.setSkinInfo(this._showSkinId, showSkinInfo);
+            if (showSkinInfo.VideoCount >= GameDate.SkinMess[showSkinKey].videoCount) {
+                Msg.Show(i18n.t("msg.gxhdxjs"));//恭喜获得新角色
+                cocosz.dataMgr.CurSkinId = this._showSkinId;
+                this._aniEffect(2);
+            } else {
+                Msg.Show(i18n.t("msg.jswc") + showSkinInfo.VideoCount + "/" + GameDate.SkinMess[showSkinKey].videoCount);
+            }
+            // 更新玩家信息
+            this._updatePlayer();
+        }
+    }
+
+
     private _showSkinId: number = cocosz.dataMgr.CurSkinId;
     private _updatePlayer() {
         cc.log("showSkinID: ", this._showSkinId);

+ 42 - 2
assets/scripts/UI/UIRevivePanel.ts

@@ -5,6 +5,15 @@ import { cocosz } from "../Framework/CocosZ";
 import { utils } from "../../common-plugin/Scripts/Utils";
 import { gameMgr } from "../Game/gameMgr";
 import PlatUtils from "../../common-plugin/Scripts/PlatUtils";
+
+
+import AESUtil from "../AESUtil"
+import ATSDK from "../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../ATAndroidJS2";
+import GlobalManager from '../GlobalManager';
+
+
 // @ts-ignore
 const i18n = require('LanguageData');
 
@@ -21,7 +30,7 @@ export default class UIRevivePanel extends UIPage {
 
     private _btnVideo: cc.Node = null;
     private _btnPass: cc.Node = null;
-
+    adKey: string = "zh_ad_type";
     constructor() {
         super(PanelName.UIRevivePanel);
         this.isValid() && this.onLoad();
@@ -38,6 +47,18 @@ export default class UIRevivePanel extends UIPage {
         this._btnVideo.on(cc.Node.EventType.TOUCH_END, this._onBtnClickedHandler, this);
         this._btnPass = this._panel.getChildByName("BtnPass");
         this._btnPass.on(cc.Node.EventType.TOUCH_END, this._onBtnClickedHandler, this);
+        this.initAdForPage();
+    }
+
+    
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
     }
 
     protected onOpen() {
@@ -117,6 +138,24 @@ export default class UIRevivePanel extends UIPage {
                 // 视频
                 else if (this._btnVideo.getChildByName("video") && this._btnVideo.getChildByName("video").active) {
                     utils.SendEvent("视频-复活-播放1");
+
+                    // 注册方法 , this.ClickClose.bind(this));
+                    GlobalManager.getInstance().registerMethod('event_fuHuo', this._reLive.bind(this));
+                    cc.sys.localStorage.setItem(this.adKey, 'event_fuHuo');
+                    if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                        console.log('zh:AD  ready for idx2')
+                        ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                    } else {
+                        console.log('zh:AD not ready  for idx2')
+                        this._reLive();
+                    }
+                    if (2 > 1) {
+                        return;
+                    }
+                    //下面是原先的
+
+
+
                     cocosz.watchAD(() => {
                         utils.SendEvent("视频-复活-成功1")
                         this._reLive();
@@ -145,7 +184,8 @@ export default class UIRevivePanel extends UIPage {
     /**
      * 复活事件 
      */
-    private _reLive() {
+    public _reLive() {
+        console.log('zh:复活被触发')
         Msg.Show(i18n.t("msg.fhcg"));//复活成功
         cocosz.uiMgr.closePanel(PanelName.UIRevivePanel);
         gameMgr.revive();

+ 87 - 3
assets/scripts/UI/UISignPage.ts

@@ -8,6 +8,12 @@ import TweenEffect from "../Framework/TweenEffect";
 // @ts-ignore
 const i18n = require('LanguageData');
 
+import AESUtil from "../AESUtil"
+import ATSDK from "../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../ATAndroidJS2";
+import GlobalManager from '../GlobalManager';
+
 
 const { ccclass, property } = cc._decorator;
 
@@ -105,7 +111,7 @@ export default class UISignPanel extends UIPage {
     private _btnClose: cc.Node = null;
     private _day: DayItem[] = [];
 
-
+    private adKey: string = "zh_ad_type";
     constructor() {
         super(PanelName.UISignPanel);
         this.isValid() && this.onLoad();
@@ -135,13 +141,27 @@ export default class UISignPanel extends UIPage {
             let dayItem: DayItem = new DayItem(i, this._panel.getChildByName("Day_" + (i + 1)));
             this._day.push(dayItem);
         }
+        this.initAdForPage();
+    }
+
 
+
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
     }
 
+
+
     protected onOpen() {
         // 上报 首页签到
         utils.umaEvent("gamegamesign");
-        utils.SendEvent("页面-签到");
+        utils.SendEvent("1页面-签到");
         this._initPanel();
     }
 
@@ -159,7 +179,7 @@ export default class UISignPanel extends UIPage {
 
     private async _onBtnClickedHandler(event: cc.Event, data: any) {
         cocosz.audioMgr.playBtnEffect();
-        
+
         switch (event.target.name) {
             case "BtnGet": {
                 if (!this._canGetBonus()) {
@@ -174,6 +194,21 @@ export default class UISignPanel extends UIPage {
                     Msg.Show(i18n.t("msg.jryqd"));//今日已领取奖励
                     return;
                 }
+
+                // 注册方法 , this.ClickClose.bind(this));
+                GlobalManager.getInstance().registerMethod('_getReward_eventForAd', this._getReward_eventForAd.bind(this));
+                cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq');//
+                if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                    console.log('zh:AD  ready for idx2')
+                    ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                } else {
+                    console.log('zh:AD not ready  for idx2')
+                    this._getReward_eventForAd(true);
+                }
+                if (2 > 1) {
+                    return;//下面是原始的代码
+                }
+
                 utils.SendEvent("视频-双倍签到-播放")
                 cocosz.watchAD(() => {
                     utils.SendEvent("视频-双倍签到-成功")
@@ -236,7 +271,56 @@ export default class UISignPanel extends UIPage {
         cocosz.uiMgr.closePanel(PanelName.UISignPanel);
     }
 
+    //AD  
+    private _getReward_eventForAd(double: boolean) {
+        console.log('zh:AD  eventForAd  被触发:', double);
+        if (double == false) {
+            // 上报 普通签到
+            utils.umaEvent("gamesignordinary");
+            utils.SendEvent("签到-普通");
+        } else {
+            // 上报 双倍签到
+            utils.umaEvent("gamedoublesign");
+            utils.SendEvent("签到-双倍");
+        }
+
+        // 签到索引
+        let lastDayIndex: number = cocosz.dataMgr.LastDailyBonusIndex;
+        if (lastDayIndex == 6) {
+            lastDayIndex = -1;
+        }
+        let curDayIndex = lastDayIndex + 1;
+        // 奖励数量
+        let count: number = REWARD_SIGN[curDayIndex];
+        if (double) { count *= 2; }
+        if (curDayIndex == 3 || curDayIndex == 6) {
+            // 钻石
+            Msg.Show(i18n.t("msg.gxhdzs") + count);
+            cocosz.dataMgr.DiamondCount += count;
+            // 飞金币事件
+            setTimeout(() => {
+                cc.game.emit(Constant.E_GAME_LOGIC, { type: Constant.E_Fly_Coin, iconName: 'diamond', frameNodeName: 'CoinLabel2' })
+            }, 500);
+        } else {
+            // 金币
+            Msg.Show(i18n.t("msg.gxhdjb") + count);
+            cocosz.dataMgr.CoinCount += count;
+            // 飞金币事件
+            setTimeout(() => {
+                cc.game.emit(Constant.E_GAME_LOGIC, { type: Constant.E_Fly_Coin, iconName: 'coin', frameNodeName: 'CoinLabel' })
+            }, 500);
+        }
+        // 本地信息
+        cocosz.dataMgr.LastDailyBonusIndex = curDayIndex;
+        cocosz.dataMgr.LastDailyBonusTime = new Date().toDateString();
+        // 刷新UI
+        // this._updateDayItem();
+        // 关闭弹窗
+        cocosz.uiMgr.closePanel(PanelName.UISignPanel);
+    }
+
     private _canGetBonus() {
+       // cocosz.dataMgr.LastDailyBonusTime = 'Fri Dec 18 2024';
         return (new Date().toDateString() != cocosz.dataMgr.LastDailyBonusTime);
     }
 

+ 43 - 1
assets/scripts/UI/UITurntablePage.ts

@@ -6,6 +6,16 @@ import TweenEffect from "../Framework/TweenEffect";
 import UIPage from "../Framework/UIPage";
 import GameDate, { RewardType } from "../Game/gameDate";
 import Weapon from "../Game/weapon";
+
+
+
+import AESUtil from "../AESUtil"
+import ATSDK from "../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../ATAndroidJS2";
+import GlobalManager from '../GlobalManager';
+
+
 // @ts-ignore
 const i18n = require('LanguageData');
 
@@ -43,9 +53,22 @@ export default class UITurntablePanel extends UIPage {
                 }
             }
         }
+        this.initAdForPage();
 
     }
 
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
+    }
+
+
+
     protected onOpen(): void {
         // 上报 首页抽奖
         utils.umaEvent("gamechoujiang");
@@ -155,6 +178,7 @@ export default class UITurntablePanel extends UIPage {
 
     startNum: number = 0;
     CJ() {
+        console.log('zh:cj 被触发');
         // 上报 首页抽奖
         utils.umaEvent(`gamechoujiang${cocosz.useCJTimes}`);
         this.isCJ = true;
@@ -271,7 +295,25 @@ export default class UITurntablePanel extends UIPage {
                 break;
             }
             case "BtnAD": {
-                utils.SendEvent("视频-抽奖-播放")
+                utils.SendEvent("视频-抽奖-播放1111")
+
+
+
+                // 注册方法 , this.ClickClose.bind(this));
+                GlobalManager.getInstance().registerMethod('event_UITurntablePage_forAd', this.CJ.bind(this));
+                // cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq');//
+                if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
+                    console.log('zh:AD  ready for idx2')
+                    ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
+                } else {
+                    console.log('zh:AD not ready  for idx2')
+                    this.CJ();
+                }
+                if (2 > 1) {
+                    return;//下面是原始的代码
+                }
+
+
                 cocosz.watchAD(() => {
                     utils.SendEvent("视频-抽奖-成功")
                     this.CJ();

+ 44 - 0
library/imports/00/003c244b-ccbb-48c9-afed-cb434d616083.js

@@ -26,6 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var Utils_1 = require("../../common-plugin/Scripts/Utils");
 var CocosZ_1 = require("../Framework/CocosZ");
 var Msg_1 = require("../Framework/Msg");
+var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
+var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 // @ts-ignore
 var i18n = require('LanguageData');
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
@@ -35,10 +38,12 @@ var NewClass = /** @class */ (function (_super) {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.btnAD = null;
         _this.btnSkip = null;
+        _this.adKey = "zh_ad_type";
         _this.isDiamond = false;
         return _this;
     }
     NewClass.prototype.start = function () {
+        console.log('zh:uiadpanel start ');
         if (CocosZ_1.cocosz.isADON) {
             this.node.scale = 0;
             cc.tween(this.node).to(0.3, { scale: 1 }, { easing: "backOut" }).start();
@@ -47,6 +52,16 @@ var NewClass = /** @class */ (function (_super) {
         else {
             this.node.destroy();
         }
+        this.initAdForPage();
+    };
+    NewClass.prototype.initAdForPage = function () {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoJSSDK_1.default.checkAdStatus(ATAndroidJS2_1.default.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
+            ATRewardedVideoJSSDK_1.default.loadRewardedVideo(ATAndroidJS2_1.default.getPlacementId(), setting);
+        }
     };
     NewClass.prototype.setDiamond = function () {
         this.isDiamond = true;
@@ -56,6 +71,20 @@ var NewClass = /** @class */ (function (_super) {
     NewClass.prototype.watchAD = function () {
         var _this = this;
         Utils_1.utils.SendEvent("\u89C6\u9891-" + (this.isDiamond ? "钻石购买" : "金币购买") + "-\u64AD\u653E");
+        // 注册方法 , this.ClickClose.bind(this));
+        GlobalManager_1.default.getInstance().registerMethod('event_UIADPanel_forAd', this.event_UIADPanel_forAd.bind(this));
+        // cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq');//
+        if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+            console.log('zh:AD  ready for idx2');
+            ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+        }
+        else {
+            console.log('zh:AD not ready  for idx2');
+            this.event_UIADPanel_forAd();
+        }
+        if (2 > 1) {
+            return; //下面是原始的代码
+        }
         CocosZ_1.cocosz.watchAD(function () {
             Utils_1.utils.SendEvent("\u89C6\u9891-" + (_this.isDiamond ? "钻石购买" : "金币购买") + "-\u6210\u529F");
             if (_this.isDiamond) {
@@ -73,6 +102,21 @@ var NewClass = /** @class */ (function (_super) {
             Utils_1.utils.SendEvent("\u89C6\u9891-" + (_this.isDiamond ? "钻石购买" : "金币购买") + "-\u5931\u8D25");
         });
     };
+    //zh:
+    NewClass.prototype.event_UIADPanel_forAd = function () {
+        console.log('zh:event_UIADPanel_forAd 被触发');
+        if (this.isDiamond) {
+            var num = CocosZ_1.cocosz.isDeBug ? 10000 : 200;
+            CocosZ_1.cocosz.dataMgr.DiamondCount += num;
+            Msg_1.default.Show(i18n.t("msg.gxhdzs") + num); //恭喜获得钻石
+        }
+        else {
+            var num = CocosZ_1.cocosz.isDeBug ? 10000 : 500;
+            CocosZ_1.cocosz.dataMgr.CoinCount += num;
+            Msg_1.default.Show(i18n.t("msg.gxhdjb") + num); //恭喜获得金币
+        }
+        this.node.destroy();
+    };
     NewClass.prototype.exit = function () {
         CocosZ_1.cocosz.audioMgr.playBtnEffect();
         this.node.destroy();

File diff suppressed because it is too large
+ 0 - 0
library/imports/00/003c244b-ccbb-48c9-afed-cb434d616083.js.map


+ 141 - 59
library/imports/1b/1b644b27-cab1-4118-a8bc-e494bdd06dce.js

@@ -74,6 +74,7 @@ var AESUtil_1 = require("../AESUtil");
 var ATJSSDK_1 = require("../AnyThinkAds/ATJSSDK");
 var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
 var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 // @ts-ignore
 var i18n = require('LanguageData');
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
@@ -81,6 +82,8 @@ var UIHomePage = /** @class */ (function (_super) {
     __extends(UIHomePage, _super);
     function UIHomePage() {
         var _this = _super.call(this, Constant_1.PageName.UIHomePage) || this;
+        _this.adState = false;
+        _this.adKey = "zh_ad_type";
         _this._icon_set = null;
         _this._frame_set = null;
         _this._btnAudio = null;
@@ -132,22 +135,30 @@ var UIHomePage = /** @class */ (function (_super) {
     };
     UIHomePage.prototype.onRewardedVideoAdPlayEnd = function (placementId, callbackInfo) {
         ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-        console.log('zh: ad over 开始发送事件11');
+        console.log('zh: ad PlayEnd');
         //this.node.emit("handleCustomEvent");
-        this.handleCustomEvent();
-        console.log('zh: ad over 开始发送事件OVER22');
     };
     UIHomePage.prototype.onRewardedVideoAdPlayFailed = function (placementId, errorInfo, callbackInfo) {
         ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
     };
     UIHomePage.prototype.onRewardedVideoAdClosed = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
+        ATJSSDK_1.default.printLog("zh:AnyThinkRewardedVideoDemo::AdClosed(" + placementId + ", " + callbackInfo + ")");
+        if (this.adState == true) {
+            this.adState = false;
+            console.log('zh: ad奖励OK,开始处理奖励');
+            this.handleCustomEvent();
+        }
+        else {
+            console.log('zh: ad奖励标识 NO OK ');
+        }
     };
     UIHomePage.prototype.onRewardedVideoAdPlayClicked = function (placementId, callbackInfo) {
         ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
     };
     UIHomePage.prototype.onReward = function (placementId, callbackInfo) {
         ATJSSDK_1.default.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
+        console.log('zh:onReward AD奖励标志OK');
+        this.adState = true;
     };
     UIHomePage.prototype.onLoad = function () {
         var _this = this;
@@ -243,44 +254,59 @@ var UIHomePage = /** @class */ (function (_super) {
      */
     UIHomePage.prototype.handleCustomEvent = function () {
         console.log('zh:00收到发送的事件');
-        var adKey = "zh_ad_type";
-        var idx = cc.sys.localStorage.getItem(adKey); //0,1,2,3 
+        //let adKey = "zh_ad_type"
+        var idx = cc.sys.localStorage.getItem(this.adKey);
         console.log('zh:onAdOverEve idx =' + idx);
         var adKeyTemp = ''; //初始化一下,随便
-        // switch (idx) {
-        // 	case 'doGetForAdEvent':
-        // 		adKeyTemp = 'doGetForAdEvent_monthParams';
-        // 		let mpStr = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		let mpJosn = JSON.parse(mpStr);
-        // 		console.log('zh:#############幸存者 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEvent', mpJosn.result, mpJosn.type);
-        // 		break;
-        // 	case 'doSearchForAdEvent':
-        // 		console.log('zh:#############商店搜集 奖励')
-        // 		GlobalManager.getInstance().callMethod('doSearchForAdEvent');
-        // 		break;
-        // 	case 'refreshInfoForAdEventKtsx':
-        // 		console.log('zh:#############呼叫空投-刷新物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('refreshInfoForAdEventKtsx');
-        // 		break;
-        // 	case 'doGetForAdEventKt':
-        // 		console.log('zh:#############呼叫空投-获取物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEventKt');
-        // 		break;
-        // 	case 'doubleRewardForAdEventQd':
-        // 		console.log('zh:#############签到奖励 奖励')
-        // 		GlobalManager.getInstance().callMethod('doubleRewardForAdEventQd');
-        // 		break;
-        // 	case 'sendBtnEventForAdEventFuHuo'://复活
-        // 		adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
-        // 		let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		console.log('zh:#############复活 奖励',mpStr2)
-        // 		GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo',mpStr2);
-        // 		break;
-        // 	default:
-        // 		console.log('zh:未知的道具类型AD' + idx)
-        // }
-        cc.sys.localStorage.setItem(adKey, '');
+        switch (idx) {
+            case '_getReward_eventForAd':
+                console.log('zh:#############签到奖励 奖励');
+                GlobalManager_1.default.getInstance().callMethod('_getReward_eventForAd', true);
+                break;
+            case 'event_UIADPanel_forAd':
+                console.log('zh:#############钻石,金币 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_UIADPanel_forAd', true);
+                break;
+            case 'event_UITurntablePage_forAd':
+                console.log('zh:#############抽奖 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_UITurntablePage_forAd', true);
+                break;
+            case 'event_wuqi_unlook':
+                console.log('zh:#############武器解锁 奖励');
+                //  GlobalManager.getInstance().callMethod('event_wuqi_unlook', true);
+                this.event_wuqi_unlook();
+                break;
+            case 'event_pifu_unlook':
+                console.log('zh:#############皮肤解锁 奖励');
+                //  GlobalManager.getInstance().callMethod('event_pifu_unlook', true);
+                this.event_pifu_unlook();
+                break;
+            case 'event_ciTie':
+                console.log('zh:#############磁铁 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_ciTie', true);
+                break;
+            case 'event_fuHuo':
+                console.log('zh:#############复活 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_fuHuo', true);
+                break;
+            case 'event_gaoJiWuQi':
+                console.log('zh:#############高级武器 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_gaoJiWuQi', true);
+                break;
+            case 'event_quanPinHongZha':
+                console.log('zh:#############轰炸 奖励');
+                GlobalManager_1.default.getInstance().callMethod('event_quanPinHongZha', true);
+                break;
+            case 'xxxxxxx': //复活
+                adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
+                var mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
+                console.log('zh:#############复活 奖励', mpStr2);
+                GlobalManager_1.default.getInstance().callMethod('sendBtnEventForAdEventFuHuo', mpStr2);
+                break;
+            default:
+                console.log('zh:未知的道具类型AD==' + idx);
+        }
+        cc.sys.localStorage.setItem(this.adKey, '');
         cc.sys.localStorage.setItem(adKeyTemp, '');
         console.log('zh:清理adKey ');
     };
@@ -288,8 +314,8 @@ var UIHomePage = /** @class */ (function (_super) {
         if (cc.sys.os != cc.sys.OS_ANDROID) {
             return;
         }
-        var adKey = "zh_ad_type";
-        cc.sys.localStorage.setItem(adKey, "");
+        //let adKey = "zh_ad_type"
+        cc.sys.localStorage.setItem(this.adKey, "");
         var placementId = ATAndroidJS2_1.default.getPlacementId();
         var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
         var setting = {};
@@ -307,6 +333,7 @@ var UIHomePage = /** @class */ (function (_super) {
         //  ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//正式的,发布提交go0gle play
         ATJSSDK_1.default.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83"); //测试专用,可以显示广告       
         //  ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
+        //   ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//货柜1 正式的,发布提交go0gle play
         ATJSSDK_1.default.setLogDebug(true); //zh:diy
         var GDPRLevel = ATJSSDK_1.default.getGDPRLevel();
         // 针对欧盟地区初始化时做的处理,按需求打开,不在欧盟地区发布的不用使用。
@@ -594,6 +621,20 @@ var UIHomePage = /** @class */ (function (_super) {
                             case "BtnSkinAd": {
                                 console.log('zh:BtnSkinAd');
                                 Utils_1.utils.SendEvent("视频-皮肤解锁-播放");
+                                // 注册方法 , this.ClickClose.bind(this));
+                                //GlobalManager.getInstance().registerMethod('event_wuqi_unlook', this.event_wuqi_unlook.bind(this));
+                                cc.sys.localStorage.setItem(this.adKey, 'event_pifu_unlook'); //
+                                if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                    console.log('zh:AD  ready for idx2');
+                                    ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                                }
+                                else {
+                                    console.log('zh:AD not ready  for idx2');
+                                    this.event_pifu_unlook();
+                                }
+                                if (2 > 1) {
+                                    return [2 /*return*/]; //下面是原始的代码
+                                }
                                 CocosZ_1.cocosz.watchAD(function () {
                                     // 视频成功 
                                     Utils_1.utils.SendEvent("视频-皮肤解锁-成功");
@@ -622,26 +663,24 @@ var UIHomePage = /** @class */ (function (_super) {
                             case "BtnWeaponAd": {
                                 console.log('zh:BtnWeaponAd');
                                 Utils_1.utils.SendEvent("视频-武器解锁-播放");
+                                // 注册方法 , this.ClickClose.bind(this));
+                                //GlobalManager.getInstance().registerMethod('event_wuqi_unlook', this.event_wuqi_unlook.bind(this));
+                                cc.sys.localStorage.setItem(this.adKey, 'event_wuqi_unlook'); //
+                                if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                    console.log('zh:AD  ready for idx2');
+                                    ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                                }
+                                else {
+                                    console.log('zh:AD not ready  for idx2');
+                                    this.event_wuqi_unlook();
+                                }
+                                if (2 > 1) {
+                                    return [2 /*return*/]; //下面是原始的代码
+                                }
                                 CocosZ_1.cocosz.watchAD(function () {
                                     // 视频成功 
                                     Utils_1.utils.SendEvent("视频-武器解锁-成功");
-                                    var showWeaponInfo = CocosZ_1.cocosz.dataMgr.getGunInfo(_this._showWeaponId);
-                                    var showWeaponKey = weapon_1.default.WeaponName[_this._showWeaponId];
-                                    if (!!showWeaponInfo && !!gameDate_1.default.Weapon[showWeaponKey] && !!gameDate_1.default.Weapon[showWeaponKey].videoCount) {
-                                        showWeaponInfo.VideoCount++;
-                                        CocosZ_1.cocosz.dataMgr.setGunInfo(_this._showWeaponId, showWeaponInfo);
-                                        if (showWeaponInfo.VideoCount >= gameDate_1.default.Weapon[showWeaponKey].videoCount) {
-                                            Msg_1.default.Show(i18n.t("msg.gxhdxwq"));
-                                            CocosZ_1.cocosz.dataMgr.curWeapon = _this._showWeaponId;
-                                            _this._aniEffect(2);
-                                        }
-                                        else {
-                                            Msg_1.default.Show(i18n.t("msg.jswc") + showWeaponInfo.VideoCount + "/" + gameDate_1.default.Weapon[showWeaponKey].videoCount);
-                                        }
-                                        // 更新武器信息
-                                        _this._updateWeapon();
-                                        _this._updateWeaponFrame();
-                                    }
+                                    _this.event_wuqi_unlook();
                                 }, function () {
                                     // 视频失败
                                     Utils_1.utils.SendEvent("视频-武器解锁-失败");
@@ -694,6 +733,49 @@ var UIHomePage = /** @class */ (function (_super) {
             });
         });
     };
+    //武器结算
+    UIHomePage.prototype.event_wuqi_unlook = function () {
+        console.log('zh:event_wuqi_unlook 被触发');
+        var showWeaponInfo = CocosZ_1.cocosz.dataMgr.getGunInfo(this._showWeaponId);
+        var showWeaponKey = weapon_1.default.WeaponName[this._showWeaponId];
+        if (!!showWeaponInfo && !!gameDate_1.default.Weapon[showWeaponKey] && !!gameDate_1.default.Weapon[showWeaponKey].videoCount) {
+            showWeaponInfo.VideoCount++;
+            CocosZ_1.cocosz.dataMgr.setGunInfo(this._showWeaponId, showWeaponInfo);
+            if (showWeaponInfo.VideoCount >= gameDate_1.default.Weapon[showWeaponKey].videoCount) {
+                Msg_1.default.Show(i18n.t("msg.gxhdxwq"));
+                CocosZ_1.cocosz.dataMgr.curWeapon = this._showWeaponId;
+                this._aniEffect(2);
+            }
+            else {
+                Msg_1.default.Show(i18n.t("msg.jswc") + showWeaponInfo.VideoCount + "/" + gameDate_1.default.Weapon[showWeaponKey].videoCount);
+            }
+            // 更新武器信息
+            this._updateWeapon();
+            this._updateWeaponFrame();
+        }
+    };
+    //皮肤解锁
+    UIHomePage.prototype.event_pifu_unlook = function () {
+        console.log('zh:event_pifu_unlook 被触发');
+        // 视频成功 
+        Utils_1.utils.SendEvent("视频-皮肤解锁-成功");
+        var showSkinInfo = CocosZ_1.cocosz.dataMgr.getSkinInfo(this._showSkinId);
+        var showSkinKey = "" + (this._showSkinId + 1);
+        if (!!showSkinInfo && !!gameDate_1.default.SkinMess[showSkinKey] && !!gameDate_1.default.SkinMess[showSkinKey].videoCount) {
+            showSkinInfo.VideoCount++;
+            CocosZ_1.cocosz.dataMgr.setSkinInfo(this._showSkinId, showSkinInfo);
+            if (showSkinInfo.VideoCount >= gameDate_1.default.SkinMess[showSkinKey].videoCount) {
+                Msg_1.default.Show(i18n.t("msg.gxhdxjs")); //恭喜获得新角色
+                CocosZ_1.cocosz.dataMgr.CurSkinId = this._showSkinId;
+                this._aniEffect(2);
+            }
+            else {
+                Msg_1.default.Show(i18n.t("msg.jswc") + showSkinInfo.VideoCount + "/" + gameDate_1.default.SkinMess[showSkinKey].videoCount);
+            }
+            // 更新玩家信息
+            this._updatePlayer();
+        }
+    };
     UIHomePage.prototype._updatePlayer = function () {
         var _this = this;
         cc.log("showSkinID: ", this._showSkinId);

File diff suppressed because it is too large
+ 0 - 0
library/imports/1b/1b644b27-cab1-4118-a8bc-e494bdd06dce.js.map


+ 0 - 131
library/imports/54/54a8b719-008d-4a30-9763-43908c251a9d.js

@@ -34,8 +34,6 @@ var AudioMgr_1 = require("./AudioMgr");
 var Utils_1 = require("../../common-plugin/Scripts/Utils");
 var Msg_1 = require("./Msg");
 var PlatUtils_1 = require("../../common-plugin/Scripts/PlatUtils");
-var AESUtil_1 = require("../AESUtil");
-var ATJSSDK_1 = require("../AnyThinkAds/ATJSSDK");
 var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
 var ATAndroidJS2_1 = require("../ATAndroidJS2");
 // @ts-ignore
@@ -169,38 +167,6 @@ var CocosZ = /** @class */ (function (_super) {
         _this.serverConfig_shareTime = 2;
         return _this;
     }
-    CocosZ.prototype.onRewardedVideoAdLoaded = function (placementId) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
-    };
-    CocosZ.prototype.onRewardedVideoAdFailed = function (placementId, errorInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
-    };
-    CocosZ.prototype.onRewardedVideoAdPlayStart = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
-        var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
-        var setting = {};
-        setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
-        ATRewardedVideoJSSDK_1.default.loadRewardedVideo(ATAndroidJS2_1.default.getPlacementId(), setting);
-    };
-    CocosZ.prototype.onRewardedVideoAdPlayEnd = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-        console.log('zh: ad over 开始发送事件11');
-        //this.node.emit("handleCustomEvent");
-        this.handleCustomEvent();
-        console.log('zh: ad over 开始发送事件OVER22');
-    };
-    CocosZ.prototype.onRewardedVideoAdPlayFailed = function (placementId, errorInfo, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
-    };
-    CocosZ.prototype.onRewardedVideoAdClosed = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
-    };
-    CocosZ.prototype.onRewardedVideoAdPlayClicked = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
-    };
-    CocosZ.prototype.onReward = function (placementId, callbackInfo) {
-        ATJSSDK_1.default.printLog("zh:AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-    };
     Object.defineProperty(CocosZ.prototype, "gameMgr", {
         get: function () {
             return this._gameMgr;
@@ -381,103 +347,6 @@ var CocosZ = /** @class */ (function (_super) {
                 cc.log("加载分包bundleLoad出错");
             }
         });
-        //  this.initAd();
-        // this.initAdForPage();
-    };
-    /**
-     * AD播放完毕的事件处理
-     */
-    CocosZ.prototype.handleCustomEvent = function () {
-        console.log('zh:00收到发送的事件');
-        var adKey = "zh_ad_type";
-        var idx = cc.sys.localStorage.getItem(adKey); //0,1,2,3 
-        console.log('zh:onAdOverEve idx =' + idx);
-        var adKeyTemp = ''; //初始化一下,随便
-        // switch (idx) {
-        // 	case 'doGetForAdEvent':
-        // 		adKeyTemp = 'doGetForAdEvent_monthParams';
-        // 		let mpStr = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		let mpJosn = JSON.parse(mpStr);
-        // 		console.log('zh:#############幸存者 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEvent', mpJosn.result, mpJosn.type);
-        // 		break;
-        // 	case 'doSearchForAdEvent':
-        // 		console.log('zh:#############商店搜集 奖励')
-        // 		GlobalManager.getInstance().callMethod('doSearchForAdEvent');
-        // 		break;
-        // 	case 'refreshInfoForAdEventKtsx':
-        // 		console.log('zh:#############呼叫空投-刷新物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('refreshInfoForAdEventKtsx');
-        // 		break;
-        // 	case 'doGetForAdEventKt':
-        // 		console.log('zh:#############呼叫空投-获取物品 奖励')
-        // 		GlobalManager.getInstance().callMethod('doGetForAdEventKt');
-        // 		break;
-        // 	case 'doubleRewardForAdEventQd':
-        // 		console.log('zh:#############签到奖励 奖励')
-        // 		GlobalManager.getInstance().callMethod('doubleRewardForAdEventQd');
-        // 		break;
-        // 	case 'sendBtnEventForAdEventFuHuo'://复活
-        // 		adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
-        // 		let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
-        // 		console.log('zh:#############复活 奖励',mpStr2)
-        // 		GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo',mpStr2);
-        // 		break;
-        // 	default:
-        // 		console.log('zh:未知的道具类型AD' + idx)
-        // }
-        cc.sys.localStorage.setItem(adKey, '');
-        cc.sys.localStorage.setItem(adKeyTemp, '');
-        console.log('zh:清理adKey ');
-    };
-    CocosZ.prototype.initAd = function () {
-        if (cc.sys.os != cc.sys.OS_ANDROID) {
-            console.log('zh:不支持的OS');
-            return;
-        }
-        var adKey = "zh_ad_type";
-        cc.sys.localStorage.setItem(adKey, "");
-        var placementId = ATAndroidJS2_1.default.getPlacementId();
-        var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
-        var setting = {};
-        setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
-        ATRewardedVideoJSSDK_1.default.loadRewardedVideo(placementId, setting);
-        //console.log('zh:bbb222')
-        var customPlacementId = "";
-        if (cc.sys.os === cc.sys.OS_IOS) {
-            customPlacementId = placementId;
-        }
-        else if (cc.sys.os === cc.sys.OS_ANDROID) {
-            customPlacementId = placementId;
-        }
-        // 初始化SDK
-        //  ATSDK.initSDK("h6752c78a49dc1", "aad31bcaf7f7ff45ba21a8bc87bd9318a");//正式的,发布提交go0gle play
-        ATJSSDK_1.default.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83"); //测试专用,可以显示广告       
-        //  ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
-        ATJSSDK_1.default.setLogDebug(true); //zh:diy
-        var GDPRLevel = ATJSSDK_1.default.getGDPRLevel();
-        // 针对欧盟地区初始化时做的处理,按需求打开,不在欧盟地区发布的不用使用。
-        ATJSSDK_1.default.getUserLocation(function (userLocation) {
-            //如果处于欧盟地区且等级是UNKNOW时,就执行授权弹窗
-            if (userLocation === ATJSSDK_1.default.kATUserLocationInEU) {
-                if (ATJSSDK_1.default.getGDPRLevel() === ATJSSDK_1.default.UNKNOWN) {
-                    ATJSSDK_1.default.showGDPRAuth();
-                }
-            }
-        });
-        ATRewardedVideoJSSDK_1.default.setAdListener(this);
-        if (cc.sys.os === cc.sys.OS_ANDROID) {
-            setTimeout(function () {
-                var allInfo = ATAndroidJS2_1.default.allInfo();
-                ATJSSDK_1.default.printLog("zh:allInfo=" + allInfo);
-                var key = "US2%*c3lv8sYkUe(!e-6g$E*RJg)dzn@";
-                var iv = "Jn0.aWsOu$y-Dbqb";
-                var data = { data: AESUtil_1.default.AESencrypt(allInfo, key, iv) };
-                ATJSSDK_1.default.printLog("zh:allInfo-jm=" + JSON.stringify(data));
-                console.log('zh:ad_allInfo', data);
-                ATAndroidJS2_1.default.makePostRequestWithXhr(JSON.stringify(data));
-            }, 200);
-        }
     };
     CocosZ.prototype.initAdForPage = function () {
         if (cc.sys.os === cc.sys.OS_ANDROID) {

File diff suppressed because it is too large
+ 0 - 0
library/imports/54/54a8b719-008d-4a30-9763-43908c251a9d.js.map


+ 80 - 1
library/imports/60/602c3aa8-0ee0-4fbb-8dcd-5d18712773c9.js

@@ -67,6 +67,9 @@ var Utils_1 = require("../../common-plugin/Scripts/Utils");
 var TweenEffect_1 = require("../Framework/TweenEffect");
 // @ts-ignore
 var i18n = require('LanguageData');
+var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
+var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
 var REWARD_SIGN = [500, 1000, 1500, 50, 2000, 2500, 100];
 var DayItem = /** @class */ (function () {
@@ -155,6 +158,7 @@ var UISignPanel = /** @class */ (function (_super) {
         _this._btnDouble = null;
         _this._btnClose = null;
         _this._day = [];
+        _this.adKey = "zh_ad_type";
         _this.isValid() && _this.onLoad();
         return _this;
     }
@@ -182,11 +186,21 @@ var UISignPanel = /** @class */ (function (_super) {
             var dayItem = new DayItem(i, this._panel.getChildByName("Day_" + (i + 1)));
             this._day.push(dayItem);
         }
+        this.initAdForPage();
+    };
+    UISignPanel.prototype.initAdForPage = function () {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoJSSDK_1.default.checkAdStatus(ATAndroidJS2_1.default.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
+            ATRewardedVideoJSSDK_1.default.loadRewardedVideo(ATAndroidJS2_1.default.getPlacementId(), setting);
+        }
     };
     UISignPanel.prototype.onOpen = function () {
         // 上报 首页签到
         Utils_1.utils.umaEvent("gamegamesign");
-        Utils_1.utils.SendEvent("页面-签到");
+        Utils_1.utils.SendEvent("1页面-签到");
         this._initPanel();
     };
     UISignPanel.prototype._initPanel = function () {
@@ -218,6 +232,20 @@ var UISignPanel = /** @class */ (function (_super) {
                             Msg_1.default.Show(i18n.t("msg.jryqd")); //今日已领取奖励
                             return [2 /*return*/];
                         }
+                        // 注册方法 , this.ClickClose.bind(this));
+                        GlobalManager_1.default.getInstance().registerMethod('_getReward_eventForAd', this._getReward_eventForAd.bind(this));
+                        cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq'); //
+                        if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                            console.log('zh:AD  ready for idx2');
+                            ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                        }
+                        else {
+                            console.log('zh:AD not ready  for idx2');
+                            this._getReward_eventForAd(true);
+                        }
+                        if (2 > 1) {
+                            return [2 /*return*/]; //下面是原始的代码
+                        }
                         Utils_1.utils.SendEvent("视频-双倍签到-播放");
                         CocosZ_1.cocosz.watchAD(function () {
                             Utils_1.utils.SendEvent("视频-双倍签到-成功");
@@ -284,7 +312,58 @@ var UISignPanel = /** @class */ (function (_super) {
         // 关闭弹窗
         CocosZ_1.cocosz.uiMgr.closePanel(Constant_1.PanelName.UISignPanel);
     };
+    //AD  
+    UISignPanel.prototype._getReward_eventForAd = function (double) {
+        console.log('zh:AD  eventForAd  被触发:', double);
+        if (double == false) {
+            // 上报 普通签到
+            Utils_1.utils.umaEvent("gamesignordinary");
+            Utils_1.utils.SendEvent("签到-普通");
+        }
+        else {
+            // 上报 双倍签到
+            Utils_1.utils.umaEvent("gamedoublesign");
+            Utils_1.utils.SendEvent("签到-双倍");
+        }
+        // 签到索引
+        var lastDayIndex = CocosZ_1.cocosz.dataMgr.LastDailyBonusIndex;
+        if (lastDayIndex == 6) {
+            lastDayIndex = -1;
+        }
+        var curDayIndex = lastDayIndex + 1;
+        // 奖励数量
+        var count = REWARD_SIGN[curDayIndex];
+        if (double) {
+            count *= 2;
+        }
+        if (curDayIndex == 3 || curDayIndex == 6) {
+            // 钻石
+            Msg_1.default.Show(i18n.t("msg.gxhdzs") + count);
+            CocosZ_1.cocosz.dataMgr.DiamondCount += count;
+            // 飞金币事件
+            setTimeout(function () {
+                cc.game.emit(Constant_1.default.E_GAME_LOGIC, { type: Constant_1.default.E_Fly_Coin, iconName: 'diamond', frameNodeName: 'CoinLabel2' });
+            }, 500);
+        }
+        else {
+            // 金币
+            Msg_1.default.Show(i18n.t("msg.gxhdjb") + count);
+            CocosZ_1.cocosz.dataMgr.CoinCount += count;
+            // 飞金币事件
+            setTimeout(function () {
+                cc.game.emit(Constant_1.default.E_GAME_LOGIC, { type: Constant_1.default.E_Fly_Coin, iconName: 'coin', frameNodeName: 'CoinLabel' });
+            }, 500);
+        }
+        // 本地信息
+        CocosZ_1.cocosz.dataMgr.LastDailyBonusIndex = curDayIndex;
+        CocosZ_1.cocosz.dataMgr.LastDailyBonusTime = new Date().toDateString();
+        // 刷新UI
+        // this._updateDayItem();
+        // 关闭弹窗
+        CocosZ_1.cocosz.uiMgr.closePanel(Constant_1.PanelName.UISignPanel);
+    };
     UISignPanel.prototype._canGetBonus = function () {
+        // cocosz.dataMgr.LastDailyBonusTime = 'Fri Dec 18 2024';
         return (new Date().toDateString() != CocosZ_1.cocosz.dataMgr.LastDailyBonusTime);
     };
     UISignPanel = __decorate([

File diff suppressed because it is too large
+ 0 - 0
library/imports/60/602c3aa8-0ee0-4fbb-8dcd-5d18712773c9.js.map


+ 14 - 1
library/imports/7e/7efdfd8c-6133-4167-8bdd-600f9fcf5ad2.js

@@ -90,10 +90,23 @@ var AldUtils = /** @class */ (function () {
      * 事件上报
      * @param eventName 事件名称
      */
-    AldUtils.SendEvent = function (eventName) {
+    AldUtils.SendEvent22 = function (eventName) {
         Utils_1.utils.showLog("\u4E8B\u4EF6\u4E0A\u62A5:" + eventName);
         Utils_1.utils.cur_tool && Utils_1.utils.cur_tool.sendEvent && Utils_1.utils.cur_tool.sendEvent(eventName);
     };
+    /**
+     * 事件上报
+     *
+     * @param eventName 事件名称
+     */
+    AldUtils.SendEvent = function (eventName) {
+        // 记录事件上报的日志信息
+        Utils_1.utils.showLog("\u4E8B\u4EF6\u4E0A\u62A5: " + eventName);
+        // 如果当前工具有sendEvent方法,则调用之
+        // if (utils.cur_tool && utils.cur_tool.sendEvent) {
+        //     utils.cur_tool.sendEvent(eventName);
+        // }
+    };
     AldUtils = __decorate([
         ccclass
     ], AldUtils);

File diff suppressed because it is too large
+ 0 - 0
library/imports/7e/7efdfd8c-6133-4167-8bdd-600f9fcf5ad2.js.map


+ 29 - 1
library/imports/a2/a2b2a434-387b-4818-85b4-4626c8ca3b64.js

@@ -66,6 +66,9 @@ var Msg_1 = require("../Framework/Msg");
 var UIPage_1 = require("../Framework/UIPage");
 var gameDate_1 = require("../Game/gameDate");
 var weapon_1 = require("../Game/weapon");
+var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
+var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 // @ts-ignore
 var i18n = require('LanguageData');
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
@@ -102,6 +105,16 @@ var UITurntablePanel = /** @class */ (function (_super) {
                 }
             }
         }
+        this.initAdForPage();
+    };
+    UITurntablePanel.prototype.initAdForPage = function () {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoJSSDK_1.default.checkAdStatus(ATAndroidJS2_1.default.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
+            ATRewardedVideoJSSDK_1.default.loadRewardedVideo(ATAndroidJS2_1.default.getPlacementId(), setting);
+        }
     };
     UITurntablePanel.prototype.onOpen = function () {
         // 上报 首页抽奖
@@ -209,6 +222,7 @@ var UITurntablePanel = /** @class */ (function (_super) {
     };
     UITurntablePanel.prototype.CJ = function () {
         var _this = this;
+        console.log('zh:cj 被触发');
         // 上报 首页抽奖
         Utils_1.utils.umaEvent("gamechoujiang" + CocosZ_1.cocosz.useCJTimes);
         this.isCJ = true;
@@ -323,7 +337,21 @@ var UITurntablePanel = /** @class */ (function (_super) {
                                 break;
                             }
                             case "BtnAD": {
-                                Utils_1.utils.SendEvent("视频-抽奖-播放");
+                                Utils_1.utils.SendEvent("视频-抽奖-播放1111");
+                                // 注册方法 , this.ClickClose.bind(this));
+                                GlobalManager_1.default.getInstance().registerMethod('event_UITurntablePage_forAd', this.CJ.bind(this));
+                                // cc.sys.localStorage.setItem(this.adKey, 'qianDao_dblq');//
+                                if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                    console.log('zh:AD  ready for idx2');
+                                    ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                                }
+                                else {
+                                    console.log('zh:AD not ready  for idx2');
+                                    this.CJ();
+                                }
+                                if (2 > 1) {
+                                    return [2 /*return*/]; //下面是原始的代码
+                                }
                                 CocosZ_1.cocosz.watchAD(function () {
                                     Utils_1.utils.SendEvent("视频-抽奖-成功");
                                     _this.CJ();

File diff suppressed because it is too large
+ 0 - 0
library/imports/a2/a2b2a434-387b-4818-85b4-4626c8ca3b64.js.map


+ 60 - 12
library/imports/ca/ca02e1d7-13ef-44f9-8ae9-f15f6ec532f1.js

@@ -68,6 +68,7 @@ var YZ_Constant_1 = require("../../common-plugin/Scripts/YZ_Constant");
 var gameMgr_1 = require("../Game/gameMgr");
 var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
 var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 // @ts-ignore
 var i18n = require('LanguageData');
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
@@ -81,6 +82,7 @@ var UIGamePage = /** @class */ (function (_super) {
         _this._handAni = null;
         _this._btnCt = null;
         _this._btnQpbz = null;
+        _this.adKey = "zh_ad_type";
         _this.isValid() && _this.onLoad();
         return _this;
     }
@@ -145,6 +147,7 @@ var UIGamePage = /** @class */ (function (_super) {
                 }
             }
         });
+        this.initAdForPage();
     };
     UIGamePage.prototype.initAdForPage = function () {
         if (cc.sys.os === cc.sys.OS_ANDROID) {
@@ -363,6 +366,22 @@ var UIGamePage = /** @class */ (function (_super) {
                             adIcon_1 = gameMgr_1.gameMgr.rangedWeaponAdMess.getChildByName("adIcon");
                             if (adIcon_1 && adIcon_1.active) {
                                 Utils_1.utils.SendEvent("视频-高级武器-播放");
+                                // 注册方法 , this.ClickClose.bind(this));
+                                GlobalManager_1.default.getInstance().registerMethod('event_gaoJiWuQi', this.event_gaoJiWuQi.bind(this));
+                                cc.sys.localStorage.setItem(this.adKey, 'event_gaoJiWuQi');
+                                if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                    console.log('zh:AD  ready for idx2');
+                                    ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                                }
+                                else {
+                                    console.log('zh:AD not ready  for idx2');
+                                    this.event_gaoJiWuQi();
+                                }
+                                if (2 > 1) {
+                                    return [2 /*return*/];
+                                }
+                                //下面是原先的
+                                // 
                                 CocosZ_1.cocosz.watchAD(function () {
                                     Utils_1.utils.SendEvent("视频-高级武器-成功");
                                     adIcon_1.active = false;
@@ -421,6 +440,21 @@ var UIGamePage = /** @class */ (function (_super) {
                         }
                         else if (this._btnCt && this._btnCt.getChildByName("video") && this._btnCt.getChildByName("video").active) {
                             Utils_1.utils.SendEvent("视频-磁铁-播放");
+                            // 注册方法 , this.ClickClose.bind(this));
+                            GlobalManager_1.default.getInstance().registerMethod('event_ciTie', this.event_ciTie.bind(this));
+                            cc.sys.localStorage.setItem(this.adKey, 'event_ciTie');
+                            if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                console.log('zh:AD  ready for idx2');
+                                ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                            }
+                            else {
+                                console.log('zh:AD not ready  for idx2');
+                                cc.game.emit(Constant_1.default.E_Skill_Citie);
+                            }
+                            if (2 > 1) {
+                                return [2 /*return*/];
+                            }
+                            //下面是原先的
                             CocosZ_1.cocosz.watchAD(function () {
                                 Utils_1.utils.SendEvent("视频-磁铁-成功");
                                 // 磁铁事件
@@ -448,18 +482,19 @@ var UIGamePage = /** @class */ (function (_super) {
                         }
                         else if (this._btnQpbz && this._btnQpbz.getChildByName("video") && this._btnQpbz.getChildByName("video").active) {
                             // 注册方法 , this.ClickClose.bind(this));
-                            //  GlobalManager.getInstance().registerMethod('event_duoBeiJieSuan', this.event_duoBeiJieSuan.bind(this));
-                            //cc.sys.localStorage.setItem(adKey, 'duoBeiJieSuan');//1==消除道具
-                            // if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
-                            //     console.log('zh:AD  ready for idx2')
-                            //     ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
-                            // } else {
-                            //     console.log('zh:AD not ready  for idx2')
-                            //     this.event_quanPinHongZha();
-                            // }
-                            // if (2 > 1) {
-                            //     return;
-                            // }
+                            GlobalManager_1.default.getInstance().registerMethod('event_quanPinHongZha', this.event_quanPinHongZha.bind(this));
+                            cc.sys.localStorage.setItem(this.adKey, 'event_quanPinHongZha'); //1==消除道具
+                            if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                console.log('zh:AD  ready for idx2');
+                                ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                            }
+                            else {
+                                console.log('zh:AD not ready  for idx2');
+                                this.event_quanPinHongZha();
+                            }
+                            if (2 > 1) {
+                                return [2 /*return*/];
+                            }
                             //下面是原先的
                             Utils_1.utils.SendEvent("视频-全屏轰炸-播放11");
                             CocosZ_1.cocosz.watchAD(function () {
@@ -482,9 +517,22 @@ var UIGamePage = /** @class */ (function (_super) {
         });
     };
     UIGamePage.prototype.event_quanPinHongZha = function () {
+        console.log('zh:event_quanPinHongZha 被触发');
         // 全屏轰炸动画
         this.effect_qpbz();
     };
+    UIGamePage.prototype.event_ciTie = function () {
+        console.log('zh:event_ciTie 被触发');
+        cc.game.emit(Constant_1.default.E_Skill_Citie);
+    };
+    UIGamePage.prototype.event_gaoJiWuQi = function () {
+        console.log('zh:event_gaoJiWuQi 被触发');
+        var adIcon = gameMgr_1.gameMgr.rangedWeaponAdMess.getChildByName("adIcon");
+        Utils_1.utils.SendEvent("视频-高级武器-成功");
+        adIcon.active = false;
+        gameMgr_1.gameMgr.useRangedWeaponAd();
+        gameMgr_1.gameMgr.rangedWeaponAdMess.stopAllActions();
+    };
     UIGamePage = __decorate([
         ccclass
     ], UIGamePage);

File diff suppressed because it is too large
+ 0 - 0
library/imports/ca/ca02e1d7-13ef-44f9-8ae9-f15f6ec532f1.js.map


+ 30 - 0
library/imports/f6/f624a1a2-fd09-48b9-90db-4c5187409b97.js

@@ -65,6 +65,9 @@ var Constant_1 = require("../Framework/Constant");
 var CocosZ_1 = require("../Framework/CocosZ");
 var Utils_1 = require("../../common-plugin/Scripts/Utils");
 var gameMgr_1 = require("../Game/gameMgr");
+var ATRewardedVideoJSSDK_1 = require("../AnyThinkAds/ATRewardedVideoJSSDK");
+var ATAndroidJS2_1 = require("../ATAndroidJS2");
+var GlobalManager_1 = require("../GlobalManager");
 // @ts-ignore
 var i18n = require('LanguageData');
 var _a = cc._decorator, ccclass = _a.ccclass, property = _a.property;
@@ -78,6 +81,7 @@ var UIRevivePanel = /** @class */ (function (_super) {
         _this._proIcon = null;
         _this._btnVideo = null;
         _this._btnPass = null;
+        _this.adKey = "zh_ad_type";
         _this._tw1 = null;
         _this._tw2 = null;
         _this.isValid() && _this.onLoad();
@@ -92,6 +96,16 @@ var UIRevivePanel = /** @class */ (function (_super) {
         this._btnVideo.on(cc.Node.EventType.TOUCH_END, this._onBtnClickedHandler, this);
         this._btnPass = this._panel.getChildByName("BtnPass");
         this._btnPass.on(cc.Node.EventType.TOUCH_END, this._onBtnClickedHandler, this);
+        this.initAdForPage();
+    };
+    UIRevivePanel.prototype.initAdForPage = function () {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            var deviceId = ATAndroidJS2_1.default.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoJSSDK_1.default.checkAdStatus(ATAndroidJS2_1.default.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoJSSDK_1.default.userIdKey] = deviceId;
+            ATRewardedVideoJSSDK_1.default.loadRewardedVideo(ATAndroidJS2_1.default.getPlacementId(), setting);
+        }
     };
     UIRevivePanel.prototype.onOpen = function () {
         Utils_1.utils.SendEvent("页面-复活");
@@ -164,6 +178,21 @@ var UIRevivePanel = /** @class */ (function (_super) {
                         // 视频
                         else if (this._btnVideo.getChildByName("video") && this._btnVideo.getChildByName("video").active) {
                             Utils_1.utils.SendEvent("视频-复活-播放1");
+                            // 注册方法 , this.ClickClose.bind(this));
+                            GlobalManager_1.default.getInstance().registerMethod('event_fuHuo', this._reLive.bind(this));
+                            cc.sys.localStorage.setItem(this.adKey, 'event_fuHuo');
+                            if (ATRewardedVideoJSSDK_1.default.hasAdReady(ATAndroidJS2_1.default.getPlacementId())) {
+                                console.log('zh:AD  ready for idx2');
+                                ATRewardedVideoJSSDK_1.default.showAd(ATAndroidJS2_1.default.getPlacementId());
+                            }
+                            else {
+                                console.log('zh:AD not ready  for idx2');
+                                this._reLive();
+                            }
+                            if (2 > 1) {
+                                return [2 /*return*/];
+                            }
+                            //下面是原先的
                             CocosZ_1.cocosz.watchAD(function () {
                                 Utils_1.utils.SendEvent("视频-复活-成功1");
                                 _this._reLive();
@@ -195,6 +224,7 @@ var UIRevivePanel = /** @class */ (function (_super) {
      * 复活事件
      */
     UIRevivePanel.prototype._reLive = function () {
+        console.log('zh:复活被触发');
         Msg_1.default.Show(i18n.t("msg.fhcg")); //复活成功
         CocosZ_1.cocosz.uiMgr.closePanel(Constant_1.PanelName.UIRevivePanel);
         gameMgr_1.gameMgr.revive();

File diff suppressed because it is too large
+ 0 - 0
library/imports/f6/f624a1a2-fd09-48b9-90db-4c5187409b97.js.map


+ 46 - 46
library/uuid-to-mtime.json

@@ -1500,8 +1500,8 @@
     "relativePath": "bundleRes\\UI\\UIRevivePanel.prefab"
   },
   "96b4403c-66d0-4732-ab64-a70ab843bb04": {
-    "asset": 1734398335561,
-    "meta": 1734398335563,
+    "asset": 1734601524160,
+    "meta": 1734601524163,
     "relativePath": "bundleRes\\UI\\UIHomePage.prefab"
   },
   "5d184976-f916-4bc4-b5ce-1a3910136a01": {
@@ -1909,11 +1909,6 @@
     "meta": 1734398336956,
     "relativePath": "common-plugin\\Scripts\\AdSDK.js"
   },
-  "7efdfd8c-6133-4167-8bdd-600f9fcf5ad2": {
-    "asset": 1686238138000,
-    "meta": 1734398336965,
-    "relativePath": "common-plugin\\Scripts\\AldUtils.ts"
-  },
   "fe7d838a-f909-493b-8442-88392bd9ebf0": {
     "asset": 1686238138000,
     "meta": 1734398336977,
@@ -6249,11 +6244,6 @@
     "meta": 1734398343406,
     "relativePath": "scripts\\UI"
   },
-  "96bb687c-1987-4e5b-8edc-8f230f8c78e5": {
-    "asset": 1686238140000,
-    "meta": 1734398343416,
-    "relativePath": "scripts\\UI\\CoinBord.ts"
-  },
   "acaa08dc-4be1-43d6-994e-e9f635084f73": {
     "asset": 1686238140000,
     "meta": 1734398343422,
@@ -6269,11 +6259,6 @@
     "meta": 1734398343438,
     "relativePath": "scripts\\UI\\ShareOrVideo.ts"
   },
-  "003c244b-ccbb-48c9-afed-cb434d616083": {
-    "asset": 1686238140000,
-    "meta": 1734398343444,
-    "relativePath": "scripts\\UI\\UIADPanel.ts"
-  },
   "c5a1d088-5ff5-404c-98db-68be4e8af173": {
     "asset": 1686238140000,
     "meta": 1734398343449,
@@ -6294,11 +6279,6 @@
     "meta": 1734398343585,
     "relativePath": "scripts\\UI\\UIPausePanel.ts"
   },
-  "602c3aa8-0ee0-4fbb-8dcd-5d18712773c9": {
-    "asset": 1686238140000,
-    "meta": 1734398343616,
-    "relativePath": "scripts\\UI\\UISignPage.ts"
-  },
   "5ae233f9-b494-4aba-b27c-d173a385e998": {
     "asset": 1686238140000,
     "meta": 1734398343629,
@@ -6309,11 +6289,6 @@
     "meta": 1734398343643,
     "relativePath": "scripts\\UI\\UITrySkinPanel.ts"
   },
-  "a2b2a434-387b-4818-85b4-4626c8ca3b64": {
-    "asset": 1686238140000,
-    "meta": 1734398343671,
-    "relativePath": "scripts\\UI\\UITurntablePage.ts"
-  },
   "6b4eb702-4f49-4486-8659-589195734612": {
     "asset": 1686238140000,
     "meta": 1734398343704,
@@ -6334,11 +6309,6 @@
     "meta": 1734398889625,
     "relativePath": "common-plugin\\Scripts\\LuckBoxPannel.ts"
   },
-  "f624a1a2-fd09-48b9-90db-4c5187409b97": {
-    "asset": 1734399496661,
-    "meta": 1734400054764,
-    "relativePath": "scripts\\UI\\UIRevivePanel.ts"
-  },
   "119892cf-5c12-41e8-a11e-6964cf4c9a36": {
     "asset": 1734083836184,
     "meta": 1734421004700,
@@ -6744,11 +6714,6 @@
     "meta": 1734424610368,
     "relativePath": "scripts\\crypto-js-4.2.0\\md5_2024.js"
   },
-  "8552566d-c09c-4530-bf25-dada46819573": {
-    "asset": 1734491264219,
-    "meta": 1734491266604,
-    "relativePath": "scripts\\ATAndroidJS2.ts"
-  },
   "30bc39b7-83f8-49ff-940c-540a3f8f40b3": {
     "asset": 1734492213374,
     "meta": 1734492439827,
@@ -6764,19 +6729,54 @@
     "meta": 1734502147263,
     "relativePath": "scripts\\Game\\gameMgr.ts"
   },
+  "7efdfd8c-6133-4167-8bdd-600f9fcf5ad2": {
+    "asset": 1734572837203,
+    "meta": 1734572844531,
+    "relativePath": "common-plugin\\Scripts\\AldUtils.ts"
+  },
+  "96bb687c-1987-4e5b-8edc-8f230f8c78e5": {
+    "asset": 1734601896058,
+    "meta": 1734601937469,
+    "relativePath": "scripts\\UI\\CoinBord.ts"
+  },
+  "003c244b-ccbb-48c9-afed-cb434d616083": {
+    "asset": 1734602244841,
+    "meta": 1734602248404,
+    "relativePath": "scripts\\UI\\UIADPanel.ts"
+  },
+  "a2b2a434-387b-4818-85b4-4626c8ca3b64": {
+    "asset": 1734602740389,
+    "meta": 1734602743798,
+    "relativePath": "scripts\\UI\\UITurntablePage.ts"
+  },
+  "602c3aa8-0ee0-4fbb-8dcd-5d18712773c9": {
+    "asset": 1734660721193,
+    "meta": 1734660725906,
+    "relativePath": "scripts\\UI\\UISignPage.ts"
+  },
+  "8552566d-c09c-4530-bf25-dada46819573": {
+    "asset": 1734661012216,
+    "meta": 1734661016037,
+    "relativePath": "scripts\\ATAndroidJS2.ts"
+  },
+  "f624a1a2-fd09-48b9-90db-4c5187409b97": {
+    "asset": 1734662279811,
+    "meta": 1734662384381,
+    "relativePath": "scripts\\UI\\UIRevivePanel.ts"
+  },
+  "54a8b719-008d-4a30-9763-43908c251a9d": {
+    "asset": 1734662397802,
+    "meta": 1734662399348,
+    "relativePath": "scripts\\Framework\\CocosZ.ts"
+  },
   "ca02e1d7-13ef-44f9-8ae9-f15f6ec532f1": {
-    "asset": 1734503212159,
-    "meta": 1734503707190,
+    "asset": 1734664684750,
+    "meta": 1734664743810,
     "relativePath": "scripts\\UI\\UIGamePage.ts"
   },
   "1b644b27-cab1-4118-a8bc-e494bdd06dce": {
-    "asset": 1734503703851,
-    "meta": 1734503707348,
+    "asset": 1734664739947,
+    "meta": 1734664743956,
     "relativePath": "scripts\\UI\\UIHomePage.ts"
-  },
-  "54a8b719-008d-4a30-9763-43908c251a9d": {
-    "asset": 1734504889728,
-    "meta": 1734504892108,
-    "relativePath": "scripts\\Framework\\CocosZ.ts"
   }
 }

+ 24 - 23
local/layout.editor.json

@@ -18,23 +18,23 @@
                 "children": [
                   "hierarchy"
                 ],
-                "height": 360.3578796386719,
+                "height": 329.8387145996094,
                 "type": "panel",
-                "width": 347.0514221191406
+                "width": 347.12701416015625
               },
               {
                 "active": 0,
                 "children": [
                   "assets"
                 ],
-                "height": 660.6602783203125,
+                "height": 605.7081909179688,
                 "type": "panel",
-                "width": 347.0514221191406
+                "width": 347.12701416015625
               }
             ],
-            "height": 1024.01708984375,
+            "height": 938.5458984375,
             "type": "dock-v",
-            "width": 347.0514221191406
+            "width": 347.12701416015625
           },
           {
             "children": [
@@ -45,23 +45,23 @@
                     "children": [
                       "scene"
                     ],
-                    "height": 743.0191650390625,
+                    "height": 545.3125,
                     "type": "panel",
-                    "width": 1097.3790283203125
+                    "width": 863.5836791992188
                   },
                   {
                     "active": 0,
                     "children": [
                       "node-library"
                     ],
-                    "height": 743.0191650390625,
+                    "height": 545.3125,
                     "type": "panel",
-                    "width": 305.83416748046875
+                    "width": 265.09576416015625
                   }
                 ],
-                "height": 743.0191650390625,
+                "height": 545.3125,
                 "type": "dock-h",
-                "width": 1406.224853515625
+                "width": 1131.678466796875
               },
               {
                 "active": 0,
@@ -70,14 +70,14 @@
                   "timeline",
                   "game-window"
                 ],
-                "height": 277.9989929199219,
+                "height": 390.234375,
                 "type": "panel",
-                "width": 1406.224853515625
+                "width": 1131.678466796875
               }
             ],
-            "height": 1024.01708984375,
+            "height": 938.5458984375,
             "type": "dock-v",
-            "width": 1406.224853515625
+            "width": 1131.678466796875
           },
           {
             "active": 0,
@@ -85,9 +85,9 @@
               "inspector",
               "cocos-services"
             ],
-            "height": 1024.01708984375,
+            "height": 938.5458984375,
             "type": "panel",
-            "width": 306.04840087890625
+            "width": 574.8613891601562
           }
         ],
         "type": "dock-h"
@@ -104,14 +104,15 @@
         "cocos-services"
       ]
     },
-    "window-1734503712319": {}
+    "window-1734664041805": {},
+    "worker": {}
   },
   "panels": {
     "builder": {
-      "x": 2588,
-      "y": 162,
-      "width": 563,
-      "height": 775
+      "x": 2624,
+      "y": 214,
+      "width": 588,
+      "height": 803
     }
   },
   "panelLabelWidth": {

+ 51 - 51
local/local.json

@@ -1,36 +1,15 @@
 {
-  "last-edit": "e33d457c-0172-432f-948a-16877f8ba9c5",
+  "last-edit": "2eebca53-f35d-4668-81b9-f34b97756660",
   "recent-items": [
-    "eba0b784-0d48-41d1-8990-78715c043f39",
-    "ddbd2b0e-4345-4ae5-b082-aaa53d3d34bf",
-    "8e9902c4-a4b8-437f-a32a-06fd703989b7",
-    "12b48a3e-d908-4a81-beaf-095656d87e12",
-    "b0d7accd-9845-45b7-8f15-13dcad23b9a0",
-    "f1dc6570-7344-4719-822a-2e6a3f743837",
-    "383f7a8f-030c-471a-90b5-a602c9670936",
-    "653fd6cf-adbc-43b3-aeff-4af4db1bfde6",
-    "3c0e04c9-75a5-427c-8b65-cfdb2ed6fec8",
     "2117aafd-bef4-4d50-9b64-84a9652b8d66",
     "2f72a9e6-01f6-4db2-847c-6c12c9d6c293",
     "ce0de520-727b-4a11-a534-ea94e4231d4e",
     "daaa89a4-8a0c-41cf-b9be-b50b38572e44",
-    "29fae169-4c10-4524-9558-e877364cf401",
     "9dbf1dcb-0147-422d-915b-67edebf782f8",
     "2eb7f4f6-2f8d-43fc-a853-e73b3ee7b9b7",
     "dcf810db-c4db-4000-898e-d1427ebf7878",
-    "bee99777-9392-4301-b60e-04d301a9fcaa",
     "ff40e3ab-13ec-44c3-9876-ac2b4195b9de",
     "5809c7c7-7534-45a6-933a-3a7c5c05449f",
-    "5f066fc5-b150-4798-94f8-0f417caa0436",
-    "d7f8a1db-f301-4c82-bc64-39ec124fba94",
-    "141272cb-5d7d-41e1-a780-c973122a355c",
-    "85657d40-8669-4270-8e57-936d2545ca4c",
-    "5728cc76-fcd9-4c15-b8f2-643f71ce9ddf",
-    "58656e86-bacb-45aa-8619-2a6473e82f06",
-    "5d184976-f916-4bc4-b5ce-1a3910136a01",
-    "494cfea1-c091-4852-99b0-e497f782b485",
-    "2f77ae77-2587-4334-8628-fa5f603e395d",
-    "4488035d-90dd-4acd-8286-0b196acb7056",
     "039e9a19-0873-4bf4-8500-bba7fbb006e8",
     "9f74276e-3d27-45c6-b584-18ebdd82b3f3",
     "973f3509-2531-4a9c-ad1c-dad9a9632402",
@@ -39,67 +18,88 @@
     "0fb9a533-db09-4e84-b66a-3307e136fa3b",
     "10df6215-ef20-491b-8fe5-c2e021b248ce",
     "db6e13e2-f32d-435e-8c8a-d86f39fbedcf",
-    "5ae34e1a-2786-4797-b9be-6195b51ed9f4",
     "b878b32f-5a80-4608-8dc0-a09c8cd01298",
-    "088c4445-6905-46a0-b038-324ad555e508",
     "4527faa5-7b92-46ce-aadb-929fb2e6c9b6",
-    "2803cfe6-997f-41e6-aeae-d63080e04312",
     "01f6a78d-9d8e-4647-a632-a7b4a7a1114d",
     "db3544d8-c9e2-429b-bb01-0526aac11f51",
-    "a8a14ad6-b3a2-49ab-8412-e23b0cadbd55",
     "e4c63929-8c24-4a08-a7f2-221c2b63b809",
     "1346cce7-ae3a-43a8-955f-21a8ff872567",
-    "e7f73c45-d167-4fc2-8a4b-d27a51edf1bc",
     "e24d20e0-47b0-4929-bace-a8f6e8afa4d7",
     "9ef45cd1-67b4-4ddc-bc09-042f389e087c",
-    "06757667-d164-4ad5-a71f-692c21b8b427",
     "3349ae86-0c03-4264-88b7-eb05b7face52",
     "af515378-a30b-4166-b066-e5c06903f9b7",
     "98a239cc-81df-4082-9e7c-7a8c20177657",
     "aba00ea4-83ea-4fb8-ab7d-006ccf242726",
     "21a4ff36-024d-42d8-b074-bb0ee9350ea6",
     "f775ba70-68c0-42d6-a779-92c176732621",
-    "9c636ce9-8389-42c4-a017-679265d4d92f",
-    "2eebca53-f35d-4668-81b9-f34b97756660",
-    "9f6735c6-957a-429e-9b49-a0ddeaa36721",
-    "e33d457c-0172-432f-948a-16877f8ba9c5",
     "1ab36edf-a3b6-4ce8-ba77-1a749528ca7a",
-    "4a4355aa-9052-459d-accc-26156932e8f8",
     "a0c9962a-c86e-465f-aaea-f05e14775a3a",
     "7eb89eb0-6560-4986-a0bf-c3f858f98dac",
     "07cdefa4-7182-4bc4-a674-6ff29bda9189",
     "eb42010c-de0f-4c61-84e1-9aac4460ba39",
     "fa343ac8-6712-4fe2-8298-5077b0a0024b",
     "0888ee94-cf57-4d84-9634-e2a80457325c",
-    "4085235f-e9cd-460f-a7f8-8db3b8e35ac2",
-    "520272f0-a87d-48c8-934e-e9b122e02bf1",
     "08585d4c-eb74-4a75-ad68-6cc23282b7ec",
-    "54c46715-a8f6-4d14-ba5c-6ec3570353eb",
     "81a58fd5-73fd-4d51-90e4-5e1214d06f0d",
     "33e40797-4f82-4fad-8fb0-7442599d3994",
-    "6e18672c-91fb-4d10-a42d-193d8280817e",
-    "f121f74e-463c-494e-992b-27a70c1affcd",
-    "fda397c4-1eed-46d2-93cc-6e03d284aea3",
-    "8bdf65c6-d7e1-43af-ac7d-2bb55d94c2aa",
-    "770e5361-ae56-4806-aa88-9b81b01d9f17",
-    "73bc0861-11a0-41ba-973a-1198e9ccd2cd",
-    "25002cae-a097-461a-85ac-41e9878c22ff",
     "a27b4e5d-e3af-4b56-b7f5-085df2ef0f14",
-    "a2fa398d-c489-4259-be65-4edb66cc05e1",
-    "dc3b0685-db32-4ded-afac-4cc9375ad544",
-    "f8ee0ad6-821f-4d40-bea4-7aa0ab11a183",
     "eff96b34-b639-4b55-977f-f032e7741533",
     "961d16b2-96d8-4785-b461-bd4ef979db94",
     "e7b9db64-a599-435e-9e5e-d52f32e545c8",
     "27737736-58dd-4482-b2dd-0a4dbbbdba78",
     "df06086d-e07a-4169-a754-c0a6d8e2e325",
     "2c3b9275-526c-4a42-bc9d-ab37d38792bc",
-    "cd4c803b-2303-44ae-a0b5-b705f21159f3",
-    "849eb1f2-bf5c-4963-abe4-f41f5568636f",
-    "c11a852f-c19b-45b0-8b2d-aafc6c76f3c5",
-    "39e8a631-0b47-46b7-b0c5-13c1d29dad14",
     "a398247e-2fa1-46a4-b66d-114057e0d01b",
+    "1faaa632-a5ba-452f-8122-bb2179e36ace",
+    "b29a446a-4753-4c5b-a0bc-1f212b0d94de",
+    "29fae169-4c10-4524-9558-e877364cf401",
+    "bee99777-9392-4301-b60e-04d301a9fcaa",
+    "958943c0-7075-4be1-ac87-e6702b34e351",
+    "1eb1a199-011e-42d1-a166-aa0fa3f8c9dc",
+    "4a4355aa-9052-459d-accc-26156932e8f8",
+    "06757667-d164-4ad5-a71f-692c21b8b427",
+    "5ae34e1a-2786-4797-b9be-6195b51ed9f4",
+    "9c636ce9-8389-42c4-a017-679265d4d92f",
+    "e33d457c-0172-432f-948a-16877f8ba9c5",
+    "9f6735c6-957a-429e-9b49-a0ddeaa36721",
+    "2eebca53-f35d-4668-81b9-f34b97756660",
+    "54c46715-a8f6-4d14-ba5c-6ec3570353eb",
+    "088c4445-6905-46a0-b038-324ad555e508",
+    "520272f0-a87d-48c8-934e-e9b122e02bf1",
+    "4085235f-e9cd-460f-a7f8-8db3b8e35ac2",
     "d31cc54e-787f-4ee1-9766-2fbf0e1a3b39",
-    "1eb1a199-011e-42d1-a166-aa0fa3f8c9dc"
+    "39e8a631-0b47-46b7-b0c5-13c1d29dad14",
+    "c11a852f-c19b-45b0-8b2d-aafc6c76f3c5",
+    "849eb1f2-bf5c-4963-abe4-f41f5568636f",
+    "cd4c803b-2303-44ae-a0b5-b705f21159f3",
+    "2803cfe6-997f-41e6-aeae-d63080e04312",
+    "6e18672c-91fb-4d10-a42d-193d8280817e",
+    "f121f74e-463c-494e-992b-27a70c1affcd",
+    "fda397c4-1eed-46d2-93cc-6e03d284aea3",
+    "8bdf65c6-d7e1-43af-ac7d-2bb55d94c2aa",
+    "770e5361-ae56-4806-aa88-9b81b01d9f17",
+    "73bc0861-11a0-41ba-973a-1198e9ccd2cd",
+    "4e21ae37-d50f-420a-830c-60f5d33a475c",
+    "25002cae-a097-461a-85ac-41e9878c22ff",
+    "dc3b0685-db32-4ded-afac-4cc9375ad544",
+    "a2fa398d-c489-4259-be65-4edb66cc05e1",
+    "a8a14ad6-b3a2-49ab-8412-e23b0cadbd55",
+    "e7f73c45-d167-4fc2-8a4b-d27a51edf1bc",
+    "f8ee0ad6-821f-4d40-bea4-7aa0ab11a183",
+    "96b4403c-66d0-4732-ab64-a70ab843bb04",
+    "58656e86-bacb-45aa-8619-2a6473e82f06",
+    "5f066fc5-b150-4798-94f8-0f417caa0436",
+    "14c51558-f3df-45c9-a5e4-c398a63e8297",
+    "7f957898-3766-4864-9827-dec30ec63293",
+    "5d184976-f916-4bc4-b5ce-1a3910136a01",
+    "494cfea1-c091-4852-99b0-e497f782b485",
+    "4d6fedb9-8f29-433c-9464-afc34b01fe86",
+    "2f77ae77-2587-4334-8628-fa5f603e395d",
+    "4488035d-90dd-4acd-8286-0b196acb7056",
+    "61cdf448-cc0d-465f-9e8d-b29897e5d611",
+    "d7f8a1db-f301-4c82-bc64-39ec124fba94",
+    "141272cb-5d7d-41e1-a780-c973122a355c",
+    "85657d40-8669-4270-8e57-936d2545ca4c",
+    "5728cc76-fcd9-4c15-b8f2-643f71ce9ddf"
   ]
 }

+ 281 - 281
local/node-tree-state.json

@@ -1,285 +1,5 @@
 {
   "nodeFoldStates": [
-    "2cqYwyOJ9LOJ9JI8pGGRkx",
-    "52BwtDO+xOtr9RBKtum2n6",
-    "31quHXuhlFarTwuqAmRI/X",
-    "55dIcWNfNIya75mCPvt3NM",
-    "6cmpA4iNlIVJ2awiVe8ec3",
-    "a3G/ndBdpF2a/ItGbE7nCs",
-    "d2v12hMrFND7j/+rC9s/oq",
-    "a2EtZXnfJIDoZvb/myTBnk",
-    "96RUQnPqxKvIqaANJv6xEO",
-    "b64kxPROtA8YHENqfcn3QQ",
-    "9bgKlcxXZFnKIoL+WIC9cD",
-    "8bCKJYkSFL+ofuf98kTfrV",
-    "12UxbdpWJJWYf/kYAEmRXI",
-    "8bB+/yR5ROY5/uy/+lkIuM",
-    "d3c0nIbQJHGJ+Z1hVNgGzu",
-    "31Kar6VddIVp/e5PK6KCN5",
-    "6eUMYZq8FO8JAbyB1WxxCL",
-    "87tG4/cgNBNKSChhy/xOGw",
-    "666v4MgGxIk6iDKJOQlY8c",
-    "410cW7TO9Fmb2JkXdX2+XF",
-    "05BPSSnOlGmIn18FmZmugA",
-    "cchxZ3QyFDbrJSiMfI/Eua",
-    "6adJXrbb5JlpS6yToRrFIa",
-    "b5NZ4M0aBJy48moN3CAwlR",
-    "b4qcEH0H1N1bjQZy7BlY/A",
-    "00UZHCJOJCeLCrOLQc0ei5",
-    "61X1DuglxM9JxXwHA+bT4D",
-    "a6ir2kna9JqYkeq8Dky56x",
-    "99xN5wohFFnJxtbG/Vcm/E",
-    "4fKGvSKyVG6rfiU3x0zMbm",
-    "89XxWrcihKWIfYF0ZuUqnx",
-    "a5esZu+45LA5mBpvttspPD",
-    "50iVmPtqRLgaQDmSz92jcD",
-    "85P9jWsWBEp44lJwrazojt",
-    "bdG+iawzJJdJAtEd1SsIHz",
-    "b4ZkXmK/xP87f/edZKquUn",
-    "8faiRDuwVKiYcnHzGE3LzA",
-    "27Cr5fGClPsYgizB71HlpD",
-    "81a+8cC/RGf5ywJn6SUGQb",
-    "5elBhlTCpLDp1+Lem0KN7L",
-    "57XtHLbJ1NErfk2Opq7dhW",
-    "14muf/fedNoo6od/d3LwVn",
-    "527EI1BOBDXZE07Y8FH0jp",
-    "35UwTSicVGvJSjm78bxEGm",
-    "82Bknanu9Ik5+DyA9H53H4",
-    "36k4nOVfdCiJn5D9jqh7Mo",
-    "bfnIHZm1ZCkLmlYezoZJvs",
-    "913MXbtvlH57rp9tNRx9kP",
-    "cdm8R9iQFE77JUkSNu7Iyi",
-    "bffWadG6ZF8KaaVE7j1cTB",
-    "04J2pAlSlIJa2xf2VbPmr3",
-    "8dygoTWOdI2LhcHs8aMsWA",
-    "b01AZy26lAnp/RJ5pNc+sT",
-    "baz79xhy1NI4wlTjOH/hZl",
-    "9duMLTj8tLPo351F4MWbeo",
-    "99ouukuXVHvrXkOD6NmCQ0",
-    "36FRhVNoBFgKv84JOpMFnU",
-    "e5UCiA0ZhHd4AojO0ATZfg",
-    "81OOuuS7VGpKy6YqYld6eb",
-    "69N1Qoz91AxLvw76p1gYaX",
-    "0cWu5e3MRLQaCKhKxZtOjj",
-    "b8GDcFHnBAv6pYFebIqMwT",
-    "72wflIsTlMcYaugCo4SIRh",
-    "9fkSRjm1ZK9pYwFU9bteY8",
-    "813Iq1AktC4oYZCLjUSZ2H",
-    "be0AgMK2hNO7wvK5KGaNVz",
-    "38uq3b3k5CuILxcuIDkSXD",
-    "4bhyzJpU9KN5Wi8zLVrADF",
-    "31R/Ta8FFKNJH2w2r2LEgw",
-    "feM5FvtYNL/KEpZFKd/q0a",
-    "6eDdlyA/FFbYUJZB9NlzG5",
-    "8fDu+BtWpNIKiLjARHOHpi",
-    "a5ezc6TglDjo8oMs13Q0OV",
-    "28VvtvwkVF9rHTtLHA2Dsy",
-    "7d92aWZ7NIlrbF4dKRPonW",
-    "7arMizsRNGJ74b5NCUTNMo",
-    "26Nv7fq7ZEwKgA9o5DFzyd",
-    "53ZhWVxHZHibbU4qYX7oQB",
-    "f13I4tCL9GuZWJGeNfmmtI",
-    "d9CWN5LNNKz4GA11FagVR0",
-    "91SmBAKE9KrJjcuBgSKLQD",
-    "f2S1jbWQJOCbQThtsW8Ngk",
-    "1fLBcgOzNMGL9oB1/pkyZz",
-    "ea+XsRTRNAvp/PYmqSx0kQ",
-    "3cnj4pO+pBcIy3hr0tLQI3",
-    "52RZ81ZPhJg6TZ3PXVBL+m",
-    "26QvII1+RHdpm9gdaWhbs5",
-    "34Sy3YHoZLLbYdoj2iS2XG",
-    "46PaFg7KlF7a/MOBBjZyz/",
-    "6bEIvClWNA/LfIYf6h7o00",
-    "ec/xjb6PtKDYEtVKJ4dUpi",
-    "cdT8/YdKhABYktwNaS8QRQ",
-    "79ZqoSVM5ABbOTdjf5F1tW",
-    "3bFJnkWX5HGpHmVp/f0/qx",
-    "5dLvFjR6ZB7Ij0RruphMgJ",
-    "b7ZAhM91lGcq5qpdkpj1UW",
-    "fb6XiCsVZJpJ3AKg+CcfOv",
-    "efdYoC2U5MzK+6zTir/zRd",
-    "feRL268OxA7Z3VZBOGR1Ir",
-    "32j/dmXi1IOYvjsGk1cHuW",
-    "f9f+ViQDlDQ5Sux5aWTZns",
-    "7d8IV1Zc9F766wCwZRlvfT",
-    "cdG9e0ArJEY6lQ9fRIEvMm",
-    "1ctrPcLGJF7azSr51GswAd",
-    "9eNTtcbP9CYKaOZaGb60ir",
-    "76bHy9rbZAcrtesOlRbr1p",
-    "9eqJyJpx5Pe7vePTSNqQUQ",
-    "76kYz9HI5KwqtLj2Nx+R6r",
-    "10xqaB01BCzopZeXKR44qq",
-    "f4vpdTCIFCc5QVRBWK9Vag",
-    "6eKMjDPL5OW4M6145o10dP",
-    "660xlYZq9DMKawa8Y5CfpT",
-    "ccF6xdXA5EBIj6ph7tI5AI",
-    "15gxO6HaFBOYcnUg/WBoOw",
-    "c1HQMPF4pIy5hYAPNsN1v8",
-    "626xWPrrRF157cFWHQwKrr",
-    "f99069HOdKXKde8D6J+Vxc",
-    "8fkpOg4w9FIoOGWUfpLfRz",
-    "5cyoUT+CRIvKrNOr/uJCMS",
-    "d1ZTLQfT5K4K6CU8Bipp9I",
-    "35WVZOLzdHAKSCqFZ9AwAQ",
-    "abpbQxK4NK15ADSVqR4uru",
-    "6aCjv2jM1DaIJ8qmML08K4",
-    "cd67fwHUtLypDNW9FCOgdk",
-    "87gk5PA9hDPaT+7hUcg5je",
-    "c4p1gfkURLzJxhxdV15niS",
-    "efprGowBVBXadKc/JTm9+X",
-    "61TdK6dd5Hgq1BRsLioH0P",
-    "a3byOSDIBCV6eEw4UJp0tC",
-    "ecWgUKN6pFx5HZpKZGwf0Q",
-    "06oROofkJNaK7UXCtK5B67",
-    "bfObMuGkRE6oYQ/eb7zyL0",
-    "97yeeDOZtGV7BH65aBk9vN",
-    "6fkLB9+FtOzYpbIO/iKaxg",
-    "1eCOYGy1hNJKstg54OG5pn",
-    "deUwcXZZJKo7MvIZB7R6Jy",
-    "2emafkvIxAD5DgUqQx3CsR",
-    "67ZU85h9xBboKlh3ZYnJUG",
-    "36+gTRpQ1OcYKx7lJfzcUN",
-    "53A0a+o/lLI425VXYK2aFl",
-    "49TsREcElDm6GvxWOi+2Ch",
-    "b85x+DZldCe7COCP2YvEtG",
-    "7bhqwp3fdLCbDYopeyge8o",
-    "21KA97wptIHrTjGhlWhGg9",
-    "5bg+ZqPzhBUIJySqv107L7",
-    "177PBXErdF76d5JgB0sQkj",
-    "71ZmaxPNZMxbH2s8faJnzb",
-    "3bVCZNIqRD66hmGiMS9KYU",
-    "4fAZqaUQ9CsbylAeZ/Z9fD",
-    "3216KndG1II5ISh7s0I/c6",
-    "2dp8OEYo9BebheDnuvCfg7",
-    "1eZcY9QpZNIqzpe+dDbMeY",
-    "39cwQzcDRAY7KOyVQ4ffSO",
-    "b3WWbUcI9NWaQ6u23ccrpG",
-    "3d2/sFW9BDAa1GIsdNIY/Y",
-    "37abNJW6ZL8YlCbqwzj7eR",
-    "67QIxxWdFDm4K++rz95pBE",
-    "f0HhCvJElEH6E4mAAMqyOh",
-    "dbY6aovctL4bFTZaBwkOSU",
-    "be3eGmYthPbIfSSIOaZ7M0",
-    "fbLN6qs7dGMZf5MBJyAN2Q",
-    "0au62avlFNXrT2EmjO705X",
-    "30r0FtBPtE8LRkv8gh1vnn",
-    "a6sfWaielImpkm9x7lM5sL",
-    "cdvXFVfgJKZonXzSVKaty6",
-    "62mf7Gpo5P666/uGDDbzOB",
-    "5fSBRvr+9HCrUXGGYfq7w0",
-    "fcFdtzptdFqpd0E+ebiOfT",
-    "93YmCW7yZIt7nBvUlIYnTO",
-    "3aQiAnnXNDE5F4tzvBD+G8",
-    "d3orYiCg9IRZKshUBe1F94",
-    "c9CqiRamJPf6HyPTzpnWUH",
-    "be6PUL9y9IOLmVU//RXscl",
-    "18oZBwJ4JChZVJPPe6rQLz",
-    "678z305DFNOZYVdaEB4U6c",
-    "09sv9c9ixEd4C6Hbxi969Q",
-    "2fQjed8M5IuZ1MiXelfTTd",
-    "e8gB0yxmZO6qbgr97TvzA1",
-    "dflnx84eFP2rWqDh9PXYel",
-    "dfbsyYrTZJoo1h+MVsDmFl",
-    "cfnIWk7ENK8bQfdQ22ZLvF",
-    "afhTHJ4chNg7OXOgwVCdrR",
-    "eaveGu1dZCVYR3vQKE+vJa",
-    "d4mJuaA/VE35+3ciYLnx7l",
-    "43daA5VgtGsYCM9mBdOplF",
-    "bfICrucwBN0bWbQ/xmP23a",
-    "c6ztbhynZLa5Mv9qE5azUn",
-    "be2ErW/11GJIAnE1YJQkYI",
-    "3cyv/PvcxIb7Tzz/5rFo3C",
-    "c6HInbUJ9OmY8SZqXQcq94",
-    "f7DLLGtPlO4oxNX9DA/AgP",
-    "32NvA4Xt9B+JfCWlgQDOV6",
-    "7e8PM9DYpDI7Ll/ZVFQ6cR",
-    "caEbxpHa9E74H78/4z2lEH",
-    "efokrkmuZPrbpqGy7keMgD",
-    "53ec6k7ZNAXKG/ABvzNtyS",
-    "15Uz9iARJDx53R9GMkkbz5",
-    "9fP2aBksJGkITvUB42L468",
-    "83rJoMvzROUY0eYuTLMOd+",
-    "fe+hkA4WRKcZ4OWg4CiYzh",
-    "4e/tjPON9BnYd4GUbR9tyu",
-    "a4aLGdqMhPqZQINdhxa6Y0",
-    "97BJcAS9JP9r56VWNoTR80",
-    "5bg3HMRxtMKJb46kyneVpi",
-    "45ZI0LnxpPsaVKxaizpuJV",
-    "85sx4B4f5JiZ0rhFslZKvt",
-    "3bAL0KygxD84VQy8ZodNP7",
-    "85SE9nE/ZMiKSh4u+91O3+",
-    "dedLxRYc5G95HBAfvWt8gy",
-    "fdTS590N5PMLfy67aVHAuR",
-    "740fMEcQFBc4sYEgnMfnbX",
-    "53a6oMRslHUYnzOv1Z6XyZ",
-    "c3Ilgnpc9MGbL2q0CBB9AV",
-    "15n1XKqEtCGII87Dd5twRZ",
-    "efCKxIZrRDYpxRgHWZkeig",
-    "e68JjLC+dF4ZbA8eglhESu",
-    "92zOoeVI1CNYwt6Cq9T5OF",
-    "e3Vo16wx1Hb6GxZK72s0ZW",
-    "f5JLbiAR9DRpqdknennl4b",
-    "ffCtAM3rtFHZ0CUeLzK++N",
-    "c3taG+yDVKorFQ3fc64GJ8",
-    "aeFYUEF8NJNoiJgQiHaBe1",
-    "af0nNdco1OvJjpsid/pmt4",
-    "26ddg5GJZLoLZI/yrfFfPE",
-    "99DT2dWf9Dv40XQ/O2XXB+",
-    "3deNrkaYhH6qVlCrCvGNQc",
-    "a7baMlTG5LI4ySGrcrfICU",
-    "ffBVQYL6VF6IUFxYPIEoGa",
-    "26CmImEx9PU6fLCBHCOGz1",
-    "69KyMzEwZPJq9OqUue3bvD",
-    "72zjNsO2VE94hHIiz3wVA6",
-    "ccimHkNYpP/K8qqywmDITx",
-    "2allDUiQROgpSYWVLOx2wM",
-    "48AIV+3/lFxav0Ld2ckECY",
-    "01cfxRh9dMGb8jqRq+IHZP",
-    "2b6I5/geRFdJOe/DG9ub2D",
-    "f4Zk5BIc9MlY1P8vqyMiwW",
-    "76v/8B//ND94fWRfqhWl7H",
-    "686eCDjbpLWoKa3DUcRdA9",
-    "0f3xXdvaZID6lTYPdmJt9O",
-    "12YrZ8BtNDHo9hF1qwfA26",
-    "9eD3g4TVVHTa2nUDN6YF2E",
-    "37v8Z58ZdLaLnbe1aS7r30",
-    "160mm+v6pCsL9gBtHafDNc",
-    "e6eTulqRJH755lUQjdIZXH",
-    "2e0JjmivtDSoACGKbnT0mA",
-    "0aFx7bXQdPSLopVGHBlMNh",
-    "199gTadS9Ev690X3gYudhE",
-    "94Ls4pj2RHWI7mAkzURMqc",
-    "eerTDHkiRJCbPbAXo6NtLS",
-    "d98BHz1Z1GdrSWDC85ifYs",
-    "c9mMgUJxhD1rSBws0mg0BW",
-    "ec/YNnUPtDDreu+ccz7dq2",
-    "2dU59kJkpCO7ocznyjN/ow",
-    "adgP98I4xFzqGbhMEZuyod",
-    "a3axZj4OdJP5qgXzDZHXaP",
-    "375HdCD01Ic6mInaIY6ygk",
-    "68IAK19c9PJI/BqintznVV",
-    "45DbJ9t7FLYp8mZz/dTSdv",
-    "62qGkm0lFMh6mpvsQ3KLMw",
-    "bfmkdnFqpNfY3F7Otucgjs",
-    "9ee0M3wl5LbJhf2PeQw0nk",
-    "eaACavRRpOWKpXZq5WRj8R",
-    "10VG/yCjhEUozmcuVnidn/",
-    "1b7a97ywVHfZqe38AAfATX",
-    "24O0Q6MSBNEa+fTSvkjzml",
-    "4eV4IpU1hC2IUOQeSDWxKY",
-    "75yFlWAHhEWotBilyRFLFA",
-    "62+FU+0IpD+7fFm49URdu+",
-    "5c7xzC0WxJhboregHJK3DR",
-    "a9uNT9XiBOO5PWD14G8zQA",
-    "794t4LJBRITa4Pwgy8R0LO",
-    "39fMDuD61IBKcnTritiD+K",
-    "c5J9z0yPxNYa26ibd+8dt9",
-    "03OQ/6wKtAy7x0n0YcEhCa",
-    "bbt7xOJqJDwr4HXRJex1A0",
-    "c3klouvXFDUJ76mCVVhtpY",
-    "18RXZy6GlK2LUloYzn5oWQ",
-    "4f92dgro1GYa+l9QrdqAXI",
-    "a2OWelp3xCMYuRhTEKOE7C",
     "f8Z29hHdhO7own9lfKkNmU",
     "6ebNyZXv1MpJokqP0b27ZV",
     "03Kqqj4mZNgb1FtT0VBfPq",
@@ -499,6 +219,286 @@
     "368aLkhaRPkaLo1czu4PbF",
     "a88xhqBF5IG7z7SSqL0q56",
     "f6QmwzJLlJNIIfli/y6i8I",
-    "76J4SDlppJSpxXGU+y7/hF"
+    "76J4SDlppJSpxXGU+y7/hF",
+    "bemNyo8PpEY7xvvFpHKUXN",
+    "6e2KUlj/pMWYByZ3eNRx75",
+    "05RTPLWmBDEaAwrnNMjjm8",
+    "caTZXgeIlMPb3p9Bqw0UEJ",
+    "c5M/bUNphN4bOToevNisTz",
+    "29jCByMURCpbbaBZqX7tsW",
+    "c23BEFbQVEk6kCZTa80XQt",
+    "5fgMtRmvZICbEo9dIMhbWg",
+    "ceVaYc8NZIPb8zi00bRCOD",
+    "22hiMja8dOhpNexFXLrNrn",
+    "5cNaotMx5GI5eK8qejbQ+u",
+    "89zB3DwGxNKrlhoDvkLdbG",
+    "63nRoUjZVAbqJ4+ptMtpaz",
+    "f8q/37AndNw7r2Qosj8A/y",
+    "27GZ0p9ndHzL8ML0wwoQFC",
+    "c5j9IsEZxCeLQbMODvLXQZ",
+    "4bEPt0ZNRMKLBKXopVQ/Lv",
+    "b9YIzTIS5BxIjtZGDbe847",
+    "99k7dwispECYj4psuTh2uy",
+    "d4iY7ZsqlF+IGJRPhZYWUi",
+    "56PNrYohZKJYo6r9wo+kyv",
+    "daM33fSJNNH5e4J3rylEat",
+    "f0KK4SrYlP5Lf0pw+RDNQf",
+    "e61csF8PBOKb4bhVAPQZCZ",
+    "977CHU2PBMU5mP1em8V6Ye",
+    "acqItGuRJGPJl7sRoXQbsm",
+    "36wmV6Fd1GRYWSvKcGwJxA",
+    "bfWsCLwKdJSa/IUrD0yaKF",
+    "71eMiFLdhGWKVyB3AFCCRy",
+    "12QoPKgGpNtYTnhhNP5YRJ",
+    "76pxPcKI1OQq4looQ1JcTZ",
+    "fcXJKLQ7JE+btFXHAvF+mV",
+    "35QptOuLVFArQhsXsDhp/C",
+    "f0WD/RubhDeI+odkwEAs/C",
+    "3bpBTM0C9MKbpiapE5M9S7",
+    "f8Pc1f8DRGv6vH0bjqMypc",
+    "2b5+u3KL9MiqiotM5Aozdp",
+    "e1k0ExC3pMvILdknQrlSrj",
+    "c8LKmFhZVAdoZkmffKfUrT",
+    "22jkfBfVZCwqwFUlaNr12C",
+    "eewBd9+MFPY7W+bk+JrmCu",
+    "40vT/3CfZL0rNCOHqoEZ5D",
+    "29dC1xUIVBQIHGmz6zGDmN",
+    "42slN+rDlNDrUK99u1TszU",
+    "92RhC4zu5AbaIBUQb48SRl",
+    "86XlpdkzREM4Pr2XsDchgm",
+    "f1p8JPGLdLQ4wn1KyiB4Ok",
+    "03DJ6gYhlOco+dakj8QGez",
+    "6bPef94ypBMozi4ejVB0tb",
+    "4dD8SILzZPd6lvnGTc2wcr",
+    "77yBuPeqRJ/alLgvRgr8RU",
+    "cb4gi9f1NIVrlv/0ASNj2H",
+    "bbAYhLDRFJurryH6ytPbMp",
+    "81d/SzJcxH76jX0uEFXv24",
+    "7f3AFehPVIRqyGu0/cAdiD",
+    "19ava9yOhOcJFI6Drp+u0L",
+    "0ejxKMj2lFv56qL+0KnVeo",
+    "d5RZCs0tdLyaBxxPHYrIe3",
+    "0db5w1HaVGgYsDjJ6et4h5",
+    "421Uze0k9AX7076CuhbFrh",
+    "d69W55Db9DJoUqifqm45Ad",
+    "e7HzlNJB9O1p5ShHbPkaBJ",
+    "ffPtbexnpHk4bojqlJXI8h",
+    "7c4i/aPlVN2YezCOiTAGoT",
+    "c9oxu5/ZJKdL6FkGDKHR9i",
+    "faCzVTydFDaIZfw0K5Wf+5",
+    "56XGXyFw9MmZPeRRXMBPBJ",
+    "24yiAs1KFOs50tqJvnu/Rn",
+    "40AuMbmltKH7D3OVpLz+rm",
+    "5eAX1uexVD/q89Z1l8seSC",
+    "7fCHNfLxBJz5tvb4cHsiX2",
+    "82rm5HoIJPp5Utlo3w+Qc7",
+    "d4+Ox1H0lKYbItfGnpfbKM",
+    "f89lzPEJZB1ZLaSzVCTjP1",
+    "86jOr6UmVGB7sXVg1cT6Ja",
+    "03Jl1RCf9FNZuOzMNNq2F4",
+    "90XA6+4uNO2reb809dHU9H",
+    "a5esZu+45LA5mBpvttspPD",
+    "c5ayuQWEJAjbk2i2vAoPvw",
+    "d4uFxnOBFJzKf6pe/tcCf3",
+    "75NzY07wFIOoPVvYe+71z0",
+    "1ai8CVdQ9LH7AKxlOA9Xff",
+    "1dnfrqb1VG0qIj+UiSi+yH",
+    "6714BtfbBOhp1ldo17sGX5",
+    "e9Z8DQ2YBPlrj2EgOGOjh4",
+    "cerNO7viVJQo3d3xuZ7UxV",
+    "53VyNZVL9HArP7XovbwPh8",
+    "277KmMRFlCJIvz/TTt1crB",
+    "b0aNU4atJN4Z/4/7yTdVQQ",
+    "2dirsdLfNNbIGIY0VjHOyb",
+    "6eUHm9xPVNh5QTO0G0FrA/",
+    "73NQfLtsxFqbyGK7JzD9Ww",
+    "e9qaLbllNIoqIdut/eV1rC",
+    "28RwBm2RpOZaPvyIh8/AJC",
+    "cdHwOsBi1LXK0ToSAu3o99",
+    "fepT5V2eNB3rlxxDsabjTR",
+    "5dU/3NJKVA9ZUchjJTf2iI",
+    "14p673UyRPYpbPpAGPJzpH",
+    "8aw6DjdNZGrr+Md4GRYVhF",
+    "c8Shdf4fFLjKZPz/kpmpED",
+    "2fuL1yo7xKNpe5JSaFPX1v",
+    "e9sLYNyJlKBbMMfsHtVedQ",
+    "6cKZUeeT5M57QMPH6jWOkh",
+    "d5h6awQ/hO174INxwufQPM",
+    "f0dyZS/GFIpq4xT/S1EO2J",
+    "3fXGRQpUxGU5luf8ATXR7h",
+    "d97UNce8NNwpKC1/8B1GpE",
+    "b36pNBS7xE0Y08a1BHnxir",
+    "f7MpwwDZBGF7QvcMg8/ey3",
+    "00o5WuXnZMU49TEU0i5sTL",
+    "9bbeQ2kdNKd54lwZE0QUz/",
+    "bfGiYYwLxGerxQeqbqbQHd",
+    "e35eOaMidAxoSeLEybtxzQ",
+    "2fLtLfyZdEcryxjyPFSMRP",
+    "a9w+s+Fj9Pdo/GwMQHhw2f",
+    "1epUWskCZGYJfhKSdy3qBC",
+    "92dD5GIttClrJ1F5DMQxiY",
+    "d1X48rrDFNbocFaf1fOZnH",
+    "6cUbm9TUFFpYugXXg57Gkg",
+    "9fvXhja+tA5oO/NcPpN7mX",
+    "57FOQeBpFAfqgeaAvBc0N6",
+    "d9VoGvPRJNEbjjGSBaE/8b",
+    "69kmojupJHepu1zw4A40Al",
+    "0bWXNm7bZMu5Exm9vdtyO9",
+    "ddh0NN99JFNIm2x0/fEQ46",
+    "d75MFsti5HkYOrUGZQM8Qe",
+    "3aEBMeOvRGGKMz/mAFOFAe",
+    "a44UTSGqpDSp2fRSYpkgPq",
+    "05pxqFRBZCCZFBpYzasVJu",
+    "4cT7cXFP1IVLNdqQDiOei/",
+    "c9ELtj3JZNbaFWSnVDFxb3",
+    "91MnIbV+9LrKXElbjHhwGn",
+    "d9lU+m9nBDTb/oRubRQxp9",
+    "e22A5sgDxAD6bfXUo/V2rO",
+    "59TcN11IdIbalFkmY+xQt1",
+    "6at++cPnpD54aILVSjEaiW",
+    "57SrDzLd5KI5gyFZDsClzF",
+    "01Tbj83IBJwrS1m6yXf06P",
+    "baBFhYFN5P/qUTbrr5GyIV",
+    "9f55ZSVedKu4LhXW3rmrRH",
+    "d3xe7TGs9KyKERfVAD/yb1",
+    "48KAoukW1MX6qrJQfeVKkN",
+    "15ZCAnb1pKjKPEcREoVj3r",
+    "a1kH04KupOE5oXQH6LhuiZ",
+    "d7YkV489FBBLXq4vJdKXHA",
+    "e5Y1NS0ZJNnIwZigM/8CSL",
+    "978GY6QpxE3Y9D4D1Sc4G/",
+    "04XwOJg8RAx7bQfYSO+JVX",
+    "1fWhTAGqlMKIa8qIKUOMQ9",
+    "febsBwbFJEsp20b7TjsXiY",
+    "1596XXywhJa7nQP07BzjQj",
+    "8aE7LS6qdMiI+Qd/Vdo0By",
+    "c6+ZFpt2ZKuYIcgZn63jHL",
+    "52X/0sC7RIApLZ/mLhGQrH",
+    "80v4aDMiZF8YWF6Cex+D4z",
+    "8e6QxXskRHW5lxgsuasem1",
+    "b32XFq2/dDJqv54032XhVE",
+    "0aa5g7y7pP/qPUDF2Zf8nm",
+    "a3tT3RejxOCJRtKq4xhwEG",
+    "d8bSzHWK1K+aj+qkwdW8vl",
+    "5azte8/l9FOIoHxqtNUKQx",
+    "4bYEcMZdhCDK13MWPKaTTf",
+    "260qDUkTNMyL3YiG09Az2c",
+    "7cOuYttT1IZZ9HNsVzWjZ4",
+    "b4Fqq6FmpG1a5UMsEdrdjt",
+    "e8lYYKux1B+J2xcSa8FCY0",
+    "56K0GOLsZLcZSGon7qlE/G",
+    "50nWhA+L9MbYNOTQo96+07",
+    "e1Gz/hPXBN3qjOKq62sBTW",
+    "9foYJHPh9LJpS4wKUx9+qt",
+    "153+zYraRJzKdmVtCZs1jq",
+    "089gH4QNtJtZ9UZdpFTSoM",
+    "f4ticKypZJjZHi3pqzZQVI",
+    "bdXwlIFcpBc58M3YknVPQ1",
+    "0et7sB8e9N7b0bxZxDW6hz",
+    "f4MXaHLyNDuZxkTqqsnTtf",
+    "a852wBJrVH1p5kZAWXeixR",
+    "2ceHo5cCxN+aXDhhqf4nFJ",
+    "34n+Xy8JNMtauMRg1FsIGf",
+    "b04JABqENHNocb0RWVwo6c",
+    "2670iQpWJEi7gx8sxlyqO3",
+    "3fv8k5ZAJGFbO6Pc9a7/pm",
+    "6a14CDpfFIm6ipr916IjPh",
+    "abKqfDmFdL8IH4XUiSyGf8",
+    "26x3toQ4hEmr89Jn6uc1UR",
+    "6fBh5ZrIhNo4C2SBE3q3Cd",
+    "c6aXdwwbpHy6OAL7sr2CF4",
+    "c9AbuLsyRAsrw/CMK/qqHO",
+    "d8dS5B8fZLCKvV/4wMmDds",
+    "d6qeLlMYxPh7T1hiO+J7lX",
+    "2fklFzUdNNYK9jj1BSFR60",
+    "137DAh5TpCS6RTrsHdz9d0",
+    "3dfF8J+CxB/5eq2EFT6VAN",
+    "f8OMPmYPdHw4imNTEGA/Kt",
+    "40aUS7SgNJBJ0rLDtP6P+i",
+    "cb+c3xphVCLbYHRsrDRkwu",
+    "13PmjI9kNKiK2P3umIyJK+",
+    "527+nbp/RBFJFTGDlIriYa",
+    "4dK2X/E9pEZ4WmraZNL6cQ",
+    "92PMWJXshAu7lRzvzQ80E3",
+    "f5IokcogBITpSNkwMH6ZBA",
+    "db9d77yYhCe7LJ8HTjVuzR",
+    "e98BJVhshEkqph2y+hqi16",
+    "62VordjQtDhJp6LVjS5id8",
+    "2f5ZrMZXBHX4Ro6/ISQAKg",
+    "0dRbYpI8lH3pYUUkU+rqs6",
+    "4dWxabRjpM94mP4KpBPuyG",
+    "63NTPr6U5AHpwfcmy9oGXv",
+    "dd7Lz0RD5JYpzPfk3ATH8r",
+    "1caK3Jbx9LF6GVG99mpJIF",
+    "d8t1VCY41J95CFRkd4AojJ",
+    "d2GE1XGVtCX45cngfFobUj",
+    "483OLRe7tP0IJVIR4VV7b3",
+    "dciOH8bf5N9bS5ITWIrNkD",
+    "ac8rTkxTBBRpotEl7ObzK/",
+    "3dX3qJWiRA2qowCk+A1IOV",
+    "95dEKxBstGVJLDFCvg1g1p",
+    "b7ZWTnfFtL478bMPAkyv0u",
+    "8f7dOpzPpJZ5GMEqlPPgg7",
+    "d6JEvIjXVEUasrmUSFMC9a",
+    "cfYYVCuwpI6KDxP79Tnrd9",
+    "83LPSZ8HpMtpIizsEORyk8",
+    "36gL4rLVBBJIBc7yg9M78M",
+    "e3fYJfea9CxLAnq1XJMKLM",
+    "ca/5rh5wlHoaYIVt7hTy0z",
+    "1dm535cbJJqqZ26aIsTrXp",
+    "eaSoqfmMpFub9f//iWLf+9",
+    "946hnfDP9KtoFs24jmhgAN",
+    "88RD4rzIlEHoum5S7BirWF",
+    "a62n2Gq7BBOIXU8rOj9HUu",
+    "688PE3dD9FSYMXhismfOR2",
+    "37ii9OeMxDWLl9D8+YnNU6",
+    "d6bSZxjT5KF4QEvvAahSGa",
+    "c51gjOrCNM4LMnM0OJne4P",
+    "6cXmrNez1JPLcm/wGQpQxu",
+    "c6o8RlMS1C1ZbRo/l/kYzr",
+    "7efuR9YqBJSIeSvzFSJJ6e",
+    "ad2NPOCdZDlbPF4q1hiZn+",
+    "fffspNg2dE+6+1Qs8G1aUs",
+    "68RELFERVM7o66u3cV5U5u",
+    "ba9s5S3sFOiYORyY+crphC",
+    "c4oF0kdj5Nc6WNih63AC7O",
+    "d7J7JAkUxCXYnUy9udjuzl",
+    "1dn1DYgNxJe6jVVwywbZ9d",
+    "e9+ojVG3dM1JIssHwVgnmy",
+    "10JvlRgk1E44BYVqHTfzIf",
+    "88qutDjS1A2YgcibNbe0ux",
+    "3dqkgcwT9OtqU/fpqrc6Xi",
+    "be8bHZ6eBBboy/qflltU7Y",
+    "07qY4fITpAWqsEPzBtbqWU",
+    "9b7Hhx5FhN94uvuvtCrLIJ",
+    "d6fLO+rbJGppHs54/K8MKS",
+    "0fsWNNpHZM5Z7werpL4Cgr",
+    "8dD3O+1O5Ii6sCntG9/j6K",
+    "2fVLa+/8ND9bbvRh6CO8qq",
+    "4bw9coZ4pD9YyWrTVm58KX",
+    "4e9dDlCgRP14452Hs5ljUs",
+    "d7uMd9aw5PEpDV9BQZdN5t",
+    "76dfFtwaJJsKhv9CbJTTsA",
+    "f9WxLLv0dOf5M9uK18SYOv",
+    "11uruQOl5K0b3peyREp7hp",
+    "300nltcMdD2rkVWB4ybVRE",
+    "1320+gGf1Bnaoh+wQ7wIs+",
+    "30jVGi2BpKFZTNCOgyKCW3",
+    "6eg2DyODlH1LTR7cw4E4DE",
+    "a1A7sTS75AW4eEYI4/j6XZ",
+    "15Mal+459Jjo70Ese2vcdt",
+    "8fWc3IzIpFaZQQqS6kB6eF",
+    "76JUdyHRlNUp94mSEdrK9g",
+    "a3AGKOXOhGqbApbbULpMBT",
+    "caSvHNoyNGhbjwodmIEBIQ",
+    "53tQHselFJfZzrjyfrAqoT",
+    "be/Bg+fmxAG6PLFQMVue3x",
+    "bcQ77w+ENPvK1EwHf8jvD5",
+    "de8btBh21EV6olejNstQ8c",
+    "adCFhbAl9ErKf8Zg4882Dz",
+    "2fS1SzYQVC7accWD1O3mY4",
+    "31ePkkHd5DnbZTUcoSNqVW",
+    "48qKKn+HtCr77gwdVlvcyj",
+    "f3yOEOhuxA07sohcNhhVvL"
   ]
 }

Some files were not shown because too many files changed in this diff