wuwangdong 4 năm trước cách đây
mục cha
commit
5ef17cdacf
40 tập tin đã thay đổi với 790 bổ sung639 xóa
  1. 0 0
      assets/resources/module/login/hot/project.manifest
  2. 3 4
      assets/script/before/main/FarmIcon.ts
  3. 1 1
      assets/script/game/data/AdData.ts
  4. 23 4
      assets/script/game/data/GameData.ts
  5. 1 0
      assets/script/game/data/module/BlessingBagData.ts
  6. 1 0
      assets/script/game/data/module/GradeRewardData.ts
  7. 3 0
      assets/script/game/data/module/WalletCashOutData.ts
  8. 7 0
      assets/script/game/module/redBagTask/RedBagTask.ts
  9. 8 1
      assets/script/game/module/speedUpUI/ProductReward.ts
  10. 1 1
      assets/script/mk/system/JsbSystem.ts
  11. 1 1
      assets/script/mk/utils/LogUtil.ts
  12. BIN
      build/jsb-link/assets/main/index.jsc
  13. 0 0
      build/jsb-link/assets/resources/config.json
  14. 0 1
      build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json
  15. 0 0
      build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json
  16. 1 1
      build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json
  17. 0 0
      build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json
  18. 0 0
      build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json
  19. 0 0
      build/jsb-link/assets/resources/import/e8/e86f7583-0e5e-46f6-ae3f-0904f46acf88.json
  20. 34 34
      build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas
  21. 244 244
      build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas
  22. 27 27
      build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas
  23. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  24. 62 62
      build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas
  25. 27 27
      build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas
  26. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  27. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml
  28. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  29. 99 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/android-libcocos2dx.iml
  30. 0 99
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml
  31. 104 104
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml
  32. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  33. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  34. 49 20
      build/jsb-link/js backups (useful for debugging)/main.index.js
  35. 3 3
      packages-hot-update/cfg.json
  36. 0 0
      packages-hot-update/manifest/project.manifest
  37. BIN
      packages-hot-update/versions/ver_1_0.1.zip
  38. 27 0
      packages/test-tools/main.js
  39. 22 0
      packages/test-tools/package.json
  40. 37 0
      packages/test-tools/panel/index.js

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 3 - 4
assets/script/before/main/FarmIcon.ts

