合并

assets/resources/data/guide_data.json

@@ -94,5 +94,21 @@
 		"finger": "",
 		"lagNext": "0",
 		"continue": "false"
+	},
+	{
+		"id": "13_0",
+		"trigger": "1",
+		"trNum": "0",
+		"btnEnable": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "-40,-520",
+		"dialogAlignment": "1",
+		"dialog": "<color=8A4312>加油，红包就在眼前</color>",
+		"displayRect": "45:-30:600:600",
+		"clickRect": "event",
+		"finger": "50:20",
+		"lagNext": "2.5",
+		"continue": "false"
 	}
 ]

assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -33,11 +33,11 @@
         "__id__": 27
       },
       {
-        "__id__": 29
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -948,24 +948,10 @@
       "__id__": 2
     },
     "bClickClose": true,
-    "onComplete": [
-      {
-        "__id__": 28
-      }
-    ],
+    "onComplete": [],
     "_id": ""
   },
   {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "afc7c9y+IlK2pswzhp7XL30",
-    "handler": "closeUI",
-    "customEventData": ""
-  },
-  {
     "__type__": "afc7c9y+IlK2pswzhp7XL30",
     "_name": "",
     "_objFlags": 0,

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

assets/resources/module/safeDepositBox/SafeDepositBox.prefab

@@ -15614,7 +15614,7 @@
     "open_effect": 2,
     "isOpenCloseEffect": true,
     "close_effect": 2,
-    "close_toPoint": "Canvas/界面层/game/功能按钮/底部按钮/福利左",
+    "close_toPoint": "Canvas/主界面层/game/功能按钮/底部按钮/富翁银行",
     "close_uibg": false,
     "isDelayOneFrame": false,
     "_id": ""

assets/script/before/main/FactoryIcon.ts

@@ -131,22 +131,20 @@ export class FactoryIcon extends cc.Component {
             this.data.state = FactroyState.Producting;
             this.data.productID = config.picture;
             this.data.growSpan = growSpan;
-            gData.gameData.setFactoryDataMap(this.configID, this.data);
-
-            this.getComponent(MoveToCenter).move();
-
-            gData.gameData.changeLeftTimes(-1);
-
             gData.adData.checkPopRed();
-            gData.gameData.addProductMakeTimesById(this.data.productID);
-
-           
-
-            //gData.gameData.updateOrderTaskCopyData(this.data.productID);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node, parentNode);
+            this.getComponent(MoveToCenter).move();
+            try {
+                gData.gameData.setFactoryDataMap(this.configID, this.data);
+                gData.gameData.changeLeftTimes(-1);
+                gData.gameData.addProductMakeTimesById(this.data.productID);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node, parentNode);
+            } catch (error) {
+                console.log("========factoryIcon");
+            }
+            //gData.gameData.updateOrderTaskCopyData(this.data.productID);  
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
-            
+
             gData.gameData.isProducting = false;
 
             let flyRed = await gData.gameData.updateNewTaskProgress();
@@ -179,7 +177,7 @@ export class FactoryIcon extends cc.Component {
         gData.gameData.setFactoryDataMap(this.configID, this.data, sendToServer);
     }
 
-    public async onHarvest(){
+    public async onHarvest() {
         this.countDown.cleanRiped();
         this.clean();
         gData.factorySystem.currSelectFactory = null;

assets/script/before/main/FactorySystem.ts

@@ -48,12 +48,11 @@ export default class FactorySystem {
                             let len = this.factoryIcons.length;
                             for (let j = 0; j < len; j++) {
                                 let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
-                                let max = gData.gameData.getMaxProduct(tab);
-                                if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {
+                                //let max = gData.gameData.getMaxProduct(tab);
+                                if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty) {
                                     gData.gameData.nextCanProduct = gData.gameData.getProductMap(productData.picture);
                                     gData.gameData.nextMake = this.factoryIcons[j];
                                     gData.gameData.nextType = 3;
-                                    console.log("nextFactory ===== successs");
                                     return this.factoryIcons[j];
                                 }
                             }
@@ -83,6 +82,71 @@ export default class FactorySystem {
         return null;
     }
 
+    nextFactoryExtra() {
+        let factoryArray = [];
+        let data = gData.gameData.playerProp.orderData;
+        let orderData = data.orderTaskList;
+        if (data && orderData) {
+            let productJson = gData.gameData.configs.Product;
+            for (let i = 0; i != orderData.length; ++i) {
+                let dataE = orderData[i];
+                if (dataE.completeCount < dataE.taskCount) {
+                    if (dataE.Id <= productJson.length) {
+                        let productData = productJson[dataE.Id - 1];
+                        if (productData.tab == ProductType.nzw || productData.tab == ProductType.dw) {
+                            continue;
+                        } else {
+                            factoryArray.push(productData);
+                        }
+                    }
+                }
+            }
+
+            //从两种类型随机选择逻辑
+            let isMatch = false;
+            let matchSuccessFactorys = null;
+            if (factoryArray.length > 0) {
+                matchSuccessFactorys = this.isHaveEmptyFactory(factoryArray);
+                if (matchSuccessFactorys.length > 0) {
+                    isMatch = true;
+                }
+            }
+            if (isMatch) {
+                let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                let factory = matchSuccessFactorys[randFactory];
+                gData.gameData.nextCanProduct = gData.gameData.getProductMap(factory.picture);
+                gData.gameData.nextMake = factory.key;
+                gData.gameData.nextType = 3;
+                return gData.gameData.nextMake;
+            } else {
+                let len = this.factoryIcons.length;
+                for (let i = 0; i < len; i++) {
+                    if (this.factoryIcons[i].data.state == FactroyState.Empty) {
+                        gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                        gData.gameData.nextMake = this.factoryIcons[i];
+                        gData.gameData.nextType = 3;
+                        console.log(`nextFactoryExtra========${this.factoryIcons[i].configID}`);
+                        console.log(`nextFactoryExtra22========${gData.gameData.nextCanProduct}`);
+                        return this.factoryIcons[i];
+                    }
+                }
+            }
+        } else {
+
+            let len = this.factoryIcons.length;
+            for (let i = 0; i < len; i++) {
+                if (this.factoryIcons[i].data.state == FactroyState.Empty) {
+                    gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                    gData.gameData.nextMake = this.factoryIcons[i];
+                    gData.gameData.nextType = 3;
+                    return this.factoryIcons[i];
+                }
+            }
+        }
+
+        return null;
+    }
+
     doSameCheckLogic(out: any) {
         if (out.state == 0) {
             let len = this.factoryIcons.length;
@@ -178,4 +242,20 @@ export default class FactorySystem {
 
         return can;
     }
+
+    isHaveEmptyFactory(factoryTabArray: any[]) {
+        let factoryArr = [];
+        for (let i = 0; i != factoryTabArray.length; ++i) {
+            let len = this.factoryIcons.length;
+            for (var j = 0; j < len; j++) {
+                let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
+                if (tab == factoryTabArray[i].tab && this.factoryIcons[j].data.state == FactroyState.Empty) {
+                    let map = new Map();
+                    map.set(this.factoryIcons[j], factoryTabArray[i].picture);
+                    factoryArr.push(map);
+                }
+            }
+        }
+        return factoryArr;
+    }
 }

assets/script/before/main/FarmIcon.ts

@@ -133,7 +133,7 @@ export class FarmIcon extends cc.Component {
                 break;
             case FarmState.Ripe:
                 gData.farmSystem.currSelectFarm = this;
-                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
                 break;
             case FarmState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -143,7 +143,7 @@ export class FarmIcon extends cc.Component {
         }
     }
 
-    public async onHarvest(){
+    public async onHarvest() {
         this.countDown.cleanRiped();
         this.process.cleanProcess();
         gData.farmSystem.currSelectFarm = null;
@@ -172,21 +172,22 @@ export class FarmIcon extends cc.Component {
             gData.gameData.isProducting = true;
 
             this.plantIcon.node.active = true;
-            gData.gameData.changeLeftTimes(-1);
 
             gData.farmSystem.currSelectFarm = this;
-
             gData.adData.checkPopRed();
 
-            gData.gameData.addProductMakeTimesById(this.plantID);
-     
             //gData.gameData.updateOrderTaskCopyData(id);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, parentNode);
+            try {
+                gData.gameData.changeLeftTimes(-1);
+                gData.gameData.addProductMakeTimesById(this.plantID);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, parentNode);
+            } catch (error) {
+                console.log(`==========framIcon`);
+            }
+
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
 
-            
-
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
@@ -217,11 +218,10 @@ export class FarmIcon extends cc.Component {
         this.plantIcon.node.active = false;
 
         let config = gData.gameData.getProductMap(this.plantID);
-        if(mk.guide.getCurGuideIdString() == "10_2")
-        {
+        if (mk.guide.getCurGuideIdString() == "10_2") {
             this.data.growSpan = 0;
             this.data.state = FarmState.Ripe;
-        }else{
+        } else {
             let growSpan = Date.now() + config.time * 1000;
             this.data.growSpan = growSpan;
             this.data.state = FarmState.Growing;
@@ -242,7 +242,7 @@ export class FarmIcon extends cc.Component {
 
     public canHarvest() {
         gData.farmSystem.currSelectFarm = this;
-        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
     }
 
     public canClearSick() {
@@ -251,12 +251,10 @@ export class FarmIcon extends cc.Component {
         gData.adClearSickData.openPanel(ProductType.nzw, this.configID);
     }
 
-    public clickGuideBtn()
-    {
-        if(mk.guide.isGuiding())
-        {
+    public clickGuideBtn() {
+        if (mk.guide.isGuiding()) {
             //gData.farmSystem.currSelectFarm = this;
-            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, false, true);
+            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true, false, true);
         }
     }
 }

assets/script/before/main/FarmSystem.ts

@@ -62,7 +62,8 @@ export class FarmSystem {
         for (let i = 0; i < len; i++) {
             if (this.farms[i] != this.currSelectFarm && this.farms[i].data.state == FarmState.Empty) {
                 out.state = 0;
-                let nextProduct = gData.gameData.getRandomPlantConfig(out);
+                //let nextProduct = gData.gameData.getRandomPlantConfig(out);
+                let nextProduct = gData.gameData.getRandomPlantConfigExtra(out);
                 if(nextProduct)
                 {
                     if(gData.gameData.nextType == 1)

assets/script/before/main/PastureIcon.ts

@@ -221,13 +221,16 @@ export default class PastureIcon extends cc.Component {
             this.data.state = PastureState.Growing;
             this.data.productID = this.data.productID;
             this.data.growSpan = growSpan;
-            gData.gameData.setPastureDataMap(this.configID, this.data);
             this.eatNode.active = false;
             this.getComponent(MoveToCenter).move();
-            gData.gameData.changeLeftTimes(-1);
-
-            //gData.gameData.updateOrderTaskCopyData(this.data.productID);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
+            try {
+                gData.gameData.setPastureDataMap(this.configID, this.data);
+                gData.gameData.changeLeftTimes(-1);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
+            } catch (error) {
+                console.log("=======pastureIcon");
+            }
+            //gData.gameData.updateOrderTaskCopyData(this.data.productID);    
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
             

assets/script/before/main/PastureSystem.ts

@@ -55,7 +55,6 @@ export default class PastureSystem {
 
             //工厂有匹配的
             if (out.state == 1) {
-                console.log("nextPasture=======null");
                 return null;
             } else
             {
@@ -67,6 +66,91 @@ export default class PastureSystem {
         return null;
     }
 
+    nextPastureExtra() {
+        let factoryArray = [];
+        let animalArray = [];
+        let data = gData.gameData.playerProp.orderData;
+        let orderData = data.orderTaskList;
+        if (data && orderData) {
+            let productJson = gData.gameData.configs.Product;
+            for (let i = 0; i != orderData.length; ++i) {
+                let dataE = orderData[i];
+                if (dataE.completeCount < dataE.taskCount) {
+                    if (dataE.Id <= productJson.length) {
+                        let productData = productJson[dataE.Id - 1];
+                        if (productData.tab == ProductType.nzw) {
+                            continue;
+                        } else if (productData.tab == ProductType.dw) {
+                            animalArray.push(productData.picture);
+                        } else {
+                            factoryArray.push(productData);
+                        }
+                    }
+                }
+            }
+
+            //从两种类型随机选择逻辑
+            let typeArr = [];
+            let matchSuccessFactorys = null;
+            let matchSuccessPastures = null;
+
+            if (factoryArray.length > 0) {
+                matchSuccessFactorys = gData.factorySystem.isHaveEmptyFactory(factoryArray);
+                if(matchSuccessFactorys.length > 0){
+                    typeArr.push(1);
+                }
+            }
+            if (animalArray.length > 0) {
+                matchSuccessPastures = this.isHaveEmptyPasture(animalArray);
+                if(matchSuccessPastures.length > 0){
+                    typeArr.push(2);
+                }
+            }
+            if(typeArr.length > 0)
+            {
+                let rand = mk.math.random(0, typeArr.length-1);
+                let type = typeArr[rand];
+                if (type == 1) {
+                    let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                    let factory = matchSuccessFactorys[randFactory];
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(factory.picture);
+                    gData.gameData.nextMake = factory.key;
+                    gData.gameData.nextType = 3;
+                    return gData.gameData.nextMake;
+                } else if (type == 2) {
+                    let randPasture = mk.math.random(0, matchSuccessPastures.length-1);
+                    let pasture = matchSuccessPastures[randPasture];
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(pasture.data.productID);
+                    gData.gameData.nextMake = pasture
+                    gData.gameData.nextType = 2;
+                    return pasture;
+                }
+            }else{
+                let len = this.pastureIcons.length;
+                for (var i = 0; i < len; i++) {
+                    if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                        gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
+                        gData.gameData.nextMake = this.pastureIcons[i];
+                        gData.gameData.nextType = 2;
+                        return this.pastureIcons[i];
+                    }
+                }
+            }
+
+        } else {
+            let len = this.pastureIcons.length;
+            for (var i = 0; i < len; i++) {
+                if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
+                    gData.gameData.nextMake = this.pastureIcons[i];
+                    gData.gameData.nextType = 2;
+                    return this.pastureIcons[i];
+                }
+            }
+        }
+        return null;
+    }
+
     doSameCheckLogic(out:any)
     {
         if (out.state == 0) {
@@ -170,4 +254,17 @@ export default class PastureSystem {
 
         return can;
     }
+
+    isHaveEmptyPasture(animalIdArray: any[]) {
+        let pastureArr = [];
+        for (let i = 0; i != animalIdArray.length; ++i) {
+            let len = this.pastureIcons.length;
+            for (var j = 0; j < len; j++) {
+                if (this.pastureIcons[j].data.productID == animalIdArray[i] && this.pastureIcons[j].data.state == PastureState.Empty) {
+                    pastureArr.push(this.pastureIcons[j]);
+                }
+            }
+        }
+        return pastureArr;
+    }
 }

assets/script/before/view/data/HarvestData.ts

@@ -19,7 +19,7 @@ export default class HarvestData extends Data {
     isMatchOrder = false;
     //是否是点击一键生产按钮
     isTouchBtn = false;
-    openPanel(configID, plantID, call, node, isTouchBtn =false, isTeach = false) {
+    openPanel(configID, plantID, call, node, isCrops = false, isTouchBtn =false, isTeach = false) {
 
         this.configID = configID;
         this.plantID = plantID;
@@ -29,7 +29,7 @@ export default class HarvestData extends Data {
         this.config = gData.gameData.getProductMap(this.plantID);
         //this.judgeIsMatchOrder();
 
-        if(!isTeach)
+        if(!isTeach && !isCrops)
         {
             let isTeaching = mk.guide.isGuiding();
             let rand = Math.random();
@@ -98,7 +98,6 @@ export default class HarvestData extends Data {
                 hand.parent = mk.fly.node;
                 hand.setPosition(pos);
                 cc.tween(hand).delay(0.4).call(()=>{
-                    console.log("=========isCdOver == true");
                     this.getType = 0;
                     let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }];
                     gData.reward.data = rewardData;
@@ -121,8 +120,11 @@ export default class HarvestData extends Data {
             }
             
         }
-
-        gData.adData.checkShowFullInter(4);
+        let isTeaching = mk.guide.isGuiding();
+        if(!isTeaching)
+        {
+            gData.adData.checkShowFullInter(4);
+        }
     }
 
     public judgeIsMatchOrder()

assets/script/before/view/ui/PlantPanel.ts

@@ -18,6 +18,7 @@ export default class PlantPanel extends cc.Component {
         gData.plantData.init_lock = -1;
         this.initScollView();
         mk.event.emit("moveUpAndDownFarmMapUI", true);
+        mk.event.register("close-panel", this.closeUI.bind(this), this);
     }
 
     getItemDataByID(id) {
@@ -80,11 +81,11 @@ export default class PlantPanel extends cc.Component {
 
     onDestroy() {
         // this.tableView.clearItem();
-       
+        mk.event.remove("close-panel", this);
     }
 
     public closeUI()
     {
-        mk.event.emit("moveUpAndDownFarmMapUI", false);
+        mk.event.emit("moveUpAndDownFarmMapUI", false); 
     }
 }

assets/script/before/view/uiItem/PlantItem.ts

@@ -69,9 +69,12 @@ export default class PlantItem extends cc.Component {
         let times = 0;
         //根据上个商品种植次数
         if (list_data.unlock == 1) {
-            times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
-            if (times >= list_data.value) {
-                unlock = true;
+            unlock = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture);
+            if (!unlock) {
+                times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
+                if (times >= list_data.value) {
+                    unlock = true;
+                }
             }
         }
         //根据农场等级
@@ -86,7 +89,7 @@ export default class PlantItem extends cc.Component {
         if (!unlock) {
             let des = this.getDesByType();
             let plantName = gData.gameData.getProductMap(this.data.picture - 1).name;
-            if (list_data.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
+            if (list_data.picture - 1 == gData.gameData.getMaxProductExtra(this.data.tab)) {
                 this.labUnlock.string = `${des}${this.data.value}次\n${plantName}`;
                 this.lbl_progress.string = `${times}/${this.data.value}`;
                 this.labUnlock.node.active = true;
@@ -128,14 +131,14 @@ export default class PlantItem extends cc.Component {
             flyRed = await gData.factorySystem.make(this.data.picture, this.nameIcon.node);
         }
 
-        // if (flyRed) {
-        //     if (gData.gameData.funOpenData[4] == "0") {
-        //         return;
-        //     }
-        //     gData.plantData.init_ani = true;
-        //     let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
-        //     gData.gameData.gameStyle.dpFlyRedAni(pos);
-        // }
+        if (flyRed) {
+            if (gData.gameData.funOpenData[4] == "0") {
+                return;
+            }
+            gData.plantData.init_ani = true;
+            let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
+            gData.gameData.gameStyle.dpFlyRedAni(pos);
+        }
     }
 
     getDesByType() {

assets/script/game/data/AdData.ts

@@ -155,6 +155,15 @@ export class AdData {
         {
             callBack(response.data);
         }
+        
+        //达到任务之后计算视频
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
+            gData.safeDepositBoxData.richBankDailyVideoTimes++
+
+            if (gData.safeDepositBoxData.richBankDailyVideoTimes == gData.safeDepositBoxData.richBankDailyTotelVideoTimes) {
+                mk.data.sendDataEvent("Bank", "银行-当日任务完成")
+            }
+        }
     }
 
     /** 更新其他广告次数
@@ -468,6 +477,11 @@ export class AdData {
                         per = parseFloat(forceAd[i].htPercent);
                         return per;
                     }
+                case RateConfig.RC_popSpeedUp:
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)){
+                        per = parseFloat(forceAd[i].jsPercent);
+                        return per;
+                    }
             }
         }
 
@@ -508,5 +522,6 @@ export enum RateConfig {
     RC_infrormationFlow,
     RC_splash,
     RC_superDouble,
-    RC_moreGameRedBag
+    RC_moreGameRedBag,
+    RC_popSpeedUp
 }

assets/script/game/data/GameData.ts

@@ -1,6 +1,7 @@
 import Util from "../../before/util/Util";
 import FunBtns from "../game/FunBtns";
 import Game from "../game/Game";
+import { RateConfig } from "./AdData";
 import { StorageKey } from "./StorageData";
 
 /**
@@ -186,15 +187,13 @@ export class GameData {
         this.prohibitProductionAd = this.configs.ServerConfig.ProhibitProductionAd.split(";");
         this.productionAdMaxTimes = this.configs.ServerConfig.ProductionAdMax;
 
-        console.log(`popIdentifySwitch=======${gData.loginData.popIdentifySwitch}`);
-        console.log(`prohibiJBAd=======${this.prohibiJBAd}`);
-        console.log(`prohibitProductionAd=======${this.prohibitProductionAd}`);
-        console.log(`productionAdMaxTimes=======${this.productionAdMaxTimes}`);
         gData.gameData.shareUrl = this.configs.ServerConfig.shareUrl;
         gData.gameData.shareTitle = this.configs.ServerConfig.shareTitle;
         gData.gameData.shareDes = this.configs.ServerConfig.shareDes;
         gData.gameData.shareImgUrl = this.configs.ServerConfig.shareImgUrl;
         gData.gameData.RawInsectArr = this.configs.ServerConfig.RawInsect.split(',');
+        //富翁银行
+        gData.safeDepositBoxData.richBankConfig = this.configs.BankTask;
     }
 
     /**
@@ -225,21 +224,15 @@ export class GameData {
         this.playerProp.farmGradeData = res_data.userFarmGrageRewardInfo;
         this.playerProp.userNoviceWeFareInfo = res_data.userNoviceWeFareInfo;
         this.playerProp.redMoneyCashPayRecordList = res_data.redMoneyCashPayRecordList;
-        mk.console.logSingle('userNoviceWeFareInfo==>', res_data.userNoviceWeFareInfo);
-        //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
         this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
         this.playerProp.orderData = res_data.userOrderTaskInfo;
         this.playerProp.lineRedMoney = res_data.lineRedMoney;
-        console.log("==============initPlayerProp");
-        console.log(res_data.userOrderTaskInfo);
-        mk.console.logSingle('userOrderTaskInfo', res_data.userOrderTaskInfo);
+        //this.playerProp.orderData.overTimes = 3;
         //this.cloneOrderData();
-
         this.playerProp.curProductionAdTimes = res_data.dailyProductionTimes;
-        console.log(`curProductionAdTimes=======${this.playerProp.curProductionAdTimes}`);
-
+     
         mk.data.setTAUserID(gData.loginData.uin);
         mk.data.setTAEventUser(0, 'logindays_total', this.playerProp.loginDays);
         if (this.playerProp.completeFarmTaskTimes == 0) {
@@ -266,6 +259,19 @@ export class GameData {
         //渠道号
         mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.umengChannel);
 
+        //富翁银行
+        gData.safeDepositBoxData.richBankCashAmount = res_data.richBankCashAmount;
+        gData.safeDepositBoxData.currentRichBankCashTaskIndex = res_data.currentRichBankCashTaskIndex;
+        //gData.safeDepositBoxData.addRichBankFinishIndex = res_data.addRichBankFinishIndex;
+        // if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        //     gData.safeDepositBoxData.addRichBankFinishIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        // }
+        gData.safeDepositBoxData.isStartBankTask = res_data.isStartRichBankTask;
+        gData.safeDepositBoxData.richBankDailyVideoTimes = res_data.richBankDailyVideoTimes;
+        gData.safeDepositBoxData.richbankLoginDays = res_data.richbankLoginDays;
+        gData.safeDepositBoxData.richBankDailyTotelVideoTimes = res_data.richBankDailyTotelVideoTimes;
+        console.log(`richBankDailyTotelVideoTimes ======== ${res_data.richBankDailyTotelVideoTimes}`);
+
         // //test
         // this.playerProp.completeFarmTaskTimes = 3;
     }
@@ -415,7 +421,7 @@ export class GameData {
     /** 增加减少生产次数
      * @param add 增减变量
      */
-    public changeLeftTimes(add, isIgnoreMaxTimes = false, isRefresh = true) {
+    public async changeLeftTimes(add, isIgnoreMaxTimes = false, isRefresh = true) {
 
         gData.gameData.leftTimes += add;
         if (add > 0 && !isIgnoreMaxTimes) {
@@ -425,7 +431,7 @@ export class GameData {
         if (gData.gameData.leftTimes < 0) {
             gData.gameData.leftTimes = 0;
         }
-        gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
+        await gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
 
         if (isRefresh) {
             gData.gameData.init_leftTimes = true;
@@ -471,7 +477,6 @@ export class GameData {
                 }
                 this._farmMapRewardData.push(arr);
                 needSync = true;
-                console.log("-----add 数组数据")
             } else {
                 let data = this._farmMapRewardData[index];
                 let len = value.length;
@@ -479,7 +484,6 @@ export class GameData {
                     if (i >= data.length) {
                         data.push(0);
                         needSync = true;
-                        console.log("-----add 单个数据")
                     }
                 }
             }
@@ -499,13 +503,11 @@ export class GameData {
         } else {
             this._cashOutTimes = 0;
         }
-        console.log(`initCashOutTimes====>${this._cashOutTimes}`);
     }
 
     public addCashOutTimes() {
         this._cashOutTimes += 1;
         this.setProp(GameProp.cashOutTimes, this._cashOutTimes);
-        console.log(`addCashOutTimes====>${this._cashOutTimes}`);
     }
 
     /** 是否是新用户 */
@@ -537,13 +539,12 @@ export class GameData {
             let productJson = this.configs.Product;
             for (let i = 0; i != orderData.length; ++i) {
                 let dataE = orderData[i];
-                //console.log(`getRandomPlantConfig======= ${this.playerProp.copyOrderData[i]}`);
                 if (dataE.completeCount < dataE.taskCount) {
                     if (dataE.Id <= productJson.length) {
                         isNoAllComplete = true;
                         let productData = productJson[dataE.Id - 1];
                         if (productData.tab == ProductType.nzw) {
-                            let max = this.getMaxProduct(ProductType.nzw);
+                            let max = this.getMaxProductExtra(ProductType.nzw);
                             if (max && productData.picture <= max) {
                                 id = productData.picture;
                                 isNoHaveCurTab = false;
@@ -559,7 +560,6 @@ export class GameData {
                         }
                     } else {
                         isOrderDataInvalid = true;
-                        console.log("订单数据有问题，随机id");
                         break;
                     }
                 }
@@ -572,10 +572,9 @@ export class GameData {
                 //     id = picId;
                 // } else 
                 {
-                    id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+                    id = Util.rnd(10001, this.getMaxProductExtra(ProductType.nzw));
                     this.nextType = 1
                 }
-                console.log("订单数据没有匹配成功====1");
             }
         } else {
             isOrderDataInvalid = true;
@@ -584,10 +583,9 @@ export class GameData {
             //     id = picId;
             // } else 
             {
-                id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+                id = Util.rnd(10001, this.getMaxProductExtra(ProductType.nzw));
                 this.nextType = 1
             }
-            console.log("订单数据为null");
         }
 
         //选择逻辑处理
@@ -625,19 +623,14 @@ export class GameData {
                     }
 
                     if (isHaveEmpty) {
-                        console.log("getRandomPlantConfig====0");
                         return null;
-
                     } else {
-                        console.log("getRandomPlantConfig====1");
                         return this.getProductMap(id);
                     }
                 } else {
-                    console.log("getRandomPlantConfig====2");
                     return this.getProductMap(id);
                 }
             } else {
-                console.log("getRandomPlantConfig====3");
                 return this.getProductMap(id);
             }
         }
@@ -646,6 +639,93 @@ export class GameData {
         //return this.getProductMap(id);
     }
 
+    getRandomPlantConfigExtra(out: any) {
+        let id = 0;
+        let cropArray = [];
+        let factoryArray = [];
+        let animalArray = [];
+        let data = this.playerProp.orderData;
+        let orderData = data.orderTaskList;
+        if (data && orderData) {
+            let productJson = this.configs.Product;
+            for (let i = 0; i != orderData.length; ++i) {
+                let dataE = orderData[i];
+                if (dataE.completeCount < dataE.taskCount) {
+                    if (dataE.Id <= productJson.length) {
+                        let productData = productJson[dataE.Id - 1];
+                        if (productData.tab == ProductType.nzw) {
+                            let max = this.getMaxProductExtra(ProductType.nzw);
+                            if (max && productData.picture <= max) {
+                                cropArray.push(productData.picture);
+
+                            }
+                        } else if (productData.tab == ProductType.dw) {
+                            animalArray.push(productData.picture);
+
+                        } else {
+                            factoryArray.push(productData);
+                        }
+                    }
+                }
+            }
+
+            //从三种类型随机选择逻辑
+            let typeArr = [];
+            let matchSuccessFactorys = null;
+            let matchSuccessPastures = null;
+            if (cropArray.length > 0) {
+                typeArr.push(0);
+            }
+            if (factoryArray.length > 0) {
+                matchSuccessFactorys = gData.factorySystem.isHaveEmptyFactory(factoryArray);
+                if(matchSuccessFactorys.length > 0){
+                    typeArr.push(1);
+                }
+            }
+            if (animalArray.length > 0) {
+                matchSuccessPastures = gData.pastureSystem.isHaveEmptyPasture(animalArray);
+                if(matchSuccessPastures.length > 0){
+                    typeArr.push(2);
+                }
+            }
+
+            if(typeArr.length > 0)
+            {
+                let rand = mk.math.random(0, typeArr.length-1);
+                let type = typeArr[rand];
+                if (type == 0) {
+                    let randCrop = mk.math.random(0, cropArray.length-1);
+                    id = cropArray[randCrop];
+                    this.nextType = 1
+                    return this.getProductMap(id);
+                } else if (type == 1) {
+                    let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                    let factory = matchSuccessFactorys[randFactory];
+                    this.nextCanProduct = this.getProductMap(factory.picture);
+                    this.nextMake = factory.key;
+                    this.nextType = 3;
+                    return this.nextMake;
+                } else if (type == 2) {
+                    let randPasture = mk.math.random(0, matchSuccessPastures.length-1);
+                    let pasture = matchSuccessPastures[randPasture];
+                    this.nextCanProduct = this.getProductMap(pasture.data.productID);
+                    this.nextMake = pasture
+                    this.nextType = 2;
+                    return pasture;
+                }
+            }else
+            {
+                id = Util.rnd(10001, this.getMaxProductExtra(ProductType.nzw));
+                this.nextType = 1
+                return this.getProductMap(id);
+            }
+        } else {
+            id = Util.rnd(10001, this.getMaxProductExtra(ProductType.nzw));
+            this.nextType = 1
+            return this.getProductMap(id);
+        }
+    }
+    
     public doJudgeOrderLogic(out?: any) {
         let data = this.playerProp.orderData;
         let orderData = data.orderTaskList;
@@ -659,14 +739,11 @@ export class GameData {
                         if (productData.tab == ProductType.nzw) {
                             continue;
                         } else if (productData.tab == ProductType.dw) {
-                            console.log(`doJudgeOrderLogic=====${dataE.Id}`);
                             let pastureIcon = gData.pastureSystem.pastureIcons;
                             let len = pastureIcon.length;
                             for (var j = 0; j < len; j++) {
                                 if (pastureIcon[j].data.productID == productData.picture && pastureIcon[j].data.state == PastureState.Empty) {
                                     out.state = 2;
-                                    console.log("doJudgeOrderLogic====2");
-                                    console.log("doJudgeOrderLogic====22");
                                     return;
                                 }
                             }
@@ -678,8 +755,6 @@ export class GameData {
                                 let tab = this.getTabByConfigID(factoryIcon[j].configID);
                                 if (tab == productData.tab && factoryIcon[j].data.state == FactroyState.Empty) {
                                     out.state = 1;
-                                    console.log("doJudgeOrderLogic====1");
-                                    console.log("doJudgeOrderLogic====11");
                                     return;
                                 }
                             }
@@ -694,7 +769,7 @@ export class GameData {
     getRandomFactoryConfig(configID) {
         let tab = gData.gameData.getTabByConfigID(configID);
         let arr = this.getProductArrByType(tab);
-        let max = this.getMaxProduct(tab);
+        let max = this.getMaxProductExtra(tab);
         let canArr = [];
         let len = arr.length;
         for (var i = 0; i < len; i++) {
@@ -715,7 +790,7 @@ export class GameData {
         let value = 0;
         for (let key in ProductType) {
             if (startIndex <= value) {
-                let max = this.getMaxProduct(ProductType[key]);
+                let max = this.getMaxProductExtra(ProductType[key]);
                 if (max) {
                     let list_data = this.getProductArrByType(ProductType[key]);
                     for (let i = 0; i != list_data.length; ++i) {
@@ -725,7 +800,6 @@ export class GameData {
                             if (state == 0) {
                                 switch (ProductType[key]) {
                                     case ProductType.nzw:
-                                        console.log("图鉴数据匹配成功=====1");
                                         this.nextType = 1
                                         return picId;
                                     case ProductType.dw:
@@ -737,8 +811,7 @@ export class GameData {
                                                     if (isHaveEmpty && startIndex == value) {
                                                         isHaveEmpty.state = true;
                                                     }
-                                                    if (picId == pastureIconsData[index].data.productID) {
-                                                        console.log("图鉴数据匹配成功====2");
+                                                    if (picId == pastureIconsData[index].data.productID) {            
                                                         this.nextCanProduct = this.getProductMap(pastureIconsData[index].data.productID);
                                                         this.nextMake = pastureIconsData[index];
                                                         this.nextType = 2;
@@ -758,8 +831,7 @@ export class GameData {
                                                         isHaveEmpty.state = true;
                                                     }
                                                     let tab = this.getTabByConfigID(factoryIconsData[index].configID);
-                                                    if (tab == ProductType[key]) {
-                                                        console.log("图鉴数据匹配成功=====3");
+                                                    if (tab == ProductType[key]) {                             
                                                         this.nextCanProduct = this.getProductMap(picId);
                                                         this.nextMake = factoryIconsData[index];
                                                         this.nextType = 3;
@@ -777,7 +849,6 @@ export class GameData {
             }
             ++value;
         }
-        console.log("图鉴数据匹配不成功");
         return null;
     }
 
@@ -790,12 +861,15 @@ export class GameData {
         let haveEmpty = { state: -1 };
         let next = gData.farmSystem.selectNextFarm(haveEmpty, sel);
         if (!next) {
-            if (haveEmpty.state == -1) {
-                this.doJudgeOrderLogic(haveEmpty);
-            }
-            let next1 = gData.pastureSystem.nextPasture(haveEmpty);
+            //订单随机种植此处可注释掉
+            // if (haveEmpty.state == -1) {
+            //     this.doJudgeOrderLogic(haveEmpty);
+            // }
+            //let next1 = gData.pastureSystem.nextPasture(haveEmpty);
+            let next1 = gData.pastureSystem.nextPastureExtra();
             if (!next1) {
-                let next2 = gData.factorySystem.nextFactory(haveEmpty);
+                //let next2 = gData.factorySystem.nextFactory(haveEmpty);
+                let next2 = gData.factorySystem.nextFactoryExtra();
                 if (!next2) {
                     this.nextType = 0;
                 }
@@ -840,16 +914,28 @@ export class GameData {
                 flyRed = false;
                 break;
             case 1:
-                flyRed = await gData.farmSystem.btnMake();
-                gData.adData.checkPopRed();
+                if(this.popSpeedUpByRate()){
+                    flyRed = false;
+                }else{
+                    flyRed = await gData.farmSystem.btnMake();
+                    gData.adData.checkPopRed();
+                }
                 break;
             case 2:
-                flyRed = await gData.pastureSystem.btnMake();
-                gData.adData.checkPopRed();
+                if(this.popSpeedUpByRate()){
+                    flyRed = false;
+                }else{
+                    flyRed = await gData.pastureSystem.btnMake();
+                    gData.adData.checkPopRed();
+                }
                 break;
             case 3:
-                flyRed = await gData.factorySystem.btnMake();
-                gData.adData.checkPopRed();
+                if(this.popSpeedUpByRate()){
+                    flyRed = false;
+                }else{
+                    flyRed = await gData.factorySystem.btnMake();
+                    gData.adData.checkPopRed();
+                }
                 break;
         }
         return flyRed;
@@ -962,7 +1048,7 @@ export class GameData {
             this.RawInsectCurArr[0] = sickTimes;
         }
 
-        this.setMaxProduct(10003, true);
+        //this.setMaxProduct(10003, true);
     }
 
 
@@ -1001,25 +1087,73 @@ export class GameData {
         return this._productTypeMap.get(type);
     }
 
+    //根据tab获取最大id的数据
+    public getMaxProductDataByType(type: ProductType, id) {
+        let arr = this._productTypeMap.get(type);
+        let len = arr.length;
+        if (arr[len - 1].picture >= id) {
+            return this.getProductMap(id);
+        } else {
+            return null;
+        }
+    }
+
     /** 产品生产/种植次数 服务器数据 */
-    private _productMakeTimesData = [];
+    private _productMakeTimesData: any = {};
     /** 产品生产/种植次数 */
     private _productMakeTimesMap: Map<number, number> = new Map();
 
+    //产品解锁最大id
+    private _productUnlockMaxId: Map<string, number> = new Map();
+
     private initProductTimes() {
-        this._productMakeTimesData = this.getProp(GameProp.productMakeTimes);
-        if (!this._productMakeTimesData) {
-            this._productMakeTimesData = [];
+        let needUpdate = false;
+        let value = this.getProp(GameProp.productMakeTimes);
+        if (!value) {
+            this._productMakeTimesData.makeTimes = [];
+            this._productMakeTimesData.productUnlockMaxId = new Map<string, number>();
+            this._productMakeTimesData.productUnlockMaxId.set(ProductType.nzw, 10003);
+        } else {
+            if (value instanceof Array) {
+
+                this._productMakeTimesData.makeTimes = value;
+                this._productMakeTimesData.productUnlockMaxId = new Map<string, number>();
+                this._productMakeTimesData.productUnlockMaxId.set(ProductType.nzw, 10003);
+
+                let len = value.length;
+                for (let i = 0; i != len; ++i) {
+                    let data = value[i];
+                    let config = this.getProductMap(data.id);
+
+                    let v = this._productMakeTimesData.productUnlockMaxId.get(config.tab);
+                    if (v) {
+                        if (v < data.id) {
+                            this._productMakeTimesData.productUnlockMaxId.set(config.tab, data.id);
+                        }
+                    } else {
+                        this._productMakeTimesData.productUnlockMaxId.set(config.tab, data.id);
+                    }
+                }
+                needUpdate = true;
+            } else {
+                this._productMakeTimesData.makeTimes = value.makeTimes;
+                this._productMakeTimesData.productUnlockMaxId = this.objToMap(JSON.parse(value.productUnlockMaxId));
+            }
         }
 
-        let len = this._productMakeTimesData.length;
+        let len = this._productMakeTimesData.makeTimes.length;
         for (var i = 0; i < len; i++) {
-            this._productMakeTimesMap.set(this._productMakeTimesData[i].id, this._productMakeTimesData[i].times);
-            this.setMaxProduct(this._productMakeTimesData[i].id);
+            this._productMakeTimesMap.set(this._productMakeTimesData.makeTimes[i].id, this._productMakeTimesData.makeTimes[i].times);
+            //this.setMaxProduct(this._productMakeTimesData.makeTimes[i].id);
+        }
+
+        let isUpdate = this.judgeAddExtraUnlockMaxId();
+        if (needUpdate || isUpdate) {
+            this.updateDataToSever();
         }
     }
 
-    addProductMakeTimesById(id: number) {
+    async addProductMakeTimesById(id: number) {
         let isAddMaxProduct = false;
         let times = this._productMakeTimesMap.get(id);
         if (!times) {
@@ -1030,17 +1164,17 @@ export class GameData {
 
         //更新到服务器
         let has = false;
-        let len = this._productMakeTimesData.length;
+        let len = this._productMakeTimesData.makeTimes.length;
         for (var i = 0; i < len; i++) {
-            if (this._productMakeTimesData[i].id == id) {
-                this._productMakeTimesData[i].times = times;
+            if (this._productMakeTimesData.makeTimes[i].id == id) {
+                this._productMakeTimesData.makeTimes[i].times = times;
                 has = true;
                 break;
             }
         }
         if (!has) {
             let data = { 'id': id, 'times': times };
-            this._productMakeTimesData.push(data);
+            this._productMakeTimesData.makeTimes.push(data);
         }
 
         //设置可种植/生产最大id
@@ -1048,20 +1182,24 @@ export class GameData {
         let curConfig = this.getProductMap(id);
         let nextConfig = this.getProductMap(nextID);
 
-        if (id == this.getMaxProduct(curConfig.tab)) {
+        if (id == this.getMaxProductExtra(curConfig.tab)) {
             if (nextConfig) {
                 gData.plantData.init_itemIndex = nextID;
             }
         }
 
         if (nextConfig) {
-            if (nextConfig.tab == curConfig.tab && nextID > this.getMaxProduct(curConfig.tab)) {
+            if (nextConfig.tab == curConfig.tab && nextID > this.getMaxProductExtra(curConfig.tab)) {
                 if (nextConfig.unlock == 1 && nextConfig.value <= times) {
                     isAddMaxProduct = true;
                     this._productMakeTimesMap.set(nextID, 0);
                     let data = { 'id': nextID, 'times': 0 };
-                    this._productMakeTimesData.push(data);
-                    this.setMaxProduct(nextID);
+                    this._productMakeTimesData.makeTimes.push(data);
+                    this._productMakeTimesData.productUnlockMaxId.set(nextConfig.tab, nextID);
+                    //this.setMaxProduct(nextID);
+                    //需要更新最大生产id
+                    gData.farmMapData.isStateChange = true;
+                    this.updateMaxProduct();
                     let nConfig = this.getProductMap(nextID + 1);
                     if (nConfig) {
                         gData.plantData.init_lock = nextID + 1;
@@ -1073,7 +1211,78 @@ export class GameData {
         if (!isAddMaxProduct) {
             mk.event.emit("refreshFarmMapUI");
         }
-        this.setProp(GameProp.productMakeTimes, this._productMakeTimesData);
+        let sss: any = {};
+        sss.makeTimes = this._productMakeTimesData.makeTimes;
+        let json = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+        sss.productUnlockMaxId = JSON.stringify(json);
+
+        await this.setProp(GameProp.productMakeTimes, sss);
+    }
+
+    mapToObj(mapData) {
+        let obj = {};
+        mapData.forEach(function (value, key) {
+            obj[key] = value;
+        });
+        return obj;
+    }
+
+    objToMap(obj) {
+        let map = new Map();
+        for (let k in obj) {
+            map.set(k, obj[k]);
+        }
+        return map;
+    }
+
+    //设置解锁的最大id
+    addProductUnlockMaxId(tab, id) {
+        if (this._productMakeTimesData.productUnlockMaxId) {
+            let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
+            if (productId) {
+                if(id > productId){
+                    this._productMakeTimesData.productUnlockMaxId.set(tab, id);
+                    console.log(`addProductUnlockMaxId====${tab}====${id}`);
+                    return true;
+                }
+            }else{
+                console.log(`addProductUnlockMaxId22====${tab}====${id}`);
+                this._productMakeTimesData.productUnlockMaxId.set(tab, id);
+                return true;
+            }
+            return false;
+        }
+        return false;
+    }
+
+    //判断前面解锁需要数值大于后面解锁数值的情况
+    public judgeAddExtraUnlockMaxId() {
+        let isUpdateToSever = false;
+        if (this._productMakeTimesData.productUnlockMaxId) {
+            let data = this._productMakeTimesData.productUnlockMaxId;
+            data.forEach((value, key) => {
+                if (key != ProductType.dw) {
+                    let product = this.getMaxProductDataByType(key, value + 1);
+                    if (product && product.unlock == 1) {
+                        let makeTimes = this.getProductMakeTimesById(value);
+                        if (makeTimes >= product.value) {
+                            this.addProductUnlockMaxId(key, product.picture);
+                            isUpdateToSever = true;
+                        }
+                    }
+                }
+            });
+        }
+        return isUpdateToSever;
+    }
+
+    updateDataToSever() {
+        let sss: any = {};
+        sss.makeTimes = this._productMakeTimesData.makeTimes;
+        let json = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+        sss.productUnlockMaxId = JSON.stringify(json);
+
+        this.setProp(GameProp.productMakeTimes, sss);
     }
 
     getProductMakeTimesById(id: number) {
@@ -1084,6 +1293,22 @@ export class GameData {
         return times;
     }
 
+    getProductUnlockById(tab, id: number) {
+        if (this._productMakeTimesData.productUnlockMaxId) {
+            let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
+            if (productId) {
+                if (productId >= id) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
+
     //------------- 养殖场数据-----------
     /**  养殖场数据 服务器数据 */
     private _pastureData = [];
@@ -1190,6 +1415,7 @@ export class GameData {
             this._factoryData = [];
         }
 
+        let isUpdate = false;
         let len = this._factoryData.length;
         //新玩家初始化工厂数据
         if (len < 6) {
@@ -1205,7 +1431,12 @@ export class GameData {
                 else {
                     data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
                     //更新最大可购买商品
-                    this.setMaxProduct(arr[0].picture, true);
+                    //this.setMaxProduct(arr[0].picture, true);
+                    // let is = this.addProductUnlockMaxId(tab, arr[0].picture);
+                    // if(!isUpdate)
+                    // {
+                    //     isUpdate = is;
+                    // }
                 }
                 this._factoryData.push(data);
                 this._factoryDataMap.set(id, data);
@@ -1229,15 +1460,26 @@ export class GameData {
 
                 if (this.playerProp.orderData.overTimes >= arr[0].value) {
                     //更新最大可购买商品
-                    this.setMaxProduct(arr[0].picture, true);
+                    //this.setMaxProduct(arr[0].picture, true);;
+                    // let is = this.addProductUnlockMaxId(tab, arr[0].picture);
+                    // if(!isUpdate)
+                    // {
+                    //     isUpdate = is;
+                    // }
                 }
                 id++;
             }
 
             this.RawInsectCurArr[2] = sickTimes;
         }
+
+        // if(isUpdate)
+        // {
+        //     this.updateDataToSever();
+        // }
     }
 
+
     /** 通过工厂建筑物ID获取标签 */
     getTabByConfigID(configID: number): ProductType {
         let tab = ProductType.bmhc;
@@ -1365,6 +1607,14 @@ export class GameData {
         return null;
     }
 
+    getMaxProductExtra(tab) {
+        if (this._productMakeTimesData.productUnlockMaxId) {
+            let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
+            return productId;
+        }
+        return null;
+    }
+
     /** 设置最大可生产商品
      * @param id 产品id
      * @param unlock 是否是解锁增加
@@ -1395,12 +1645,12 @@ export class GameData {
         }
 
         gData.farmMapData.isStateChange = true;
-
         this.updateMaxProduct();
     }
 
     /** 农场升级时解锁工厂，检查最大可种植/生产商品 */
     public checkTaskFinishUnLock() {
+        let isUpdateToSever = false;
         for (var key in ProductType) {
             let tab = ProductType[key];
             let configArr = this.getProductArrByType(tab);
@@ -1428,10 +1678,14 @@ export class GameData {
                         }
                         id++;
                     }
-
+                    console.log(`checkTaskFinishUnLock11=====${maxId}`);
                     if (maxId != 0) {
                         //更新最大可购买商品
-                        this.setMaxProduct(maxId, true);
+                        //this.setMaxProduct(maxId, true);
+                        let is = this.addProductUnlockMaxId(tab, maxId);
+                        if (!isUpdateToSever) {
+                            isUpdateToSever = is;
+                        }
                     }
 
                     //更新到服务器
@@ -1452,7 +1706,12 @@ export class GameData {
                             needUpdate = true;
                         }
                         //更新最大可购买商品
-                        this.setMaxProduct(configArr[0].picture, true);
+                        //this.setMaxProduct(configArr[0].picture, true);
+                        console.log(`checkTaskFinishUnLock222=====${maxId}`);
+                        let is = this.addProductUnlockMaxId(tab, configArr[0].picture);
+                        if (!isUpdateToSever) {
+                            isUpdateToSever = is;
+                        }
                     }
 
                     if (needUpdate) {
@@ -1462,6 +1721,15 @@ export class GameData {
                     break;
             }
         }
+
+        if (isUpdateToSever) {
+            console.log('===================isUpdateToSever222');
+            this.updateDataToSever();
+
+            //需要更新最大生产id
+            gData.farmMapData.isStateChange = true;
+            this.updateMaxProduct();
+        }
     }
 
     checkCanSpeedUp(pop = false) {
@@ -1480,6 +1748,24 @@ export class GameData {
         return can;
     }
 
+    popSpeedUpByRate()
+    {
+        let isPop = false;
+        let rate = gData.adData.getPerByEcpm(RateConfig.RC_popSpeedUp);
+        if(rate >= Math.random())
+        {
+            isPop = gData.pastureSystem.canSpeedUp();
+            if (!isPop) {
+                isPop = gData.factorySystem.canSpeedUp();
+            }
+        }
+
+        if(isPop){
+            mk.ui.openPanel('module/speedUpUI/speedUp');
+        }
+        return isPop;
+    }
+
     setHarvest() {
         gData.farmSystem.setHarvest();
         gData.pastureSystem.setHarvest();
@@ -1531,12 +1817,15 @@ export class GameData {
     /** 更新最大可种植产品到服务器 */
     async updateMaxProduct() {
         if (this.maxProductToServer) {
-            let data = { "unLockProductList": this._maxProduct };
-            // for (let i = 0; i != this._maxProduct.length; ++i) {
-            //     let dataE = this._maxProduct[i];
-            //     let d = { id: dataE.productID, tab: dataE.tab };
-            //     data.unLockProductList.push(d);
-            // }
+            //let data = { "unLockProductList": this._maxProduct };
+            let data = { "unLockProductList": [] };
+            let maxProductData = this._productMakeTimesData.productUnlockMaxId;
+            maxProductData.forEach((value, key) => {
+                let config = this.getProductMap(value);
+                let d = { tab: key, productID: value, id: config.id };
+                data.unLockProductList.push(d);
+            });
+
             mk.console.logSingle("updateMaxProduct", data);
             let respone = await mk.http.sendData('orderTask/updateUnlockProduct', data);
             console.log("------");
@@ -1894,8 +2183,12 @@ export enum DataEventId {
     loading = 'loading',
     /** 排队 */
     queue = 'queue',
-    //实名认证
-    realName = 'realName'
+    /** 实名认证 */
+    realName = 'realName',
+    /** 离线生产次数弹出 */
+    offlineProductTimes = "offlineProductTimes",
+    /**触发提现到达上限 */
+    cashLimit = "cashLimit"
 }
 
 
@@ -1995,4 +2288,22 @@ export enum FactroyState {
     Producting,
     Ripe,
     Sick
+}
+
+//功能开关含义
+export enum FunctionSwitch{
+    FS_farmGrade = 0,                   //农场等级奖励
+    FS_cashOutBtn = 1,                  //主界面提现按钮
+    FS_sign = 2,                        //签到
+    FS_turntable = 3,                   //抽奖转盘
+    FS_redPacketTash = 4,               //任务红包
+    FS_welfareBtn = 5,                  //福利按钮
+    FS_inviteBtn = 6,                   //邀请按钮
+    FS_floatRedPacket = 7,              //漂浮红包
+    FS_electBtn = 8,                    //互推按钮
+    FS_sheepRedPacket = 9,              //山羊红包
+    FS_addCashBtn = 10,                 //提现界面的加现金按钮
+    FS_order = 11,                      //订单
+    FS_floatFarmMap = 12,               //图鉴浮窗
+    FS_richManBank = 13                 //富翁银行
 }

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 1;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/game/data/LoginData.ts

@@ -199,7 +199,6 @@ export class LoginData {
             }
             else if (response.errcode == -10003 || response.errcode == -20003) {
                 //清除缓存
-                console.log('KKKK 6 ', this.uin)
                 console.log('restart  errcode ', response.errcode)
                 this.reload();
             }
@@ -223,81 +222,77 @@ export class LoginData {
         }
 
         if (this.uin != data.uin) {
-            console.log('KKKK 0 ', this.uin)
             this.uin = data.uin;
             this.isNew = false;
         }
         else {
-            console.log('KKKK -1 ', this.uin)
             this.isNew = true;
         }
         mk.storage.setStorage(StorageKey.uin, this.uin);
         this.checkLogin();
     }
 
-    /**
+  /**
      * 检测登录
      * @returns 
      */
-    private async checkLogin() {
-        //checkLogin
-        let tmp_key = '';
-        if (gData.wechatData.code != null) {
-            tmp_key = this.sessionKey;
-        }
-        else {
-            tmp_key = mk.encrypt.randomString();
-        }
+   private async checkLogin() {
+    //checkLogin
+    let tmp_key = '';
+    if (gData.wechatData.code != null) {
+        tmp_key = this.sessionKey;
+    }
+    else {
+        tmp_key = mk.encrypt.randomString();
+    }
 
-        let data = {
-            "tmp_key": tmp_key,
-            "uin": this.uin,
-            "login_ticket": this.loginTicket,
-            "appId": gData.appData.appId
-        }
-        let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
-        if (response.errcode != 0) {
-            if (response.errcode == 403) {
-                console.log('block 403');
-                gData.warnTipData.setSolution(4);
-            }
-            return;
-        }
-        let decryptData;
-        if (gData.wechatData.code != null) {
-            decryptData = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
-        }
-        else {
-            decryptData = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
+    let data = {
+        "tmp_key": tmp_key,
+        "uin": this.uin,
+        "login_ticket": this.loginTicket,
+        "appId": gData.appData.appId
+    }
+    let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
+    if (response.errcode != 0) {
+        if (response.errcode == 403) {
+            console.log('block 403');
+            gData.warnTipData.setSolution(4);
         }
+        return;
+    }
+    let decryptData;
+    if (gData.wechatData.code != null) {
+        decryptData = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
+    }
+    else {
+        decryptData = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
+    }
 
-        let parseData = JSON.parse(decryptData);
-        this.sessionKey = parseData.session_key;
-        mk.console.logSingle("[FC]checkLogin decrypt", parseData);
-        console.log("this.sessionKey  ", this.sessionKey);
-        mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
-        if (gData.wechatData.code != null) {
-            if (this.isNew) {
-                console.log('KKKK 1 ', this.uin)
-                this.getUserInfo();
-            }
-            else {
-                console.log('KKKK 2 ', this.uin)
-                this.isNew = false;
-                gData.wechatData.code = null;
-
-                cc.audioEngine.stopAll();
-                //调用Android的更好
-                cc.game.restart();
-            }
-        }
-        else {
-            console.log('KKKK 3 ', this.uin)
+    let parseData = JSON.parse(decryptData);
+    this.sessionKey = parseData.session_key;
+    mk.console.logSingle("[FC]checkLogin decrypt", parseData);
+    console.log("this.sessionKey  ", this.sessionKey);
+    mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
+    if (gData.wechatData.code != null) {
+        if (this.isNew) {
+            console.log('KKKK 1 ', this.uin)
             this.getUserInfo();
         }
+        else {
+            console.log('KKKK 2 ', this.uin)
+            this.isNew = false;
+            gData.wechatData.code = null;
 
+            cc.audioEngine.stopAll();
+            //调用Android的更好
+            cc.game.restart();
+        }
+    }
+    else {
+        console.log('KKKK 3 ', this.uin)
         this.getUserInfo();
     }
+}
 
     private async getUserInfo() {
         this.getAccountInfo();
@@ -316,10 +311,10 @@ export class LoginData {
         //获取user
         let aa = {
             "uin": this.uin,
-            "mac": gData.appData.machineInfo.mac,
             "login_ticket": this.loginTicket,
             "szlm_did": mk.shuzilmM.szlm_did,
-            "black_box": mk.tongdunM.tdEquipID
+            "black_box": mk.tongdunM.tdEquipID,
+            "mac": gData.appData.machineInfo.mac
         };
 
         let data = {

assets/script/game/data/module/BlessingBagData.ts

@@ -32,7 +32,6 @@ export class BlessingBagData extends Data {
     init() {
         this.isPlayAniUpdate = false;
         this.videoRbData = gData.gameData.playerProp.userTuCaoInfo;
-        // console.log("福袋数据---------------->", this.videoRbData);
     }
 
     setAdData(data) {
@@ -111,9 +110,14 @@ export class BlessingBagData extends Data {
         mk.console.logSingle("'welFare/welFareCash", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
-
+        
         // gData.cashPro.init_success = true;
         this.isPlayAniUpdate = false;
         this.videoRbData = response.data.userWelFareTaskInfo;
@@ -126,6 +130,7 @@ export class BlessingBagData extends Data {
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');
 
+        gData.safeDepositBoxData.updateQipao();
         return response
     }
 

assets/script/game/data/module/FarmMapData.ts

@@ -27,6 +27,6 @@ export class FarmMapData extends Data {
 
     setChooseType(t: ProductType) {
         this.chooseType = t;
-        this.maxUnluckValue = gData.gameData.getMaxProduct(t);
+        this.maxUnluckValue = gData.gameData.getMaxProductExtra(t);
     }
 }

assets/script/game/data/module/GradeRewardData.ts

@@ -21,12 +21,16 @@ export class GradeRewardData extends Data {
         // gData.cashPro.openCashPro(0);
         this.cashId = id;
         let data = { id: this.cashId };
-        // console.log(`农场等级提现数据=======>${this.cashId}`);
         let response = await mk.http.sendData('farmGrade/farmGradeCash', data);
 
         mk.console.logSingle("农场等级提现数据=>", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
 
@@ -44,6 +48,7 @@ export class GradeRewardData extends Data {
         // gData.cashPro.init_success = true;
 
         gData.gameData.init_red_point = true;
+        gData.safeDepositBoxData.updateQipao();
         return response
     }
 

assets/script/game/data/module/LineUpUIData.ts

@@ -14,16 +14,13 @@ export class LineUpUIData extends Data {
     public popType = 0;
 
     showTips() {
-        console.log(`showTips======${gData.gameData.playerProp.lineRedMoney}`);
         if (gData.gameData.playerProp.lineRedMoney > 0) {
             cc.tween(this).delay(0.5).call(() => {
                 let add = Math.round(this.redMoney / 100);
                 mk.tip.pop(`插队成功,并获得${add}红包币`);
             }).start();
         } else {
-            console.log("showTips================");
             cc.tween(this).delay(0.5).call(() => {
-                console.log("showTips================2");
                 mk.tip.pop("插队成功");
             }).start();
         }
@@ -32,7 +29,6 @@ export class LineUpUIData extends Data {
     setAdData(data) {
         //mk.console.logSingle('LineUpUIData  addata ', this.adData);
         super.setAdData(data);
-        console.log(`LineUpUIData=========${data}`);
         this.redMoney = 0;
         let rewardData = this.adData.videoRedMoney.videoRewardList;
         for (let i = 0; i != rewardData.length; ++i) {

assets/script/game/data/module/SafeDepositBoxData.ts

@@ -21,6 +21,9 @@ export default class SafeDepositBoxData {
     //富翁银行正在进行过的档位
     addRichBankFinishIndex = 0;
 
+    //是否开启任务
+    isStartBankTask = 0;
+
     qipaoType = -1;
 
     freshQipao = false;
@@ -60,6 +63,27 @@ export default class SafeDepositBoxData {
         }
     }
 
+    getBankTaskIndexExtra(isMinusOne = false){
+        let configInfo = gData.safeDepositBoxData.richBankConfig
+        if (configInfo == null || configInfo == undefined) {
+            return
+        }
+
+        let curIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        if(isMinusOne)
+        {
+            curIndex -= 1;
+        }
+        if (curIndex > configInfo.length) {
+            return configInfo[configInfo.length - 1]
+        }
+        for (let entry of configInfo) {
+            if (entry.index == curIndex) {
+                return entry
+            }
+        }
+    }
+
     async updateQipao() {
         await mk.time.WaitForSeconds(1);
         let response = await mk.http.sendData('richbank/getCashRecord', {});

assets/script/game/data/module/SignData.ts

@@ -1,6 +1,6 @@
 import { Data } from "../../../mk/data/Data";
 import { OpenActionType } from "../../../mk/system/UISystem";
-import { GameProp, RewardState, RewardType } from "../GameData";
+import { DataEventId, GameProp, RewardState, RewardType } from "../GameData";
 
 /**
  * @description 签到数据
@@ -144,6 +144,10 @@ export class SignData extends Data {
             if (response.errcode != 0) {
                 mk.tip.pop('系统异常');
                 // gData.cashPro.init_fail = true;
+                if (response.errcode == 405) {
+                    mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                    mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                }
                 return;
             }
 
@@ -152,7 +156,7 @@ export class SignData extends Data {
             }
 
             gData.gameData.addCashOutTimes();
-            
+
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
 
@@ -160,6 +164,8 @@ export class SignData extends Data {
             // gData.cashPro.cashPro_money = rewardNum;
             // gData.cashPro.init_success = true;
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);
+
+            gData.safeDepositBoxData.updateQipao();
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
             // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]

assets/script/game/data/module/WalletCashOutData.ts

@@ -22,6 +22,11 @@ export class WalletCashOutData extends Data {
         mk.console.logSingle('wallet1=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
         this.init_novice = true;
@@ -32,6 +37,7 @@ export class WalletCashOutData extends Data {
         gData.receiptNotice.receip_rmb = value;
         mk.ui.openPanel('module/newNotice/newNotice');
 
+        gData.safeDepositBoxData.updateQipao();
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();
     }
@@ -57,6 +63,12 @@ export class WalletCashOutData extends Data {
 
         mk.console.logSingle('wallet2=>', response);
         if (response.errcode != 0) {
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                return;
+            }
             if (response.data.count > 0) {
                 // gData.cashPro.init_fail = true;  
                 gData.lineUpUIData.personCount = response.data.count;
@@ -86,6 +98,7 @@ export class WalletCashOutData extends Data {
             mk.ui.openPanel('module/newNotice/newNotice');
         }
 
+        gData.safeDepositBoxData.updateQipao();
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();

assets/script/game/game/AniControl.ts

@@ -267,7 +267,6 @@ export default class AniControl extends cc.Component {
 
 
         let add = response.data.redMoneyAddition;
-        console.log('addCoin===============>', add);
         if (add > 0) {
             const several = 3;
             let intV = Math.floor(add / several);

assets/script/game/game/FunBtns.ts

@@ -22,6 +22,8 @@ export default class FunBtns extends cc.Component {
     btn9: cc.Node = null;
     @property({ type: cc.Node, displayName: "订单" })
     btn12: cc.Node = null;
+    @property({ type: cc.Node, displayName: "富翁银行" })
+    btn14: cc.Node = null;
 
     onLoad() {
         gData.gameData.funBtns = this;
@@ -43,7 +45,11 @@ export default class FunBtns extends cc.Component {
                 {
                     this.btn5.y = this.btn5.y + 170;
                     add += 1;
-                }else if (i == 4 && data[i] == "0")
+                }else if(i == 2 && data[i] == "0")
+                {
+                    this.btn4.y = this.btn4.y + 170;
+                }
+                else if (i == 4 && data[i] == "0")
                 {
                     add += 1;
                 }

assets/script/game/game/Game.ts

@@ -239,6 +239,8 @@ export default class Game extends cc.Component {
                     //add = add > gData.gameData.maxTimes ? gData.gameData.maxTimes : add;
                     gData.gameData.restoreProductTimes = add;
                     mk.ui.openPanel('module/speedUpUI/restoreProductTimes');
+
+                    mk.data.sendDataEvent(DataEventId.offlineProductTimes, "离线生产次数弹出");
                 }
             }
         }
@@ -547,25 +549,25 @@ export default class Game extends cc.Component {
         let flyRed = await gData.gameData.makeProduct();
 
         //任务红包刷新逻辑
-        // if (flyRed) {
-        //     //mk.audio.playEffect('redmoney');
-        //     if (gData.gameData.playerProp.userFarmTaskInfo) {
-        //         let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-        //         let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-
-        //         let addAni = cc.instantiate(this.ani_add3);
-        //         addAni.parent = this.ani_add3.parent;
-        //         addAni.getComponent(cc.Label).string = `百元红包:${com}/${count}`;
-        //         cc.tween(addAni).call(() => {
-        //             addAni.opacity = 255;
-        //         }).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).call(() => {
-        //             addAni.destroy();
-        //         }).start();
-        //     }
+        if (flyRed) {
+            //mk.audio.playEffect('redmoney');
+            if (gData.gameData.playerProp.userFarmTaskInfo) {
+                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+
+                let addAni = cc.instantiate(this.ani_add3);
+                addAni.parent = this.ani_add3.parent;
+                addAni.getComponent(cc.Label).string = `百元红包:${com}/${count}`;
+                cc.tween(addAni).call(() => {
+                    addAni.opacity = 255;
+                }).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).call(() => {
+                    addAni.destroy();
+                }).start();
+            }
 
 
-        //     this.dpFlyRedAni();
-        // }
+            this.dpFlyRedAni();
+        }
     }
 
     public dpFlyRedAni(starPos: cc.Vec2 = null) {
@@ -613,7 +615,6 @@ export default class Game extends cc.Component {
     }
 
     public registerCallBack() {
-        console.log('cocos keyDown');
         JsbSystem.callBack = null;
         JsbSystem.callBack = () => {
 
@@ -735,7 +736,7 @@ export default class Game extends cc.Component {
         //1:有可领奖的,2:正在解锁,3:所有奖励都领取完
         this.uiShowType = 3;
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);
                 for (let i = 0; i != list_data.length; ++i) {
@@ -988,7 +989,7 @@ export default class Game extends cc.Component {
                             namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
                         }
 
-                        if (dataE.completeCount == dataE.taskCount) {
+                        if (dataE.completeCount >= dataE.taskCount) {
                             this.lbl_progress[i].node.active = false;
                             this.sp_mark[i].node.active = true;
                             ++completeCount;
@@ -1003,7 +1004,6 @@ export default class Game extends cc.Component {
                         this.sp_cropIcon[i].spriteFrame = await mk.loader.load(plantPath + productData.picture, cc.SpriteFrame);
 
                     } else {
-                        console.log('订单数据错误');
                         return;
                     }
                 }
@@ -1020,13 +1020,8 @@ export default class Game extends cc.Component {
                     this.node_getOrderReward.getComponent(cc.Animation).stop();
                     this.node_orderHand.active = false;
                 }
-            } else {
-                console.log('订单数据错误');
-            }
-
-        } else {
-            console.log('订单数据错误');
-        }
+            } 
+        } 
     }
 
     public clickGetOrderRewardBtn() {
@@ -1035,7 +1030,8 @@ export default class Game extends cc.Component {
             mk.tip.pop("完成订单即可提现");
         } else {
             //smk.tip.pop("测试使用==订单领奖");
-            mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
+            //mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
+            mk.data.sendDataEvent(DataEventId.Sundry, "订单领奖按钮");
             this.getOrderReward();
         }
     }
@@ -1057,8 +1053,12 @@ export default class Game extends cc.Component {
 
         let data = {};
         let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
-        console.log(`getOrderReward=========${response}`);
         if (response.errcode != 0) {
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
         let addMoney = gData.gameData.playerProp.orderData.cashMoney;
@@ -1077,6 +1077,7 @@ export default class Game extends cc.Component {
         this.initOrderUI();
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
+        gData.safeDepositBoxData.updateQipao();
     }
 
     showTips()
@@ -1278,5 +1279,11 @@ export default class Game extends cc.Component {
             gData.farmSystem._lastSeletFarm.clickGuideBtn();
         }
     }
+
+    //富翁银行
+    /** 点击富翁银行 */
+    public onClickSafeDepositBox() {
+        mk.data.sendDataEvent(DataEventId.button_click, "富翁银行icon");
+    }
 }
 

assets/script/game/game/RedPointControl.ts

@@ -38,7 +38,7 @@ export class RedPointControl extends cc.Component {
     private changeStatus()
     {
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);        
                 for (let i = 0; i != list_data.length; ++i) {

assets/script/game/game/TouchListener.ts

@@ -13,8 +13,6 @@ const { ccclass, property } = cc._decorator;
     start(){
         this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
         this.node['_touchListener'].swallowTouches  = false;
-
-        //cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, this.onKeyDown, this);
     }
 
     private onTouchStart(e) 
@@ -27,10 +25,6 @@ const { ccclass, property } = cc._decorator;
         //mk.ui.openPanel('module/safeDepositBox/SafeDepositBox');
     }
 
-    onKeyDown(event)
-    {
-        console.log('cocos onKeyDown',event);
-    }
  }
 
 export function Eve(Eve: any) {

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -176,7 +176,6 @@ export default class BlessingBag extends cc.Component {
         this.delta = (this.targetProgress - this.lastNum) / time;
         this.curValue = this.lastNum;
         this.curTime = 0;
-        console.log("--->Update Time: " + time + " delta: " + this.delta + " curValue: " + this.curValue + " lastNum: " + this.lastNum);
         this.isPlayAni = true;
     }
 
@@ -190,7 +189,6 @@ export default class BlessingBag extends cc.Component {
                     this.curValue = this.targetProgress;
                     this.lastNum = this.targetProgress;
                 }
-                console.log("-->CurValue:" + this.curValue);
             } else {
                 this.isPlayAni = false;
                 this.curTime = this.totalTime;
@@ -227,8 +225,6 @@ export default class BlessingBag extends cc.Component {
             mk.tip.pop('今日观看次数已用完');
             }
         }
-
-        console.log("--->You Click AdProgressBtn  ", gData.blessingBag.videoRbData);
     }
 
     /**
@@ -263,7 +259,6 @@ export default class BlessingBag extends cc.Component {
     }
 
     async Click_CashBtn() {
-        console.log("--->You Click CashBtn");
         mk.audio.playEffect("button");
 
         if (gData.blessingBag.videoRbData.cumulativeAmount >= gData.blessingBag.videoRbData.requestAmount) {

assets/script/game/module/blessingBag/BlessingBagItem.ts

@@ -169,19 +169,16 @@ export default class BlessingBagItem extends cc.Component {
 
     Click_CashedBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked cashed");
         mk.tip.pop('该红包已提现');
     }
 
     Click_CanCashBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked canCash");
         gData.blessingBag.OpenTaskRbPanel(this.data.Id, this.data.redMoney);
     }
 
     Click_NoFinishBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked noFinish");
         mk.tip.pop('提现进度不足');
     }
 }

assets/script/game/module/farmMap/FarmMap.ts

@@ -58,7 +58,7 @@ export default class FarmMap extends cc.Component {
     private refreshBtnState() {
         let index = 0;
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 this.itemName[index].toggle.interactable = true;
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);

assets/script/game/module/newCashUI/NewCashUI.ts

@@ -32,7 +32,6 @@ export default class NewCashUI extends cc.Component {
 
         this.coolTime = true;
 
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -232,7 +232,6 @@ export default class WalletCashOut extends cc.Component {
 
     private clickCashOutBtn() {
         mk.audio.playEffect("button");
-        console.log('=========>', this.isCanCash);
         if (this.isCanCash) {
 
             if (this.checkShowTip()) {

assets/script/game/module/newNotice/LineUpUI.ts

@@ -35,7 +35,6 @@ export default class LineUpUI extends cc.Component {
 
     update(dt) {
         if (gData.lineUpUIData.refresh) {
-            console.log('lineUp=====>', gData.lineUpUIData.personCount);
             gData.lineUpUIData.refresh = false;
             this.lbl_tip.string = `<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>${gData.lineUpUIData.personCount}</color><color=#8A4312>人</color>`;
             cc.tween(this.lbl_tip.node).to(0.3, { scale: 1.4 }).to(0.2, { scale: 1 }).call(() => {

assets/script/game/module/newNotice/NewNotice.ts

@@ -24,7 +24,6 @@ export default class NewNotice extends cc.Component {
     }
 
     private initUI() {
-        console.log("newNotices=>" + gData.receiptNotice.receip_rmb);
         this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2);
         this.lbl_time.string = mk.time.getNowDayStringExtend();
     }

assets/script/game/module/redBagCode/RedBagCode.ts

@@ -55,7 +55,6 @@ export default class RedBagCode extends cc.Component {
         this.coolTime = true
 
         gData.redCodeData.teachVideoType = 1;
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -285,6 +285,11 @@ export default class RedBagTask extends cc.Component {
         mk.console.logSingle('redBagTask=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return;
         }
         mk.console.logSingle('redBagTaskhttpCashOut=>', response.data.userFarmTaskInfo);
@@ -320,6 +325,7 @@ export default class RedBagTask extends cc.Component {
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();
         gData.adData.checkPopCashFull();
+        gData.safeDepositBoxData.updateQipao();
     }
 
     /**

assets/script/game/module/redCode/RedCode.ts

@@ -75,7 +75,6 @@ export default class RedCode extends cc.Component {
         this.coolTime = true
 
         gData.redCodeData.teachVideoType = 1;
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

assets/script/game/module/safeDepositBox/BankQipaoTip.ts

@@ -30,7 +30,7 @@ export default class BankQipaoTip extends cc.Component {
 
     init(data = null) {
         this.node.opacity = 0;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             this.node.opacity = 255;
             this.node_tixian.active = true;
             this.node_cunru.active = false;

assets/script/game/module/safeDepositBox/SafeDepositBox.ts

@@ -1,3 +1,4 @@
+import { DataEventId } from "../../data/GameData";
 import MoneySaveItem from "./MoneySaveItem";
 
 const { ccclass, property } = cc._decorator;
@@ -158,26 +159,26 @@ export default class SafeDepositBox extends cc.Component {
                 this.updateScrollView(response.data);
             }
 
-            if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
-                let response = await mk.http.sendData('richbank/getRichBankInfo', {});
-                mk.console.logSingle('getRichBankInfo  ', response);
-                if (response && response.errcode == 0) {
-                    if (response.data.richBankDailyVideoTimes >= 0) {
-                        gData.safeDepositBoxData.richBankDailyVideoTimes = response.data.richBankDailyVideoTimes;
-                    }
-
-                    if (response.data.richbankLoginDays >= 0) {
-                        gData.safeDepositBoxData.richbankLoginDays = response.data.richbankLoginDays;
-                        if (gData.safeDepositBoxData.richbankLoginDays == 0) {
-                            gData.safeDepositBoxData.richbankLoginDays = 1;
-                        }
-                    }
-
-                    gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
-
-                    this.setTaskProgress();
-                }
-            }
+            // if (gData.safeDepositBoxData.isStartBankTask > 0) {
+            //     let response = await mk.http.sendData('richbank/getRichBankInfo', {});
+            //     mk.console.logSingle('getRichBankInfo  ', response);
+            //     if (response && response.errcode == 0) {
+            //         if (response.data.richBankDailyVideoTimes >= 0) {
+            //             gData.safeDepositBoxData.richBankDailyVideoTimes = response.data.richBankDailyVideoTimes;
+            //         }
+
+            //         if (response.data.richbankLoginDays >= 0) {
+            //             gData.safeDepositBoxData.richbankLoginDays = response.data.richbankLoginDays;
+            //             if (gData.safeDepositBoxData.richbankLoginDays == 0) {
+            //                 gData.safeDepositBoxData.richbankLoginDays = 1;
+            //             }
+            //         }
+
+            //         gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
+            //     }
+
+            //     this.setTaskProgress();
+            // }
         }
 
         this.initView()
@@ -192,11 +193,12 @@ export default class SafeDepositBox extends cc.Component {
         if (money == null || undefined) {
             money = 0
         }
-        this.startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex
+        //this.startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex
+        this.startTixian = gData.safeDepositBoxData.isStartBankTask
         if (this.startTixian > 0) {
             this.weitixianNode.active = false
             this.tixianzhongNode.active = true
-            let config = gData.safeDepositBoxData.getBankTaskIndex()
+            let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
             this.tixianzhongMoneyLabel.string = (config.money * 0.01).toFixed(2) + "元"
             this.readyTixianLabel.node.active = false
             this.tixianzhongNode.getChildByName("tixianLabel").active = true
@@ -209,8 +211,8 @@ export default class SafeDepositBox extends cc.Component {
             if (showStep) {
                 this.showInfoByStep()
             }
-            this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0
-            this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0)
+            this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.isStartBankTask > 0
+            this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.isStartBankTask > 0)
         } else {
             this.tixianzhongNode.active = false
             this.weitixianNode.active = true
@@ -244,7 +246,7 @@ export default class SafeDepositBox extends cc.Component {
         this.noPacketTip.position = cc.v3(324, -10)
 
         let count = 0
-        let startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        let startTixian = gData.safeDepositBoxData.isStartBankTask;
         let showFinger: boolean = startTixian > 0
         this.itemP = await mk.loader.load('module/safeDepositBox/prefabs/MoneySaveItem', cc.Prefab);
         for (let entry of data) {
@@ -269,7 +271,7 @@ export default class SafeDepositBox extends cc.Component {
     //将提现金额放入保险箱
     async clickItemEvent(data, node) {
         mk.audio.playEffect('button');
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             mk.tip.pop("提现后可存入")
             return
         }
@@ -327,11 +329,11 @@ export default class SafeDepositBox extends cc.Component {
         mk.audio.playEffect('button');
 
         let minConfig = null;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex == 0) {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex(true);
+        if (gData.safeDepositBoxData.isStartBankTask == 0) {
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
         else {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex();
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
 
         let richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount
@@ -367,33 +369,37 @@ export default class SafeDepositBox extends cc.Component {
     //点开始任务
     async confirmStartTixian() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex(true);
-        if (!config) {
-            mk.console.logSingle("SafeDepositBox", "can not confirmStartTixian")
-            return
-        }
+        // let config = gData.safeDepositBoxData.getBankTaskIndex(true);
+        // if (!config) {
+        //     mk.console.logSingle("SafeDepositBox", "can not confirmStartTixian")
+        //     return
+        // }
         this.confirmTixianNode.active = false
         this.boxNode.stopAllActions()
         this.boxNode.x = 161
         this.boxNode.y = 0
         this.content.active = true
         if (this.test) {
+            gData.safeDepositBoxData.isStartBankTask = 1;
             this.updateBankTask(1);
         } else {
-            let response = await mk.http.sendData('richbank/openCashTask', { "index": config.index });
+            //let response = await mk.http.sendData('richbank/openCashTask', { "index": config.index });
+            let response = await mk.http.sendData('richbank/openCashTask', {});
             mk.console.logSingle('openCashTask  ', response);
             if (response && response.errcode == 0) {
                 gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
-                this.updateBankTask(config.index);
+                gData.safeDepositBoxData.isStartBankTask = response.data.isStartRichBankTask;
+                console.log(`openCashTask=====${response.data.richBankDailyTotelVideoTimes}=======${response.data.isStartBankTask}`);
+                this.updateBankTask(1);
             }
         }
     }
 
     updateBankTask(index) {
-        gData.safeDepositBoxData.currentRichBankCashTaskIndex = index;
-        gData.safeDepositBoxData.addRichBankFinishIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        // gData.safeDepositBoxData.currentRichBankCashTaskIndex = index;
+        // gData.safeDepositBoxData.addRichBankFinishIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
         gData.safeDepositBoxData.richbankLoginDays = 1
-        gData.safeDepositBoxData.richBankDailyVideoTimes = 0
+        // gData.safeDepositBoxData.richBankDailyVideoTimes = 0
         mk.storage.setStorage("bankTaskStartTime", Date.now())
         this.initView(true)
         mk.data.sendDataEvent("Bank", "开始任务")
@@ -455,11 +461,11 @@ export default class SafeDepositBox extends cc.Component {
         console.log("checkCurrentCanStartTask money:" + money)
 
         let minConfig = null;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex == 0) {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex(true);
+        if (gData.safeDepositBoxData.isStartBankTask == 0) {
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
         else {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex();
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
 
         console.log("checkCurrentCanStartTask minConfig.index:" + minConfig.index)
@@ -478,8 +484,8 @@ export default class SafeDepositBox extends cc.Component {
             this.readyTixianBtn.interactable = true
             outLine.color = cc.color(181, 140, 59)
             showMoney = Math.floor(minConfig.money / 100) > 0 ? (minConfig.money / 100) + "" : (minConfig.money / 100).toFixed(2)
-
-            mk.guide.open(5);
+            console.log("=================checkCurrentCanStartTask");
+            //mk.guide.open(13);
         } else {
             console.log("checkCurrentCanStartTask minConfig.index: money < minMoney")
             this.readyTixianBtn.node.getComponent(cc.Sprite).spriteFrame = this.spriteFrameList[1]
@@ -490,32 +496,32 @@ export default class SafeDepositBox extends cc.Component {
 
     async clickLingqu() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         this.labMoeny.string = "¥" + (config.money * 0.01).toFixed(2)
         if (this.test) {
             this.updateBankCash(null)
         } else {
             this.loadPart.active = true
             this.spot1.play('load', 0);
-            let response = await mk.http.sendData('richbank/richbankcash', {
-                "index": config.index,
-                'appVersion': gData.appData.appVersion
-            });
-
+            let response = await mk.http.sendData('richbank/richbankcash', {});
             if (response) {
                 if (response.errcode == 0) {
                     this.updateBankCash(response.data);
                 }
                 else {
                     this.loadPart.active = false;
-                    if (response.data.count) {
-                        gData.lineUpUIData.popType = 1;
-                        gData.lineUpUIData.personCount = response.data.count;
-                        mk.ui.openPanel("module/newNotice/lineUpUI");
-                    }
-                    else {
-                        mk.tip.pop('提现排队中，多看视频优先提现');
+                    if (response.errcode == 405) {
+                        mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                        mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
                     }
+                    // if (response.data.count) {
+                    //     gData.lineUpUIData.popType = 1;
+                    //     gData.lineUpUIData.personCount = response.data.count;
+                    //     mk.ui.openPanel("module/newNotice/lineUpUI");
+                    // }
+                    // else {
+                    //     mk.tip.pop('提现排队中，多看视频优先提现');
+                    // }
                 }
             }
         }
@@ -533,11 +539,14 @@ export default class SafeDepositBox extends cc.Component {
             }
         }
 
-        gData.safeDepositBoxData.currentRichBankCashTaskIndex = 0
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
+
+        gData.safeDepositBoxData.currentRichBankCashTaskIndex = data.currentRichBankCashTaskIndex;
         gData.safeDepositBoxData.richbankLoginDays = 1
         gData.safeDepositBoxData.richBankDailyVideoTimes = 0
+        gData.safeDepositBoxData.isStartBankTask = 0;
         //计算提现后，银行内剩余的
-        let currentConfig = gData.safeDepositBoxData.getBankTaskIndex()
+        let currentConfig = gData.safeDepositBoxData.getBankTaskIndexExtra(true);
         gData.safeDepositBoxData.richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount - currentConfig.money
         if (gData.safeDepositBoxData.richBankCashAmount < 0) {
             gData.safeDepositBoxData.richBankCashAmount = 0
@@ -545,6 +554,8 @@ export default class SafeDepositBox extends cc.Component {
 
         mk.data.sendDataEvent("Bank", "银行-任务全部完成")
         this.tixianSuccess(true);
+        gData.receiptNotice.receip_rmb = config.money;
+        mk.ui.openPanel('module/newNotice/newNotice');
 
         gData.safeDepositBoxData.updateQipao();
         //累计成功提现次数
@@ -552,6 +563,7 @@ export default class SafeDepositBox extends cc.Component {
         //累计提现金额
         mk.data.setTAEventUser(1, 'cash_total', cashMoney);
 
+        mk.data.sendDataEvent(DataEventId.Sundry, "富翁银行提现");
         // if (data.CashMode == 2) {
         //     gData.redCodeData.openRedCode(cashMoney, data.withdrawalCode);
         //     mk.data.sendDataEvent('Bank', '公众号提现-富翁银行')
@@ -561,7 +573,7 @@ export default class SafeDepositBox extends cc.Component {
     tixianSuccess(showPro) {
         this.loadPart.active = false
         if (showPro) {
-            this.cashPro.active = true
+            //this.cashPro.active = true
             gData.adData.checkShowFullInter(1);
         }
 
@@ -570,24 +582,24 @@ export default class SafeDepositBox extends cc.Component {
 
     tixianFail() {
         this.loadPart.active = false
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     hideTixianNode() {
         mk.audio.playEffect('button');
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     closeTixianNode() {
         mk.audio.playEffect('button');
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     setTaskProgress() {
         let richBankDailyVideoTimes = gData.safeDepositBoxData.richBankDailyVideoTimes
         let richbankLoginDays = gData.safeDepositBoxData.richbankLoginDays
 
-        let currentConfig = gData.safeDepositBoxData.getBankTaskIndex()
+        let currentConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         if (currentConfig == null || currentConfig == undefined) {
             return
         }
@@ -595,7 +607,7 @@ export default class SafeDepositBox extends cc.Component {
         let totaldays = currentConfig.loginTimes
         let progress = "(" + richbankLoginDays + "/" + totaldays + ")"
         this.labDes.string = `连续完成${totaldays}日的每日任务即可提现\n任意一日未完成将重置提现进度`;
-        this.loginProgress.string = "<color=#a87921>1.登陆游戏</>"
+        this.loginProgress.string = "<color=#a87921>1.连续登陆" + progress + "</>";
         if (richbankLoginDays < totaldays) {
             this.logDaysNode.getChildByName("labelNode").active = true
             this.logDaysNode.getChildByName("gou").active = false
@@ -659,10 +671,13 @@ export default class SafeDepositBox extends cc.Component {
         if (richbankLoginDays <= 1) {
             //任务中断的情况
             let showBankTaskRestart = mk.storage.getStorage("showBankTaskRestart")
+            console.log(`1=======${showBankTaskRestart}`);
             let same = this.checkSameDay(new Number(showBankTaskRestart).valueOf())
-
+            console.log(`2=======${same}`);
             let bankTaskStartTime = mk.storage.getStorage("bankTaskStartTime")
+            console.log(`3=======${bankTaskStartTime}`);
             let startTimeSame = this.checkSameDay(new Number(bankTaskStartTime).valueOf())
+            console.log(`4=======${startTimeSame}`);
             if (!same && !startTimeSame) {
                 this.scheduleOnce(() => {
                     this.showRestartTaskNode()
@@ -678,7 +693,7 @@ export default class SafeDepositBox extends cc.Component {
         //     return
         // }
         this.ruleNode.active = true
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         let money = config.money
         let showMoney = Math.floor(money / 100) > 0 ? (money / 100) + "" : (money / 100).toFixed(2)
         this.rulelabel.string = "2、存入金额达到" + showMoney + "元可开启提现"
@@ -729,20 +744,20 @@ export default class SafeDepositBox extends cc.Component {
 
     clickBoxShowTip() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         let money = config.money
         let showMoney = Math.floor(money / 100) > 0 ? (money / 100) + "" : (money / 100).toFixed(2)
 
         let str = "存款达到" + showMoney + "元可提现哦"
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             str = "完成任务可提现，加油哦！"
         }
         mk.tip.pop(str)
     }
 
     showNoPacket() {
-        this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0
-        this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0)
+        this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.isStartBankTask > 0
+        this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.isStartBankTask > 0)
         this.noPacketTip.active = true
         let moveNode = this.noPacketTip
         let x = moveNode.x

assets/script/game/module/setting/Setting.ts

@@ -45,8 +45,6 @@ export default class Setting extends cc.Component {
     }
 
     private async initData() {
-        console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
-        console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
         this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
         this.lbl_version.string = gData.appData.appVersion;
@@ -62,12 +60,10 @@ export default class Setting extends cc.Component {
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
         this.sp_achieve.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.playerProp.farmGradeName, cc.SpriteFrame);
-        console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
         if (gData.wechatData.avatar != '') {
             let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
             if (result) {
                 this.img_head.spriteFrame = new cc.SpriteFrame(result);
-                console.log("=== loadHead:", result);
             }
         }
     }

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -173,29 +173,29 @@ export default class ProductReward extends cc.Component {
     }
 
     update(dt) {
-        if (gData.gameData.init_productTask) {
-            if (gData.gameData.playerProp.userFarmTaskInfo) {
-                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-                if (count <= 10) {
-                    if (count > com) {
-                        this.lbl_taskTimes.string = (count - com).toString();
-                        this.node_Uncomplete.active = true;
-                        this.node_complete.active = false;
-                    } else {
-                        this.node_Uncomplete.active = false;
-                        this.node_complete.active = true;
-                    }
-                    this.lbl_progress.string = `${com}/${count}`;
-                    this.sp_taskProgress.fillRange = com / count;
-                } else {
-                    this.node_1.active = false;
-                    this.node_2.active = true;
-                }
-            }
-
-            gData.gameData.init_productTask = false;
-        }
+        // if (gData.gameData.init_productTask) {
+        //     if (gData.gameData.playerProp.userFarmTaskInfo) {
+        //         let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+        //         let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+        //         if (count <= 10) {
+        //             if (count > com) {
+        //                 this.lbl_taskTimes.string = (count - com).toString();
+        //                 this.node_Uncomplete.active = true;
+        //                 this.node_complete.active = false;
+        //             } else {
+        //                 this.node_Uncomplete.active = false;
+        //                 this.node_complete.active = true;
+        //             }
+        //             this.lbl_progress.string = `${com}/${count}`;
+        //             this.sp_taskProgress.fillRange = com / count;
+        //         } else {
+        //             this.node_1.active = false;
+        //             this.node_2.active = true;
+        //         }
+        //     }
+
+        //     gData.gameData.init_productTask = false;
+        // }
 
         if(gData.gameData.init_order)
         {

assets/script/mk/system/FlySystem2.ts

@@ -65,8 +65,7 @@ export default class FlySystem2 extends cc.Component {
         cc.tween(target)
             .to(dur, { scale: 0.8 })
             .start();
-
-            console.log('---');
+            
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {

assets/script/mk/system/GuideSystem.ts

@@ -33,7 +33,6 @@ export default class GuideSystem {
         // }
         //test
         // this.crtGuideID = 0
-
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");
             return false;

assets/script/mk/system/HttpSystem.ts

@@ -79,6 +79,7 @@ export default class HttpSystem {
             };
             httpRequest.onerror = function (e) {
                 mk.console.error("http.onerror", url);
+                mk.console.logSingle("http.onerror", e);
                 reject({ errcode: 1, errmsg: "onerror" });
             };
             send();

assets/script/mk/system/JsbSystem.ts

@@ -151,7 +151,7 @@ export default class JsbSystem {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
             gData.appData.appId = "wxd98fe9d52af10e59";
-            gData.appData.version = "1.1.6";
+            gData.appData.version = "12.1.7";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

build/jsb-link/assets/resources/import/eb/ebfa09f7-ef7d-4aeb-b477-87eb94357dd8.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AnimationClip",["_name","_duration","wrapMode","curveData"],-1]],[[0,0,1,2,3,5]],[[0,"btnShake",3.5166666666666666,2,{"props":{"angle":[{"frame":0,"value":0},{"frame":0.016666666666666666,"value":15},{"frame":0.16666666666666666,"value":-15},{"frame":0.3333333333333333,"value":10},{"frame":0.5,"value":-10},{"frame":0.6666666666666666,"value":0},{"frame":3.5166666666666666,"value":0}],"scaleY":[{"frame":0.6666666666666666,"value":1}],"scaleX":[{"frame":0.6666666666666666,"value":1}]},"paths":{"homepage_hezi_1":{"props":{"position":[],"angle":[]}}}}]],0,0,[],[],[]]

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml

@@ -10,7 +10,7 @@
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
-            <option value="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
+            <option value="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml

@@ -5,7 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1786486690/platform-android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/1786486690/platform-android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/libcocos2dx.iml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="PROJECT_TYPE" value="1" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+  </component>
+</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/platform-android-libcocos2dx.iml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":libcocos2dx" external.linked.project.path="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="1" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
-    </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
-  </component>
-</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -33,155 +33,155 @@
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
-    <content url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures">
-      <sourceFolder url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
     </content>
-    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
+    <content url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures">
+      <sourceFolder url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../Classes">
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
@@ -273,9 +273,9 @@
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-game-9.2.0+G.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/utdid4all-1.5.2.1-proguard.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/du.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
@@ -353,6 +353,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="platform-android-libcocos2dx" />
+    <orderEntry type="module" module-name="libcocos2dx" />
   </component>
 </module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
 PACKAGE_NAME=com.aries.kncdsf.mz
-VERSION_NAME=1.1.6
+VERSION_NAME=1.1.7
 VERSION_CODE=1000
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.1.6"
+APP_CONFIG_CODE="12.1.7"

packages-hot-update/cfg.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.5",
+    "version": "1.0.6",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1636515232657,
-    "genTime": 1636515232657,
+    "buildTime": 1637046508548,
+    "genTime": 1637046508548,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1636421220116,
+  "last-module-event-record-time": 1637027217827,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }