Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/resources/game/prefab/game.prefab

@@ -31,19 +31,22 @@
       },
       {
         "__id__": 208
+      },
+      {
+        "__id__": 337
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 337
+        "__id__": 340
       },
       {
-        "__id__": 339
+        "__id__": 342
       }
     ],
     "_prefab": {
-      "__id__": 340
+      "__id__": 343
     },
     "_opacity": 255,
     "_color": {
@@ -6356,7 +6359,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "f5YZDsP1lEsqrPqnwlQ40J",
+    "fileId": "8cbHbEAV5HEqTYAjiRhx44",
     "sync": false
   },
   {
@@ -6589,7 +6592,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "beRnNfFppIoYyKzfuY+Cnl",
+    "fileId": "07Zs7vCSlHtauLAXxhB1fd",
     "sync": false
   },
   {
@@ -6719,7 +6722,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "79dxlxZxlLX5ZxyDWscu3+",
+    "fileId": "51L+S0EepBaJc2QeS4AOzw",
     "sync": false
   },
   {
@@ -11248,6 +11251,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 338
+      }
+    ],
+    "_prefab": {
+      "__id__": 339
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -289.317,
+        -10.151,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 337
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "热更成功",
+    "_N$string": "热更成功",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "9cj8nly1JI66d/VUe4T8Kx",
+    "sync": false
+  },
+  {
     "__type__": "8760dQYasROwLaLe1idTS07",
     "_name": "",
     "_objFlags": 0,
@@ -11289,7 +11400,7 @@
       "__id__": 54
     },
     "nodeRedPoint": {
-      "__id__": 338
+      "__id__": 341
     },
     "icon_plant": {
       "__id__": 304

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

@@ -1 +1 @@
-{"version":"1.0.1","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/version.manifest"}

assets/resources/module/login/login.prefab

@@ -33,17 +33,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 84
-      },
-      {
         "__id__": 85
       },
       {
         "__id__": 86
+      },
+      {
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -490,17 +490,17 @@
         "__id__": 20
       },
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -779,16 +779,16 @@
         "__id__": 21
       },
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 59
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 78
+      "__id__": 79
     },
     "_opacity": 255,
     "_color": {
@@ -839,7 +839,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "更新文本",
     "_objFlags": 0,
     "_parent": {
       "__id__": 20
@@ -849,35 +849,38 @@
     "_components": [
       {
         "__id__": 22
+      },
+      {
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 237,
-      "g": 62,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124.92,
-      "height": 40.32
+      "width": 334.89,
+      "height": 46.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 0.5,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -73.473,
-        69.219,
+        0,
+        123.872,
         0,
         0,
         0,
@@ -916,9 +919,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "加载中 11%",
-    "_N$string": "加载中 11%",
-    "_fontSize": 24,
+    "_string": "正在更新中,请耐心等待",
+    "_N$string": "正在更新中,请耐心等待",
+    "_fontSize": 32,
     "_lineHeight": 32,
     "_enableWrapText": true,
     "_N$file": null,
@@ -935,6 +938,24 @@
     "_id": ""
   },
   {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 122,
+      "g": 68,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -954,47 +975,47 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 26
       },
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 31
+        "__id__": 32
       },
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 37
+        "__id__": 38
       },
       {
-        "__id__": 40
+        "__id__": 41
       },
       {
-        "__id__": 43
+        "__id__": 44
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 50
+        "__id__": 51
       },
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 57
       },
       {
-        "__id__": 57
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -1048,17 +1069,17 @@
     "_name": "loading_1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1112,7 +1133,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1155,17 +1176,17 @@
     "_name": "loading_2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -1219,7 +1240,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1262,17 +1283,17 @@
     "_name": "loading_3",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1326,7 +1347,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1369,17 +1390,17 @@
     "_name": "loading_4",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1433,7 +1454,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1476,17 +1497,17 @@
     "_name": "loading_5",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1540,7 +1561,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1583,17 +1604,17 @@
     "_name": "loading_6",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1647,7 +1668,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1690,20 +1711,20 @@
     "_name": "loading_7",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 45
       },
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1757,7 +1778,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1789,7 +1810,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_defaultClip": null,
@@ -1813,17 +1834,17 @@
     "_name": "loading_8",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1877,7 +1898,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1920,17 +1941,17 @@
     "_name": "loading_9",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1984,7 +2005,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -2027,17 +2048,17 @@
     "_name": "loading_10",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -2091,7 +2112,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2134,7 +2155,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_layoutSize": {
@@ -2166,7 +2187,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2200,26 +2221,26 @@
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 61
       },
       {
-        "__id__": 64
+        "__id__": 65
       },
       {
-        "__id__": 68
+        "__id__": 69
       },
       {
-        "__id__": 72
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2273,20 +2294,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 62
       },
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 64
     },
     "_opacity": 200,
     "_color": {
@@ -2340,7 +2361,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     "_enabled": true,
     "_materials": [
@@ -2373,7 +2394,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 61
     },
     "_enabled": true,
     "_color": {
@@ -2402,20 +2423,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 66
       },
       {
-        "__id__": 66
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 68
     },
     "_opacity": 200,
     "_color": {
@@ -2469,7 +2490,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2502,7 +2523,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_color": {
@@ -2531,20 +2552,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 72
     },
     "_opacity": 200,
     "_color": {
@@ -2598,7 +2619,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2631,7 +2652,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "_color": {
@@ -2660,20 +2681,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 74
       },
       {
-        "__id__": 74
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 76
     },
     "_opacity": 200,
     "_color": {
@@ -2727,7 +2748,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2760,7 +2781,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 73
     },
     "_enabled": true,
     "_color": {
@@ -2789,7 +2810,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     "_enabled": true,
     "_layoutSize": {
@@ -2849,11 +2870,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -2907,7 +2928,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 80
     },
     "_enabled": true,
     "_materials": [
@@ -3024,11 +3045,14 @@
     "lbl_progress": {
       "__id__": 22
     },
+    "node_load": {
+      "__id__": 25
+    },
     "lbl_server": {
-      "__id__": 65
+      "__id__": 66
     },
     "lbl_privacy": {
-      "__id__": 73
+      "__id__": 74
     },
     "_id": ""
   },

assets/script/before/main/FactoryIcon.ts

@@ -10,7 +10,7 @@ export class FactoryIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: cc.Node, tooltip: "完成品展示节点" }) showGroup: cc.Node = null;
 
-    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+    @property({ type: cc.Node, tooltip: '闲置动画' }) idleAni: cc.Node = null;
 
     public configID: number = 0;
     public sortID: number = 0;
@@ -25,27 +25,8 @@ export class FactoryIcon extends cc.Component {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
+        this.tab = gData.gameData.getTabByConfigID(this.configID);
 
-        switch (this.configID) {
-            case 30004:
-                this.tab = ProductType.bmhc;
-                break;
-            case 30005:
-                this.tab = ProductType.gdp;
-                break;
-            case 30006:
-                this.tab = ProductType.ztc;
-                break;
-            case 30007:
-                this.tab = ProductType.lrc;
-                break;
-            case 30008:
-                this.tab = ProductType.gfmg;
-                break;
-            case 30009:
-                this.tab = ProductType.kcd;
-                break;
-        }
         this.countDown.node.active = false;
 
         this.freshState();
@@ -74,16 +55,14 @@ export class FactoryIcon extends cc.Component {
 
                     break;
                 case FactroyState.Empty:
-                    if(this.idleAni && this.idleAni.active == false)
-                    {
+                    if (this.idleAni && this.idleAni.active == false) {
                         this.idleAni.active = true;
                     }
                     break;
                 case FactroyState.Producting:
                     this.countDown.node.active = true;
                     this.countDown.setData(this.data);
-                    if(this.idleAni && this.idleAni.active == true)
-                    {
+                    if (this.idleAni && this.idleAni.active == true) {
                         this.idleAni.active = false;
                     }
                     break;

assets/script/before/main/FactorySystem.ts

@@ -1,6 +1,6 @@
 /** 工厂数据类 */
 
-import { ProductType } from "../../game/data/GameData";
+import { FactroyState } from "../../game/data/GameData";
 import { FactoryIcon } from "./FactoryIcon";
 
 const { ccclass } = cc._decorator;
@@ -8,6 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class FactorySystem {
     private _currSelectFactory: FactoryIcon = null;
+    private factoryIcons: Array<FactoryIcon> = [];
 
     public set currSelectFactory(factory: FactoryIcon) {
         this._currSelectFactory = factory;
@@ -20,4 +21,23 @@ export default class FactorySystem {
     public make(id: number): void {
         this._currSelectFactory && this._currSelectFactory.make(id);
     }
+
+    public addFactory(factory) {
+        this.factoryIcons.push(factory);
+    }
+
+    public nextFactory() {
+        let len = this.factoryIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.factoryIcons[i].state == FactroyState.Empty) {
+                gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                gData.gameData.nextMake = this.factoryIcons[i];
+                return this.factoryIcons[i];
+            }
+        }
+    }
+
+    public btnMake() {
+        gData.gameData.nextMake.make(gData.gameData.nextCanProduct.picture);
+    }
 }

assets/script/before/main/FarmIcon.ts

@@ -155,7 +155,7 @@ export class FarmIcon extends cc.Component {
             this.plantIcon.getComponent(cc.Animation).play();
             // this.plantIcon.getComponent(Sound).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-            gData.farmSystem.selectNextFarm();
+            // gData.farmSystem.selectNextFarm();
             gData.gameData.leftTimes--;
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;

assets/script/before/main/FarmSystem.ts

@@ -46,27 +46,16 @@ export class FarmSystem {
     private getCanPlantFarm(): FarmIcon | null {
         for (let i = 0; i < this.farms.length; i++) {
             if (this.farms[i] != this.currSelectFarm && this.farms[i].state == FarmState.Empty) {
+                gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
+                gData.gameData.nextMake = this.farms[i];
                 return this.farms[i];
             }
         }
         return null;
     }
-    /**触摸事件的同级传递 */
-    public next(node: FarmIcon, e): void {
-        let index = this.farms.indexOf(node);
-        if (index % 3 < 2) {
-            this.farms[index + 1].node.emit(cc.Node.EventType.TOUCH_END, e);
-        }
-    }
-
-    public novice_plant(): void {
-        let frame = this.farms[0];
-        frame.novice_plant();
-    }
 
-    public novice_clean(): void {
-        let frame = this.farms[0];
-        frame.novice_clean();
+    public btnMake() {
+        gData.gameData.nextMake.plant(gData.gameData.nextCanProduct.picture);
     }
 }
 

assets/script/before/main/PastureIcon.ts

@@ -56,6 +56,7 @@ export default class PastureIcon extends cc.Component {
         }
 
         this.freshState();
+        
     }
 
     update() {

assets/script/before/main/PastureSystem.ts

@@ -1,4 +1,6 @@
+import { PastureState } from "../../game/data/GameData";
 import PastureData from "./PastureData";
+import PastureIcon from "./PastureIcon";
 
 /** 动物移动管理系统 */
 const { ccclass } = cc._decorator;
@@ -6,6 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class PastureSystem {
     private pastureDataMap: Map<number, PastureData> = new Map<number, PastureData>();
+    private pastureIcons: Array<PastureIcon> = [];
 
     setPastureData(configID) {
         if (this.getPastureData(configID)) {
@@ -19,4 +22,25 @@ export default class PastureSystem {
     getPastureData(configID) {
         return this.pastureDataMap.get(configID);
     }
+
+    addPastureIcon(pasture) {
+        this.pastureIcons.push(pasture);
+    }
+
+    /** 下一个空置饲养场 */
+    nextPasture() {
+        let len = this.pastureIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.pastureIcons[i].state == PastureState.Empty) {
+                gData.gameData.nextCanProduct = this.pastureIcons[i].data;
+                gData.gameData.nextMake = this.pastureIcons[i];
+                return this.pastureIcons[i];
+            }
+        }
+        return null;
+    }
+
+    btnMake() {
+        gData.gameData.nextMake.onEat();
+    }
 }

assets/script/before/map/MapMove.ts

@@ -16,6 +16,11 @@ export class MapMove extends cc.Component {
     start() {
         this.canvas = cc.find('Canvas');
         this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
+
+        //地图场景加载结束
+        this.scheduleOnce(() => {
+            gData.gameData.setNextProduct();
+        }, 0.1)
     }
 
     onDestroy() {
@@ -106,8 +111,7 @@ export class MapMove extends cc.Component {
     }
 
 
-    private clickMapBookBtn()
-    {
+    private clickMapBookBtn() {
         mk.ui.openPanel('module/farmMap/farmMap');
     }
 

assets/script/game/data/GameData.ts

@@ -56,6 +56,14 @@ export class GameData {
 
     public init_leftTimes: boolean = false;
 
+    /** 可生产商品配置 */
+    public nextCanProduct = null;
+    /** 按钮生产选中的农田、牧场或工厂 */
+    public nextMake = null;
+    /** 类型标识 */
+    private nextType = 0;
+
+    public init_makeInfo = false;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -210,6 +218,7 @@ export class GameData {
         this.setFramDataMapByServer();
         this.setPastureDataMapByServer();
         this.setFactoryDataMapByServer();
+        this.initSetMaxProduct();
         this.initLeftTimes();
         this.initFarmMapGetRewardData();
     }
@@ -226,8 +235,8 @@ export class GameData {
 
         this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
         this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
-        // //test
-        // this.ProductionRecovery = 1;
+        //test
+        this.ProductionRecovery = 1;
     }
 
     //图鉴领取数据
@@ -321,67 +330,6 @@ export class GameData {
     }
 
     //*********** ================= 农场数据 ================== */
-
-    // public needReloadData = false;
-    // private _productingListMap: Map<number, Array<{ productID: number, ripeDate: number }>> = new Map();
-
-    // /**建筑生产队列列表 */
-    // public getProductingList(id: number): Array<{ productID: number, ripeDate: number }> {
-    //     if (!this._productingListMap.has(id)) {
-    //         this._productingListMap.set(id, []);
-    //     }
-    //     return this._productingListMap.get(id);
-    // }
-
-    // /**已激活的建筑列表 */
-    // private buildDataMap: Map<number, number> = new Map();
-    // public hasBuildData(id: number): boolean {
-    //     return this.buildDataMap.has(id);
-    // }
-    // public getBuildData(id: number): number {
-    //     return this.buildDataMap.get(id);
-    // }
-    // public setBuildData(id: number, userBuildID: number): void {
-    //     this.buildDataMap.set(id, userBuildID);
-    // }
-    // // /**设置建筑数据（生产队列，流水线数量，激活情况等） */
-    // // public async setGameData(data: any) {
-    // //     this._productingListMap = new Map();
-    // //     this._unlockMap = new Map();
-    // //     this.buildDataMap = new Map();
-    // //     let product = ConfigData.configMap.get("product");
-    // //     for (let i = 0; i < data.length; i++) {
-    // //         const build = data[i];
-    // //         if (!this.buildDataMap.has(build.buildID)) {
-    // //             this.buildDataMap.set(build.buildID, build.userBuildID);
-    // //             this.setUnlock(build.buildID, build.addValue + 1);
-    // //         }
-    // //         if (build.productID != 0) {
-    // //             let result = product[build.productID];
-    // //             this.getProductingList(build.buildID).push({ productID: build.productID, ripeDate: build.plantTime * 1000 + result["time"] * 1000 });
-    // //         }
-    // //     }
-    // // }
-    // /**是否有任务可领取 */
-    // public taskReceive = false;
-    // /**是否有3日活动任务可领取 */
-    // public threeDayTaskReceive = 0;
-    // /**3日活动还需要邀请人数 */
-    // public needChildCount: number = 0;
-    // /**3日活动激活后结束时间 */
-    // public threedayTaskTime: number = 0
-    // /**种植奖励数据 */
-    // public productPrize = null;
-
-    // // /**排行榜数据*/
-    // // public rankData: RankData;
-    // // /**排行榜积分数据*/
-    // // public rankScore: number = 0;
-    // // /**是否刷新排行榜活动倒计时*/
-    // // public isRefreshRankTime: boolean;
-    // // /**是否可以领取排行榜奖励*/
-    // // public isCanGetRankReward: boolean;
-
     /** 农田数据 服务器数据 */
     private _farmData = [];
     /** 农田字典 本地数据，方便操作*/
@@ -389,11 +337,78 @@ export class GameData {
     //刷新农田
     public needFreshArr = [];
 
+    /** 随机获取可种植物品 */
     getRandomPlantConfig() {
         let id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
         return this.getProductMap(id);
     }
 
+    /** 随机获取可生产产品 */
+    getRandomFactoryConfig(configID) {
+        let tab = gData.gameData.getTabByConfigID(configID);
+        let arr = this.getProductArrByType(tab);
+        let max = this.getMaxProduct(tab);
+        let canArr = [];
+        let len = arr.length;
+        for (var i = 0; i < len; i++) {
+            if (arr[i] <= max) {
+                canArr.push(arr[i]);
+                if (arr[i] == max) {
+                    break;
+                }
+            }
+        }
+
+        let index = Util.rnd(0, canArr.length - 1);
+        let id = canArr[index];
+        return this.getProductMap(id);
+    }
+
+    setNextProduct() {
+        this.nextMake = null;
+        let next = gData.farmSystem.selectNextFarm();
+        if (!next) {
+            let next1 = gData.pastureSystem.nextPasture();
+            if (!next1) {
+                let next2 = gData.factorySystem.nextFactory();
+                if (!next2) {
+                    this.nextType = 0;
+                }
+                else {
+                    this.nextType = 3;
+                }
+            }
+            else {
+                this.nextType = 2;
+            }
+        }
+        else {
+            this.nextType = 1;
+        }
+
+        this.init_makeInfo = true;
+    }
+
+    makeProduct() {
+        switch (this.nextType) {
+            case 0:
+                mk.tip.pop('农场已满，无法继续生产');
+                break;
+            case 1:
+                gData.farmSystem.btnMake();
+                this.setNextProduct();
+                break;
+            case 2:
+                gData.pastureSystem.btnMake();
+                this.setNextProduct();
+                break;
+            case 3:
+                gData.factorySystem.btnMake();
+                this.setNextProduct();
+                break;
+        }
+    }
+
     public setFarmDataMap(id, data, sendToServer = true) {
         this._farmDataMap.set(id, data);
         let len = this._farmData.length;
@@ -580,16 +595,20 @@ export class GameData {
         }
 
         let len = this._pastureData.length;
-        //新玩家初始化农田数据
+        //新玩家初始化养殖场数据
         if (len < 3) {
             let arr = this.getProductArrByType(ProductType.dw);
             let len1 = arr.length;
             let id = 30001;
             let data = null;
             for (var i = 0; i < len1; i++) {
-                // data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
-                //test
-                data = { id: id, state: PastureState.Empty, productID: arr[i].picture, growSpan: 0 };
+                if (arr[i].value < this.gameData.gradeLevel) {
+                    data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
+                }
+                else {
+                    data = { id: id, state: PastureState.Empty, productID: arr[i].picture, growSpan: 0 };
+                }
+
                 this._pastureData.push(data);
                 this._pastureDataMap.set(id, data);
                 id++;
@@ -641,14 +660,20 @@ export class GameData {
         }
 
         let len = this._factoryData.length;
-        //新玩家初始化农田数据
-        if (len < 3) {
+        //新玩家初始化工厂数据
+        if (len < 6) {
             let id = 30004;
             let data = null;
+            let tab = null;
             for (var i = 0; i < 6; i++) {
-                // data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
-                //test
-                data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
+                tab = this.getTabByConfigID(id);
+                let arr = this.getProductArrByType(tab);
+                if (arr[0].value < this.gameData.gradeLevel) {
+                    data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
+                }
+                else {
+                    data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
+                }
                 this._factoryData.push(data);
                 this._factoryDataMap.set(id, data);
                 id++;
@@ -663,6 +688,58 @@ export class GameData {
         }
     }
 
+    /** 通过工厂建筑物ID获取标签 */
+    getTabByConfigID(configID: number): ProductType {
+        let tab = ProductType.bmhc;
+        switch (configID) {
+            case 30004:
+                tab = ProductType.bmhc;
+                break;
+            case 30005:
+                tab = ProductType.gdp;
+                break;
+            case 30006:
+                tab = ProductType.ztc;
+                break;
+            case 30007:
+                tab = ProductType.lrc;
+                break;
+            case 30008:
+                tab = ProductType.gfmg;
+                break;
+            case 30009:
+                tab = ProductType.kcd;
+                break;
+        }
+        return tab;
+    }
+
+    /** 通过标签获取工厂建筑物ID */
+    getConfigIDByTab(tab: ProductType): number {
+        let configID = 0;
+        switch (tab) {
+            case ProductType.bmhc:
+                configID = 30004;
+                break;
+            case ProductType.gdp:
+                configID = 30005;
+                break;
+            case ProductType.ztc:
+                configID = 30006;
+                break;
+            case ProductType.lrc:
+                configID = 30007;
+                break;
+            case ProductType.gfmg:
+                configID = 30008;
+                break;
+            case ProductType.kcd:
+                configID = 30009;
+                break;
+        }
+        return configID;
+    }
+
 
     /** 最大可种植/生产商品数组 */
     private _maxProduct = [];
@@ -706,16 +783,58 @@ export class GameData {
         this.setProp(GameProp.maxProduct, this._maxProduct);
     }
 
-    /** 农场升级时检查最大可种植/生产商品 */
-    public checkMaxProduct() {
+    public initSetMaxProduct() {
+        if (this._maxProduct.length <= 0) {
+            this._maxProduct = this.getProp(GameProp.maxProduct);
+        }
+    }
+
+    /** 农场升级时解锁工厂，检查最大可种植/生产商品 */
+    public checkGradeUpUnLock() {
         for (var key in ProductType) {
-            let tab = ProductType[key]
-            let curmax = this.getMaxProduct(tab);
-            if (!curmax) {
-                let configArr = this.getProductArrByType(tab);
-                if (gData.gameData.gameData.gradeLevel >= configArr[0].value && this.getMaxProduct(tab) <= configArr[0].value) {
-                    this.setMaxProduct(tab, configArr[0].picture);
-                }
+            let tab = ProductType[key];
+            let configArr = this.getProductArrByType(tab);
+            let len = configArr.length;
+            let data = null;
+            let needUpdate = false;
+            switch (tab) {
+                case ProductType.nzw:
+                    //不做处理，游戏最开始已解锁
+                    break;
+                case ProductType.dw:
+                    let id = 30001;
+                    needUpdate = false;
+                    for (var i = 0; i < len; i++) {
+                        data = this.getPastureDataMap(id);
+                        if (data.state == PastureState.Lock && configArr[i].value >= this.gameData.gradeLevel) {
+                            data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
+                            this.setPastureDataMap(id, data, false);
+                            needUpdate = true;
+                        }
+                        id++;
+                    }
+                    //更新到服务器
+                    if (needUpdate) {
+                        this.setProp(GameProp.pastureData, this._pastureData);
+                    }
+                    break;
+                default:
+                    //工厂解锁根据第一个商品
+                    needUpdate = false;
+                    let configID = this.getConfigIDByTab(tab);
+                    data = this.getFactoryDataMap(configID);
+                    if (data.state == FactroyState.Lock && gData.gameData.gameData.gradeLevel >= configArr[0].value) {
+                        data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
+                        this.setFactoryDataMap(configID, data, false);
+                        needUpdate = true;
+                        //更新最大可购买商品
+                        this.setMaxProduct(tab, configArr[0].picture);
+                    }
+
+                    if (needUpdate) {
+                        this.setProp(GameProp.factoryData, this._factoryData);
+                    }
+                    break;
             }
         }
     }
@@ -740,9 +859,6 @@ export enum GameProp {
     cashTimes = 6,
 
     /** ------------------ 游戏核心数据 --------------------------- */
-    /** 农场等级 */
-    levelNum = 10,
-
     /** 农田数据 */
     farmData = 11,
     /** 产品生产次数 */
@@ -877,18 +993,11 @@ class PlayerProp {
     versioncfg = 0;
     /** 福袋数据 */
     userTuCaoInfo = 0;
-    /** 关卡数 */
-    levelNum = 0;
-    /** 锤子道具数目 */
-    hammerPropNum = 0;
-    /** 重设道具数目 */
-    resetPropNum = 0;
-    /** 变色道具数目 */
-    changePropNum = 0;
+
     /** 能免费领红包 1 表示是新人第一次产出红包币，不用看视频*/
     isFirstRedMoney = 0;
 
-    //玩家等级
+    //农场等级
     gradeLevel = 6;
 }
 

assets/script/game/game/Game.ts

@@ -62,14 +62,11 @@ export default class Game extends cc.Component {
     private lastTimeSpan = 0;
     private span = 0;
 
-    /** 可种植植物配置 */
-    private canPlantConfig = null;
-
     onLoad() {
         gData.gameData.gameStyle = this;
         mk.ui.closePanel("login");
         this.span = gData.gameData.ProductionRecovery * 60 * 1000;
-        gData.gameData.checkMaxProduct();
+        gData.gameData.checkGradeUpUnLock();
         this.loadMain();
     }
 
@@ -80,7 +77,6 @@ export default class Game extends cc.Component {
         this.initInfo();
         this.autoOpenPanel();
         this.runGuideWeak();
-        this.initCanPlantInfo();
         this.initLeftTimes();
 
         mk.guide.open(1);
@@ -129,6 +125,10 @@ export default class Game extends cc.Component {
             this.initRedPoint();
         }
 
+        if (gData.gameData.init_makeInfo) {
+            this.initCanPlantInfo();
+        }
+
         if (gData.gameData.init_leftTimes) {
             this.initLeftTimes();
         }
@@ -228,9 +228,11 @@ export default class Game extends cc.Component {
     }
 
     private async initCanPlantInfo() {
-        this.canPlantConfig = gData.gameData.getRandomPlantConfig();
-        this.icon_plant.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.canPlantConfig.picture, cc.SpriteFrame);
-        this.icon_plantName.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + this.canPlantConfig.picture, cc.SpriteFrame);
+        if (gData.gameData.nextCanProduct) {
+            gData.gameData.init_makeInfo = false;
+            this.icon_plant.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+            this.icon_plantName.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+        }
     }
 
     private initLeftTimes() {
@@ -336,23 +338,7 @@ export default class Game extends cc.Component {
             return;
         }
 
-        if (!gData.farmSystem.currSelectFarm) {
-            let next = gData.farmSystem.selectNextFarm();
-            if (!next) {
-                mk.tip.pop('没有空闲的农田');
-                return;
-            }
-        }
-
-        if (gData.farmSystem.currSelectFarm) {
-            if (gData.farmSystem.currSelectFarm.state != FarmState.Empty) {
-                mk.tip.pop('没有空闲的农田');
-                return;
-            }
-        }
-
-        gData.farmSystem.plant(this.canPlantConfig.picture);
-        this.initCanPlantInfo();
+        gData.gameData.makeProduct();
     }
 }
 

assets/script/game/module/forceUpdate/ForceUpdate.ts

@@ -1,4 +1,3 @@
-import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
 import { UpdateState } from "../../data/AppData";
 import { AUDIO_TYPE } from "../../data/GameData";

assets/script/game/module/hotUpdate/HotUpdatePanel.ts

@@ -38,10 +38,9 @@ export default class HotUpdatePanel extends cc.Component {
             let byte = event.getPercent().toFixed(2);
             let msg = event.getMessage();
 
+            gData.appData.updateState = UpdateState.IsUpdate;
+            gData.appData.updatePercent = parseFloat(file);
             console.log('[update]: 进度=' + file);
-            // this.updateProgress.progress = parseFloat(file);
-            // this.tipsLabel.string = '正在更新中,请耐心等待';
-            console.log(msg);
         };
         options.OnNeedToUpdate = (data) => {
             HotUpdate.hotUpdate();
@@ -52,15 +51,15 @@ export default class HotUpdatePanel extends cc.Component {
         options.OnUpdateFailed = () => {
             // this.tipsLabel.string = '更新失败';
             console.log('热更新失败');
-            // HotUpdate.checkUpdate();
+            setTimeout(() => {
+                HotUpdate.checkUpdate();
+            }, 2000);
         };
         options.OnUpdateSucceed = () => {
             // this.tipsLabel.string = '更新成功';
             console.log('更新成功');
-            // DialogMgr.showTipsWithOkBtn('更新成功,点击确定重启游戏', () => {
-            //     cc.audioEngine.stopAll();
-            //     cc.game.restart();
-            // });
+            cc.audioEngine.stopAll();
+            cc.game.restart();
         };
         HotUpdate.init(this.manifest, options);
     }

assets/script/game/module/login/Login.ts

@@ -10,8 +10,10 @@ export default class Login extends cc.Component {
 
     @property(cc.Sprite)
     private bar: cc.Sprite = null;
-    @property({ displayName: '加载文字', type: cc.Label })
+    @property({ displayName: '更新文本', type: cc.Label })
     private lbl_progress: cc.Label = null;
+    @property({ displayName: '加载动画节点', type: cc.Node })
+    private node_load: cc.Node = null;
     @property({ displayName: '服务协议', type: cc.Label })
     private lbl_server: cc.Label = null;
     @property({ displayName: '隐私协议', type: cc.Label })
@@ -25,6 +27,8 @@ export default class Login extends cc.Component {
     private hasDeviceBackInit = false;
 
     onLoad() {
+        this.lbl_progress.node.active = false;
+        this.node_load.active = true;
         this.setProgress(0);
     }
 
@@ -61,8 +65,9 @@ export default class Login extends cc.Component {
         }
 
         if (gData.appData.updateState == UpdateState.IsUpdate) {
-            this.lbl_progress.string = '正在更新中,请耐心等待';
-            this.setProgress(gData.appData.updatePercent);
+            this.lbl_progress.node.active = true;
+            this.node_load.active = false;
+            this.setProgress(gData.appData.updatePercent * 100);
             return;
         }
 

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="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
+            <option value="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>

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>

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

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

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

@@ -90,7 +90,7 @@
       <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 31 Platform" jdkType="Android SDK" />
+    <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" />

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://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 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://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
     </content>
-    <content url="file://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 url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
     </content>
-    <content url="file://$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://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../Classes">
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
@@ -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: 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: ./../../../../../../../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: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
@@ -333,6 +333,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="android-libcocos2dx" />
+    <orderEntry type="module" module-name="libcocos2dx" />
   </component>
 </module>

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

@@ -6,6 +6,10 @@ android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
     buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
+    lintOptions {
+        abortOnError false
+    }
+
     defaultConfig {
         applicationId PACKAGE_NAME
         minSdkVersion PROP_MIN_SDK_VERSION

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:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/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

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

@@ -4299,7 +4299,7 @@ for (var o = !0, n = 0; n != e.welFareTaskList.length; ++n) if (e.welFareTaskLis
 o = !1;
 break;
 }
-if (o) {
+if (o || e.leftVideoTimes <= 0) {
 this.video_btn.interactable = !1;
 (a = this.video_btn.getComponent(l.default)) && a.setGray(!0);
 }
@@ -4377,13 +4377,13 @@ this.txtBigNum.string = this.curValue.toFixed(2) + "元";
 e.prototype.Click_AdProgressBtn = function() {
 mk.audio.playEffect("button");
 if (!cc.sys.isNative || gData.loginData.isAuth) {
-if (1 == gData.blessingBag.videoRbData.isVideo) gData.blessingBag.addProgress(); else {
+if (1 == gData.blessingBag.videoRbData.isVideo) gData.blessingBag.addProgress(); else if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
 mk.ad.videoAdType = u.VideoAdType.Fudai;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.blessingBag.addProgress();
 });
-}
+} else mk.tip.pop("今日观看次数已用完");
 mk.audio.playEffect("button");
 console.log("---\x3eYou Click AdProgressBtn  ", gData.blessingBag.videoRbData);
 } else s.default.WxAuth();
@@ -8890,7 +8890,7 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = t("../../component/TableView"), c = t("../../data/GameData"), s = t("./ItemName"), l = cc._decorator, p = l.ccclass, u = l.property, d = function(t) {
+var r = t("../../component/TableView"), c = t("./ItemName"), s = cc._decorator, l = s.ccclass, p = s.property, u = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -8902,20 +8902,16 @@ return e;
 }
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {
-var t = this, e = gData.gameData.getProductArrByType(c.ProductType.nzw);
-this.scroll_view.node.emit("srollview-init", e);
-cc.tween(this.node).delay(.1).call(function() {
-t.scroll_view.vertical = !1;
-}).delay(.1).call(function() {
+var t = this;
+this.scroll_view.node.emit("srollview-init", [ {}, {}, {}, {}, {}, {}, {} ]);
+cc.tween(this.node).delay(.2).call(function() {
 for (var e = t.tableview.getFrontPositionItemByCount(5), o = 0; o != e.length; ++o) {
 e[o].active = !0;
-e[o].x = 600;
-cc.tween(e[o]).delay(.1 * o + .2).to(.3, {
-x: 0
+e[o].setPosition(e[o].position.x + 600, e[o].position.y);
+cc.tween(e[o]).delay(.1 * o + .2).by(.3, {
+x: -600
 }, cc.easeSineOut()).start();
 }
-}).delay(1).call(function() {
-t.scroll_view.vertical = !0;
 }).start();
 };
 e.prototype.clickToggleBtn = function(t, e) {
@@ -8943,22 +8939,21 @@ this.scroll_view.node.emit("srollview-init", n);
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
-i([ u({
+i([ p({
 displayName: "种类",
-type: s.default
+type: c.default
 }) ], e.prototype, "itemName", void 0);
-i([ u({
+i([ p({
 displayName: "滚动视图",
 type: cc.ScrollView
 }) ], e.prototype, "scroll_view", void 0);
-i([ u(r.default) ], e.prototype, "tableview", void 0);
-return i([ p ], e);
+i([ p(r.default) ], e.prototype, "tableview", void 0);
+return i([ l ], e);
 }(cc.Component);
-o.default = d;
+o.default = u;
 cc._RF.pop();
 }, {
 "../../component/TableView": "TableView",
-"../../data/GameData": "GameData",
 "./ItemName": "ItemName"
 } ],
 FarmSystem: [ function(t, e, o) {
@@ -9066,10 +9061,10 @@ return e;
 }
 e.prototype.start = function() {
 this.clips = this.animation.getClips();
-this.refreshTime = 10;
+this.refreshTime = 2.5;
 this.redMoneyNum = 3;
 };
-e.prototype.update = function(t) {
+e.prototype.update = function() {
 this.walk.curTargetPoint && this.walk.curTargetPoint.x > this.node.position.x ? this.node.setScale(cc.v3(-1, 1, 1)) : this.node.setScale(cc.v3(1, 1, 1));
 if (this.walk.state == r.WalkState.Stop) if (this.walk.curTargetPoint && this.walk.curTargetPoint.y > this.node.position.y) {
 this.animation.play(this.clips[1].name);
@@ -9078,10 +9073,6 @@ this.forwardMask.node.active = !(this.backMask.node.active = !0);
 this.animation.play(this.clips[0].name);
 this.forwardMask.node.active = !(this.backMask.node.active = !1);
 }
-if (this.refreshTime >= 0) this.refreshTime -= t; else {
-this.refreshTime = 10;
-mk.fly.PlayCoinAnim(1, 3, this.fly_node, "", null, 2);
-}
 };
 i([ l({
 type: r.TakeAwalk,
@@ -10618,7 +10609,7 @@ this.gameData.newPlayer = t.newPlayer;
 this.gameData.initPiggyBank(t.piggyBank);
 this.gameData.piggyBankCashTimes = t.piggyBankCashTimes;
 this.gameData.redMoney = null == t.redMoney ? 0 : t.redMoney;
-this.gameData.signInDay = t.signInDay;
+this.gameData.signInDay = 8;
 this.gameData.totalPiggyBankCashTimes = t.totalPiggyBankCashTimes;
 this.gameData.turntableTimes = t.turntableTimes;
 this.gameData.userTuCaoInfo = t.userTuCaoInfo;
@@ -10707,10 +10698,6 @@ this.setProp(i.leftTimes, this.leftTimes);
 this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
 this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
 };
-t.prototype.initFarmMapGetRewardData = function() {
-this._farmMapRewardData = this.getProp(i.farmMapGetRewardData);
-this._farmMapRewardData || (this._farmMapRewardData = new Map());
-};
 t.prototype.resetProps = function() {
 var t = [];
 t.push({
@@ -10937,7 +10924,6 @@ t[t.maxProduct = 13] = "maxProduct";
 t[t.pastureData = 14] = "pastureData";
 t[t.factoryData = 15] = "factoryData";
 t[t.leftTimes = 16] = "leftTimes";
-t[t.farmMapGetRewardData = 17] = "farmMapGetRewardData";
 t[t.turnable_leftTimes = 20] = "turnable_leftTimes";
 t[t.sign_last_bar = 120] = "sign_last_bar";
 t[t.sign_can = 121] = "sign_can";
@@ -13516,9 +13502,11 @@ t.local, t.server;
 };
 e.OnUpdateProgress = function(t) {
 t.getDownloadedBytes(), t.getTotalBytes(), t.getDownloadedFiles(), t.getTotalFiles();
-var e = t.getPercentByFile().toFixed(2), o = (t.getPercent().toFixed(2), t.getMessage());
+var e = t.getPercentByFile().toFixed(2);
+t.getPercent().toFixed(2), t.getMessage();
+gData.appData.updateState = c.UpdateState.IsUpdate;
+gData.appData.updatePercent = parseFloat(e);
 console.log("[update]: 进度=" + e);
-console.log(o);
 };
 e.OnNeedToUpdate = function() {
 r.default.hotUpdate();
@@ -13528,9 +13516,14 @@ t.enterGame();
 };
 e.OnUpdateFailed = function() {
 console.log("热更新失败");
+setTimeout(function() {
+r.default.checkUpdate();
+}, 2e3);
 };
 e.OnUpdateSucceed = function() {
 console.log("更新成功");
+cc.audioEngine.stopAll();
+cc.game.restart();
 };
 r.default.init(this.manifest, e);
 };
@@ -15273,7 +15266,7 @@ gData.gameData.dataFinish = !1;
 }
 } else {
 this.lbl_progress.string = "正在更新中,请耐心等待";
-this.setProgress(gData.appData.updatePercent);
+this.setProgress(100 * gData.appData.updatePercent);
 }
 }
 };
@@ -17450,10 +17443,6 @@ a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_value = [];
-e.lbl_reward_value = null;
-e.spr_cash_out = null;
-e.lbl_progress = null;
-e.node_cash = null;
 return e;
 }
 e.prototype.start = function() {
@@ -17465,20 +17454,6 @@ this.showWatchAdReward();
 gData.turnable.adData = null;
 }
 };
-e.prototype.initCashOutStyle = function(t) {
-void 0 === t && (t = 0);
-var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
-if (o) {
-var n = t > o.type_value ? o.type_value : t;
-this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.type_value;
-var a = n / o.type_value >= 1 ? 1 : n / o.type_value;
-cc.tween(this.spr_cash_out).to(a, {
-fillRange: a
-}).start();
-t >= o.type_value ? this.node_cash.play() : this.node_cash.stop();
-}
-};
 e.prototype.showWatchAdReward = function() {
 if (gData.reward.adData) {
 var t = "0.30";
@@ -17497,7 +17472,6 @@ t.lbl_value[o].string = "" + n;
 };
 e.prototype.clickOpenBtn = function() {
 mk.audio.playEffect("button");
-mk.ui.closePanel(this.name);
 mk.ad.videoAdType = s.VideoAdType.StartQiPaoRedBag;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
@@ -17511,10 +17485,6 @@ i([ u({
 displayName: "数字组",
 type: cc.Label
 }) ], e.prototype, "lbl_value", void 0);
-i([ u(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ u(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ u(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ u(cc.Animation) ], e.prototype, "node_cash", void 0);
 return i([ p ], e);
 }(cc.Component);
 o.default = d;
@@ -23234,7 +23204,7 @@ o > 0 && (o -= 1);
 this.tableview.contentMoveByIndex(o, .01);
 cc.tween(this.node).delay(.1).call(function() {
 t.scroll_view.vertical = !1;
-}).call(function() {
+}).delay(.1).call(function() {
 var e = t.tableview.getItemByIndexAndCount(o, 3);
 e && e.sort(function(t, e) {
 return t.index - e.index;
@@ -25035,7 +25005,8 @@ this.isMoved = !1;
 };
 e.prototype.onTouchMove = function(t) {
 if (t.getTouches().length > 1) this.isMoved = !0; else {
-this.isMoved = cc.Vec2.distance(t.getStartLocation(), t.getLocation()) > 20;
+var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
+this.isMoved = cc.Intersection.pointInPolygon(o, this.points);
 if (this.isScaleAct && this.isMoved) {
 console.log("------move" + this.name);
 cc.tween(this.node).to(.1, {

packages-hot-update/cfg.json

@@ -1,14 +1,15 @@
 {
-    "version": "1.0.2",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
+    "version": "1.0.1",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
     "resourceRootDir": "D:\\mokaszProjects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1630478176179,
-    "genTime": 1630478176179,
+    "buildTime": 1630465024843,
+    "genTime": 1630465024843,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.1","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/version.manifest"}