wuwangdong 4 anos atrás
pai
commit
aeb76f27d5
25 arquivos alterados com 747 adições e 517 exclusões
  1. 0 12
      assets/resources/animation/Main.meta
  2. 163 143
      assets/resources/module/newCashUI/walletCashOut.prefab
  3. 1 1
      assets/resources/module/speedUpUI/productReward.prefab
  4. 17 0
      assets/script/before/view/ui/HarvestPanel.ts
  5. 1 1
      assets/script/game/data/GameData.ts
  6. 4 2
      assets/script/game/data/module/GradeRewardData.ts
  7. 1 0
      assets/script/game/data/module/WalletCashOutData.ts
  8. 17 20
      assets/script/game/game/Game.ts
  9. 27 3
      assets/script/game/module/newCashUI/WalletCashOut.ts
  10. BIN
      build/jsb-link/assets/main/index.jsc
  11. 0 0
      build/jsb-link/assets/resources/config.json
  12. 1 1
      build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json
  13. 0 0
      build/jsb-link/assets/resources/import/3c/3c12cc7b-777b-45f9-8bf1-8a285075e6f7.json
  14. 0 0
      build/jsb-link/assets/resources/import/5f/5f53c125-7a14-4ca0-986a-0e0d2d665268.json
  15. 0 0
      build/jsb-link/assets/resources/import/82/82a16e23-7ade-43a5-af4f-5504bb39b61f.json
  16. 0 0
      build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json
  17. 0 0
      build/jsb-link/assets/resources/import/e3/e3718e3b-b05d-4d23-9195-924548d5c740.json
  18. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  19. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml
  20. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  21. 99 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/android-libcocos2dx.iml
  22. 0 99
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml
  23. 104 104
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml
  24. 308 127
      build/jsb-link/js backups (useful for debugging)/main.index.js
  25. 2 2
      packages-hot-update/cfg.json

+ 0 - 12
assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "564a4fe1-1171-4ae2-89c7-32875759763b",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

Diferenças do arquivo suprimidas por serem muito extensas
+ 163 - 143
assets/resources/module/newCashUI/walletCashOut.prefab


+ 1 - 1
assets/resources/module/speedUpUI/productReward.prefab

@@ -1125,7 +1125,7 @@
         "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
       }
     ],
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_id": ""
   },
   {

+ 17 - 0
assets/script/before/view/ui/HarvestPanel.ts

@@ -19,6 +19,8 @@ export default class HarvestPanel extends cc.Component {
         gData.reward.data = rewardData;
         gData.reward.callback = gData.harvestData.call;
         mk.ui.openPanel('module/reward/reward');
+
+        this.updateNewTaskProgress();
     }
 
     public async clickSuperBtn() {
@@ -36,10 +38,25 @@ export default class HarvestPanel extends cc.Component {
                 gData.reward.data = rewardData;
                 gData.reward.callback = gData.harvestData.call;
                 mk.ui.openPanel('module/reward/reward');
+                
+                this.updateNewTaskProgress();
             }
         });
     }
 
+    private async updateNewTaskProgress()
+    {
+        let data = {};
+        let response = await mk.http.sendData('farmTask/updateUserFarmTaskInfo', data);
+        mk.console.logSingle('refrehTask=>', response);
+        if (response.errcode != 0) {
+            return null;
+        }
+
+        gData.gameData.gameData.userFarmTaskInfo = response.data.userFarmTaskInfo;
+        gData.gameData.init_task = true;
+    }
+
     onEnable() {
         mk.ad.showBanner();
     }

+ 1 - 1
assets/script/game/data/GameData.ts

@@ -1079,7 +1079,7 @@ class PlayerProp {
     set redMoney(value: number) {
         this._redMoney = value;
         gData.gameData.init_coin = true;
-        gData.gameData.init_red_point = true;
+        //gData.gameData.init_red_point = true;
         gData.gameData.init_wallet_redMoney = true;
     }
     get redMoney(): number {

+ 4 - 2
assets/script/game/data/module/GradeRewardData.ts

@@ -31,8 +31,9 @@ export class GradeRewardData extends Data {
         this.changeExp = true;
         gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo
         //const rewardNum = Math.round(response.data.userFarmGrageRewardInfo.money * 100);
-        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.money;
-
+        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo[this.cashId-1].money;
+ 
+        gData.gameData.init_red_point = true;
         //console.log(`农场等级提现数据=======>${response.data.userFarmGrageRewardInfo}`);
         mk.ui.openPanel('module/newNotice/newNotice');
         return response
@@ -58,6 +59,7 @@ export class GradeRewardData extends Data {
             gData.gameData.gameData.gradeLevel = response.data.farmLevel;
             gData.gameData.gameData.farmExpValue = response.data.userExp;
             gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo;
+            gData.gameData.init_red_point = true;
         } else {
             gData.gameData.gameStyle.doFlyExpAni(addExp, desNode, response.data);
         }

+ 1 - 0
assets/script/game/data/module/WalletCashOutData.ts

@@ -35,6 +35,7 @@
         }
 
         gData.gameData.gameData.userNoviceWeFareInfo = response.data.userNoviceWeFareInfo;
+        mk.tip.pop('现金进度已增加');
         this.init_novice = true;
     }
 

+ 17 - 20
assets/script/game/game/Game.ts

@@ -5,18 +5,10 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass("RedPoinNode")
 export class RedPoinNode {
+    @property({ type: cc.Node, displayName: "等级奖励" })
+    node_gradeReward: cc.Node = null;
     @property({ type: cc.Node, displayName: "签到" })
     node_sign: cc.Node = null;
-    @property({ type: cc.Node, displayName: "存钱罐" })
-    node_pigbank: cc.Node = null;
-    @property({ type: cc.Node, displayName: "红包提现" })
-    node_redbagCash: cc.Node = null;
-    @property({ type: cc.Node, displayName: "福袋" })
-    node_blessingBag: cc.Node = null;
-    @property({ type: cc.Node, displayName: "转盘" })
-    node_turnable: cc.Node = null;
-    @property({ type: cc.Node, displayName: "福利礼包" })
-    node_redeem: cc.Node = null;
 }
 
 @ccclass
@@ -241,17 +233,21 @@ export default class Game extends cc.Component {
      */
     private initRedPoint() {
         this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
-        this.nodeRedPoint.node_pigbank.active = gData.pigbank.redPoint();
-        this.nodeRedPoint.node_redbagCash.active = gData.redBagCash.redPoint();
-        this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
-        this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
-        this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
-
-        gData.gameData.init_red_point = false;
-
-        if (this.nodeRedPoint.node_redbagCash.active) {
-            //mk.ui.closeAllUI();
+        let isShow = false;
+        let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList;
+        if(data)
+        {     
+            let len = data.length;
+            for(let i = 0; i != len; ++i)
+            {
+                if(data[i].status == 1)
+                {
+                    isShow = true;
+                    break;
+                }
+            }
         }
+        this.nodeRedPoint.node_gradeReward.active = isShow;  
     }
 
     /**
@@ -412,6 +408,7 @@ export default class Game extends cc.Component {
             gData.gameData.gameData.farmExpValue = data.userExp;
             gData.gameData.gameData.farmGradeData = data.userFarmGrageRewardInfo;
             // gData.gameData.init_add = true;
+            gData.gameData.init_red_point = true;
             this.playAdd();
         })
     }

+ 27 - 3
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -34,6 +34,8 @@ export default class WalletCashOut extends cc.Component {
 
     @property(SetGray)
     btn_cashOut: SetGray = null;
+    @property(SetGray)
+    btn_addProgress: SetGray = null;
 
     @property({ displayName: '6个选择按钮', type: CheckButton })
     private check_button: CheckButton[] = [];
@@ -66,13 +68,35 @@ export default class WalletCashOut extends cc.Component {
             this.lbl_noviceTitle.string = data.name + ':';
             this.sp_progress.fillRange = data.progressRate;
             let value = data.cashmoney / 100;
-            this.lbl_noviceValue.string = (value * data.progressRate).toFixed(1) + '元';
+            let v = this.multiply(value, data.progressRate);
+            this.lbl_noviceValue.string = v.toString() + '元';
             this.intV = Math.round(value);
             this.lbl_tipUp.string = `进度加满后必得${this.intV}元现金`;
             this.lbl_cashOut.string = `满${this.intV}元提现`;
+
+            if(data.progressRate >= 1)
+            {
+                this.btn_addProgress.setGray(true);
+            }else
+            {
+                this.btn_addProgress.setGray(false);
+            }
         }
     }
 
+    private multiply(num1, num2) {
+        const num1Changed = Number(num1.toString().replace('.', ''));
+        const num2Changed = Number(num2.toString().replace('.', ''));
+        const baseNum = this.digitLength(num1) + this.digitLength(num2);
+        return num1Changed * num2Changed / Math.pow(10, baseNum);
+    }
+
+    private digitLength(num) {
+        const eSplit = num.toString().split(/[eE]/);
+        const len = (eSplit[0].split('.')[1] || '').length - (+(eSplit[1] || 0));
+        return len > 0 ? len : 0;       
+    }
+
     private initCashOutUI() {
         if (gData.gameData.configs.CashCfg) {
             let arr = [];
@@ -97,8 +121,8 @@ export default class WalletCashOut extends cc.Component {
     private initTip() {
 
         this.lbl_redMoney.string =  gData.gameData.gameData.redMoney.toString();
-        this.lbl_value.string = (gData.gameData.gameData.redMoney/10000).toString();
-        
+        this.lbl_value.string = (gData.gameData.gameData.redMoney/10000) + '元';
+
         if (this.curChooseIndex != -1) {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
             let isEnough = gData.gameData.gameData.redMoney - data.redMoney;

BIN
build/jsb-link/assets/main/index.jsc


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 1
build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json

@@ -1 +1 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"1"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>完成任务必得现金,最\n高可以提现100元哦!</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产,即可种植农\n作物,获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":":-50::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次,即可获得任\n务红包,快领取次数吧!</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦!你完成了任务!\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"1"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"0"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>完成任务必得现金,最\n高可以提现100元哦!</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产,即可种植农\n作物,获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":"::::-600:","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次,即可获得任\n务红包,快领取次数吧!</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦!你完成了任务!\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/3c/3c12cc7b-777b-45f9-8bf1-8a285075e6f7.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/5f/5f53c125-7a14-4ca0-986a-0e0d2d665268.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/82/82a16e23-7ade-43a5-af4f-5504bb39b61f.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/e3/e3718e3b-b05d-4d23-9195-924548d5c740.json


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


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

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

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

@@ -2,9 +2,9 @@
 <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/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1786486690/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/1786486690/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

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

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

+ 0 - 99
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/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>

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

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

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

@@ -6361,8 +6361,8 @@ return e;
 e.prototype.setShowUI = function(t) {
 this.data = t;
 var e = t.cashFrequency - gData.gameData.gameData.getRedMoneyCashOutTimesByIndex(t.index);
-this.lbl_times.string = e.toString();
-this.lbl_value.string = (t.money / 100).toString();
+this.lbl_times.string = "剩" + e + "次";
+this.lbl_value.string = t.money / 100 + "元";
 return e > 0;
 };
 e.prototype.setIsChoose = function(t) {
@@ -6382,7 +6382,7 @@ return this.isCanNotChoose;
 };
 e.prototype.setRemaineTimes = function() {
 var t = gData.gameData.gameData.getRedMoneyCashOutTimesByIndex(this.data.index), e = this.data.cashFrequency - t;
-this.lbl_times.string = e.toString();
+this.lbl_times.string = "剩" + e + "次";
 if (e <= 0) {
 this.setIsCanNotChoose();
 return !0;
@@ -11028,7 +11028,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), x = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = function() {
 function t() {
 this.init();
 }
@@ -11041,7 +11041,7 @@ this.wechatData = new l.WechatData();
 this.httpData = new r.HttpData();
 this.adData = new y.AdData();
 this.storageData = new s.StorageData();
-this.guideData = new k.GuideData();
+this.guideData = new P.GuideData();
 this.guideWeakData = new O.default();
 this.reward = new g.RewardData();
 this.help = new p.HelpData();
@@ -11052,7 +11052,7 @@ this.sign = new h.SignData();
 this.receiptNotice = new _.ReceiptNoticeData();
 this.redBagCash = new D.RedBagCashData();
 this.cashNormal = new m.CashNormalData();
-this.setting = new P.SettingData();
+this.setting = new k.SettingData();
 this.moreGame = new A.MoreGameData();
 this.blessingBag = new v.BlessingBagData();
 this.cashPro = new b.default();
@@ -11061,11 +11061,11 @@ this.redeem = new S.default();
 this.newCashUiData = new R.NewCashUIData();
 this.adUnlockData = new T.default();
 this.plantData = new C.default();
-this.harvestData = new N.default();
+this.harvestData = new x.default();
 this.adClearSickData = new j.default();
 this.pastureSystem = new F.default();
 this.factorySystem = new M.default();
-this.farmSystem = new x.FarmSystem();
+this.farmSystem = new N.FarmSystem();
 this.farmMapData = new B.FarmMapData();
 this.farmGradeData = new L.GradeRewardData();
 this.walletCashOutData = new E.WalletCashOutData();
@@ -11414,6 +11414,7 @@ this.init_makeInfo = !1;
 this.isProducting = !1;
 this.init_task = !1;
 this.init_expLevel = !1;
+this.init_redBagTask = !0;
 this._farmMapRewardData = [];
 this._farmData = [];
 this._farmDataMap = new Map();
@@ -11503,6 +11504,7 @@ this.gameData.farmExpValue = t.userExp;
 this.gameData.farmGradeData = t.userFarmGrageRewardInfo;
 this.gameData.userNoviceWeFareInfo = t.userNoviceWeFareInfo;
 this.gameData.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
+this.gameData.userFarmTaskInfo = t.userFarmTaskInfo;
 mk.data.setTAUserID(gData.loginData.uin);
 if (gData.loginData.isFirstIn) {
 gData.loginData.isFirstIn = !1;
@@ -11586,6 +11588,8 @@ this.initSetMaxProduct();
 this.initProductTimes();
 this.initLeftTimes();
 this.initFarmMapGetRewardData();
+var o = this.getProp(i.redBagTaskRefresh);
+null != o && (this.init_redBagTask = o);
 }
 };
 t.prototype.initLeftTimes = function() {
@@ -12043,6 +12047,7 @@ t[t.pastureData = 14] = "pastureData";
 t[t.factoryData = 15] = "factoryData";
 t[t.leftTimes = 16] = "leftTimes";
 t[t.farmMapGetRewardData = 17] = "farmMapGetRewardData";
+t[t.redBagTaskRefresh = 18] = "redBagTaskRefresh";
 t[t.turnable_leftTimes = 20] = "turnable_leftTimes";
 t[t.sign_last_bar = 120] = "sign_last_bar";
 t[t.sign_can = 121] = "sign_can";
@@ -12071,6 +12076,7 @@ this.farmGradeData = {};
 this.farmExp = 0;
 this.userNoviceWeFareInfo = {};
 this.redMoneyCashPayRecordList = null;
+this.userFarmTaskInfo = null;
 this.groupCode = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
@@ -12671,7 +12677,10 @@ e.prototype.initBtns = function() {};
 e.prototype.initInfo = function() {
 this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
 gData.gameData.init_coin = !1;
-this.lbl_task.string = "<b><color=#8D4D32>进行100次生产</c><color=#7EB80E>(100/100)</color></b>";
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
+}
 };
 e.prototype.changeInfo = function() {
 cc.tween(this.lbl_redMoney.node).to(.1, {
@@ -12695,7 +12704,10 @@ scale: 1.2
 }).to(.1, {
 scale: 1
 }).start();
-this.lbl_task.string = "<outline  color=#914128 width =2><color=#FCFDFB>完成100次收获</c><color=#66FF3D>(1/100)</color></outline>";
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
+}
 gData.gameData.init_task = !1;
 };
 e.prototype.initFarmExpUI = function() {
@@ -13205,7 +13217,7 @@ mk.console.logSingle("农场等级提现数据=>", o);
 if (0 != o.errcode) return [ 2, null ];
 this.changeExp = !0;
 gData.gameData.gameData.farmGradeData = o.data.userFarmGrageRewardInfo;
-gData.receiptNotice.receip_rmb = 100 * o.data.userFarmGrageRewardInfo.money;
+gData.receiptNotice.receip_rmb = o.data.money;
 mk.ui.openPanel("module/newNotice/newNotice");
 return [ 2, o ];
 }
@@ -13882,6 +13894,7 @@ function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(n.GameProp.guideID);
 null == this.crtGuideID && (this.crtGuideID = 0);
+this.crtGuideID = 0;
 if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过:" + t); else {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
@@ -14219,10 +14232,11 @@ e.node_person = null;
 e.rich_dialog = null;
 e.rich_dialog1 = null;
 e.widgets = [ "top", "bottom", "left", "right", "verticalCenter", "horizontalCenter" ];
-e._eventManager = cc.internal.eventManager;
 return e;
 }
-e.prototype.onLoad = function() {};
+e.prototype.onLoad = function() {
+this.node_click.on(cc.Node.EventType.TOUCH_START, this.clickNodeClick, this);
+};
 e.prototype.start = function() {
 if (null != gData.guideData.crtID) {
 this.reset();
@@ -14246,7 +14260,6 @@ this.node_finger.opacity = 255;
 this.node_dialog.opacity = 255;
 this.targetNode = null;
 this.event_data = null;
-this.ifThrough = !0;
 var e = [ null, null, null, null ], o = e[0], n = e[1], a = e[2], i = e[3];
 if ("all" == this.crtGuide.click_rect || -1 != this.crtGuide.click_rect.indexOf("event")) {
 if (0 == this.crtGuide.display_rect.length) this.node_display.width = this.node_display.height = 0; else {
@@ -14261,7 +14274,6 @@ this.node_click.x = 0;
 this.node_click.y = 0;
 this.node_click.width = this.node.width;
 this.node_click.height = this.node.height;
-this.ifThrough = !1;
 } else {
 this.event_data = this.crtGuide.id + "_" + (this.crtStep + 1);
 this.node_click.x = o;
@@ -14361,7 +14373,13 @@ r = this.crtGuide.finger.split(":");
 this.node_finger.x = o + parseInt(r[0]);
 this.node_finger.y = n + parseInt(r[1]);
 }
-3 != this.crtGuide.tr_form && 4 != this.crtGuide.tr_form || (this.node_bg.opacity = 0);
+if (3 == this.crtGuide.tr_form || 4 == this.crtGuide.tr_form) {
+this.node_bg.active = !1;
+this.node_click._touchListener && (this.node_click._touchListener.swallowTouches = !1);
+} else {
+this.node_bg.active = !0;
+this.node_click._touchListener && (this.node_click._touchListener.swallowTouches = !0);
+}
 if (1 == this.crtGuide.tr_form || 3 == this.crtGuide.tr_form) {
 this.node_head.node.active = !0;
 this.node_person.active = !1;
@@ -14419,36 +14437,8 @@ mk.audio.playEffect("closeButton");
 mk.data.sendXYEvent("guide", "skip_" + mk.guide.crtGuideID);
 this.close();
 };
-e.prototype.initTouch = function() {
-var t = cc.EventListener;
-this._touchListener = t.create({
-event: t.TOUCH_ONE_BY_ONE,
-swallowTouches: !1,
-owner: this.node_click,
-mask: null,
-onTouchBegan: this.onTouchStart.bind(this),
-onTouchMoved: null,
-onTouchEnded: this.onTouchEnded.bind(this),
-onTouchCancelled: null
-});
-this._eventManager.addListener(this._touchListener, this.node_click);
-};
-e.prototype.onTouchStart = function(t) {
-if (this.ifThrough) {
-var e = t.getLocation(), o = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(e.x, e.y));
-return this.pointInPoly(o, this.node_click);
-}
-return !1;
-};
-e.prototype.pointInPoly = function(t, e) {
-var o = e.getPosition();
-return t.x >= o.x - this.node_click.width / 2 && t.x <= o.x + this.node_click.width / 2 && t.y >= o.y - this.node_click.height / 2 && t.y <= o.y + this.node_click.height / 2;
-};
-e.prototype.onTouchEnded = function() {
-this.clickNodeClick();
-};
 e.prototype.onDestroy = function() {
-this._eventManager.removeListener(this._touchListener, this.node_click);
+this.node_click.off(cc.Node.EventType.TOUCH_START, this.clickNodeClick, this);
 };
 i([ u({
 type: cc.Node,
@@ -14705,6 +14695,7 @@ rewardNum: 20
 gData.reward.data = t;
 gData.reward.callback = gData.harvestData.call;
 mk.ui.openPanel("module/reward/reward");
+this.updateNewTaskProgress();
 return [ 2 ];
 });
 });
@@ -14712,7 +14703,14 @@ return [ 2 ];
 e.prototype.clickSuperBtn = function() {
 return r(this, void 0, void 0, function() {
 var t = this;
-return c(this, function() {
+return c(this, function(e) {
+switch (e.label) {
+case 0:
+gData.harvestData.setToEmpty();
+return [ 4, mk.time.WaitForSeconds(.3) ];
+
+case 1:
+e.sent();
 mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
 var t;
@@ -14724,7 +14722,6 @@ return e ? [ 4, gData.adData.watchVideo(s.AdFun.harvest) ] : [ 3, 2 ];
 
 case 1:
 o.sent();
-gData.harvestData.setToEmpty();
 t = [ {
 rewardType: 1,
 rewardNum: 20
@@ -14732,6 +14729,7 @@ rewardNum: 20
 gData.reward.data = t;
 gData.reward.callback = gData.harvestData.call;
 mk.ui.openPanel("module/reward/reward");
+this.updateNewTaskProgress();
 o.label = 2;
 
 case 2:
@@ -14741,6 +14739,27 @@ return [ 2 ];
 });
 });
 return [ 2 ];
+}
+});
+});
+};
+e.prototype.updateNewTaskProgress = function() {
+return r(this, void 0, void 0, function() {
+var t, e;
+return c(this, function(o) {
+switch (o.label) {
+case 0:
+t = {};
+return [ 4, mk.http.sendData("farmTask/updateUserFarmTaskInfo", t) ];
+
+case 1:
+e = o.sent();
+mk.console.logSingle("refrehTask=>", e);
+if (0 != e.errcode) return [ 2, null ];
+gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
+gData.gameData.init_task = !0;
+return [ 2 ];
+}
 });
 });
 };
@@ -17034,7 +17053,7 @@ cc._RF.push(e, "f0038hKHC9Nf5+ipaUV9rc5", "MKSystem");
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var n = t("../sdk/BuglySDK"), a = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), A = t("../../game/component/NumberAnim"), P = t("../sdk/aliRisk/AliRiskManager"), k = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = function() {
+var n = t("../sdk/BuglySDK"), a = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), A = t("../../game/component/NumberAnim"), k = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -17122,7 +17141,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "ad", {
 get: function() {
-return this._ad || (this._ad = new g.default(k.default.getInstance()));
+return this._ad || (this._ad = new g.default(P.default.getInstance()));
 },
 enumerable: !1,
 configurable: !0
@@ -17178,7 +17197,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "aliRiskManager", {
 get: function() {
-return this._aliRiskManager || (this._aliRiskManager = new P.default());
+return this._aliRiskManager || (this._aliRiskManager = new k.default());
 },
 enumerable: !1,
 configurable: !0
@@ -18115,7 +18134,7 @@ if (e.downLoadTaskMap[t.nebulaAppId]) {
 mk.tip.pop("正在下载中...");
 return null;
 }
-mk.tip.pop("开始下载...");
+mk.tip.pop("领取成功,正在下载");
 var r = new p(0, 0, t.nebulaAppId, null), c = s.default.downFile2Local(a, t.nebulaAppId + ".apk", function() {
 r.progress = -2;
 o.sendAppDownloadLog(t.nebulaAppId);
@@ -18165,6 +18184,7 @@ return [ 4, mk.http.sendData("saveDailyRedMoney", t) ];
 
 case 1:
 if (0 != (e = n.sent()).errcode) return [ 2 ];
+mk.console.logSingle("popNodeGetRedBag  ", e);
 if (0 != e.data.redMoneyAddition) {
 o = [ {
 rewardType: 1,
@@ -18962,7 +18982,8 @@ this.initUI();
 }
 };
 e.prototype.initUI = function() {
-this.lbl_reward_value.string = "¥" + (gData.receiptNotice.receip_rmb / 100).toFixed(2);
+console.log("newNotices=>" + gData.receiptNotice.receip_rmb);
+this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2);
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
 e.prototype.clickCloseBtn = function() {};
@@ -19177,14 +19198,14 @@ e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
-var n = t > o.type_value ? o.type_value : t;
+var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.type_value;
-var a = n / o.type_value >= 1 ? 1 : n / o.type_value;
+this.lbl_progress.string = n + "/" + o.redMoney;
+var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
 }).start();
-t >= o.type_value ? this.node_cash.play() : this.node_cash.stop();
+t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 }
 };
 e.prototype.showWatchAdReward = function() {
@@ -19222,6 +19243,7 @@ if (!this.cool) {
 this.cool = !0;
 mk.data.sendDataEvent(u.DataEventId.hutuiFunction, "互推插屏下载");
 1 == this.data.appType ? l.default.ifCanStartGame(this.data.packageName, !0) || gData.moreGame.createNewTask(this.data) : 2 == this.data.appType && cc.sys.openURL(this.data.recommendLink);
+mk.ui.closePanel(this.node.name);
 gData.moreGame.popNodeGetRedBag();
 }
 };
@@ -21081,7 +21103,6 @@ mk.audio.playEffect("button");
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
-c.default.systemExit();
 };
 e.prototype.clickExitBtn = function() {
 c.default.systemExit();
@@ -21712,7 +21733,7 @@ this.cash_bar++;
 this.update_list = !0;
 gData.gameData.gameData.cashIndex++;
 a = this.getItemDataByIndex(t);
-gData.gameData.gameData.redMoney -= a.type_value;
+gData.gameData.gameData.redMoney -= a.redMoney;
 i = 0;
 for (c = 0; c < n.CashStatusList.length; c++) if (n.CashStatusList[c].index == t) {
 i = n.CashStatusList[c].amount;
@@ -21747,7 +21768,7 @@ e++;
 };
 e.prototype.initState = function() {
 for (var t = gData.gameData.gameData.redMoney + 0, e = this.c_data.length, o = 0; o < e; o++) if (this.c_data[o].index < gData.redBagCash.cash_bar) this.c_data[o].state = l.RewardState.none; else {
-t = this.itemAllowCash(t, this.c_data[o].type_value);
+t = this.itemAllowCash(t, this.c_data[o].redMoney);
 this.c_data[o].state = t > 0 ? l.RewardState.unlock : l.RewardState.lock;
 }
 };
@@ -21762,7 +21783,7 @@ for (var t = 0; t < 20; t++) {
 var e = t + 1, o = {
 index: e,
 money: e,
-type_value: 1e3 * e,
+redMoney: 1e3 * e,
 time: e,
 directVideoTime: e,
 delayVideoTimes: e,
@@ -21777,7 +21798,7 @@ this.c_data.push(o);
 this.init_list = !0;
 };
 e.prototype.redPoint = function() {
-for (var t = gData.gameData.gameData.redMoney, e = this.c_data.length, o = 0; o < e; o++) if (!(this.c_data[o].index < gData.redBagCash.cash_bar) && t >= this.c_data[o].type_value) return !0;
+for (var t = gData.gameData.gameData.redMoney, e = this.c_data.length, o = 0; o < e; o++) if (!(this.c_data[o].index < gData.redBagCash.cash_bar) && t >= this.c_data[o].redMoney) return !0;
 return !1;
 };
 return e;
@@ -22428,11 +22449,123 @@ t.prototype = null === e ? Object.create(e) : (o.prototype = e.prototype, new o(
 var a, i = arguments.length, r = i < 3 ? e : null === n ? n = Object.getOwnPropertyDescriptor(e, o) : n;
 if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, o, n); else for (var c = t.length - 1; c >= 0; c--) (a = t[c]) && (r = (i < 3 ? a(r) : i > 3 ? a(e, o, r) : a(e, o)) || r);
 return i > 3 && r && Object.defineProperty(e, o, r), r;
+}, r = this && this.__awaiter || function(t, e, o, n) {
+return new (o || (o = Promise))(function(a, i) {
+function r(t) {
+try {
+s(n.next(t));
+} catch (t) {
+i(t);
+}
+}
+function c(t) {
+try {
+s(n.throw(t));
+} catch (t) {
+i(t);
+}
+}
+function s(t) {
+t.done ? a(t.value) : (e = t.value, e instanceof o ? e : new o(function(t) {
+t(e);
+})).then(r, c);
+var e;
+}
+s((n = n.apply(t, e || [])).next());
+});
+}, c = this && this.__generator || function(t, e) {
+var o, n, a, i, r = {
+label: 0,
+sent: function() {
+if (1 & a[0]) throw a[1];
+return a[1];
+},
+trys: [],
+ops: []
+};
+return i = {
+next: c(0),
+throw: c(1),
+return: c(2)
+}, "function" == typeof Symbol && (i[Symbol.iterator] = function() {
+return this;
+}), i;
+function c(t) {
+return function(e) {
+return s([ t, e ]);
+};
+}
+function s(i) {
+if (o) throw new TypeError("Generator is already executing.");
+for (;r; ) try {
+if (o = 1, n && (a = 2 & i[0] ? n.return : i[0] ? n.throw || ((a = n.return) && a.call(n), 
+0) : n.next) && !(a = a.call(n, i[1])).done) return a;
+(n = 0, a) && (i = [ 2 & i[0], a.value ]);
+switch (i[0]) {
+case 0:
+case 1:
+a = i;
+break;
+
+case 4:
+r.label++;
+return {
+value: i[1],
+done: !1
+};
+
+case 5:
+r.label++;
+n = i[1];
+i = [ 0 ];
+continue;
+
+case 7:
+i = r.ops.pop();
+r.trys.pop();
+continue;
+
+default:
+if (!(a = r.trys, a = a.length > 0 && a[a.length - 1]) && (6 === i[0] || 2 === i[0])) {
+r = 0;
+continue;
+}
+if (3 === i[0] && (!a || i[1] > a[0] && i[1] < a[3])) {
+r.label = i[1];
+break;
+}
+if (6 === i[0] && r.label < a[1]) {
+r.label = a[1];
+a = i;
+break;
+}
+if (a && r.label < a[2]) {
+r.label = a[2];
+r.ops.push(i);
+break;
+}
+a[2] && r.ops.pop();
+r.trys.pop();
+continue;
+}
+i = e.call(t, r);
+} catch (t) {
+i = [ 6, t ];
+n = 0;
+} finally {
+o = a = 0;
+}
+if (5 & i[0]) throw i[1];
+return {
+value: i[0] ? i[1] : void 0,
+done: !0
+};
+}
 };
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = t("../../../before/util/Util"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
+var s = t("../../../before/util/Util"), l = t("../../component/SetGray"), p = t("../../data/GameData"), u = cc._decorator, d = u.ccclass, h = u.property, f = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -22453,21 +22586,28 @@ e.isShowNewTask = !0;
 e.num = 0;
 e.delayTime = 0;
 e.times = 0;
+e.maxNum = 14;
+e.isCanCash = !1;
 return e;
 }
 e.prototype.start = function() {
 mk.ad.showBanner();
-if (this.isShowNewTask) {
-this.node_value.active = !1;
-this.node_task.active = !1;
-this.openBtn_ani.node.active = !1;
-this.lbl_Ani.node.active = !0;
-} else {
+this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+this.isShowNewTask = gData.gameData.init_redBagTask;
+if (this.isShowNewTask) this.showNewTaskUI(); else {
 this.initTaskProgressUI();
 this.showChangePart();
 }
 this.initCashOutStyle(gData.gameData.gameData.redMoney);
 };
+e.prototype.showNewTaskUI = function() {
+this.node_value.active = !1;
+this.node_task.active = !1;
+this.openBtn_ani.node.active = !1;
+this.lbl_Ani.node.active = !0;
+gData.gameData.init_redBagTask = !1;
+gData.gameData.setProp(p.GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask);
+};
 e.prototype.onEnable = function() {
 mk.ad.showBanner();
 };
@@ -22484,7 +22624,7 @@ if (2 == this.times) {
 this.times = 0;
 this.num += 1;
 this.lbl_Ani.string = this.num.toString();
-if (14 == this.num) {
+if (this.num == this.maxNum) {
 this.isShowNewTask = !1;
 this.lbl_Ani.node.color = new cc.Color(255, 218, 49);
 var o = cc.instantiate(this.lbl_Ani.node);
@@ -22528,8 +22668,10 @@ e.showChangePart();
 };
 e.prototype.initTaskProgressUI = function() {
 var t = this;
-cc.tween(this.sp_taskProgress).delay(.2).to(.3, {
-fillRange: .4
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var e = gData.gameData.gameData.userFarmTaskInfo.completeCount, o = gData.gameData.gameData.userFarmTaskInfo.taskCount, n = e / o;
+cc.tween(this.sp_taskProgress).delay(.2).to(.2, {
+fillRange: n
 }, {
 onUpdate: function() {
 var e = 100 * t.sp_taskProgress.fillRange;
@@ -22537,12 +22679,21 @@ t.lbl_taskProgress.string = e.toFixed(0) + "%";
 }
 }).start();
 cc.tween(this);
+this.lbl_taskNum.string = o.toString();
+this.lbl_taskDes.string = "完成          次收获,领取红包(" + e + "/" + o + ")";
+var a = this.openBtn_ani.getComponent(l.default);
+if (a && e < o) {
+a.setGray(!0);
+this.openBtn_ani.getComponent(cc.Button).interactable = !1;
+}
+this.isCanCash = e >= o;
+}
 };
 e.prototype.showChangePart = function() {
 var t = this, e = this.lbl_value.length;
 this.schedule(function() {
 for (var o = 0; o < e; o++) {
-var n = r.default.rnd(0, 9);
+var n = s.default.rnd(0, 9);
 t.lbl_value[o].string = "" + n;
 }
 }, .1);
@@ -22551,19 +22702,45 @@ e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
-var n = t > o.type_value ? o.type_value : t;
+var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.type_value;
-var a = n / o.type_value >= 1 ? 1 : n / o.type_value;
+this.lbl_progress.string = n + "/" + o.redMoney;
+var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
 }).start();
-t >= o.type_value ? this.node_cash.play() : this.node_cash.stop();
+t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 }
 };
 e.prototype.clickVideoBtn = function() {};
 e.prototype.clickGetRewardBtn = function() {
+this.isCanCash && this.httpCashOut();
+};
+e.prototype.httpCashOut = function() {
+return r(this, void 0, void 0, function() {
+var t, e;
+return c(this, function(o) {
+switch (o.label) {
+case 0:
+t = {};
+return [ 4, mk.http.sendData("farmTask/farmTaskCash", t) ];
+
+case 1:
+e = o.sent();
+mk.console.logSingle("redBagTask=>", e);
+if (0 != e.errcode) return [ 2, null ];
+gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
+gData.gameData.init_redBagTask = !0;
+gData.gameData.init_task = !0;
+this.showNewTaskUI();
+this.isShowNewTask = !0;
+gData.receiptNotice.receip_rmb = e.data.cashMoney;
+mk.ui.openPanel("module/newNotice/newNotice");
 gData.adData.checkPopCashFull();
+return [ 2 ];
+}
+});
+});
 };
 e.prototype.clickCashOut = function() {
 mk.audio.playEffect("button");
@@ -22573,52 +22750,54 @@ mk.ui.openPanel("module/newCashUI/walletCashOut");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
-i([ l({
+i([ h({
 displayName: "数字组",
 type: cc.Label
 }) ], e.prototype, "lbl_value", void 0);
-i([ l({
+i([ h({
 displayName: "任务进度条",
 type: cc.Sprite
 }) ], e.prototype, "sp_taskProgress", void 0);
-i([ l({
+i([ h({
 displayName: "任务进度文本",
 type: cc.Label
 }) ], e.prototype, "lbl_taskProgress", void 0);
-i([ l({
+i([ h({
 displayName: "按钮动画",
 type: cc.Animation
 }) ], e.prototype, "openBtn_ani", void 0);
-i([ l(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ l(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ l(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ l(cc.Animation) ], e.prototype, "node_cash", void 0);
-i([ l({
+i([ h(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
+i([ h(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
+i([ h(cc.Label) ], e.prototype, "lbl_progress", void 0);
+i([ h(cc.Animation) ], e.prototype, "node_cash", void 0);
+i([ h({
 type: cc.Node,
 displayName: "显示金额节点"
 }) ], e.prototype, "node_value", void 0);
-i([ l({
+i([ h({
 type: cc.Node,
 displayName: "任务节点"
 }) ], e.prototype, "node_task", void 0);
-i([ l({
+i([ h({
 type: cc.Label,
 displayName: "动画显示文字"
 }) ], e.prototype, "lbl_Ani", void 0);
-i([ l({
+i([ h({
 type: cc.Label,
 displayName: "任务数量"
 }) ], e.prototype, "lbl_taskNum", void 0);
-i([ l({
+i([ h({
 type: cc.Label,
 displayName: "任务描述"
 }) ], e.prototype, "lbl_taskDes", void 0);
-return i([ s ], e);
+return i([ d ], e);
 }(cc.Component);
-o.default = p;
+o.default = f;
 cc._RF.pop();
 }, {
-"../../../before/util/Util": "Util"
+"../../../before/util/Util": "Util",
+"../../component/SetGray": "SetGray",
+"../../data/GameData": "GameData"
 } ],
 RedCodeData: [ function(t, e, o) {
 "use strict";
@@ -23546,14 +23725,14 @@ e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
-var n = t > o.type_value ? o.type_value : t;
+var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_cash.string = o.money / 100 + "元";
-this.lbl_cash_out.string = n + "/" + o.type_value;
-var a = n / o.type_value >= 1 ? 1 : n / o.type_value;
+this.lbl_cash_out.string = n + "/" + o.redMoney;
+var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
 }).start();
-t >= o.type_value ? this.node_cash.play() : this.node_cash.stop();
+t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 }
 };
 e.prototype.clickWatchVideo = function() {
@@ -24407,11 +24586,7 @@ var t = gData.appData.installVersion;
 s.default.versionCompareHandle(gData.appData.appVersion, t) < 0 ? mk.ui.openPanel("module/forceUpdate/forceUpdate") : mk.tip.pop("当前已是最新版本");
 };
 e.prototype.onClickWxAuth = function() {
-if (!gData.loginData.isAuth) {
-mk.ui.closePanel(this.node.name);
-l.default.WxAuth();
-this.onClickClose();
-}
+gData.loginData.isAuth || l.default.WxAuth();
 };
 e.prototype.clickRule = function(t) {
 return r(this, void 0, void 0, function() {
@@ -24421,7 +24596,9 @@ return [ 2 ];
 });
 });
 };
-e.prototype.update = function() {};
+e.prototype.update = function() {
+gData.gameData.init_head && this.initData();
+};
 e.prototype.onDestroy = function() {};
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("closeButton");
@@ -29006,7 +29183,9 @@ e = {};
 return [ 4, mk.http.sendData("noviceWeFare/noviceWeFareCash", e) ];
 
 case 1:
-if (0 != (o = n.sent()).errcode) return [ 2, null ];
+o = n.sent();
+mk.console.logSingle("wallet1=>", o);
+if (0 != o.errcode) return [ 2, null ];
 this.init_novice = !0;
 gData.gameData.gameData.userNoviceWeFareInfo = o.data.userNoviceWeFareInfo;
 gData.receiptNotice.receip_rmb = t;
@@ -29047,7 +29226,7 @@ return [ 4, mk.http.sendData("redMoney/cashPay", e) ];
 
 case 1:
 o = n.sent();
-mk.console.logSingle("wallet=>", o);
+mk.console.logSingle("wallet2=>", o);
 if (0 != o.errcode) {
 if (o.data.count > 0) {
 gData.lineUpUIData.personCount = o.count;
@@ -29124,7 +29303,7 @@ if (t) {
 this.lbl_noviceTitle.string = t.name + ":";
 this.sp_progress.fillRange = t.progressRate;
 var e = t.cashmoney / 100;
-this.lbl_noviceValue.string = (e * t.progressRate).toFixed(1) + "元";
+this.lbl_noviceValue.string = (e * t.progressRate).toFixed(2) + "元";
 this.intV = Math.round(e);
 this.lbl_tipUp.string = "进度加满后必得" + this.intV + "元现金";
 this.lbl_cashOut.string = "满" + this.intV + "元提现";
@@ -29142,6 +29321,8 @@ this.initTip();
 }
 };
 e.prototype.initTip = function() {
+this.lbl_redMoney.string = gData.gameData.gameData.redMoney.toString();
+this.lbl_value.string = gData.gameData.gameData.redMoney / 1e4 + "元";
 if (-1 != this.curChooseIndex) {
 var t = gData.gameData.configs.CashCfg[this.curChooseIndex];
 if (gData.gameData.gameData.redMoney - t.redMoney >= 0) {
@@ -29615,30 +29796,30 @@ var c = t[s = a + r];
 t[s] = 16711935 & (c << 8 | c >>> 24) | 4278255360 & (c << 24 | c >>> 8);
 }
 r = this._hash.words;
-var s = t[a + 0], l = (c = t[a + 1], t[a + 2]), u = t[a + 3], d = t[a + 4], h = t[a + 5], f = t[a + 6], y = t[a + 7], g = t[a + 8], m = t[a + 9], _ = t[a + 10], v = t[a + 11], b = t[a + 12], D = t[a + 13], w = t[a + 14], S = t[a + 15], A = e(A = r[0], O = r[1], k = r[2], P = r[3], s, 7, p[0]), P = e(P, A, O, k, c, 12, p[1]), k = e(k, P, A, O, l, 17, p[2]), O = e(O, k, P, A, u, 22, p[3]);
-A = e(A, O, k, P, d, 7, p[4]), P = e(P, A, O, k, h, 12, p[5]), k = e(k, P, A, O, f, 17, p[6]), 
-O = e(O, k, P, A, y, 22, p[7]), A = e(A, O, k, P, g, 7, p[8]), P = e(P, A, O, k, m, 12, p[9]), 
-k = e(k, P, A, O, _, 17, p[10]), O = e(O, k, P, A, v, 22, p[11]), A = e(A, O, k, P, b, 7, p[12]), 
-P = e(P, A, O, k, D, 12, p[13]), k = e(k, P, A, O, w, 17, p[14]), A = o(A, O = e(O, k, P, A, S, 22, p[15]), k, P, c, 5, p[16]), 
-P = o(P, A, O, k, f, 9, p[17]), k = o(k, P, A, O, v, 14, p[18]), O = o(O, k, P, A, s, 20, p[19]), 
-A = o(A, O, k, P, h, 5, p[20]), P = o(P, A, O, k, _, 9, p[21]), k = o(k, P, A, O, S, 14, p[22]), 
-O = o(O, k, P, A, d, 20, p[23]), A = o(A, O, k, P, m, 5, p[24]), P = o(P, A, O, k, w, 9, p[25]), 
-k = o(k, P, A, O, u, 14, p[26]), O = o(O, k, P, A, g, 20, p[27]), A = o(A, O, k, P, D, 5, p[28]), 
-P = o(P, A, O, k, l, 9, p[29]), k = o(k, P, A, O, y, 14, p[30]), A = n(A, O = o(O, k, P, A, b, 20, p[31]), k, P, h, 4, p[32]), 
-P = n(P, A, O, k, g, 11, p[33]), k = n(k, P, A, O, v, 16, p[34]), O = n(O, k, P, A, w, 23, p[35]), 
-A = n(A, O, k, P, c, 4, p[36]), P = n(P, A, O, k, d, 11, p[37]), k = n(k, P, A, O, y, 16, p[38]), 
-O = n(O, k, P, A, _, 23, p[39]), A = n(A, O, k, P, D, 4, p[40]), P = n(P, A, O, k, s, 11, p[41]), 
-k = n(k, P, A, O, u, 16, p[42]), O = n(O, k, P, A, f, 23, p[43]), A = n(A, O, k, P, m, 4, p[44]), 
-P = n(P, A, O, k, b, 11, p[45]), k = n(k, P, A, O, S, 16, p[46]), A = i(A, O = n(O, k, P, A, l, 23, p[47]), k, P, s, 6, p[48]), 
-P = i(P, A, O, k, y, 10, p[49]), k = i(k, P, A, O, w, 15, p[50]), O = i(O, k, P, A, h, 21, p[51]), 
-A = i(A, O, k, P, b, 6, p[52]), P = i(P, A, O, k, u, 10, p[53]), k = i(k, P, A, O, _, 15, p[54]), 
-O = i(O, k, P, A, c, 21, p[55]), A = i(A, O, k, P, g, 6, p[56]), P = i(P, A, O, k, S, 10, p[57]), 
-k = i(k, P, A, O, f, 15, p[58]), O = i(O, k, P, A, D, 21, p[59]), A = i(A, O, k, P, d, 6, p[60]), 
-P = i(P, A, O, k, v, 10, p[61]), k = i(k, P, A, O, l, 15, p[62]), O = i(O, k, P, A, m, 21, p[63]);
+var s = t[a + 0], l = (c = t[a + 1], t[a + 2]), u = t[a + 3], d = t[a + 4], h = t[a + 5], f = t[a + 6], y = t[a + 7], g = t[a + 8], m = t[a + 9], _ = t[a + 10], v = t[a + 11], b = t[a + 12], D = t[a + 13], w = t[a + 14], S = t[a + 15], A = e(A = r[0], O = r[1], P = r[2], k = r[3], s, 7, p[0]), k = e(k, A, O, P, c, 12, p[1]), P = e(P, k, A, O, l, 17, p[2]), O = e(O, P, k, A, u, 22, p[3]);
+A = e(A, O, P, k, d, 7, p[4]), k = e(k, A, O, P, h, 12, p[5]), P = e(P, k, A, O, f, 17, p[6]), 
+O = e(O, P, k, A, y, 22, p[7]), A = e(A, O, P, k, g, 7, p[8]), k = e(k, A, O, P, m, 12, p[9]), 
+P = e(P, k, A, O, _, 17, p[10]), O = e(O, P, k, A, v, 22, p[11]), A = e(A, O, P, k, b, 7, p[12]), 
+k = e(k, A, O, P, D, 12, p[13]), P = e(P, k, A, O, w, 17, p[14]), A = o(A, O = e(O, P, k, A, S, 22, p[15]), P, k, c, 5, p[16]), 
+k = o(k, A, O, P, f, 9, p[17]), P = o(P, k, A, O, v, 14, p[18]), O = o(O, P, k, A, s, 20, p[19]), 
+A = o(A, O, P, k, h, 5, p[20]), k = o(k, A, O, P, _, 9, p[21]), P = o(P, k, A, O, S, 14, p[22]), 
+O = o(O, P, k, A, d, 20, p[23]), A = o(A, O, P, k, m, 5, p[24]), k = o(k, A, O, P, w, 9, p[25]), 
+P = o(P, k, A, O, u, 14, p[26]), O = o(O, P, k, A, g, 20, p[27]), A = o(A, O, P, k, D, 5, p[28]), 
+k = o(k, A, O, P, l, 9, p[29]), P = o(P, k, A, O, y, 14, p[30]), A = n(A, O = o(O, P, k, A, b, 20, p[31]), P, k, h, 4, p[32]), 
+k = n(k, A, O, P, g, 11, p[33]), P = n(P, k, A, O, v, 16, p[34]), O = n(O, P, k, A, w, 23, p[35]), 
+A = n(A, O, P, k, c, 4, p[36]), k = n(k, A, O, P, d, 11, p[37]), P = n(P, k, A, O, y, 16, p[38]), 
+O = n(O, P, k, A, _, 23, p[39]), A = n(A, O, P, k, D, 4, p[40]), k = n(k, A, O, P, s, 11, p[41]), 
+P = n(P, k, A, O, u, 16, p[42]), O = n(O, P, k, A, f, 23, p[43]), A = n(A, O, P, k, m, 4, p[44]), 
+k = n(k, A, O, P, b, 11, p[45]), P = n(P, k, A, O, S, 16, p[46]), A = i(A, O = n(O, P, k, A, l, 23, p[47]), P, k, s, 6, p[48]), 
+k = i(k, A, O, P, y, 10, p[49]), P = i(P, k, A, O, w, 15, p[50]), O = i(O, P, k, A, h, 21, p[51]), 
+A = i(A, O, P, k, b, 6, p[52]), k = i(k, A, O, P, u, 10, p[53]), P = i(P, k, A, O, _, 15, p[54]), 
+O = i(O, P, k, A, c, 21, p[55]), A = i(A, O, P, k, g, 6, p[56]), k = i(k, A, O, P, S, 10, p[57]), 
+P = i(P, k, A, O, f, 15, p[58]), O = i(O, P, k, A, D, 21, p[59]), A = i(A, O, P, k, d, 6, p[60]), 
+k = i(k, A, O, P, v, 10, p[61]), P = i(P, k, A, O, l, 15, p[62]), O = i(O, P, k, A, m, 21, p[63]);
 r[0] = r[0] + A | 0;
 r[1] = r[1] + O | 0;
-r[2] = r[2] + k | 0;
-r[3] = r[3] + P | 0;
+r[2] = r[2] + P | 0;
+r[3] = r[3] + k | 0;
 },
 _doFinalize: function() {
 var e = this._data, o = e.words, n = 8 * this._nDataBytes, a = 8 * e.sigBytes;

+ 2 - 2
packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631069538771,
-    "genTime": 1631069538771,
+    "buildTime": 1631084374236,
+    "genTime": 1631084374236,
     "genVersion": null
 }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff