[FC][农场新版本]初步上传

assets/resources/game/otherGame/prefab/nodepool/SelectCellItemBtn.prefab

@@ -22,13 +22,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 5
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 6
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -183,19 +179,6 @@
     "sync": false
   },
   {
-    "__type__": "e8b95pOPehKPZhmoQnbaZAT",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "spr_icon": {
-      "__id__": 3
-    },
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -203,7 +186,7 @@
     "asset": {
       "__uuid__": "ceb1c542-7e44-4682-9cec-8c2a76a739b7"
     },
-    "fileId": "76gYARMUtNxYuxcMPVt84g",
+    "fileId": "",
     "sync": false
   }
 ]

assets/resources/game/otherGame/prefab/uiItem/SelectSceneItem.prefab

@@ -22,13 +22,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 5
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 6
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -185,19 +181,6 @@
     "sync": false
   },
   {
-    "__type__": "9d3b6Lu9dhMg7Y4yEuxQFkw",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "spr_selectScene": {
-      "__id__": 3
-    },
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -205,7 +188,7 @@
     "asset": {
       "__uuid__": "af2a708a-3e04-483e-a2f5-9f78813db808"
     },
-    "fileId": "320M7ZHeRD8bfLx/USI5Y6",
+    "fileId": "",
     "sync": false
   }
 ]

assets/resources/game/prefab/game.prefab

@@ -27,20 +27,20 @@
         "__id__": 566
       },
       {
-        "__id__": 632
+        "__id__": 635
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 634
+        "__id__": 637
       },
       {
-        "__id__": 636
+        "__id__": 639
       }
     ],
     "_prefab": {
-      "__id__": 637
+      "__id__": 640
     },
     "_opacity": 255,
     "_color": {
@@ -19854,7 +19854,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 631
+      "__id__": 634
     },
     "_opacity": 255,
     "_color": {
@@ -19921,7 +19921,7 @@
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 630
+      "__id__": 633
     },
     "_opacity": 255,
     "_color": {
@@ -20077,10 +20077,10 @@
         "__id__": 572
       },
       {
-        "__id__": 601
+        "__id__": 604
       },
       {
-        "__id__": 614
+        "__id__": 617
       },
       {
         "__id__": 588
@@ -20089,14 +20089,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 627
+        "__id__": 630
       },
       {
-        "__id__": 628
+        "__id__": 631
       }
     ],
     "_prefab": {
-      "__id__": 629
+      "__id__": 632
     },
     "_opacity": 255,
     "_color": {
@@ -20167,7 +20167,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 600
+      "__id__": 603
     },
     "_opacity": 255,
     "_color": {
@@ -20654,14 +20654,14 @@
       "__id__": 587
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 585
       }
     ],
     "_prefab": {
-      "__id__": 599
+      "__id__": 602
     },
     "_opacity": 255,
     "_color": {
@@ -20723,16 +20723,19 @@
       },
       {
         "__id__": 586
+      },
+      {
+        "__id__": 597
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 597
+        "__id__": 600
       }
     ],
     "_prefab": {
-      "__id__": 598
+      "__id__": 601
     },
     "_opacity": 255,
     "_color": {
@@ -21113,6 +21116,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 587
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 598
+      }
+    ],
+    "_prefab": {
+      "__id__": 599
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 86,
+      "b": 10,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 88.98,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -0.509999999999998,
+        6,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 597
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "????",
+    "_N$string": "????",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "26f6fe46-d914-443b-85c1-0ea7e479e0a7"
+    },
+    "fileId": "07JJF0ahFLDau1mYDnjXCP",
+    "sync": false
+  },
+  {
     "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
@@ -21186,20 +21297,20 @@
     },
     "_children": [
       {
-        "__id__": 602
+        "__id__": 605
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 611
+        "__id__": 614
       },
       {
-        "__id__": 612
+        "__id__": 615
       }
     ],
     "_prefab": {
-      "__id__": 613
+      "__id__": 616
     },
     "_opacity": 255,
     "_color": {
@@ -21253,24 +21364,24 @@
     "_name": "mask",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 601
+      "__id__": 604
     },
     "_children": [
       {
-        "__id__": 603
+        "__id__": 606
       },
       {
-        "__id__": 606
+        "__id__": 609
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 609
+        "__id__": 612
       }
     ],
     "_prefab": {
-      "__id__": 610
+      "__id__": 613
     },
     "_opacity": 255,
     "_color": {
@@ -21324,17 +21435,17 @@
     "_name": "icon_1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 602
+      "__id__": 605
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 604
+        "__id__": 607
       }
     ],
     "_prefab": {
-      "__id__": 605
+      "__id__": 608
     },
     "_opacity": 255,
     "_color": {
@@ -21388,7 +21499,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 603
+      "__id__": 606
     },
     "_enabled": true,
     "_materials": [
@@ -21431,17 +21542,17 @@
     "_name": "icon_2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 602
+      "__id__": 605
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 607
+        "__id__": 610
       }
     ],
     "_prefab": {
-      "__id__": 608
+      "__id__": 611
     },
     "_opacity": 255,
     "_color": {
@@ -21495,7 +21606,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 606
+      "__id__": 609
     },
     "_enabled": true,
     "_materials": [
@@ -21538,7 +21649,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 602
+      "__id__": 605
     },
     "_enabled": true,
     "_materials": [
@@ -21571,7 +21682,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 601
+      "__id__": 604
     },
     "_enabled": true,
     "_materials": [
@@ -21603,14 +21714,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 601
+      "__id__": 604
     },
     "_enabled": true,
     "sp_icon_1": {
-      "__id__": 604
+      "__id__": 607
     },
     "sp_icon_2": {
-      "__id__": 607
+      "__id__": 610
     },
     "delayTime": 0.6,
     "distance": 98,
@@ -21649,20 +21760,20 @@
     },
     "_children": [
       {
-        "__id__": 615
+        "__id__": 618
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 624
+        "__id__": 627
       },
       {
-        "__id__": 625
+        "__id__": 628
       }
     ],
     "_prefab": {
-      "__id__": 626
+      "__id__": 629
     },
     "_opacity": 255,
     "_color": {
@@ -21716,24 +21827,24 @@
     "_name": "mask",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 614
+      "__id__": 617
     },
     "_children": [
       {
-        "__id__": 616
+        "__id__": 619
       },
       {
-        "__id__": 619
+        "__id__": 622
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 622
+        "__id__": 625
       }
     ],
     "_prefab": {
-      "__id__": 623
+      "__id__": 626
     },
     "_opacity": 255,
     "_color": {
@@ -21787,17 +21898,17 @@
     "_name": "icon_1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 615
+      "__id__": 618
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 617
+        "__id__": 620
       }
     ],
     "_prefab": {
-      "__id__": 618
+      "__id__": 621
     },
     "_opacity": 255,
     "_color": {
@@ -21851,7 +21962,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 616
+      "__id__": 619
     },
     "_enabled": true,
     "_materials": [
@@ -21894,17 +22005,17 @@
     "_name": "icon_2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 615
+      "__id__": 618
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 620
+        "__id__": 623
       }
     ],
     "_prefab": {
-      "__id__": 621
+      "__id__": 624
     },
     "_opacity": 255,
     "_color": {
@@ -21958,7 +22069,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 619
+      "__id__": 622
     },
     "_enabled": true,
     "_materials": [
@@ -22001,7 +22112,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 615
+      "__id__": 618
     },
     "_enabled": true,
     "_materials": [
@@ -22034,7 +22145,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 614
+      "__id__": 617
     },
     "_enabled": true,
     "_materials": [
@@ -22066,14 +22177,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 614
+      "__id__": 617
     },
     "_enabled": true,
     "sp_icon_1": {
-      "__id__": 617
+      "__id__": 620
     },
     "sp_icon_2": {
-      "__id__": 620
+      "__id__": 623
     },
     "delayTime": 0.6,
     "distance": 98,
@@ -22207,7 +22318,7 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 633
+      "__id__": 636
     },
     "_name": "gameplay",
     "_active": true,
@@ -22238,7 +22349,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 632
+      "__id__": 635
     },
     "asset": {
       "__uuid__": "4c49ec9e-c64a-4921-84eb-9bdd737656e5"
@@ -22276,7 +22387,7 @@
       "__id__": 3
     },
     "nodeRedPoint": {
-      "__id__": 635
+      "__id__": 638
     },
     "icon_plant": {
       "__id__": 434

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -2553,7 +2553,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "302ZJ9k91OeZaHx+brlZNd",
+    "fileId": "0a4mH1PJdCVoFwOraCkq9c",
     "sync": false
   },
   {
@@ -2664,7 +2664,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "25w2krdXlKC6QIHTR3rSQb",
+    "fileId": "42Szdd1OxLu5CsoO7fBf15",
     "sync": false
   },
   {
@@ -2775,7 +2775,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "eaTQF5ey9PirFVqSH/QlFj",
+    "fileId": "84+LmZfpFGO4aHM64E0SEA",
     "sync": false
   },
   {

assets/script/before/main/FarmIcon.ts

@@ -146,7 +146,8 @@ 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);
+                this.onHarvest();
+                // gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
                 this.isCanTouch = false;
                 setTimeout(() => {
                     this.isCanTouch = true;

assets/script/before/main/FarmSystem.ts

@@ -28,18 +28,16 @@ export class FarmSystem {
     public addFram(fram: FarmIcon) {
         this.farms[fram.sortID] = fram;
     }
-    public async plant(id: number, parentNode = null){
-        if(this.currSelectFarm)
-        {
-             return await this.currSelectFarm.plant(id, parentNode);
-        }    
-        else
-        {
+    public async plant(id: number, parentNode = null) {
+        if (this.currSelectFarm) {
+            return await this.currSelectFarm.plant(id, parentNode);
+        }
+        else {
             return false;
         }
         // this._lastSeletFarm = this._currSelectFarm;
     }
-    public selectNextFarm(out?: any ,sel = true): FarmIcon | null {
+    public selectNextFarm(out?: any, sel = true): FarmIcon | null {
         let nextFarm = this.getCanPlantFarm(out);
         if (this._lastSeletFarm) {
             this._lastSeletFarm.selectFarm(false);
@@ -64,25 +62,23 @@ export class FarmSystem {
                 out.state = 0;
                 //let nextProduct = gData.gameData.getRandomPlantConfig(out);
                 let nextProduct = gData.gameData.getRandomPlantConfigExtra(out);
-                if(nextProduct)
-                {
-                    if(gData.gameData.nextType == 1)
-                    {
+                if (nextProduct) {
+                    if (gData.gameData.nextType == 1) {
                         gData.gameData.nextCanProduct = nextProduct
                         gData.gameData.nextMake = this.farms[i];
                     }
                     mk.console.logSingle('getCanPlantFarm  ', this.farms[i].data);
                     return this.farms[i];
-                }else{
+                } else {
                     return null;
-                }               
+                }
             }
         }
         return null;
     }
 
     public async btnMake() {
-        
+
         let flyRed = await gData.gameData.nextMake.plant(gData.gameData.nextCanProduct.picture);
         return flyRed;
     }

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

@@ -26,7 +26,7 @@ export default class OrderDrawPanel extends cc.Component {
 
     async onLoad() {
         let data = {};
-        let response = await mk.http.sendData('orderTaskNew/getOrderLuckyReward', data);
+        let response = await mk.http.sendData('orderTaskTree/getOrderLuckyReward', data);
         if (response.errcode != 0) {
             return null;
         }
@@ -54,7 +54,7 @@ export default class OrderDrawPanel extends cc.Component {
                 gData.adData.watchVideo(AdFun.harvest, async () => {
                     console.log('aaaaaaaa 222 ');
                     let data = {};
-                    let response = await mk.http.sendData('orderTaskNew/receiveRewardNewCash', data);
+                    let response = await mk.http.sendData('orderTaskTree/receiveRewardNewCash', data);
                     console.log('aaaaaaaa  ', response.errcode);
                     mk.console.logSingle('receiveRewardNewCash  ', response);
                     gData.gameData.isOrderVideo = false;

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

@@ -1,3 +1,5 @@
+import { GameData } from "../../../game/data/GameData";
+
 /** 气泡界面 */
 const { ccclass, property } = cc._decorator;
 
@@ -13,6 +15,14 @@ export default class QipaoPanel extends cc.Component {
     }
 
     protected update(dt: number): void {
+
+        if (gData.gameData.configs.ServerConfig) {
+            if (gData.gameData.adShowConfig.average_ecpm < gData.gameData.configs.ServerConfig.FlyswitchECPM) {
+                this.airshipAni.node.active = false
+                return;
+            }
+        }
+
         if (this.showRedNum < 1) {
             this.countDown += dt;
             if (this.countDown >= 30) {

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

@@ -123,9 +123,19 @@ export default class PlantItem extends cc.Component {
             }
 
             for (var i = 0; i < len; i++) {
-                if (data.orderTaskList[i].Id == this.data.id && orderPlantTimes[data.orderTaskList[i].Id] < data.orderTaskList[i].taskCount) {
-                    isDingdan = true;
-                    break;
+                // if (data.orderTaskList[i].Id == this.data.id && orderPlantTimes[data.orderTaskList[i].Id] < data.orderTaskList[i].taskCount) {
+                //     isDingdan = true;
+                //     break;
+                // }
+
+                if (data.orderTaskList[i].Id == this.data.id) {
+                    console.log("===[订单id",data.orderTaskList[i].Id,this.data.id)
+                    console.log("===[订单id 种植次数",orderPlantTimes[data.orderTaskList[i].Id],data.orderTaskList[i].taskCount)
+                   
+                    if (orderPlantTimes[data.orderTaskList[i].Id] < data.orderTaskList[i].taskCount) {
+                        isDingdan = true;
+                        break;
+                    }
                 }
             }
         }
@@ -162,7 +172,7 @@ export default class PlantItem extends cc.Component {
         else {
             flyRed = await gData.factorySystem.make(this.data.picture, this.nameIcon.node);
         }
-
+        console.log("===[种植订单 flyRed",flyRed);
         if (flyRed) {
             let orderPlantTimes = gData.gameData.getProp(GameProp.orderPlantTimes);
             if (orderPlantTimes[this.data.id] == undefined) {

assets/script/game/data/AdData.ts

@@ -545,12 +545,12 @@ export class AdData {
             let data = {};
             // data["isDefault"] = isDefault;
             data["isDefault"] = 1;
-            let response = await mk.http.sendData('orderTaskNew/getUserOrderTaskInfo', data);
+            let response = await mk.http.sendData('orderTaskTree/getUserOrderTaskInfo', data);
             if (response.errcode != 0) {
                 return;
             }
             gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
-
+            console.log("===[获取到订单信息", JSON.stringify(gData.gameData.playerProp.orderData));
             mk.event.emit("initOrderUi");
         }
     }
@@ -571,6 +571,7 @@ export enum AdFun {
     farmMap = 10,       //图鉴领取视频
     lineUp = 11,        //插队视频
     addProductTimes = 12,//获得生产次数
+    farmSpeedUp = 13
 }
 
 export enum RateConfig {

assets/script/game/data/GameData.ts

@@ -92,7 +92,7 @@ export class GameData {
 
     public init_speedup = false;
 
-    标志位
+    //标志位
     public init_hideRedBag = false;
 
     public shareUrl = '';
@@ -1012,10 +1012,12 @@ export class GameData {
     }
 
     public async updateNewTaskProgress(isNeedRefresh = false) {
+         
+        //[FC][]飞红包关闭 也刷新订单
+        // if (gData.gameData.funOpenData[4] == "0") {
+        //     return false;
+        // }
 
-        if (gData.gameData.funOpenData[4] == "0") {
-            return false;
-        }
         if (this.playerProp.userFarmTaskInfo) {
             let com = this.playerProp.userFarmTaskInfo.completeCount;
             let count = this.playerProp.userFarmTaskInfo.taskCount;
@@ -1938,7 +1940,7 @@ export class GameData {
             });
 
             mk.console.logSingle("updateMaxProduct", data);
-            let respone = await mk.http.sendData('orderTaskNew/updateUnlockProduct', data);
+            let respone = await mk.http.sendData('orderTaskTree/updateUnlockProduct', data);
             console.log("------");
         }
     }

assets/script/game/data/HttpData.ts

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

assets/script/game/game/Game.ts

@@ -1235,8 +1235,9 @@ export default class Game extends cc.Component {
     }
 
     public async getOrderReward(isGame = true) {
-        mk.ui.openPanel('game/prefab/uiPanel/OrderDrawPanel');
-        return;
+        // mk.ui.openPanel('game/prefab/uiPanel/OrderDrawPanel');
+        // return;
+
         //现金提现
         if (gData.gameData.orderRewardType == 2) {
             if (cc.sys.isNative) {
@@ -1248,7 +1249,7 @@ export default class Game extends cc.Component {
                 }
             }
 
-            let response = await mk.http.sendData('orderTaskNew/receiveRewardCash', {});
+            let response = await mk.http.sendData('orderTaskTree/receiveRewardCash', {});
             if (response.errcode != 0) {
                 if (response.errcode == 405) {
                     mk.tip.pop("今日提现额度已到上限，请明天再提现");
@@ -1265,7 +1266,8 @@ export default class Game extends cc.Component {
             gData.cashPro.callBack = this.getRewardCallBack.bind(this);
             gData.receiptNotice.receip_rmb = addMoney;
             mk.ui.openPanel('module/newNotice/newNotice');
-
+            //[FC]新增 当前订单种植数据清空
+            gData.gameData.setProp(GameProp.orderPlantTimes, {});
             if (isGame) {
                 this.node_crop.forEach((v) => {
                     v.active = false;
@@ -1278,18 +1280,21 @@ export default class Game extends cc.Component {
 
         } else {
             let data = {};
-            let response = await mk.http.sendData('orderTaskNew/receiveReward', data);
+            let response = await mk.http.sendData('orderTaskTree/receiveReward', data);
             if (response.errcode != 0) {
                 return null;
             }
-            let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+            // let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+            let addMoney = response.data.orderRedMoney;
+            console.log("====[response.data.orderRedMoney", response.data.orderRedMoney);
             gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
             //处理红包币逻辑
             gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
             gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
             gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney }]
             mk.ui.openPanel('module/reward/reward');
-
+            //[FC]新增 当前订单种植数据清空
+            gData.gameData.setProp(GameProp.orderPlantTimes, {});
             if (isGame) {
                 gData.gameData.isDoOrderRefreshAni = true;
                 this.node_crop.forEach((v) => {
@@ -1469,7 +1474,7 @@ export default class Game extends cc.Component {
     public async updataOrderProgress(id) {
 
         let data = { "id": id };
-        let response = await mk.http.sendData('orderTaskNew/updateUserOrderTaskInfo', data);
+        let response = await mk.http.sendData('orderTaskTree/updateUserOrderTaskInfo', data);
         if (response.errcode != 0) {
             return null;
         }

assets/script/game/module/guide/Guide.ts

@@ -152,6 +152,7 @@ export default class Guide extends cc.Component {
                 }
             }
             else {//点击按钮下一步，显示区域为配置的node，点击区域=显示区域
+                console.log("===[this.crtGuide.click_rect",this.crtGuide.click_rect);
                 this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
                 w = this.targetNode.width * this.targetNode.scaleX;
                 h = this.targetNode.height * this.targetNode.scaleY;

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

@@ -1,3 +1,4 @@
+import { AdFun } from "../../data/AdData";
 import { BannerAdType, VideoAdType } from "../../data/GameData";
 
 
@@ -92,7 +93,7 @@ export default class SpeedUpUI extends cc.Component {
             mk.ad.videoAdType = VideoAdType.video_init_14;
             mk.ad.watchAd(async (success) => {
                 if (success) {
-                    gData.adData.watchVideo(null);
+                    gData.adData.watchVideo(AdFun.farmSpeedUp);
                     let response = await mk.http.sendData('farmSpeedUp', {});
                     if (response && response.errcode == 0) {
                         gData.gameData.playerProp.speedUpLeftTimes = response.data.speedUpLeftTimes;

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -235,64 +235,67 @@ export class ATRewardVideo extends zgSingleton {
             mk.data.sendDataEvent(DataEventId.video_end, mk.ad.videoAdType);
 
             let data = JSON.parse(callbackInfo)
-            let request_id = '';
-            let tag_id = '';
-            if (data.ext_info) {
-                if (data.ext_info.request_id) {
-                    request_id = data.ext_info.request_id;
-                }
-                if (data.ext_info.tag_id) {
-                    tag_id = data.ext_info.tag_id;
+            //[FC]:增加一层保护，只有穿山甲才走上报逻辑
+            if (data.network_firm_id == 15) {
+                let request_id = '';
+                let tag_id = '';
+                if (data.ext_info) {
+                    if (data.ext_info.request_id) {
+                        request_id = data.ext_info.request_id;
+                    }
+                    if (data.ext_info.tag_id) {
+                        tag_id = data.ext_info.tag_id;
+                    }
                 }
-            }
 
-            if (request_id != '') {
-                let index = this.requestIdArr.indexOf(request_id);
-                if (index != -1) {
-                    console.log('AnyThinkRewardedVideoDemo>>  delRequest_id ', request_id);
-                    let delRequest_id = this.requestIdArr.splice(index, 1);
-                    this.delRequestIdArr.push(delRequest_id);
-                    console.log('AnyThinkRewardedVideoDemo>>  After this.requestIdArr ', this.requestIdArr.toString());
-                    console.log('AnyThinkRewardedVideoDemo>>  DELARR  this.delRequestIdArr ', this.delRequestIdArr.toString());
+                if (request_id != '') {
+                    let index = this.requestIdArr.indexOf(request_id);
+                    if (index != -1) {
+                        console.log('AnyThinkRewardedVideoDemo>>  delRequest_id ', request_id);
+                        let delRequest_id = this.requestIdArr.splice(index, 1);
+                        this.delRequestIdArr.push(delRequest_id);
+                        console.log('AnyThinkRewardedVideoDemo>>  After this.requestIdArr ', this.requestIdArr.toString());
+                        console.log('AnyThinkRewardedVideoDemo>>  DELARR  this.delRequestIdArr ', this.delRequestIdArr.toString());
+                    }
+                    else {
+                        mk.data.sendDataEvent('illegalAdRequestId', `${data.adsource_id}_${request_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
+                        mk.data.sendXYEvent('illegalAdRequestId', `${data.adsource_id}_${request_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
+                        console.log('AnyThinkRewardedVideoDemo>>  illegalAdRequestId ', data.adsource_id + "_" + request_id);
+                    }
                 }
                 else {
-                    mk.data.sendDataEvent('illegalAdRequestId', `${data.adsource_id}_${request_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
-                    mk.data.sendXYEvent('illegalAdRequestId', `${data.adsource_id}_${request_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
-                    console.log('AnyThinkRewardedVideoDemo>>  illegalAdRequestId ', data.adsource_id + "_" + request_id);
+                    console.log('AnyThinkRewardedVideoDemo>>  request_id is Empty ');
                 }
-            }
-            else {
-                console.log('AnyThinkRewardedVideoDemo>>  request_id is Empty ');
-            }
 
-            if (tag_id != '') {
-                let index = this.tagIdArr.indexOf(tag_id);
-                if (index != -1) {
-                    console.log('AnyThinkRewardedVideoDemo>>  delTag_id ', tag_id);
-                    let delTag_id = this.tagIdArr.splice(index, 1);
-                    this.delTagIdArr.push(delTag_id);
-                    console.log('AnyThinkRewardedVideoDemo>>  After this.tagIdArr ', this.tagIdArr.toString());
-                    console.log('AnyThinkRewardedVideoDemo>>  DELARR  this.delTagIdArr ', this.delTagIdArr.toString());
+                if (tag_id != '') {
+                    let index = this.tagIdArr.indexOf(tag_id);
+                    if (index != -1) {
+                        console.log('AnyThinkRewardedVideoDemo>>  delTag_id ', tag_id);
+                        let delTag_id = this.tagIdArr.splice(index, 1);
+                        this.delTagIdArr.push(delTag_id);
+                        console.log('AnyThinkRewardedVideoDemo>>  After this.tagIdArr ', this.tagIdArr.toString());
+                        console.log('AnyThinkRewardedVideoDemo>>  DELARR  this.delTagIdArr ', this.delTagIdArr.toString());
+                    }
+                    else {
+                        mk.data.sendDataEvent('illegalAdTagId', `${data.adsource_id}_${tag_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
+                        mk.data.sendXYEvent('illegalAdTagId', `${data.adsource_id}_${tag_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
+                        console.log('AnyThinkRewardedVideoDemo>>  illegalAdTagId ', data.adsource_id + "_" + tag_id);
+
+                        mk.data.sendDataEvent('adStatusCaches', `${gData.loginData.uin}_${this.adStatusCaches}`);
+                        mk.data.sendDataEvent('tagIdArr', `${gData.loginData.uin}_${this.tagIdArr.toString()}`);
+                        mk.data.sendDataEvent('delTagIdArr', `${gData.loginData.uin}_${this.delTagIdArr.toString()}`);
+                        mk.data.sendDataEvent('requestIdArr', `${gData.loginData.uin}_${this.requestIdArr.toString()}`);
+                        mk.data.sendDataEvent('delRequestIdArr', `${gData.loginData.uin}_${this.delRequestIdArr.toString()}`);
+                    }
                 }
                 else {
-                    mk.data.sendDataEvent('illegalAdTagId', `${data.adsource_id}_${tag_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
-                    mk.data.sendXYEvent('illegalAdTagId', `${data.adsource_id}_${tag_id}_${gData.loginData.uin}_${gData.appData.appVersion}`);
-                    console.log('AnyThinkRewardedVideoDemo>>  illegalAdTagId ', data.adsource_id + "_" + tag_id);
-
-                    mk.data.sendDataEvent('adStatusCaches', `${gData.loginData.uin}_${this.adStatusCaches}`);
-                    mk.data.sendDataEvent('tagIdArr', `${gData.loginData.uin}_${this.tagIdArr.toString()}`);
-                    mk.data.sendDataEvent('delTagIdArr', `${gData.loginData.uin}_${this.delTagIdArr.toString()}`);
-                    mk.data.sendDataEvent('requestIdArr', `${gData.loginData.uin}_${this.requestIdArr.toString()}`);
-                    mk.data.sendDataEvent('delRequestIdArr', `${gData.loginData.uin}_${this.delRequestIdArr.toString()}`);
+                    console.log('AnyThinkRewardedVideoDemo>>  tag_id is Empty ');
                 }
             }
             else {
-                console.log('AnyThinkRewardedVideoDemo>>  tag_id is Empty ');
+                ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.Cancel);
             }
         }
-        else {
-            ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.Cancel);
-        }
 
         this.canGet = false;
         this.reawardAdState = RewardAdState.PlayEnd;

build/jsb-link/assets/resources/import/af/af2a708a-3e04-483e-a2f5-9f78813db808.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy","41zVXZDxBMLriqNOtk1bgn"],["_spriteFrame","root","node","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_children","_prefab","_contentSize"],1,2,4,5],["cc.Node",["_name","_parent","_components","_prefab","_contentSize"],2,1,9,4,5],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.PrefabInfo",["fileId","root"],2,1]],[[4,0,1,2],[0,0,2],[1,0,1,2,3,4,3],[2,0,1,2,3,4,2],[3,0,1,2,1]],[[1,"SelectSceneItem"],[2,"SelectSceneItem",[null],[-2],[0,"320M7ZHeRD8bfLx/USI5Y6",-1],[5,750,700]],[3,"spr_selectScene",1,[[4,-3,[0],1]],[0,"f6G0xMicVGXap7ibfyNLOI",1],[5,672,693]]],0,[0,1,1,0,-1,2,0,2,2,0,3,1,3],[0,0],[-1,0],[0,1]]
+[1,["ecpdLyjvZBwrvm+cedCcQy","41zVXZDxBMLriqNOtk1bgn"],["_spriteFrame","root","node","data"],[["cc.Node",["_name","_prefab","_contentSize","_children","_parent","_components"],2,4,5,2,1,9],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6]],[[2,0,2],[0,0,3,1,2,2],[0,0,4,5,1,2,2],[3,0,1,2,1],[1,0,1,2],[1,1,1]],[[0,"SelectSceneItem"],[1,"SelectSceneItem",[-2],[5,-1],[5,750,700]],[2,"spr_selectScene",1,[[3,-3,[0],1]],[4,"f6G0xMicVGXap7ibfyNLOI",1],[5,672,693]]],0,[0,1,1,0,-1,2,0,2,2,0,3,1,3],[0,0],[-1,0],[0,1]]

build/jsb-link/assets/resources/import/ce/ceb1c542-7e44-4682-9cec-8c2a76a739b7.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy"],["root","node","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_children","_prefab","_contentSize"],1,2,4,5],["cc.Node",["_name","_parent","_components","_prefab","_contentSize"],2,1,9,4,5],["cc.Sprite",["_sizeMode","_isTrimmedMode","node","_materials"],1,1,3],["cc.PrefabInfo",["fileId","root"],2,1]],[[4,0,1,2],[0,0,2],[1,0,1,2,3,4,3],[2,0,1,2,3,4,2],[3,0,1,2,3,3]],[[1,"SelectCellItemBtn"],[2,"SelectCellItemBtn",[null],[-2],[0,"76gYARMUtNxYuxcMPVt84g",-1],[5,73,73]],[3,"spr_icon",1,[[4,0,false,-3,[0]]],[0,"4bdK0wmqJDhaBqk8/jFWhZ",1],[5,70,70]]],0,[0,0,1,0,-1,2,0,1,2,0,2,1,3],[0],[-1],[0]]
+[1,["ecpdLyjvZBwrvm+cedCcQy"],["root","node","data"],[["cc.Node",["_name","_prefab","_contentSize","_children","_parent","_components"],2,4,5,2,1,9],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Sprite",["_sizeMode","_isTrimmedMode","node","_materials"],1,1,3]],[[2,0,2],[0,0,3,1,2,2],[0,0,4,5,1,2,2],[3,0,1,2,3,3],[1,0,1,2],[1,1,1]],[[0,"SelectCellItemBtn"],[1,"SelectCellItemBtn",[-2],[5,-1],[5,73,73]],[2,"spr_icon",1,[[3,0,false,-3,[0]]],[4,"4bdK0wmqJDhaBqk8/jFWhZ",1],[5,70,70]]],0,[0,0,1,0,-1,2,0,1,2,0,2,1,3],[0],[-1],[0]]

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

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

@@ -4,16 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <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="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/jiguang" />
+            <option value="$PROJECT_DIR$/../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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

@@ -2,13 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <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/jiguang/jiguang.iml" filepath="$PROJECT_DIR$/.idea/modules/jiguang/jiguang.iml" group="proj.android-studio/jiguang" />
-      <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/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" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/jiguang/proj.android-studio.jiguang.iml" filepath="$PROJECT_DIR$/.idea/modules/jiguang/proj.android-studio.jiguang.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/proj.android-studio.kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/proj.android-studio.kxnly.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1746423203/proj.android-studio.libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1746423203/proj.android-studio.libcocos2dx.iml" />
     </modules>
   </component>
 </project>

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/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: ./../../../../../../../Develop/CocosDashboard_1.0.9/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: ./../../../../../../../Develop/CocosDashboard_1.0.9/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: ./../../../../../../../Develop/CocosDashboard_1.0.9/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

@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" 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=":kxnly" />
-        <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="native-android-gradle" name="Native-Android-Gradle">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug-armeabi-v7a" />
-      </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://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../res;file://$MODULE_DIR$/../../../app/res;file://$MODULE_DIR$/../../../app/libs/topon/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/agc/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/test/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/testDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <content url="file://$MODULE_DIR$/../../../../Classes">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/agc/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/libs/topon/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/.cxx" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/.externalNativeBuild" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../jni/hellojavascript">
-      <sourceFolder url="file://$MODULE_DIR$/../../../jni/hellojavascript" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../res">
-      <sourceFolder url="file://$MODULE_DIR$/../../../res" type="java-resource" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/umeng/crashsdk-3.2.0.4.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-crash-v0.0.4.jar" level="project" />
-    <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: ./jiguang/libs/jcore-android-3.1.0.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-huawei-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-oppo-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-vivo-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-xiaomi-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/MiPush_SDK_Client_4_8_2.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/push_sdk_v3.0.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" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/anythink_cocosjs_bridge.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_banner.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_china_core.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_core.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_interstitial.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_native.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_baidu.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_gdt.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_kuaishou.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_mintegral_china.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_pangle_china.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_sigmob.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_rewardvideo.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_splash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.16.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.410.1280.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.15-publishRelease-4533d8764.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_chinasame.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitial.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitialvideo.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbanner.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbid.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbjscommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnative.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnativeadvanced.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbsplash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_nativeex.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_playercommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_reward.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videocommon.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videojs.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.0.3.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.3.4.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/thinkingdata/ThinkingSDK.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/ysdkshell.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/YSDK_Android_1.8.1_79033d3d.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/tongdun/fraudmetrix-3.6.7.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/jiguang/com.heytap.msp-push-2.1.0.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/jiguang/lib-ios-dialog-debug.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <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="jiguang" />
-  </component>
-</module>

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" 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="native-android-gradle" name="Native-Android-Gradle">
+      <configuration>
+        <option name="SELECTED_ABI" value="armeabi-v7a" />
+        <option name="SELECTED_VARIANT" value="debug" />
+      </configuration>
+    </facet>
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":kxnly" />
@@ -8,11 +14,6 @@
         <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
       </configuration>
     </facet>
-    <facet type="native-android-gradle" name="Native-Android-Gradle">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug-armeabi-v7a" />
-      </configuration>
-    </facet>
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
@@ -23,8 +24,8 @@
         </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://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../res;file://$MODULE_DIR$/../../../app/res;file://$MODULE_DIR$/../../../app/libs/topon/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/test/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/testDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../res;file://$MODULE_DIR$/../../../app/res;file://$MODULE_DIR$/../../../app/libs/topon/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/agc/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -33,81 +34,29 @@
     <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://$MODULE_DIR$/../../../../Classes">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" type="native-Source-root" />
+    </content>
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/agc/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-<<<<<<< HEAD
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-=======
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
->>>>>>> 191957573f2c919c0d8a509b011c59685fa6b308
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/libs/topon/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.cxx" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.externalNativeBuild" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../jni">
+      <sourceFolder url="file://$MODULE_DIR$/../../../jni" type="native-header-root" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../jni/hellojavascript">
+      <sourceFolder url="file://$MODULE_DIR$/../../../jni/hellojavascript" type="native-Source-root" />
     </content>
     <content url="file://$MODULE_DIR$/../../../res">
       <sourceFolder url="file://$MODULE_DIR$/../../../res" type="java-resource" />
@@ -115,16 +64,33 @@
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
+    <content url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x" type="native-Source-root" />
+    </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/crashsdk-3.2.0.4.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-crash-v0.0.4.jar" level="project" />
     <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: 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" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/du.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/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: ./../../../../../../../Develop/CocosDashboard_1.0.9/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: ./../../../../../../../Develop/CocosDashboard_1.0.9/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: ./jiguang/libs/jcore-android-3.1.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-huawei-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-oppo-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-vivo-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-xiaomi-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/MiPush_SDK_Client_4_8_2.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/push_sdk_v3.0.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/anythink_cocosjs_bridge.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_banner.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_china_core.aar" level="project" />
@@ -134,22 +100,41 @@
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_baidu.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_gdt.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_kuaishou.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_mintegral_china.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_pangle_china.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_sigmob.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_rewardvideo.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_splash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.1.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.351.1221.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.9-publishRelease-4ea04e00c.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.5.0.8.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.16.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.410.1280.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.15-publishRelease-4533d8764.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_chinasame.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitial.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitialvideo.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbanner.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbid.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbjscommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnative.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnativeadvanced.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbsplash.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_nativeex.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_playercommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_reward.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videocommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videojs.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.0.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-2.25.2.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.3.4.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/thinkingdata/ThinkingSDK.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/ysdkshell.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/YSDK_Android_1.8.1_79033d3d.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/tongdun/fraudmetrix-3.6.7.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/jiguang/com.heytap.msp-push-2.1.0.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/jiguang/lib-ios-dialog-debug.aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
@@ -181,5 +166,7 @@
     <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="proj.android-studio.libcocos2dx" />
+    <orderEntry type="module" module-name="proj.android-studio.jiguang" />
   </component>
 </module>

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":jiguang" external.linked.project.path="$MODULE_DIR$/../../../jiguang" 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=":jiguang" />
-        <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="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../jiguang/src/main/res;file://$MODULE_DIR$/../../../jiguang/src/debug/res;file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../jiguang/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../jiguang/src/androidTest/res;file://$MODULE_DIR$/../../../jiguang/src/test/res;file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/res;file://$MODULE_DIR$/../../../jiguang/src/testDebug/res;file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../jiguang/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_7">
-    <output url="file://$MODULE_DIR$/../../../jiguang/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../jiguang/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../jiguang">
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../jiguang/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jcore-android-3.1.0.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-huawei-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-oppo-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-vivo-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-xiaomi-v4.4.5.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/MiPush_SDK_Client_4_8_2.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/push_sdk_v3.0.0.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./jiguang/libs/com.heytap.msp-push-2.1.0.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:push:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:opendevice:5.1.1.304@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:base:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-base:1.1.5.306@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:availableupdate:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:device:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:update:3.0.2.300@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:stats:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:network-grs:4.0.20.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:hatool:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-ssl:1.1.5.306@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-encrypt:1.1.5.306@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:ui:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:log:5.3.0.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.agconnect:agconnect-core:1.5.0.300@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hmf:tasks:1.4.1.300@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:componentverifysdk:11.2.1.300@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:network-framework-compat:4.0.20.301@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.huawei.hms:network-common:4.0.20.301@aar" level="project" />
-  </component>
-</module>

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":jiguang" external.linked.project.path="$MODULE_DIR$/../../../jiguang" 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=":jiguang" />
+        <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="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../jiguang/src/main/res;file://$MODULE_DIR$/../../../jiguang/src/debug/res;file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../jiguang/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../jiguang/src/androidTest/res;file://$MODULE_DIR$/../../../jiguang/src/androidTestDebug/res;file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../jiguang/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_7">
+    <output url="file://$MODULE_DIR$/../../../jiguang/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../jiguang/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../jiguang">
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../jiguang/src/main/res" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../jiguang/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../jiguang/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jcore-android-3.1.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-huawei-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-oppo-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-vivo-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/jpush-android-plugin-xiaomi-v4.4.5.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/MiPush_SDK_Client_4_8_2.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/push_sdk_v3.0.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./jiguang/libs/com.heytap.msp-push-2.1.0.aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:push:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:opendevice:5.1.1.304@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:base:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-base:1.1.5.306@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:availableupdate:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:device:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:update:3.0.2.300@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:stats:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:network-grs:4.0.20.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:hatool:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-ssl:1.1.5.306@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.android.hms:security-encrypt:1.1.5.306@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:ui:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:log:5.3.0.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.agconnect:agconnect-core:1.5.0.300@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hmf:tasks:1.4.1.300@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:componentverifysdk:11.2.1.300@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:network-framework-compat:4.0.20.301@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.huawei.hms:network-common:4.0.20.301@aar" level="project" />
+  </component>
+</module>

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

@@ -3,15 +3,15 @@
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" />
         <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1000,"versionName":"1.2.1","enabled":true,"outputFile":"kxnly-release.apk","fullName":"release","baseName":"release"},"path":"kxnly-release.apk","properties":{}}]

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

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/kncdsf.keystore
+#RELEASE_STORE_FILE=D:/App/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/kncdsf.keystore
 RELEASE_STORE_PASSWORD=szmoka
 RELEASE_KEY_ALIAS=kncdsf.keystore
 RELEASE_KEY_PASSWORD=szmoka

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2073,7 +2073,7 @@ case 0:
 if (this.canGet) {
 p.default.getInstance().watchVideoAdCallBack(p.AdPlayStateType.WatchEnd);
 mk.data.sendDataEvent(s.DataEventId.video_end, mk.ad.videoAdType);
-t = JSON.parse(e);
+if (15 == (t = JSON.parse(e)).network_firm_id) {
 a = "";
 o = "";
 if (t.ext_info) {
@@ -2108,6 +2108,7 @@ mk.data.sendDataEvent("requestIdArr", gData.loginData.uin + "_" + this.requestId
 mk.data.sendDataEvent("delRequestIdArr", gData.loginData.uin + "_" + this.delRequestIdArr.toString());
 } else console.log("AnyThinkRewardedVideoDemo>>  tag_id is Empty ");
 } else p.default.getInstance().watchVideoAdCallBack(p.AdPlayStateType.Cancel);
+}
 this.canGet = !1;
 this.reawardAdState = c.PlayEnd;
 return this.singleClick ? [ 4, gData.warnTipData.getUserShutdownAds(function() {}) ] : [ 3, 2 ];
@@ -3221,11 +3222,12 @@ switch (a.label) {
 case 0:
 if (gData.gameData.playerProp.orderData) return [ 3, 2 ];
 (t = {}).isDefault = 1;
-return [ 4, mk.http.sendData("orderTaskNew/getUserOrderTaskInfo", t) ];
+return [ 4, mk.http.sendData("orderTaskTree/getUserOrderTaskInfo", t) ];
 
 case 1:
 if (0 != (e = a.sent()).errcode) return [ 2 ];
 gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
+console.log("===[获取到订单信息", JSON.stringify(gData.gameData.playerProp.orderData));
 mk.event.emit("initOrderUi");
 a.label = 2;
 
@@ -3250,6 +3252,7 @@ t[t.harvest = 9] = "harvest";
 t[t.farmMap = 10] = "farmMap";
 t[t.lineUp = 11] = "lineUp";
 t[t.addProductTimes = 12] = "addProductTimes";
+t[t.farmSpeedUp = 13] = "farmSpeedUp";
 })(i = a.AdFun || (a.AdFun = {}));
 (function(t) {
 t[t.RC_fullScreen = 0] = "RC_fullScreen";
@@ -10997,7 +11000,7 @@ break;
 
 case s.FarmState.Ripe:
 gData.farmSystem.currSelectFarm = this;
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+this.onHarvest();
 this.isCanTouch = !1;
 setTimeout(function() {
 t.isCanTouch = !0;
@@ -15783,7 +15786,6 @@ var t, e, a, o;
 return n(this, function(n) {
 switch (n.label) {
 case 0:
-if ("0" == gData.gameData.funOpenData[4]) return [ 2, !1 ];
 if (this.playerProp.userFarmTaskInfo) {
 t = this.playerProp.userFarmTaskInfo.completeCount;
 e = this.playerProp.userFarmTaskInfo.taskCount;
@@ -16459,7 +16461,7 @@ id: e.getProductMap(a).id
 t.unLockProductList.push(n);
 });
 mk.console.logSingle("updateMaxProduct", t);
-return [ 4, mk.http.sendData("orderTaskNew/updateUnlockProduct", t) ];
+return [ 4, mk.http.sendData("orderTaskTree/updateUnlockProduct", t) ];
 
 case 1:
 a.sent();
@@ -18944,8 +18946,13 @@ var e, a, o;
 return c(this, function(n) {
 switch (n.label) {
 case 0:
-mk.ui.openPanel("game/prefab/uiPanel/OrderDrawPanel");
+if (2 != gData.gameData.orderRewardType) return [ 3, 2 ];
+if (cc.sys.isNative && !gData.loginData.isAuth) {
+gData.gameData.authUIType = 0;
+mk.ui.openPanel("module/authUI/authUI");
 return [ 2 ];
+}
+return [ 4, mk.http.sendData("orderTaskTree/receiveRewardCash", {}) ];
 
 case 1:
 if (0 != (a = n.sent()).errcode) {
@@ -18962,6 +18969,7 @@ gData.cashPro.isOrderCashOut = !0;
 gData.cashPro.callBack = this.getRewardCallBack.bind(this);
 gData.receiptNotice.receip_rmb = o;
 mk.ui.openPanel("module/newNotice/newNotice");
+gData.gameData.setProp(d.GameProp.orderPlantTimes, {});
 if (t) {
 this.node_crop.forEach(function(t) {
 t.active = !1;
@@ -18973,11 +18981,12 @@ return [ 3, 4 ];
 
 case 2:
 e = {};
-return [ 4, mk.http.sendData("orderTaskNew/receiveReward", e) ];
+return [ 4, mk.http.sendData("orderTaskTree/receiveReward", e) ];
 
 case 3:
 if (0 != (a = n.sent()).errcode) return [ 2, null ];
-o = gData.gameData.playerProp.orderData.redMoneyAddition;
+o = a.data.orderRedMoney;
+console.log("====[response.data.orderRedMoney", a.data.orderRedMoney);
 gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
 gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
 gData.reward.adData = {
@@ -18990,6 +18999,7 @@ rewardType: 1,
 rewardNum: o
 } ];
 mk.ui.openPanel("module/reward/reward");
+gData.gameData.setProp(d.GameProp.orderPlantTimes, {});
 if (t) {
 gData.gameData.isDoOrderRefreshAni = !0;
 this.node_crop.forEach(function(t) {
@@ -19171,7 +19181,7 @@ case 0:
 e = {
 id: t
 };
-return [ 4, mk.http.sendData("orderTaskNew/updateUserOrderTaskInfo", e) ];
+return [ 4, mk.http.sendData("orderTaskTree/updateUserOrderTaskInfo", e) ];
 
 case 1:
 if (0 != (a = o.sent()).errcode) return [ 2, null ];
@@ -20877,6 +20887,7 @@ this.node_click.height = i;
 }
 }
 } else {
+console.log("===[this.crtGuide.click_rect", this.crtGuide.click_rect);
 this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
 n = this.targetNode.width * this.targetNode.scaleX;
 i = this.targetNode.height * this.targetNode.scaleY;
@@ -22508,7 +22519,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -27826,7 +27837,7 @@ return c(this, function(n) {
 switch (n.label) {
 case 0:
 t = {};
-return [ 4, mk.http.sendData("orderTaskNew/getOrderLuckyReward", t) ];
+return [ 4, mk.http.sendData("orderTaskTree/getOrderLuckyReward", t) ];
 
 case 1:
 if (0 != (e = n.sent()).errcode) return [ 2, null ];
@@ -27857,7 +27868,7 @@ switch (i.label) {
 case 0:
 console.log("aaaaaaaa 222 ");
 t = {};
-return [ 4, mk.http.sendData("orderTaskNew/receiveRewardNewCash", t) ];
+return [ 4, mk.http.sendData("orderTaskTree/receiveRewardNewCash", t) ];
 
 case 1:
 e = i.sent();
@@ -29160,11 +29171,15 @@ var a = t.orderTaskList.length, o = gData.gameData.getProp(l.GameProp.orderPlant
 o || (o = {});
 gData.gameData.setProp(l.GameProp.orderPlantTimes, o);
 null == o[this.data.id] && (o[this.data.id] = 0);
-for (var n = 0; n < a; n++) if (t.orderTaskList[n].Id == this.data.id && o[t.orderTaskList[n].Id] < t.orderTaskList[n].taskCount) {
+for (var n = 0; n < a; n++) if (t.orderTaskList[n].Id == this.data.id) {
+console.log("===[订单id", t.orderTaskList[n].Id, this.data.id);
+console.log("===[订单id 种植次数", o[t.orderTaskList[n].Id], t.orderTaskList[n].taskCount);
+if (o[t.orderTaskList[n].Id] < t.orderTaskList[n].taskCount) {
 e = !0;
 break;
 }
 }
+}
 this.node_dingdan.active = e;
 };
 e.prototype.showTips = function() {
@@ -29192,6 +29207,7 @@ t = n.sent();
 n.label = 4;
 
 case 4:
+console.log("===[种植订单 flyRed", t);
 if (t) {
 null == (e = gData.gameData.getProp(l.GameProp.orderPlantTimes))[this.data.id] ? e[this.data.id] = 1 : e[this.data.id]++;
 gData.gameData.setProp(l.GameProp.orderPlantTimes, e);
@@ -30546,6 +30562,13 @@ e.prototype.start = function() {
 this.airshipAni.node.active = !1;
 };
 e.prototype.update = function(t) {
+if (gData.gameData.configs.ServerConfig) {
+console.log("gData.gameData.configs.ServerConfig.FlyswitchECPM", gData.gameData.configs.ServerConfig.FlyswitchECPM);
+if (gData.gameData.adShowConfig.average_ecpm < gData.gameData.configs.ServerConfig.FlyswitchECPM) {
+this.airshipAni.node.active = !1;
+return;
+}
+}
 if (this.showRedNum < 1) {
 this.countDown += t;
 if (this.countDown >= 30) {
@@ -35044,7 +35067,7 @@ done: !0
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var s = t("../../data/GameData"), l = cc._decorator, p = l.ccclass, u = l.property, d = function(t) {
+var s = t("../../data/AdData"), l = t("../../data/GameData"), p = cc._decorator, u = p.ccclass, d = p.property, h = function(t) {
 n(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -35061,7 +35084,7 @@ this.lbl_remainTimes.string = "今日剩余次数：" + gData.gameData.playerPro
 mk.event.register("refreshCoin", this.initCashOutStyle.bind(this), this);
 };
 e.prototype.onEnable = function() {
-mk.ad.showBanner(s.BannerAdType.banner_click_5);
+mk.ad.showBanner(l.BannerAdType.banner_click_5);
 };
 e.prototype.onDisable = function() {
 mk.event.remove("refreshCoin", this);
@@ -35100,7 +35123,7 @@ var t = this;
 mk.audio.playEffect("button");
 if (gData.gameData.playerProp.speedUpLeftTimes <= 0) mk.tip.pop("今日加速次数已用完"); else if (gData.gameData.checkCanSpeedUp()) {
 mk.ui.closePanel(this.node.name);
-mk.ad.videoAdType = s.VideoAdType.video_init_14;
+mk.ad.videoAdType = l.VideoAdType.video_init_14;
 mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
 var t;
@@ -35108,7 +35131,7 @@ return c(this, function(a) {
 switch (a.label) {
 case 0:
 if (!e) return [ 3, 2 ];
-gData.adData.watchVideo(null);
+gData.adData.watchVideo(s.AdFun.farmSpeedUp);
 return [ 4, mk.http.sendData("farmSpeedUp", {}) ];
 
 case 1:
@@ -35134,16 +35157,17 @@ mk.audio.playEffect("button");
 e.prototype.onDestroy = function() {
 gData.gameData.popTableScreenADLogic(8);
 };
-i([ u(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ u(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ u(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ u(cc.Animation) ], e.prototype, "node_cash", void 0);
-i([ u(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
-return i([ p ], e);
+i([ d(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
+i([ d(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
+i([ d(cc.Label) ], e.prototype, "lbl_progress", void 0);
+i([ d(cc.Animation) ], e.prototype, "node_cash", void 0);
+i([ d(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
+return i([ u ], e);
 }(cc.Component);
-a.default = d;
+a.default = h;
 cc._RF.pop();
 }, {
+"../../data/AdData": "AdData",
 "../../data/GameData": "GameData"
 } ],
 SpineEffectPlay: [ function(t, e, a) {

packages-hot-update/cfg.json

@@ -13,7 +13,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote1/"
     ],
-    "buildTime": 1643365205100,
-    "genTime": 1643365205100,
+    "buildTime": 1644563234318,
+    "genTime": 1644563234318,
     "genVersion": null
 }

settings/project.json

@@ -36,5 +36,5 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1643365016664
+  "last-module-event-record-time": 1644562798221
 }