@@ -179,15 +179,14 @@ export class FarmIcon extends cc.Component {
 
             gData.gameData.addProductMakeTimesById(this.plantID);
 
+            gData.gameData.nextMake = null;
+            gData.gameData.setNextProduct(false);
+
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
 
             let flyRed = await gData.gameData.updateNewTaskProgress();
-
-            gData.gameData.nextMake = null;
-            gData.gameData.setNextProduct(false);
-
             return flyRed;
         }
         else {

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

@@ -142,7 +142,7 @@ export class AdData {
         }
         gData.gameData.setProp(GameProp.videoTimes, ++times);
         if (times < 5) {
-            mk.data.sendXYEvent("video_end_" + times, "第" + times + "次看视频");
+            mk.data.sendXYEvent("videoEnd_" + times, "第" + times + "次看视频");
         }
 
         let curData = this.adMap.get(this.ad_subType)

+ 23 - 4
assets/script/game/data/GameData.ts

@@ -332,10 +332,10 @@ export class GameData {
     /** 增加减少生产次数
      * @param add 增减变量
      */
-    public changeLeftTimes(add) {
+    public changeLeftTimes(add, isIgnoreMaxTimes = false) {
 
         gData.gameData.leftTimes += add;
-        if (add > 0) {
+        if (add > 0 && !isIgnoreMaxTimes) {
             gData.gameData.leftTimes = (gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
         }
 
@@ -586,11 +586,12 @@ export class GameData {
         if (len < 18) {
             let id = 31000;
             let data = null;
+            let unluckNum = parseInt(gData.gameData.configs.ServerConfig.unluckNum);
             for (var i = 0; i < 18; i++) {
-                if (i < 9) {
+                if (i < unluckNum) {
                     data = { id: id, state: FarmState.Empty, productID: 0, growSpan: 0 };
                 }
-                else if (i == 9) {
+                else if (i == unluckNum) {
                     data = { id: id, state: FarmState.CanUnlock, productID: 0, growSpan: 0 };
                 }
                 else {
@@ -1117,6 +1118,24 @@ export class GameData {
 
         return can;
     }
+
+    doPointToXYLogic()
+    {
+        let value = mk.storage.getStorage('cash_out');
+        if (!value) {
+            mk.storage.setStorage('cash_out', 1);
+            mk.data.sendXYEvent('cash_1', `第一次提现`);
+        }else{
+            if(value == 1)
+            {
+                mk.storage.setStorage('cash_out', 2);
+                mk.data.sendXYEvent('cash_2', `第二次提现`);
+            }else if(value == 2){
+                mk.storage.setStorage('cash_out', 3);
+                mk.data.sendXYEvent('cash_3', `第三次提现`);
+            }
+        }
+    }
 }
 
 /**

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

@@ -119,6 +119,7 @@ export class BlessingBagData extends Data {
 
         mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包第${this.taskRbId}档提现成功`);
         mk.data.sendDataEvent(DataEventId.Sundry, '福利提现成功');
+        gData.gameData.doPointToXYLogic();
 
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');

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

@@ -31,6 +31,7 @@ export class GradeRewardData extends Data {
         }
 
         mk.data.sendDataEvent(DataEventId.Sundry, '农场等级奖励提现成功');
+        gData.gameData.doPointToXYLogic();
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
 

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

@@ -29,6 +29,8 @@ export class WalletCashOutData extends Data {
         // gData.cashPro.init_success = true;
         gData.receiptNotice.receip_rmb = value;
         mk.ui.openPanel('module/newNotice/newNotice');
+
+        gData.gameData.doPointToXYLogic();
     }
 
     async addProgress() {
@@ -78,6 +80,7 @@ export class WalletCashOutData extends Data {
         }
 
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
+        gData.gameData.doPointToXYLogic();
     }
 
 }

+ 7 - 0
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -285,6 +285,13 @@ export default class RedBagTask extends cc.Component {
         mk.ui.openPanel('module/newNotice/newNotice');
 
         mk.data.sendDataEvent(DataEventId.Sundry, '任务红包提现成功');
+        let value = mk.storage.getStorage('guide_harvest');
+        if (!value) {
+            mk.storage.setStorage('guide_harvest', 1);
+            mk.data.sendXYEvent('guide_harvest', '首次领取任务红包');
+        }
+        gData.gameData.doPointToXYLogic();
+
         gData.adData.checkPopCashFull();
     }
 

+ 8 - 1
assets/script/game/module/speedUpUI/ProductReward.ts

@@ -67,7 +67,7 @@ export default class ProductReward extends cc.Component {
         }
 
         if (isGuide) {
-            
+
             let id = gData.gameData.getProp(GameProp.guideID);
             if (id >= 2) {
                 mk.ad.showNative();
@@ -115,6 +115,13 @@ export default class ProductReward extends cc.Component {
                 gData.reward.data = rewardData;
                 gData.reward.callback = this.addTimes;
                 mk.ui.openPanel('module/reward/reward');
+
+                let value = mk.storage.getStorage('guide_production');
+                if(!value)
+                {
+                    mk.storage.setStorage('guide_production', 1);
+                    mk.data.sendXYEvent('guide_production', '首次领取生产次数');
+                }
             }
         })
     }

+ 1 - 1
assets/script/mk/system/JsbSystem.ts

@@ -150,7 +150,7 @@ export default class JsbSystem {
             // gData.appData.appId = "wx3c0cc2f730c5ad5a";
             // gData.appData.version = "1.0.0";
             gData.appData.appId = "wx667751c00aad1686";
-            gData.appData.version = "1.1.1";
+            gData.appData.version = "1.1.2";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

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


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/config.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 1
build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json


+ 1 - 1
build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json

@@ -1 +1 @@
-[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\nlight.png\nsize: 1382,1360\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\ndeng1\n  rotate: true\n  xy: 2, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng2\n  rotate: true\n  xy: 688, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\ndeng3\n  rotate: true\n  xy: 692, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng4\n  rotate: true\n  xy: 2, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\r\nlight.png\r\nsize: 1382,1360\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\ndeng1\r\n  rotate: true\r\n  xy: 2, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng2\r\n  rotate: true\r\n  xy: 688, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\ndeng3\r\n  rotate: true\r\n  xy: 692, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng4\r\n  rotate: true\r\n  xy: 2, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/import/e8/e86f7583-0e5e-46f6-ae3f-0904f46acf88.json


+ 34 - 34
build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas

@@ -1,34 +1,34 @@
-
-light.png
-size: 1382,1360
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-deng1
-  rotate: true
-  xy: 2, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng2
-  rotate: true
-  xy: 688, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
-deng3
-  rotate: true
-  xy: 692, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng4
-  rotate: true
-  xy: 2, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
+
+light.png
+size: 1382,1360
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+deng1
+  rotate: true
+  xy: 2, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng2
+  rotate: true
+  xy: 688, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1
+deng3
+  rotate: true
+  xy: 692, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng4
+  rotate: true
+  xy: 2, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1

+ 244 - 244
build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas

@@ -1,244 +1,244 @@
-
-pandan.png
-size: 1848,400
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-baoxiang
-  rotate: true
-  xy: 692, 162
-  size: 236, 191
-  orig: 236, 191
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 468, 147
-  size: 222, 251
-  orig: 222, 251
-  offset: 0, 0
-  index: -1
-ditan
-  rotate: false
-  xy: 1050, 2
-  size: 464, 164
-  orig: 464, 164
-  offset: 0, 0
-  index: -1
-dudou
-  rotate: true
-  xy: 1113, 238
-  size: 160, 129
-  orig: 162, 131
-  offset: 1, 1
-  index: -1
-erduo
-  rotate: true
-  xy: 310, 37
-  size: 361, 156
-  orig: 361, 156
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: true
-  xy: 566, 8
-  size: 137, 145
-  orig: 144, 154
-  offset: 5, 4
-  index: -1
-eye1-2
-  rotate: true
-  xy: 1244, 246
-  size: 152, 151
-  orig: 156, 158
-  offset: 2, 3
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1496, 169
-  size: 97, 110
-  orig: 99, 112
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: false
-  xy: 468, 37
-  size: 96, 108
-  orig: 98, 110
-  offset: 1, 1
-  index: -1
-eye2-3
-  rotate: false
-  xy: 1490, 268
-  size: 122, 130
-  orig: 124, 132
-  offset: 1, 1
-  index: -1
-eye3-1
-  rotate: false
-  xy: 1089, 171
-  size: 118, 59
-  orig: 120, 61
-  offset: 1, 1
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1209, 177
-  size: 101, 59
-  orig: 103, 61
-  offset: 1, 1
-  index: -1
-eye4-4
-  rotate: false
-  xy: 1516, 37
-  size: 122, 130
-  orig: 125, 132
-  offset: 2, 1
-  index: -1
-face
-  rotate: true
-  xy: 2, 21
-  size: 377, 306
-  orig: 377, 306
-  offset: 0, 0
-  index: -1
-jinbi
-  rotate: false
-  xy: 480, 12
-  size: 58, 23
-  orig: 59, 23
-  offset: 0, 0
-  index: -1
-jinbi1
-  rotate: false
-  xy: 1640, 113
-  size: 76, 55
-  orig: 76, 55
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: false
-  xy: 349, 10
-  size: 67, 25
-  orig: 70, 27
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 418, 12
-  size: 60, 23
-  orig: 62, 25
-  offset: 1, 1
-  index: -1
-naiping
-  rotate: false
-  xy: 833, 7
-  size: 215, 153
-  orig: 217, 155
-  offset: 1, 1
-  index: -1
-naizui
-  rotate: true
-  xy: 1608, 170
-  size: 96, 116
-  orig: 99, 118
-  offset: 1, 1
-  index: -1
-shou2
-  rotate: false
-  xy: 1397, 252
-  size: 91, 146
-  orig: 97, 148
-  offset: 1, 1
-  index: -1
-shou3
-  rotate: true
-  xy: 713, 6
-  size: 154, 118
-  orig: 156, 120
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 957, 168
-  size: 130, 60
-  orig: 133, 63
-  offset: 1, 2
-  index: -1
-tui1
-  rotate: false
-  xy: 1733, 65
-  size: 112, 96
-  orig: 114, 98
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: true
-  xy: 1614, 268
-  size: 130, 92
-  orig: 132, 94
-  offset: 1, 1
-  index: -1
-xing
-  rotate: true
-  xy: 310, 3
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
-youshou_1
-  rotate: false
-  xy: 957, 230
-  size: 77, 168
-  orig: 78, 174
-  offset: 0, 6
-  index: -1
-youshouzhang
-  rotate: true
-  xy: 1312, 168
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
-yy
-  rotate: true
-  xy: 885, 182
-  size: 216, 70
-  orig: 216, 70
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: true
-  xy: 1726, 163
-  size: 105, 120
-  orig: 115, 125
-  offset: 3, 4
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1640, 6
-  size: 105, 91
-  orig: 115, 96
-  offset: 3, 4
-  index: -1
-zui2-1
-  rotate: true
-  xy: 1708, 270
-  size: 128, 120
-  orig: 138, 125
-  offset: 5, 4
-  index: -1
-zuoshou_1
-  rotate: false
-  xy: 1036, 232
-  size: 75, 166
-  orig: 78, 174
-  offset: 3, 8
-  index: -1
-zuoshouzhang
-  rotate: true
-  xy: 1404, 174
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
+
+pandan.png
+size: 1848,400
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baoxiang
+  rotate: true
+  xy: 692, 162
+  size: 236, 191
+  orig: 236, 191
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 468, 147
+  size: 222, 251
+  orig: 222, 251
+  offset: 0, 0
+  index: -1
+ditan
+  rotate: false
+  xy: 1050, 2
+  size: 464, 164
+  orig: 464, 164
+  offset: 0, 0
+  index: -1
+dudou
+  rotate: true
+  xy: 1113, 238
+  size: 160, 129
+  orig: 162, 131
+  offset: 1, 1
+  index: -1
+erduo
+  rotate: true
+  xy: 310, 37
+  size: 361, 156
+  orig: 361, 156
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: true
+  xy: 566, 8
+  size: 137, 145
+  orig: 144, 154
+  offset: 5, 4
+  index: -1
+eye1-2
+  rotate: true
+  xy: 1244, 246
+  size: 152, 151
+  orig: 156, 158
+  offset: 2, 3
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1496, 169
+  size: 97, 110
+  orig: 99, 112
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: false
+  xy: 468, 37
+  size: 96, 108
+  orig: 98, 110
+  offset: 1, 1
+  index: -1
+eye2-3
+  rotate: false
+  xy: 1490, 268
+  size: 122, 130
+  orig: 124, 132
+  offset: 1, 1
+  index: -1
+eye3-1
+  rotate: false
+  xy: 1089, 171
+  size: 118, 59
+  orig: 120, 61
+  offset: 1, 1
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1209, 177
+  size: 101, 59
+  orig: 103, 61
+  offset: 1, 1
+  index: -1
+eye4-4
+  rotate: false
+  xy: 1516, 37
+  size: 122, 130
+  orig: 125, 132
+  offset: 2, 1
+  index: -1
+face
+  rotate: true
+  xy: 2, 21
+  size: 377, 306
+  orig: 377, 306
+  offset: 0, 0
+  index: -1
+jinbi
+  rotate: false
+  xy: 480, 12
+  size: 58, 23
+  orig: 59, 23
+  offset: 0, 0
+  index: -1
+jinbi1
+  rotate: false
+  xy: 1640, 113
+  size: 76, 55
+  orig: 76, 55
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: false
+  xy: 349, 10
+  size: 67, 25
+  orig: 70, 27
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 418, 12
+  size: 60, 23
+  orig: 62, 25
+  offset: 1, 1
+  index: -1
+naiping
+  rotate: false
+  xy: 833, 7
+  size: 215, 153
+  orig: 217, 155
+  offset: 1, 1
+  index: -1
+naizui
+  rotate: true
+  xy: 1608, 170
+  size: 96, 116
+  orig: 99, 118
+  offset: 1, 1
+  index: -1
+shou2
+  rotate: false
+  xy: 1397, 252
+  size: 91, 146
+  orig: 97, 148
+  offset: 1, 1
+  index: -1
+shou3
+  rotate: true
+  xy: 713, 6
+  size: 154, 118
+  orig: 156, 120
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 957, 168
+  size: 130, 60
+  orig: 133, 63
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: false
+  xy: 1733, 65
+  size: 112, 96
+  orig: 114, 98
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: true
+  xy: 1614, 268
+  size: 130, 92
+  orig: 132, 94
+  offset: 1, 1
+  index: -1
+xing
+  rotate: true
+  xy: 310, 3
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1
+youshou_1
+  rotate: false
+  xy: 957, 230
+  size: 77, 168
+  orig: 78, 174
+  offset: 0, 6
+  index: -1
+youshouzhang
+  rotate: true
+  xy: 1312, 168
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1
+yy
+  rotate: true
+  xy: 885, 182
+  size: 216, 70
+  orig: 216, 70
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: true
+  xy: 1726, 163
+  size: 105, 120
+  orig: 115, 125
+  offset: 3, 4
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1640, 6
+  size: 105, 91
+  orig: 115, 96
+  offset: 3, 4
+  index: -1
+zui2-1
+  rotate: true
+  xy: 1708, 270
+  size: 128, 120
+  orig: 138, 125
+  offset: 5, 4
+  index: -1
+zuoshou_1
+  rotate: false
+  xy: 1036, 232
+  size: 75, 166
+  orig: 78, 174
+  offset: 3, 8
+  index: -1
+zuoshouzhang
+  rotate: true
+  xy: 1404, 174
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


+ 62 - 62
build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas

@@ -1,62 +1,62 @@
-
-skeleton.png
-size: 1386,710
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-1
-  rotate: true
-  xy: 1051, 233
-  size: 136, 131
-  orig: 145, 141
-  offset: 7, 4
-  index: -1
-2
-  rotate: true
-  xy: 355, 4
-  size: 350, 349
-  orig: 359, 359
-  offset: 5, 5
-  index: -1
-3
-  rotate: true
-  xy: 1048, 371
-  size: 337, 336
-  orig: 347, 348
-  offset: 6, 5
-  index: -1
-4
-  rotate: true
-  xy: 707, 367
-  size: 341, 339
-  orig: 350, 349
-  offset: 6, 5
-  index: -1
-5
-  rotate: true
-  xy: 2, 2
-  size: 352, 351
-  orig: 361, 362
-  offset: 5, 5
-  index: -1
-6
-  rotate: false
-  xy: 2, 356
-  size: 352, 352
-  orig: 359, 362
-  offset: 3, 5
-  index: -1
-7
-  rotate: false
-  xy: 356, 359
-  size: 349, 349
-  orig: 359, 362
-  offset: 5, 7
-  index: -1
-8
-  rotate: false
-  xy: 706, 11
-  size: 343, 346
-  orig: 351, 357
-  offset: 4, 5
-  index: -1
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas

@@ -1,27 +1,27 @@
-
-guanghuan.png
-size: 445,248
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-button_lq
-  rotate: false
-  xy: 248, 42
-  size: 195, 204
-  orig: 195, 204
-  offset: 0, 0
-  index: -1
-button_tv
-  rotate: false
-  xy: 248, 11
-  size: 27, 29
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-huan
-  rotate: false
-  xy: 2, 2
-  size: 244, 244
-  orig: 244, 244
-  offset: 0, 0
-  index: -1
+
+guanghuan.png
+size: 445,248
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+button_lq
+  rotate: false
+  xy: 248, 42
+  size: 195, 204
+  orig: 195, 204
+  offset: 0, 0
+  index: -1
+button_tv
+  rotate: false
+  xy: 248, 11
+  size: 27, 29
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+huan
+  rotate: false
+  xy: 2, 2
+  size: 244, 244
+  orig: 244, 244
+  offset: 0, 0
+  index: -1

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" />
@@ -349,6 +349,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>

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

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wx667751c00aad1686"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u5fc3\u519c\u4e50\u56ed
 PACKAGE_NAME=com.aries.kxnly.jsb
-VERSION_NAME=1.1.1
+VERSION_NAME=1.1.2
 VERSION_CODE=1
 TOPON="a614a8250add59,66b742dd0e502b64d783d9c66a9d30c4,b614a82cb8bc30,b614ac87eb4952,b614a82cf4e1bc,b614a82cebe4b5,b614a82cecd344,b614a82ce40be5,b614a82cd52ee7"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.1.1"
+APP_CONFIG_CODE="1.1.2"

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

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

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

@@ -2591,7 +2591,7 @@ case 1:
 if (0 != (o = a.sent()).errcode) return [ 2 ];
 (n = gData.gameData.getProp(c.GameProp.videoTimes)) || (n = 0);
 gData.gameData.setProp(c.GameProp.videoTimes, ++n);
-n < 5 && mk.data.sendXYEvent("video_end_" + n, "第" + n + "次看视频");
+n < 5 && mk.data.sendXYEvent("videoEnd_" + n, "第" + n + "次看视频");
 (i = this.adMap.get(this.ad_subType)) && i.setAdData(o.data);
 return [ 2 ];
 }
@@ -4303,6 +4303,7 @@ this.isPlayAniUpdate = !1;
 this.videoRbData = e.data.userWelFareTaskInfo;
 mk.data.sendDataEvent(s.DataEventId.fudaiFunction, "视频红包第" + this.taskRbId + "档提现成功");
 mk.data.sendDataEvent(s.DataEventId.Sundry, "福利提现成功");
+gData.gameData.doPointToXYLogic();
 gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
 mk.ui.openPanel("module/newNotice/newNotice");
 return [ 2, e ];
@@ -9285,9 +9286,9 @@ this.node.removeChild(t);
 };
 e.prototype.plant = function(t) {
 return r(this, void 0, void 0, function() {
-var e, o;
-return c(this, function(n) {
-switch (n.label) {
+var e;
+return c(this, function(o) {
+switch (o.label) {
 case 0:
 if (this.state != s.FarmState.Empty) return [ 3, 3 ];
 this.plantID = t;
@@ -9297,20 +9298,19 @@ gData.gameData.changeLeftTimes(-1);
 gData.farmSystem.currSelectFarm = this;
 gData.adData.checkPopRed();
 gData.gameData.addProductMakeTimesById(this.plantID);
+gData.gameData.nextMake = null;
+gData.gameData.setNextProduct(!1);
 e = this.plantIcon;
 return [ 4, mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame) ];
 
 case 1:
-e.spriteFrame = n.sent();
+e.spriteFrame = o.sent();
 this.plantIcon.getComponent(cc.Animation).play();
 this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
 return [ 4, gData.gameData.updateNewTaskProgress() ];
 
 case 2:
-o = n.sent();
-gData.gameData.nextMake = null;
-gData.gameData.setNextProduct(!1);
-return [ 2, o ];
+return [ 2, o.sent() ];
 
 case 3:
 mk.tip.pop("农田已满,无法继续生产");
@@ -12403,9 +12403,10 @@ this.setProp(i.leftTimes, this.leftTimes);
 this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
 this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
 };
-t.prototype.changeLeftTimes = function(t) {
+t.prototype.changeLeftTimes = function(t, e) {
+void 0 === e && (e = !1);
 gData.gameData.leftTimes += t;
-t > 0 && (gData.gameData.leftTimes = gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
+t > 0 && !e && (gData.gameData.leftTimes = gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
 gData.gameData.leftTimes < 0 && (gData.gameData.leftTimes = 0);
 gData.gameData.setProp(i.leftTimes, gData.gameData.leftTimes);
 gData.gameData.init_leftTimes = !0;
@@ -12560,6 +12561,7 @@ gData.gameData.init_task = !0;
 this.playerProp.userFarmTaskInfo = n.data.userFarmTaskInfo;
 if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
 mk.ui.closeAllUI();
+mk.guide.curDes = "";
 mk.guide.open(3);
 }
 return [ 2, !0 ];
@@ -12587,13 +12589,13 @@ this._farmData = this.getProp(i.farmData);
 this._farmData || (this._farmData = []);
 var t = this._farmData.length;
 if (t < 18) {
-for (var e = 31e3, o = null, n = 0; n < 18; n++) {
-o = n < 9 ? {
+for (var e = 31e3, o = null, n = parseInt(gData.gameData.configs.ServerConfig.unluckNum), a = 0; a < 18; a++) {
+o = a < n ? {
 id: e,
 state: s.Empty,
 productID: 0,
 growSpan: 0
-} : 9 == n ? {
+} : a == n ? {
 id: e,
 state: s.CanUnlock,
 productID: 0,
@@ -12610,12 +12612,12 @@ e++;
 }
 this.setProp(i.farmData, this._farmData);
 } else {
-var a = 0;
-for (n = 0; n < t; n++) {
-this._farmDataMap.set(this._farmData[n].id, this._farmData[n]);
-this._farmData[n].state == s.Sick && a++;
+var r = 0;
+for (a = 0; a < t; a++) {
+this._farmDataMap.set(this._farmData[a].id, this._farmData[a]);
+this._farmData[a].state == s.Sick && r++;
 }
-this.RawInsectCurArr[0] = a;
+this.RawInsectCurArr[0] = r;
 }
 this.setMaxProduct(10003, !0);
 };
@@ -12954,6 +12956,21 @@ var t = !1;
 (t = gData.farmSystem.canClearSick()) || (t = gData.pastureSystem.canClearSick()) || (t = gData.factorySystem.canClearSick());
 return t;
 };
+t.prototype.doPointToXYLogic = function() {
+var t = mk.storage.getStorage("cash_out");
+if (t) {
+if (1 == t) {
+mk.storage.setStorage("cash_out", 2);
+mk.data.sendXYEvent("cash_2", "第二次提现");
+} else if (2 == t) {
+mk.storage.setStorage("cash_out", 3);
+mk.data.sendXYEvent("cash_3", "第三次提现");
+}
+} else {
+mk.storage.setStorage("cash_out", 1);
+mk.data.sendXYEvent("cash_1", "第一次提现");
+}
+};
 return t;
 }();
 o.GameData = c;
@@ -14261,6 +14278,7 @@ o = n.sent();
 mk.console.logSingle("农场等级提现数据=>", o);
 if (0 != o.errcode) return [ 2, null ];
 mk.data.sendDataEvent(l.DataEventId.Sundry, "农场等级奖励提现成功");
+gData.gameData.doPointToXYLogic();
 this.changeExp = !0;
 gData.gameData.playerProp.farmGradeData = o.data.userFarmGrageRewardInfo;
 gData.receiptNotice.receip_rmb = o.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
@@ -17376,7 +17394,7 @@ value: !0
 o.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -22554,6 +22572,10 @@ rewardNum: parseInt(gData.gameData.configs.ServerConfig.ProductionAd)
 gData.reward.data = o;
 gData.reward.callback = t.addTimes;
 mk.ui.openPanel("module/reward/reward");
+if (!mk.storage.getStorage("guide_production")) {
+mk.storage.setStorage("guide_production", 1);
+mk.data.sendXYEvent("guide_production", "首次领取生产次数");
+}
 }
 });
 };
@@ -23696,6 +23718,11 @@ this.times = 0;
 gData.receiptNotice.receip_rmb = e.data.cashMoney;
 mk.ui.openPanel("module/newNotice/newNotice");
 mk.data.sendDataEvent(u.DataEventId.Sundry, "任务红包提现成功");
+if (!mk.storage.getStorage("guide_harvest")) {
+mk.storage.setStorage("guide_harvest", 1);
+mk.data.sendXYEvent("guide_harvest", "首次领取任务红包");
+}
+gData.gameData.doPointToXYLogic();
 gData.adData.checkPopCashFull();
 return [ 2 ];
 }
@@ -29836,6 +29863,7 @@ this.init_novice = !0;
 gData.gameData.playerProp.userNoviceWeFareInfo = o.data.userNoviceWeFareInfo;
 gData.receiptNotice.receip_rmb = t;
 mk.ui.openPanel("module/newNotice/newNotice");
+gData.gameData.doPointToXYLogic();
 return [ 2 ];
 }
 });
@@ -29893,6 +29921,7 @@ gData.receiptNotice.receip_rmb = n[t - 1].money;
 mk.ui.openPanel("module/newNotice/newNotice");
 }
 mk.data.sendDataEvent(s.DataEventId.Sundry, "红包币提现成功");
+gData.gameData.doPointToXYLogic();
 return [ 2 ];
 }
 });

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

@@ -1,7 +1,7 @@
 {
     "version": "1.0.1",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/",
-    "resourceRootDir": "D:\\mokaszProjects\\team1_nc\\build\\jsb-link",
+    "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1632464512792,
-    "genTime": 1632464512792,
+    "buildTime": 1632537051370,
+    "genTime": 1632537051370,
     "genVersion": null
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.1.zip


+ 27 - 0
packages/test-tools/main.js

@@ -0,0 +1,27 @@
+'use strict';
+
+module.exports = {
+  load () {
+    // execute when package loaded
+  },
+
+  unload () {
+    // execute when package unloaded
+  },
+
+  // register your ipc messages here
+  messages: {
+    'open' () {
+      // open entry panel registered in package.json
+      Editor.Panel.open('test-tools');
+    },
+    'say-hello' () {
+      Editor.log('Hello World!');
+      // send ipc message to panel
+      Editor.Ipc.sendToPanel('test-tools', 'test-tools:hello');
+    },
+    'clicked' () {
+      Editor.log('Button clicked!');
+    }
+  },
+};

+ 22 - 0
packages/test-tools/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "test-tools",
+  "version": "0.0.1",
+  "description": "The package template for getting started.",
+  "author": "Cocos Creator",
+  "main": "main.js",
+  "main-menu": {
+    "i18n:MAIN_MENU.package.title/test-tools/open": {
+      "message": "test-tools:open"
+    },
+    "i18n:MAIN_MENU.package.title/test-tools/hello": {
+      "message": "test-tools:say-hello"
+    }
+  },
+  "panel": {
+    "main": "panel/index.js",
+    "type": "dockable",
+    "title": "test-tools",
+    "width": 400,
+    "height": 300
+  }
+}

+ 37 - 0
packages/test-tools/panel/index.js

@@ -0,0 +1,37 @@
+// panel/index.js, this filename needs to match the one registered in package.json
+Editor.Panel.extend({
+  // css style for panel
+  style: `
+    :host { margin: 5px; }
+    h2 { color: #f90; }
+  `,
+
+  // html template for panel
+  template: `
+    <h2>test-tools</h2>
+    <hr />
+    <div>State: <span id="label">--</span></div>
+    <hr />
+    <ui-button id="btn">Send To Main</ui-button>
+  `,
+
+  // element and variable binding
+  $: {
+    btn: '#btn',
+    label: '#label',
+  },
+
+  // method executed when template and styles are successfully loaded and initialized
+  ready () {
+    this.$btn.addEventListener('confirm', () => {
+      Editor.Ipc.sendToMain('test-tools:clicked');
+    });
+  },
+
+  // register your ipc messages here
+  messages: {
+    'test-tools:hello' (event) {
+      this.$label.innerText = 'Hello!';
+    }
+  }
+});

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác