wuwangdong 4 years ago
parent
commit
e70b370d15
63 changed files with 2194 additions and 2027 deletions
  1. 193 79
      assets/resources/module/farmMap/farmItem.prefab
  2. 1 0
      assets/script/before/view/uiItem/PlantItem.ts
  3. 1 1
      assets/script/game/component/TableView.ts
  4. 8 0
      assets/script/game/component/tween/TweenCast.ts
  5. 3 3
      assets/script/game/data/GameData.ts
  6. 1 0
      assets/script/game/data/module/RewardData.ts
  7. 3 3
      assets/script/game/game/Farmer.ts
  8. 1 1
      assets/script/game/game/Game.ts
  9. 23 11
      assets/script/game/module/farmMap/FarmItem.ts
  10. 2 2
      assets/script/game/module/newCashUI/WalletCashOut.ts
  11. 1 1
      assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts
  12. 1 0
      assets/script/game/module/reward/Reward.ts
  13. 1 1
      assets/script/game/module/setting/Setting.ts
  14. BIN
      build/jsb-link/assets/main/index.jsc
  15. 0 0
      build/jsb-link/assets/resources/config.json
  16. 0 0
      build/jsb-link/assets/resources/import/09/09134bba-feed-4255-ac95-f412d855035e.json
  17. 0 0
      build/jsb-link/assets/resources/import/11/11230951-60f5-4396-8fd5-d4d98cfd676e.json
  18. 0 0
      build/jsb-link/assets/resources/import/18/18ff1999-641d-40dc-bc3f-e4efbb12918a.json
  19. 1 1
      build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json
  20. 0 0
      build/jsb-link/assets/resources/import/2b/2b8feb46-8bbf-401a-87fd-36a33df6f510.json
  21. 0 0
      build/jsb-link/assets/resources/import/31/310aa3e6-7065-424d-851c-52437a7c1c36.json
  22. 0 0
      build/jsb-link/assets/resources/import/35/35d03fbf-2b63-4d0e-b621-be53decefa7f.json
  23. 0 1
      build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json
  24. 0 0
      build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json
  25. 0 0
      build/jsb-link/assets/resources/import/5c/5c60bd7e-abeb-4804-bb23-115cc66c3b44.json
  26. 0 0
      build/jsb-link/assets/resources/import/72/72481e4b-bb87-4bc0-9455-9c0f34848370.json
  27. 1 1
      build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json
  28. 0 0
      build/jsb-link/assets/resources/import/80/80f9ffc5-91ca-4d08-aedd-b3712be53310.json
  29. 0 0
      build/jsb-link/assets/resources/import/8d/8de08dc2-a439-4a3c-b667-a56bec3c0f5d.json
  30. 0 0
      build/jsb-link/assets/resources/import/92/9221bfa6-48ee-44cb-ba6c-f37e5847e165.json
  31. 0 0
      build/jsb-link/assets/resources/import/9d/9d4f03cb-eee3-4d8d-bb0a-457af009d1cd.json
  32. 0 0
      build/jsb-link/assets/resources/import/b3/b3a90f8c-06c6-4d76-aa5d-bfecd35a2294.json
  33. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  34. 0 0
      build/jsb-link/assets/resources/import/c9/c92ee1bb-0e83-4868-97e3-d71b8b58fae0.json
  35. 0 0
      build/jsb-link/assets/resources/import/cc/cc34b721-8635-450d-a8c7-955c7db376ac.json
  36. 0 0
      build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json
  37. 0 0
      build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json
  38. 0 0
      build/jsb-link/assets/resources/import/eb/eb23e881-c37e-4e36-a213-79bd42d111d1.json
  39. 27 27
      build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas
  40. 34 34
      build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas
  41. 34 34
      build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas
  42. 244 244
      build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas
  43. 20 20
      build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas
  44. 419 419
      build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas
  45. 335 335
      build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas
  46. 27 27
      build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas
  47. 251 251
      build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas
  48. 34 34
      build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas
  49. 27 27
      build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas
  50. 27 27
      build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas
  51. 27 27
      build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas
  52. 62 62
      build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas
  53. 34 34
      build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas
  54. 27 27
      build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas
  55. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  56. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml
  57. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  58. 99 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/android-libcocos2dx.iml
  59. 0 99
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml
  60. 104 104
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml
  61. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  62. 116 85
      build/jsb-link/js backups (useful for debugging)/main.index.js
  63. 2 2
      packages-hot-update/cfg.json

+ 193 - 79
assets/resources/module/farmMap/farmItem.prefab

@@ -24,29 +24,29 @@
         "__id__": 8
       },
       {
-        "__id__": 17
+        "__id__": 20
       },
       {
-        "__id__": 29
+        "__id__": 32
       },
       {
-        "__id__": 38
+        "__id__": 41
       },
       {
-        "__id__": 46
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -326,16 +326,19 @@
       },
       {
         "__id__": 12
+      },
+      {
+        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -347,8 +350,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 98.19999999999999
+      "width": 300,
+      "height": 60.92
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -360,7 +363,7 @@
       "ctor": "Float64Array",
       "array": [
         -129.31,
-        -50.996,
+        -49.996,
         0,
         0,
         0,
@@ -392,7 +395,7 @@
       "__id__": 8
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 10
@@ -412,7 +415,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 186.65,
-      "height": 50.4
+      "height": 27.72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -424,7 +427,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        23.899999999999995,
+        16.6,
         0,
         0,
         0,
@@ -466,7 +469,7 @@
     "_string": "Lv.1玉米  15秒成熟",
     "_N$string": "Lv.1玉米  15秒成熟",
     "_fontSize": 22,
-    "_lineHeight": 40,
+    "_lineHeight": 22,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -474,7 +477,7 @@
     "_batchAsBitmap": false,
     "_styleFlags": 0,
     "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
+    "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
@@ -500,7 +503,7 @@
       "__id__": 8
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 13
@@ -520,7 +523,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 211.12,
-      "height": 67.8
+      "height": 25.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -532,7 +535,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -15.200000000000003,
+        -17.86,
         0,
         0,
         0,
@@ -571,10 +574,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "种植5次玉米胡萝卜解锁\n(0/5)",
-    "_N$string": "种植5次玉米胡萝卜解锁\n(0/5)",
+    "_string": "种植5次玉米胡萝卜解锁",
+    "_N$string": "种植5次玉米胡萝卜解锁",
     "_fontSize": 20,
-    "_lineHeight": 30,
+    "_lineHeight": 20,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -601,6 +604,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "组合描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 193,
+      "g": 105,
+      "b": 51,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 211.12,
+      "height": 25.2
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0.14000000000000057,
+        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__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "种植5次玉米胡萝卜解锁",
+    "_N$string": "种植5次玉米胡萝卜解锁",
+    "_fontSize": 20,
+    "_lineHeight": 20,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
+    },
+    "fileId": "8cL7vfuKNLOocKfLhtFSm1",
+    "sync": false
+  },
+  {
     "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
@@ -610,8 +721,8 @@
     "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 98.19999999999999
+      "width": 300,
+      "height": 60.92
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -626,7 +737,7 @@
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
     "_N$spacingX": 0,
-    "_N$spacingY": -20,
+    "_N$spacingY": 8,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
     "_N$affectedByScale": false,
@@ -652,23 +763,23 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 21
       },
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 28
       },
       {
-        "__id__": 26
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -722,20 +833,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 22
       },
       {
-        "__id__": 20
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -789,7 +900,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -824,7 +935,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_color": {
@@ -853,17 +964,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -917,7 +1028,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -960,7 +1071,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -992,7 +1103,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 20
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1001,7 +1112,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 27
+        "__id__": 30
       }
     ],
     "_N$interactable": true,
@@ -1057,7 +1168,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 17
+      "__id__": 20
     },
     "_id": ""
   },
@@ -1091,20 +1202,20 @@
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       },
       {
-        "__id__": 35
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1158,20 +1269,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 34
       },
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1225,7 +1336,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1258,7 +1369,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "_color": {
@@ -1287,7 +1398,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1319,7 +1430,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 32
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1328,7 +1439,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_N$interactable": true,
@@ -1384,7 +1495,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 29
+      "__id__": 32
     },
     "_id": ""
   },
@@ -1418,20 +1529,20 @@
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 45
       },
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1485,17 +1596,17 @@
     "_name": "锁",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 38
+      "__id__": 41
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1549,7 +1660,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1592,7 +1703,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1624,7 +1735,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 41
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1633,7 +1744,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 44
+        "__id__": 47
       }
     ],
     "_N$interactable": true,
@@ -1689,7 +1800,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 38
+      "__id__": 41
     },
     "_id": ""
   },
@@ -1725,11 +1836,11 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1783,7 +1894,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1870,17 +1981,20 @@
     "lbl_des": {
       "__id__": 13
     },
+    "lbl_groupDes": {
+      "__id__": 16
+    },
     "node_ungetBtn": {
-      "__id__": 17
+      "__id__": 20
     },
     "node_getBtn": {
-      "__id__": 29
+      "__id__": 32
     },
     "node_unluckBtn": {
-      "__id__": 38
+      "__id__": 41
     },
     "node_redPoint": {
-      "__id__": 46
+      "__id__": 49
     },
     "_id": ""
   },

+ 1 - 0
assets/script/before/view/uiItem/PlantItem.ts

@@ -116,6 +116,7 @@ export default class PlantItem extends cc.Component {
         else {
             gData.factorySystem.make(this.data.picture);
         }
+        gData.gameData.updateNewTaskProgress();
     }
 
     getDesByType() {

+ 1 - 1
assets/script/game/component/TableView.ts

@@ -191,7 +191,7 @@ export default class TableView extends cc.Component {
                 comp_script && comp_script.setItemData(this.itemData[i], this);
             } else {
                 this.itemArr[i].destroy();
-                this.itemArr[i] = null;
+                this.itemArr[i] = null;        
             }
         }
 

+ 8 - 0
assets/script/game/component/tween/TweenCast.ts

@@ -157,6 +157,14 @@ export default class TweenCast extends cc.Component {
     public setMoneyArr(v:number[])
     {
         this.moneys = v;
+        let add = this.weights.length - v.length;
+        if(add > 0)
+        {
+            for(let i = 0; i != add; ++i)
+            {
+                this.moneys.unshift(v[0]);
+            }
+        }
         if(this.isShowFirstNotice)
         {
             if(!this.rich_text_2)

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

@@ -202,7 +202,7 @@ export class GameData {
         mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.umengChannel);
 
         //test
-        this.playerProp.gradeLevel = 6;
+        //this.playerProp.gradeLevel = 6;
     }
 
     /**
@@ -488,7 +488,7 @@ export class GameData {
         return flyRed;
     }
 
-    private async updateNewTaskProgress() {
+    public async updateNewTaskProgress() {
 
         // if (gData.gameData.init_redBagTask) {
         //     return;
@@ -1281,7 +1281,7 @@ export enum AUDIO_TYPE {
     /**关闭按钮音效*/
     closeButton = "closeButton",
     //红包界面打开
-    openRedBag = 'congratulations',
+    congratulations = 'congratulations',
     //红包飞音效
     redmoney = 'redmoney'
 }

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

@@ -56,6 +56,7 @@ export class RewardData extends Data {
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType === RewardType.rmb || gData.reward.data[i].rewardType === RewardType.productTimes) continue;
             if (gData.reward.data[i].rewardNum == 0) continue;
+            mk.audio.playEffect('redmoney');
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, world_Pos, '', () => {
                 is_add_money && this.addReward();
             })

+ 3 - 3
assets/script/game/game/Farmer.ts

@@ -67,16 +67,16 @@ export class Farmer extends cc.Component {
             const several = 2;
             let intV = Math.floor(add / several);
             let r = add % several;
-            mk.audio.playEffect('redmoney');
+            //mk.audio.playEffect('redmoney');
             if(intV > 0)
             {
                 for (let i = 0; i != several; ++i) {
-                    mk.fly.PlayCoinAnim(1, 1, this.fly_node, '', null, -1, intV);
+                    mk.fly2.PlayCoinAnim(1, 1, this.fly_node, '', null, -1, intV);
                 }
             }
             
             if (r > 0) {
-                mk.fly.PlayCoinAnim(1, 1, this.fly_node, '', null, -1, r);
+                mk.fly2.PlayCoinAnim(1, 1, this.fly_node, '', null, -1, r);
             }
         }       
     }

+ 1 - 1
assets/script/game/game/Game.ts

@@ -431,7 +431,7 @@ export default class Game extends cc.Component {
         let flyRed = gData.gameData.makeProduct();
 
         if (flyRed) {
-            mk.audio.playEffect('redmoney');
+            //mk.audio.playEffect('redmoney');
             let pos = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
             mk.fly.PlayCoinAnim(1, 3, this.btn_product, pos, () => {
                 gData.gameData.init_task = true;

+ 23 - 11
assets/script/game/module/farmMap/FarmItem.ts

@@ -14,6 +14,9 @@ export default class FarmItem extends cc.Component {
     @property({ displayName: '描述', type: cc.Label })
     private lbl_des: cc.Label = null;
 
+    @property({ displayName: '组合描述', type: cc.Label })
+    private lbl_groupDes: cc.Label = null;
+
     @property({ displayName: '领奖按钮', type: cc.Node })
     private node_ungetBtn: cc.Node = null;
 
@@ -27,6 +30,7 @@ export default class FarmItem extends cc.Component {
     private node_redPoint: cc.Node = null;
 
     private data = null;
+    private isUpdate = false;
 
     public setItemData(data) {
         this.InitUI(data);
@@ -47,10 +51,7 @@ export default class FarmItem extends cc.Component {
 
         let max = gData.farmMapData.maxUnluckValue;
         if (data.picture <= max) {
-            this.lbl_nameDes.node.active = true;
-            this.lbl_nameDes.string = `${data.name} ${data.time}秒成熟`;
-            this.lbl_des.string = `最高收获${data.menuRedBagCoin/100}红包币`;
-            
+               
             let state = gData.gameData.getFarmMapRewardState(this.getIndex());
             if (state == 1) {
                 this.node_getBtn.active = true;
@@ -63,28 +64,39 @@ export default class FarmItem extends cc.Component {
                 this.node_unluckBtn.active = false;
                 this.node_redPoint.active = true;
             }
+            this.isUpdate = true;
+            this.lbl_nameDes.node.active = true;
+            this.lbl_des.node.active = true;
+            this.lbl_groupDes.node.active = false;
+            this.lbl_nameDes.string = `${data.name} ${data.time}秒成熟`;
+            this.lbl_des.string = `最高收获${data.menuRedBagCoin/100}红包币`; 
             this.sp_icon.spriteFrame = await mk.loader.load(plantPath + data.picture, cc.SpriteFrame);
 
         } else if (data.picture - 1 == max) {
-            let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
-            let plantName = gData.gameData.getProductMap(data.picture - 1).name;
-            let des = this.getDesByType();
-            this.lbl_des.string = `${des}${this.data.value}次${plantName}后解锁\n(${times}/${data.value})`;;
-            
+             
             this.node_getBtn.active = false;
             this.node_ungetBtn.active = false;
             this.node_unluckBtn.active = true;
             this.lbl_nameDes.node.active = false;
+            this.lbl_des.node.active = false;
+            this.lbl_groupDes.node.active = true;
             this.node_redPoint.active = false;
+
+            let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
+            let plantName = gData.gameData.getProductMap(data.picture - 1).name;
+            let des = this.getDesByType();
+            this.lbl_groupDes.string = `${des}${this.data.value}次${plantName}后解锁\n(${times}/${data.value})`;;
             this.sp_icon.spriteFrame = await mk.loader.load('module/farmMap/texture/gift', cc.SpriteFrame);
         } else {   
-            this.lbl_des.string = "神秘物种,等待发现";
-            
+               
             this.node_getBtn.active = false;
             this.node_ungetBtn.active = false;
             this.node_unluckBtn.active = true;
             this.lbl_nameDes.node.active = false;
+            this.lbl_des.node.active = false;
+            this.lbl_groupDes.node.active = true;
             this.node_redPoint.active = false;
+            this.lbl_groupDes.string = "神秘物种,等待发现";
             this.sp_icon.spriteFrame = await mk.loader.load('module/farmMap/texture/gift', cc.SpriteFrame);
         }
 

+ 2 - 2
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -141,13 +141,13 @@ export default class WalletCashOut extends cc.Component {
                 }
 
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.playerProp.redMoney / 1000000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3) + '元';
                 this.lbl_tip.string = `需要${needV}元,当前有` + haveV;
             } else {
                 this.isCanCash = false;
                 this.btn_cashOut.setGray(true);
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.playerProp.redMoney / 1000000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3) + '元';
                 this.lbl_tip.string = `需要${needV}元,当前只有` + haveV;
             }
         } else {

+ 1 - 1
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -29,7 +29,7 @@ export default class NewOpenRedBag extends cc.Component {
 
     data = null
     start() {
-        mk.audio.playEffect("openRedBag");
+        
         if (gData.moreGame.init_newOpenRedBag) {
             gData.moreGame.init_newOpenRedBag = false;
             this.showElectUI();

+ 1 - 0
assets/script/game/module/reward/Reward.ts

@@ -48,6 +48,7 @@ export default class Reward extends cc.Component {
     }
 
     start() {
+        mk.audio.playEffect("congratulations");
         // gData.gameData.playerProp.redMoney = 1500;// 测试数据
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
         mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");

+ 1 - 1
assets/script/game/module/setting/Setting.ts

@@ -51,7 +51,7 @@ export default class Setting extends cc.Component {
         this.lbl_lv.string = 'Lv:' + gData.gameData.playerProp.gradeLevel.toString();
         this.lbl_redBagCoin.string = (gData.gameData.playerProp.redMoney/100).toString();
 
-        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000) + '元';
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3) + '元';
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");

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


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/09/09134bba-feed-4255-ac95-f412d855035e.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/11/11230951-60f5-4396-8fd5-d4d98cfd676e.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/18/18ff1999-641d-40dc-bc3f-e4efbb12918a.json


+ 1 - 1
build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json

@@ -1 +1 @@
-[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\nzhuanpan.png\nsize: 175,101\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\nbg\n  rotate: false\n  xy: 2, 2\n  size: 97, 97\n  orig: 97, 97\n  offset: 0, 0\n  index: -1\nzhuanpan\n  rotate: false\n  xy: 101, 27\n  size: 72, 72\n  orig: 72, 72\n  offset: 0, 0\n  index: -1\nzhuanpan1\n  rotate: false\n  xy: 101, 2\n  size: 20, 23\n  orig: 21, 24\n  offset: 0, 1\n  index: -1\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\r\nzhuanpan.png\r\nsize: 175,101\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\nbg\r\n  rotate: false\r\n  xy: 2, 2\r\n  size: 97, 97\r\n  orig: 97, 97\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan\r\n  rotate: false\r\n  xy: 101, 27\r\n  size: 72, 72\r\n  orig: 72, 72\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan1\r\n  rotate: false\r\n  xy: 101, 2\r\n  size: 20, 23\r\n  orig: 21, 24\r\n  offset: 0, 1\r\n  index: -1\r\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]

File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/2b/2b8feb46-8bbf-401a-87fd-36a33df6f510.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/31/310aa3e6-7065-424d-851c-52437a7c1c36.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/35/35d03fbf-2b63-4d0e-b621-be53decefa7f.json


File diff suppressed because it is too large
+ 0 - 1
build/jsb-link/assets/resources/import/52/5210cba6-9314-4f36-85a2-4754a0df287f.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/53/532ccd25-6cf0-47ba-ac65-b0be647eb7ba.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/5c/5c60bd7e-abeb-4804-bb23-115cc66c3b44.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/72/72481e4b-bb87-4bc0-9455-9c0f34848370.json


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

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

File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/80/80f9ffc5-91ca-4d08-aedd-b3712be53310.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/8d/8de08dc2-a439-4a3c-b667-a56bec3c0f5d.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/92/9221bfa6-48ee-44cb-ba6c-f37e5847e165.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/9d/9d4f03cb-eee3-4d8d-bb0a-457af009d1cd.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/b3/b3a90f8c-06c6-4d76-aa5d-bfecd35a2294.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/c9/c92ee1bb-0e83-4868-97e3-d71b8b58fae0.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/cc/cc34b721-8635-450d-a8c7-955c7db376ac.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/d0/d0583c3f-ff06-4cb3-bf78-51680bc632e0.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/d7/d7adad34-ed08-4539-bd75-ff56d401edee.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/eb/eb23e881-c37e-4e36-a213-79bd42d111d1.json


+ 27 - 27
build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas

@@ -1,27 +1,27 @@
-
-zhuanpan.png
-size: 175,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-zhuanpan
-  rotate: false
-  xy: 101, 27
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-zhuanpan1
-  rotate: false
-  xy: 101, 2
-  size: 20, 23
-  orig: 21, 24
-  offset: 0, 1
-  index: -1
+
+zhuanpan.png
+size: 175,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+zhuanpan
+  rotate: false
+  xy: 101, 27
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+zhuanpan1
+  rotate: false
+  xy: 101, 2
+  size: 20, 23
+  orig: 21, 24
+  offset: 0, 1
+  index: -1

+ 34 - 34
build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas

@@ -1,34 +1,34 @@
-
-libao.png
-size: 234,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-lihe-1
-  rotate: false
-  xy: 101, 42
-  size: 78, 57
-  orig: 78, 57
-  offset: 0, 0
-  index: -1
-lihe-2
-  rotate: true
-  xy: 181, 26
-  size: 73, 51
-  orig: 74, 51
-  offset: 1, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 8
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+libao.png
+size: 234,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+lihe-1
+  rotate: false
+  xy: 101, 42
+  size: 78, 57
+  orig: 78, 57
+  offset: 0, 0
+  index: -1
+lihe-2
+  rotate: true
+  xy: 181, 26
+  size: 73, 51
+  orig: 74, 51
+  offset: 1, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 8
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

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

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

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

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

+ 20 - 20
build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas

@@ -1,20 +1,20 @@
-
-skeleton.png
-size: 323,60
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-hb
-  rotate: false
-  xy: 250, 5
-  size: 71, 53
-  orig: 71, 53
-  offset: 0, 0
-  index: -1
-tuowei
-  rotate: false
-  xy: 2, 2
-  size: 246, 56
-  orig: 254, 58
-  offset: 2, 1
-  index: -1
+
+skeleton.png
+size: 323,60
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+hb
+  rotate: false
+  xy: 250, 5
+  size: 71, 53
+  orig: 71, 53
+  offset: 0, 0
+  index: -1
+tuowei
+  rotate: false
+  xy: 2, 2
+  size: 246, 56
+  orig: 254, 58
+  offset: 2, 1
+  index: -1

+ 419 - 419
build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas

@@ -1,419 +1,419 @@
-
-loading.png
-size: 2017,1540
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bei
-  rotate: false
-  xy: 1959, 892
-  size: 49, 67
-  orig: 52, 70
-  offset: 2, 1
-  index: -1
-beijing
-  rotate: true
-  xy: 2, 786
-  size: 752, 1702
-  orig: 752, 1702
-  offset: 0, 0
-  index: -1
-bizi
-  rotate: true
-  xy: 1924, 438
-  size: 41, 39
-  orig: 43, 42
-  offset: 1, 2
-  index: -1
-caihong
-  rotate: false
-  xy: 2, 63
-  size: 712, 721
-  orig: 738, 735
-  offset: 14, 7
-  index: -1
-chengbao
-  rotate: true
-  xy: 1814, 213
-  size: 223, 190
-  orig: 230, 192
-  offset: 3, 1
-  index: -1
-chuan
-  rotate: false
-  xy: 1837, 12
-  size: 75, 63
-  orig: 77, 65
-  offset: 1, 1
-  index: -1
-er1
-  rotate: false
-  xy: 773, 7
-  size: 52, 52
-  orig: 54, 54
-  offset: 1, 1
-  index: -1
-er2
-  rotate: false
-  xy: 827, 10
-  size: 51, 49
-  orig: 53, 51
-  offset: 1, 1
-  index: -1
-eye1
-  rotate: true
-  xy: 1985, 131
-  size: 80, 30
-  orig: 80, 30
-  offset: 0, 0
-  index: -1
-eye2
-  rotate: true
-  xy: 1951, 105
-  size: 106, 32
-  orig: 108, 34
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 598, 33
-  size: 111, 28
-  orig: 113, 31
-  offset: 1, 2
-  index: -1
-head
-  rotate: true
-  xy: 1289, 16
-  size: 152, 110
-  orig: 154, 113
-  offset: 1, 2
-  index: -1
-kuzi
-  rotate: false
-  xy: 1401, 15
-  size: 95, 58
-  orig: 97, 61
-  offset: 1, 2
-  index: -1
-lang1
-  rotate: false
-  xy: 380, 18
-  size: 216, 43
-  orig: 224, 54
-  offset: 3, 4
-  index: -1
-lang2
-  rotate: false
-  xy: 1757, 77
-  size: 164, 24
-  orig: 170, 34
-  offset: 2, 3
-  index: -1
-lang3
-  rotate: true
-  xy: 1946, 1119
-  size: 174, 46
-  orig: 180, 52
-  offset: 4, 3
-  index: -1
-lang4
-  rotate: true
-  xy: 1946, 1295
-  size: 243, 53
-  orig: 251, 59
-  offset: 5, 3
-  index: -1
-mei1
-  rotate: false
-  xy: 1289, 2
-  size: 28, 12
-  orig: 32, 14
-  offset: 2, 1
-  index: -1
-mei2
-  rotate: false
-  xy: 130, 2
-  size: 28, 10
-  orig: 32, 12
-  offset: 2, 1
-  index: -1
-niao1
-  rotate: false
-  xy: 2, 2
-  size: 126, 59
-  orig: 126, 59
-  offset: 0, 0
-  index: -1
-san
-  rotate: false
-  xy: 1531, 438
-  size: 338, 346
-  orig: 338, 346
-  offset: 0, 0
-  index: -1
-sanying
-  rotate: false
-  xy: 716, 61
-  size: 259, 107
-  orig: 270, 121
-  offset: 8, 8
-  index: -1
-shatan
-  rotate: false
-  xy: 130, 14
-  size: 248, 47
-  orig: 248, 47
-  offset: 0, 0
-  index: -1
-shou1
-  rotate: false
-  xy: 919, 2
-  size: 28, 24
-  orig: 32, 27
-  offset: 2, 2
-  index: -1
-shou2-1
-  rotate: true
-  xy: 1959, 961
-  size: 32, 56
-  orig: 35, 59
-  offset: 1, 1
-  index: -1
-shou2-2
-  rotate: true
-  xy: 1965, 448
-  size: 31, 50
-  orig: 33, 54
-  offset: 1, 3
-  index: -1
-shou3
-  rotate: true
-  xy: 1871, 438
-  size: 41, 51
-  orig: 45, 54
-  offset: 2, 2
-  index: -1
-shou4
-  rotate: false
-  xy: 880, 19
-  size: 37, 40
-  orig: 39, 42
-  offset: 1, 1
-  index: -1
-shu1
-  rotate: true
-  xy: 1757, 103
-  size: 108, 192
-  orig: 108, 192
-  offset: 0, 0
-  index: -1
-shu2
-  rotate: false
-  xy: 1871, 607
-  size: 94, 204
-  orig: 94, 204
-  offset: 0, 0
-  index: -1
-shu3
-  rotate: true
-  xy: 977, 2
-  size: 166, 121
-  orig: 166, 121
-  offset: 0, 0
-  index: -1
-shu4
-  rotate: true
-  xy: 1530, 23
-  size: 196, 225
-  orig: 196, 225
-  offset: 0, 0
-  index: -1
-shu5
-  rotate: true
-  xy: 1531, 221
-  size: 215, 281
-  orig: 215, 281
-  offset: 0, 0
-  index: -1
-shu7
-  rotate: true
-  xy: 1923, 19
-  size: 82, 92
-  orig: 82, 92
-  offset: 0, 0
-  index: -1
-shu8
-  rotate: true
-  xy: 1414, 154
-  size: 100, 114
-  orig: 100, 114
-  offset: 0, 0
-  index: -1
-shugan1
-  rotate: false
-  xy: 1706, 1100
-  size: 238, 438
-  orig: 238, 438
-  offset: 0, 0
-  index: -1
-shuying
-  rotate: true
-  xy: 1414, 256
-  size: 528, 115
-  orig: 533, 125
-  offset: 2, 4
-  index: -1
-toufa
-  rotate: false
-  xy: 711, 20
-  size: 60, 39
-  orig: 60, 39
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1959, 836
-  size: 51, 54
-  orig: 51, 54
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: false
-  xy: 1959, 1071
-  size: 56, 46
-  orig: 56, 46
-  offset: 0, 0
-  index: -1
-tuoxie1
-  rotate: false
-  xy: 1498, 36
-  size: 28, 37
-  orig: 30, 40
-  offset: 1, 2
-  index: -1
-tuoxie2
-  rotate: false
-  xy: 919, 28
-  size: 40, 31
-  orig: 42, 34
-  offset: 1, 2
-  index: -1
-xie1
-  rotate: true
-  xy: 1959, 995
-  size: 74, 54
-  orig: 78, 56
-  offset: 2, 1
-  index: -1
-xie10
-  rotate: false
-  xy: 598, 2
-  size: 102, 29
-  orig: 108, 34
-  offset: 3, 3
-  index: -1
-xie2
-  rotate: true
-  xy: 1706, 788
-  size: 23, 32
-  orig: 23, 32
-  offset: 0, 0
-  index: -1
-xie3
-  rotate: true
-  xy: 1740, 788
-  size: 23, 31
-  orig: 23, 31
-  offset: 0, 0
-  index: -1
-xie4
-  rotate: false
-  xy: 1513, 115
-  size: 15, 17
-  orig: 18, 19
-  offset: 2, 1
-  index: -1
-xie5
-  rotate: false
-  xy: 961, 42
-  size: 14, 17
-  orig: 17, 20
-  offset: 1, 1
-  index: -1
-xie6
-  rotate: true
-  xy: 1513, 134
-  size: 18, 15
-  orig: 21, 17
-  offset: 2, 1
-  index: -1
-xie7
-  rotate: true
-  xy: 2001, 1520
-  size: 18, 14
-  orig: 21, 17
-  offset: 1, 1
-  index: -1
-xie8
-  rotate: false
-  xy: 1965, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 2, 1
-  index: -1
-xie9
-  rotate: false
-  xy: 1988, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 1, 1
-  index: -1
-xigua
-  rotate: false
-  xy: 1757, 17
-  size: 78, 58
-  orig: 80, 60
-  offset: 1, 1
-  index: -1
-yguang
-  rotate: false
-  xy: 716, 170
-  size: 696, 614
-  orig: 750, 627
-  offset: 0, 13
-  index: -1
-yifu
-  rotate: false
-  xy: 1401, 75
-  size: 110, 77
-  orig: 110, 84
-  offset: 0, 7
-  index: -1
-yingzi
-  rotate: false
-  xy: 1100, 6
-  size: 187, 162
-  orig: 191, 166
-  offset: 2, 2
-  index: -1
-yizi
-  rotate: false
-  xy: 1706, 813
-  size: 251, 285
-  orig: 255, 288
-  offset: 1, 2
-  index: -1
-zhuozi
-  rotate: true
-  xy: 1871, 481
-  size: 124, 116
-  orig: 126, 118
-  offset: 1, 1
-  index: -1
-zui
-  rotate: true
-  xy: 1985, 106
-  size: 23, 27
-  orig: 32, 30
-  offset: 5, 2
-  index: -1
+
+loading.png
+size: 2017,1540
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bei
+  rotate: false
+  xy: 1959, 892
+  size: 49, 67
+  orig: 52, 70
+  offset: 2, 1
+  index: -1
+beijing
+  rotate: true
+  xy: 2, 786
+  size: 752, 1702
+  orig: 752, 1702
+  offset: 0, 0
+  index: -1
+bizi
+  rotate: true
+  xy: 1924, 438
+  size: 41, 39
+  orig: 43, 42
+  offset: 1, 2
+  index: -1
+caihong
+  rotate: false
+  xy: 2, 63
+  size: 712, 721
+  orig: 738, 735
+  offset: 14, 7
+  index: -1
+chengbao
+  rotate: true
+  xy: 1814, 213
+  size: 223, 190
+  orig: 230, 192
+  offset: 3, 1
+  index: -1
+chuan
+  rotate: false
+  xy: 1837, 12
+  size: 75, 63
+  orig: 77, 65
+  offset: 1, 1
+  index: -1
+er1
+  rotate: false
+  xy: 773, 7
+  size: 52, 52
+  orig: 54, 54
+  offset: 1, 1
+  index: -1
+er2
+  rotate: false
+  xy: 827, 10
+  size: 51, 49
+  orig: 53, 51
+  offset: 1, 1
+  index: -1
+eye1
+  rotate: true
+  xy: 1985, 131
+  size: 80, 30
+  orig: 80, 30
+  offset: 0, 0
+  index: -1
+eye2
+  rotate: true
+  xy: 1951, 105
+  size: 106, 32
+  orig: 108, 34
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 598, 33
+  size: 111, 28
+  orig: 113, 31
+  offset: 1, 2
+  index: -1
+head
+  rotate: true
+  xy: 1289, 16
+  size: 152, 110
+  orig: 154, 113
+  offset: 1, 2
+  index: -1
+kuzi
+  rotate: false
+  xy: 1401, 15
+  size: 95, 58
+  orig: 97, 61
+  offset: 1, 2
+  index: -1
+lang1
+  rotate: false
+  xy: 380, 18
+  size: 216, 43
+  orig: 224, 54
+  offset: 3, 4
+  index: -1
+lang2
+  rotate: false
+  xy: 1757, 77
+  size: 164, 24
+  orig: 170, 34
+  offset: 2, 3
+  index: -1
+lang3
+  rotate: true
+  xy: 1946, 1119
+  size: 174, 46
+  orig: 180, 52
+  offset: 4, 3
+  index: -1
+lang4
+  rotate: true
+  xy: 1946, 1295
+  size: 243, 53
+  orig: 251, 59
+  offset: 5, 3
+  index: -1
+mei1
+  rotate: false
+  xy: 1289, 2
+  size: 28, 12
+  orig: 32, 14
+  offset: 2, 1
+  index: -1
+mei2
+  rotate: false
+  xy: 130, 2
+  size: 28, 10
+  orig: 32, 12
+  offset: 2, 1
+  index: -1
+niao1
+  rotate: false
+  xy: 2, 2
+  size: 126, 59
+  orig: 126, 59
+  offset: 0, 0
+  index: -1
+san
+  rotate: false
+  xy: 1531, 438
+  size: 338, 346
+  orig: 338, 346
+  offset: 0, 0
+  index: -1
+sanying
+  rotate: false
+  xy: 716, 61
+  size: 259, 107
+  orig: 270, 121
+  offset: 8, 8
+  index: -1
+shatan
+  rotate: false
+  xy: 130, 14
+  size: 248, 47
+  orig: 248, 47
+  offset: 0, 0
+  index: -1
+shou1
+  rotate: false
+  xy: 919, 2
+  size: 28, 24
+  orig: 32, 27
+  offset: 2, 2
+  index: -1
+shou2-1
+  rotate: true
+  xy: 1959, 961
+  size: 32, 56
+  orig: 35, 59
+  offset: 1, 1
+  index: -1
+shou2-2
+  rotate: true
+  xy: 1965, 448
+  size: 31, 50
+  orig: 33, 54
+  offset: 1, 3
+  index: -1
+shou3
+  rotate: true
+  xy: 1871, 438
+  size: 41, 51
+  orig: 45, 54
+  offset: 2, 2
+  index: -1
+shou4
+  rotate: false
+  xy: 880, 19
+  size: 37, 40
+  orig: 39, 42
+  offset: 1, 1
+  index: -1
+shu1
+  rotate: true
+  xy: 1757, 103
+  size: 108, 192
+  orig: 108, 192
+  offset: 0, 0
+  index: -1
+shu2
+  rotate: false
+  xy: 1871, 607
+  size: 94, 204
+  orig: 94, 204
+  offset: 0, 0
+  index: -1
+shu3
+  rotate: true
+  xy: 977, 2
+  size: 166, 121
+  orig: 166, 121
+  offset: 0, 0
+  index: -1
+shu4
+  rotate: true
+  xy: 1530, 23
+  size: 196, 225
+  orig: 196, 225
+  offset: 0, 0
+  index: -1
+shu5
+  rotate: true
+  xy: 1531, 221
+  size: 215, 281
+  orig: 215, 281
+  offset: 0, 0
+  index: -1
+shu7
+  rotate: true
+  xy: 1923, 19
+  size: 82, 92
+  orig: 82, 92
+  offset: 0, 0
+  index: -1
+shu8
+  rotate: true
+  xy: 1414, 154
+  size: 100, 114
+  orig: 100, 114
+  offset: 0, 0
+  index: -1
+shugan1
+  rotate: false
+  xy: 1706, 1100
+  size: 238, 438
+  orig: 238, 438
+  offset: 0, 0
+  index: -1
+shuying
+  rotate: true
+  xy: 1414, 256
+  size: 528, 115
+  orig: 533, 125
+  offset: 2, 4
+  index: -1
+toufa
+  rotate: false
+  xy: 711, 20
+  size: 60, 39
+  orig: 60, 39
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1959, 836
+  size: 51, 54
+  orig: 51, 54
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: false
+  xy: 1959, 1071
+  size: 56, 46
+  orig: 56, 46
+  offset: 0, 0
+  index: -1
+tuoxie1
+  rotate: false
+  xy: 1498, 36
+  size: 28, 37
+  orig: 30, 40
+  offset: 1, 2
+  index: -1
+tuoxie2
+  rotate: false
+  xy: 919, 28
+  size: 40, 31
+  orig: 42, 34
+  offset: 1, 2
+  index: -1
+xie1
+  rotate: true
+  xy: 1959, 995
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+xie10
+  rotate: false
+  xy: 598, 2
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+xie2
+  rotate: true
+  xy: 1706, 788
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+xie3
+  rotate: true
+  xy: 1740, 788
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+xie4
+  rotate: false
+  xy: 1513, 115
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+xie5
+  rotate: false
+  xy: 961, 42
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+xie6
+  rotate: true
+  xy: 1513, 134
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+xie7
+  rotate: true
+  xy: 2001, 1520
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+xie8
+  rotate: false
+  xy: 1965, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+xie9
+  rotate: false
+  xy: 1988, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1
+xigua
+  rotate: false
+  xy: 1757, 17
+  size: 78, 58
+  orig: 80, 60
+  offset: 1, 1
+  index: -1
+yguang
+  rotate: false
+  xy: 716, 170
+  size: 696, 614
+  orig: 750, 627
+  offset: 0, 13
+  index: -1
+yifu
+  rotate: false
+  xy: 1401, 75
+  size: 110, 77
+  orig: 110, 84
+  offset: 0, 7
+  index: -1
+yingzi
+  rotate: false
+  xy: 1100, 6
+  size: 187, 162
+  orig: 191, 166
+  offset: 2, 2
+  index: -1
+yizi
+  rotate: false
+  xy: 1706, 813
+  size: 251, 285
+  orig: 255, 288
+  offset: 1, 2
+  index: -1
+zhuozi
+  rotate: true
+  xy: 1871, 481
+  size: 124, 116
+  orig: 126, 118
+  offset: 1, 1
+  index: -1
+zui
+  rotate: true
+  xy: 1985, 106
+  size: 23, 27
+  orig: 32, 30
+  offset: 5, 2
+  index: -1

+ 335 - 335
build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas

@@ -1,335 +1,335 @@
-
-chengnian.png
-size: 1609,780
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-01
-  rotate: true
-  xy: 1201, 339
-  size: 165, 273
-  orig: 165, 273
-  offset: 0, 0
-  index: -1
-03
-  rotate: true
-  xy: 1228, 506
-  size: 272, 291
-  orig: 272, 291
-  offset: 0, 0
-  index: -1
-04
-  rotate: false
-  xy: 2, 109
-  size: 356, 356
-  orig: 356, 356
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 401, 269
-  size: 152, 196
-  orig: 152, 196
-  offset: 0, 0
-  index: -1
-erduo
-  rotate: false
-  xy: 814, 366
-  size: 385, 166
-  orig: 385, 166
-  offset: 0, 0
-  index: -1
-erji1
-  rotate: false
-  xy: 814, 534
-  size: 412, 244
-  orig: 414, 248
-  offset: 1, 3
-  index: -1
-erji2
-  rotate: false
-  xy: 434, 2
-  size: 80, 154
-  orig: 82, 157
-  offset: 1, 1
-  index: -1
-eye1-1
-  rotate: true
-  xy: 1232, 17
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: false
-  xy: 1469, 42
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: false
-  xy: 660, 2
-  size: 109, 104
-  orig: 111, 106
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: false
-  xy: 771, 2
-  size: 109, 104
-  orig: 112, 106
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1406, 37
-  size: 105, 61
-  orig: 107, 63
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: true
-  xy: 1544, 39
-  size: 90, 61
-  orig: 92, 63
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 1350, 209
-  size: 122, 128
-  orig: 127, 133
-  offset: 3, 2
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1474, 196
-  size: 128, 128
-  orig: 132, 133
-  offset: 2, 2
-  index: -1
-eye4-1
-  rotate: false
-  xy: 2, 20
-  size: 337, 87
-  orig: 344, 98
-  offset: 2, 5
-  index: -1
-eye4-2
-  rotate: true
-  xy: 360, 194
-  size: 271, 39
-  orig: 274, 41
-  offset: 1, 1
-  index: -1
-face
-  rotate: false
-  xy: 447, 473
-  size: 365, 305
-  orig: 367, 307
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 962, 137
-  size: 153, 87
-  orig: 153, 87
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: true
-  xy: 360, 122
-  size: 70, 22
-  orig: 72, 24
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 1145, 27
-  size: 60, 21
-  orig: 62, 23
-  offset: 1, 1
-  index: -1
-shou-jita
-  rotate: false
-  xy: 1321, 42
-  size: 83, 100
-  orig: 86, 103
-  offset: 2, 2
-  index: -1
-shou-jita2
-  rotate: false
-  xy: 341, 2
-  size: 91, 105
-  orig: 94, 108
-  offset: 1, 1
-  index: -1
-shou-jita3
-  rotate: false
-  xy: 2, 467
-  size: 443, 311
-  orig: 445, 313
-  offset: 1, 1
-  index: -1
-shou-jita4
-  rotate: false
-  xy: 1232, 92
-  size: 87, 105
-  orig: 113, 111
-  offset: 1, 5
-  index: -1
-shou1
-  rotate: true
-  xy: 555, 243
-  size: 90, 171
-  orig: 98, 173
-  offset: 1, 1
-  index: -1
-shou10
-  rotate: true
-  xy: 728, 235
-  size: 98, 75
-  orig: 100, 77
-  offset: 1, 1
-  index: -1
-shou11
-  rotate: true
-  xy: 401, 158
-  size: 109, 152
-  orig: 112, 154
-  offset: 2, 1
-  index: -1
-shou12
-  rotate: false
-  xy: 1145, 50
-  size: 85, 147
-  orig: 85, 147
-  offset: 0, 0
-  index: -1
-shou2
-  rotate: false
-  xy: 1521, 639
-  size: 86, 139
-  orig: 97, 141
-  offset: 10, 1
-  index: -1
-shou3
-  rotate: false
-  xy: 1521, 498
-  size: 86, 139
-  orig: 96, 141
-  offset: 1, 1
-  index: -1
-shou4
-  rotate: false
-  xy: 1474, 131
-  size: 130, 63
-  orig: 132, 65
-  offset: 1, 1
-  index: -1
-shou5
-  rotate: false
-  xy: 555, 118
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou6
-  rotate: false
-  xy: 810, 241
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou7
-  rotate: true
-  xy: 967, 226
-  size: 138, 151
-  orig: 138, 151
-  offset: 0, 0
-  index: -1
-shou8
-  rotate: true
-  xy: 1198, 199
-  size: 138, 150
-  orig: 138, 150
-  offset: 0, 0
-  index: -1
-shou9
-  rotate: false
-  xy: 1476, 326
-  size: 123, 170
-  orig: 123, 170
-  offset: 0, 0
-  index: -1
-toufa
-  rotate: false
-  xy: 516, 7
-  size: 142, 109
-  orig: 142, 109
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1120, 243
-  size: 76, 121
-  orig: 76, 121
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: true
-  xy: 1350, 144
-  size: 63, 122
-  orig: 63, 122
-  offset: 0, 0
-  index: -1
-weijin1
-  rotate: false
-  xy: 1098, 10
-  size: 45, 125
-  orig: 45, 125
-  offset: 0, 0
-  index: -1
-weijin2
-  rotate: true
-  xy: 726, 335
-  size: 136, 82
-  orig: 139, 85
-  offset: 2, 2
-  index: -1
-yifu
-  rotate: false
-  xy: 555, 335
-  size: 169, 136
-  orig: 169, 136
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: false
-  xy: 712, 108
-  size: 117, 125
-  orig: 133, 131
-  offset: 5, 5
-  index: -1
-zui1-2-2
-  rotate: false
-  xy: 882, 3
-  size: 117, 109
-  orig: 133, 112
-  offset: 5, 2
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1001, 14
-  size: 121, 95
-  orig: 133, 101
-  offset: 5, 5
-  index: -1
-zui2-1
-  rotate: false
-  xy: 831, 114
-  size: 129, 125
-  orig: 158, 131
-  offset: 6, 5
-  index: -1
+
+chengnian.png
+size: 1609,780
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+01
+  rotate: true
+  xy: 1201, 339
+  size: 165, 273
+  orig: 165, 273
+  offset: 0, 0
+  index: -1
+03
+  rotate: true
+  xy: 1228, 506
+  size: 272, 291
+  orig: 272, 291
+  offset: 0, 0
+  index: -1
+04
+  rotate: false
+  xy: 2, 109
+  size: 356, 356
+  orig: 356, 356
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 401, 269
+  size: 152, 196
+  orig: 152, 196
+  offset: 0, 0
+  index: -1
+erduo
+  rotate: false
+  xy: 814, 366
+  size: 385, 166
+  orig: 385, 166
+  offset: 0, 0
+  index: -1
+erji1
+  rotate: false
+  xy: 814, 534
+  size: 412, 244
+  orig: 414, 248
+  offset: 1, 3
+  index: -1
+erji2
+  rotate: false
+  xy: 434, 2
+  size: 80, 154
+  orig: 82, 157
+  offset: 1, 1
+  index: -1
+eye1-1
+  rotate: true
+  xy: 1232, 17
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: false
+  xy: 1469, 42
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: false
+  xy: 660, 2
+  size: 109, 104
+  orig: 111, 106
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: false
+  xy: 771, 2
+  size: 109, 104
+  orig: 112, 106
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1406, 37
+  size: 105, 61
+  orig: 107, 63
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: true
+  xy: 1544, 39
+  size: 90, 61
+  orig: 92, 63
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1350, 209
+  size: 122, 128
+  orig: 127, 133
+  offset: 3, 2
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1474, 196
+  size: 128, 128
+  orig: 132, 133
+  offset: 2, 2
+  index: -1
+eye4-1
+  rotate: false
+  xy: 2, 20
+  size: 337, 87
+  orig: 344, 98
+  offset: 2, 5
+  index: -1
+eye4-2
+  rotate: true
+  xy: 360, 194
+  size: 271, 39
+  orig: 274, 41
+  offset: 1, 1
+  index: -1
+face
+  rotate: false
+  xy: 447, 473
+  size: 365, 305
+  orig: 367, 307
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 962, 137
+  size: 153, 87
+  orig: 153, 87
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: true
+  xy: 360, 122
+  size: 70, 22
+  orig: 72, 24
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 1145, 27
+  size: 60, 21
+  orig: 62, 23
+  offset: 1, 1
+  index: -1
+shou-jita
+  rotate: false
+  xy: 1321, 42
+  size: 83, 100
+  orig: 86, 103
+  offset: 2, 2
+  index: -1
+shou-jita2
+  rotate: false
+  xy: 341, 2
+  size: 91, 105
+  orig: 94, 108
+  offset: 1, 1
+  index: -1
+shou-jita3
+  rotate: false
+  xy: 2, 467
+  size: 443, 311
+  orig: 445, 313
+  offset: 1, 1
+  index: -1
+shou-jita4
+  rotate: false
+  xy: 1232, 92
+  size: 87, 105
+  orig: 113, 111
+  offset: 1, 5
+  index: -1
+shou1
+  rotate: true
+  xy: 555, 243
+  size: 90, 171
+  orig: 98, 173
+  offset: 1, 1
+  index: -1
+shou10
+  rotate: true
+  xy: 728, 235
+  size: 98, 75
+  orig: 100, 77
+  offset: 1, 1
+  index: -1
+shou11
+  rotate: true
+  xy: 401, 158
+  size: 109, 152
+  orig: 112, 154
+  offset: 2, 1
+  index: -1
+shou12
+  rotate: false
+  xy: 1145, 50
+  size: 85, 147
+  orig: 85, 147
+  offset: 0, 0
+  index: -1
+shou2
+  rotate: false
+  xy: 1521, 639
+  size: 86, 139
+  orig: 97, 141
+  offset: 10, 1
+  index: -1
+shou3
+  rotate: false
+  xy: 1521, 498
+  size: 86, 139
+  orig: 96, 141
+  offset: 1, 1
+  index: -1
+shou4
+  rotate: false
+  xy: 1474, 131
+  size: 130, 63
+  orig: 132, 65
+  offset: 1, 1
+  index: -1
+shou5
+  rotate: false
+  xy: 555, 118
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou6
+  rotate: false
+  xy: 810, 241
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou7
+  rotate: true
+  xy: 967, 226
+  size: 138, 151
+  orig: 138, 151
+  offset: 0, 0
+  index: -1
+shou8
+  rotate: true
+  xy: 1198, 199
+  size: 138, 150
+  orig: 138, 150
+  offset: 0, 0
+  index: -1
+shou9
+  rotate: false
+  xy: 1476, 326
+  size: 123, 170
+  orig: 123, 170
+  offset: 0, 0
+  index: -1
+toufa
+  rotate: false
+  xy: 516, 7
+  size: 142, 109
+  orig: 142, 109
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1120, 243
+  size: 76, 121
+  orig: 76, 121
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: true
+  xy: 1350, 144
+  size: 63, 122
+  orig: 63, 122
+  offset: 0, 0
+  index: -1
+weijin1
+  rotate: false
+  xy: 1098, 10
+  size: 45, 125
+  orig: 45, 125
+  offset: 0, 0
+  index: -1
+weijin2
+  rotate: true
+  xy: 726, 335
+  size: 136, 82
+  orig: 139, 85
+  offset: 2, 2
+  index: -1
+yifu
+  rotate: false
+  xy: 555, 335
+  size: 169, 136
+  orig: 169, 136
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: false
+  xy: 712, 108
+  size: 117, 125
+  orig: 133, 131
+  offset: 5, 5
+  index: -1
+zui1-2-2
+  rotate: false
+  xy: 882, 3
+  size: 117, 109
+  orig: 133, 112
+  offset: 5, 2
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1001, 14
+  size: 121, 95
+  orig: 133, 101
+  offset: 5, 5
+  index: -1
+zui2-1
+  rotate: false
+  xy: 831, 114
+  size: 129, 125
+  orig: 158, 131
+  offset: 6, 5
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas

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

+ 251 - 251
build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas

@@ -1,251 +1,251 @@
-
-shaonian.png
-size: 1137,528
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-body
-  rotate: true
-  xy: 815, 368
-  size: 158, 173
-  orig: 158, 173
-  offset: 0, 0
-  index: -1
-dengpao
-  rotate: false
-  xy: 2, 3
-  size: 188, 230
-  orig: 201, 236
-  offset: 8, 1
-  index: -1
-erduo
-  rotate: false
-  xy: 387, 362
-  size: 426, 164
-  orig: 426, 164
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: false
-  xy: 1057, 264
-  size: 76, 93
-  orig: 78, 95
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: true
-  xy: 513, 135
-  size: 77, 92
-  orig: 79, 94
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: true
-  xy: 510, 16
-  size: 117, 111
-  orig: 119, 113
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: true
-  xy: 738, 178
-  size: 117, 111
-  orig: 120, 113
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 731, 57
-  size: 114, 65
-  orig: 116, 68
-  offset: 1, 2
-  index: -1
-eye2-2
-  rotate: true
-  xy: 957, 66
-  size: 97, 65
-  orig: 99, 68
-  offset: 1, 2
-  index: -1
-face
-  rotate: false
-  xy: 2, 235
-  size: 383, 291
-  orig: 385, 293
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 355, 147
-  size: 156, 78
-  orig: 156, 78
-  offset: 0, 0
-  index: -1
-lingjin
-  rotate: true
-  xy: 869, 7
-  size: 57, 105
-  orig: 59, 107
-  offset: 1, 1
-  index: -1
-meimao1
-  rotate: false
-  xy: 798, 55
-  size: 69, 24
-  orig: 73, 26
-  offset: 2, 1
-  index: -1
-meimao2
-  rotate: true
-  xy: 780, 298
-  size: 62, 23
-  orig: 64, 25
-  offset: 1, 1
-  index: -1
-shou1-2
-  rotate: false
-  xy: 192, 123
-  size: 161, 110
-  orig: 161, 110
-  offset: 0, 0
-  index: -1
-shou2-2-copy
-  rotate: true
-  xy: 607, 173
-  size: 122, 129
-  orig: 122, 129
-  offset: 0, 0
-  index: -1
-shou3-2
-  rotate: true
-  xy: 387, 227
-  size: 94, 152
-  orig: 101, 154
-  offset: 1, 1
-  index: -1
-shou4-2
-  rotate: true
-  xy: 192, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou4-3
-  rotate: true
-  xy: 316, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou5-1
-  rotate: false
-  xy: 1044, 179
-  size: 84, 83
-  orig: 86, 85
-  offset: 1, 1
-  index: -1
-shou5-2
-  rotate: false
-  xy: 798, 81
-  size: 85, 82
-  orig: 87, 85
-  offset: 1, 1
-  index: -1
-shou6-1
-  rotate: true
-  xy: 440, 18
-  size: 127, 68
-  orig: 129, 70
-  offset: 1, 1
-  index: -1
-shou6-2
-  rotate: true
-  xy: 885, 67
-  size: 96, 70
-  orig: 98, 72
-  offset: 1, 1
-  index: -1
-shou6-3
-  rotate: false
-  xy: 387, 323
-  size: 218, 37
-  orig: 220, 39
-  offset: 1, 1
-  index: -1
-shou6-4
-  rotate: true
-  xy: 623, 5
-  size: 40, 103
-  orig: 42, 105
-  offset: 1, 1
-  index: -1
-shou6-5
-  rotate: false
-  xy: 976, 3
-  size: 87, 61
-  orig: 89, 63
-  offset: 1, 1
-  index: -1
-shou7-1
-  rotate: true
-  xy: 607, 297
-  size: 63, 171
-  orig: 65, 173
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 851, 165
-  size: 112, 93
-  orig: 112, 93
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 541, 214
-  size: 64, 107
-  orig: 66, 109
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: false
-  xy: 1024, 66
-  size: 61, 106
-  orig: 63, 108
-  offset: 1, 1
-  index: -1
-yifu
-  rotate: true
-  xy: 990, 359
-  size: 167, 145
-  orig: 168, 146
-  offset: 1, 1
-  index: -1
-zui1-2
-  rotate: false
-  xy: 851, 260
-  size: 101, 106
-  orig: 112, 112
-  offset: 4, 4
-  index: -1
-zui1-3
-  rotate: false
-  xy: 954, 277
-  size: 101, 80
-  orig: 112, 87
-  offset: 4, 5
-  index: -1
-zui1-4
-  rotate: true
-  xy: 965, 174
-  size: 101, 77
-  orig: 112, 84
-  offset: 4, 5
-  index: -1
-zui2-1
-  rotate: true
-  xy: 623, 47
-  size: 124, 106
-  orig: 134, 112
-  offset: 5, 4
-  index: -1
+
+shaonian.png
+size: 1137,528
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+body
+  rotate: true
+  xy: 815, 368
+  size: 158, 173
+  orig: 158, 173
+  offset: 0, 0
+  index: -1
+dengpao
+  rotate: false
+  xy: 2, 3
+  size: 188, 230
+  orig: 201, 236
+  offset: 8, 1
+  index: -1
+erduo
+  rotate: false
+  xy: 387, 362
+  size: 426, 164
+  orig: 426, 164
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: false
+  xy: 1057, 264
+  size: 76, 93
+  orig: 78, 95
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: true
+  xy: 513, 135
+  size: 77, 92
+  orig: 79, 94
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: true
+  xy: 510, 16
+  size: 117, 111
+  orig: 119, 113
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: true
+  xy: 738, 178
+  size: 117, 111
+  orig: 120, 113
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 731, 57
+  size: 114, 65
+  orig: 116, 68
+  offset: 1, 2
+  index: -1
+eye2-2
+  rotate: true
+  xy: 957, 66
+  size: 97, 65
+  orig: 99, 68
+  offset: 1, 2
+  index: -1
+face
+  rotate: false
+  xy: 2, 235
+  size: 383, 291
+  orig: 385, 293
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 355, 147
+  size: 156, 78
+  orig: 156, 78
+  offset: 0, 0
+  index: -1
+lingjin
+  rotate: true
+  xy: 869, 7
+  size: 57, 105
+  orig: 59, 107
+  offset: 1, 1
+  index: -1
+meimao1
+  rotate: false
+  xy: 798, 55
+  size: 69, 24
+  orig: 73, 26
+  offset: 2, 1
+  index: -1
+meimao2
+  rotate: true
+  xy: 780, 298
+  size: 62, 23
+  orig: 64, 25
+  offset: 1, 1
+  index: -1
+shou1-2
+  rotate: false
+  xy: 192, 123
+  size: 161, 110
+  orig: 161, 110
+  offset: 0, 0
+  index: -1
+shou2-2-copy
+  rotate: true
+  xy: 607, 173
+  size: 122, 129
+  orig: 122, 129
+  offset: 0, 0
+  index: -1
+shou3-2
+  rotate: true
+  xy: 387, 227
+  size: 94, 152
+  orig: 101, 154
+  offset: 1, 1
+  index: -1
+shou4-2
+  rotate: true
+  xy: 192, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou4-3
+  rotate: true
+  xy: 316, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou5-1
+  rotate: false
+  xy: 1044, 179
+  size: 84, 83
+  orig: 86, 85
+  offset: 1, 1
+  index: -1
+shou5-2
+  rotate: false
+  xy: 798, 81
+  size: 85, 82
+  orig: 87, 85
+  offset: 1, 1
+  index: -1
+shou6-1
+  rotate: true
+  xy: 440, 18
+  size: 127, 68
+  orig: 129, 70
+  offset: 1, 1
+  index: -1
+shou6-2
+  rotate: true
+  xy: 885, 67
+  size: 96, 70
+  orig: 98, 72
+  offset: 1, 1
+  index: -1
+shou6-3
+  rotate: false
+  xy: 387, 323
+  size: 218, 37
+  orig: 220, 39
+  offset: 1, 1
+  index: -1
+shou6-4
+  rotate: true
+  xy: 623, 5
+  size: 40, 103
+  orig: 42, 105
+  offset: 1, 1
+  index: -1
+shou6-5
+  rotate: false
+  xy: 976, 3
+  size: 87, 61
+  orig: 89, 63
+  offset: 1, 1
+  index: -1
+shou7-1
+  rotate: true
+  xy: 607, 297
+  size: 63, 171
+  orig: 65, 173
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 851, 165
+  size: 112, 93
+  orig: 112, 93
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 541, 214
+  size: 64, 107
+  orig: 66, 109
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: false
+  xy: 1024, 66
+  size: 61, 106
+  orig: 63, 108
+  offset: 1, 1
+  index: -1
+yifu
+  rotate: true
+  xy: 990, 359
+  size: 167, 145
+  orig: 168, 146
+  offset: 1, 1
+  index: -1
+zui1-2
+  rotate: false
+  xy: 851, 260
+  size: 101, 106
+  orig: 112, 112
+  offset: 4, 4
+  index: -1
+zui1-3
+  rotate: false
+  xy: 954, 277
+  size: 101, 80
+  orig: 112, 87
+  offset: 4, 5
+  index: -1
+zui1-4
+  rotate: true
+  xy: 965, 174
+  size: 101, 77
+  orig: 112, 84
+  offset: 4, 5
+  index: -1
+zui2-1
+  rotate: true
+  xy: 623, 47
+  size: 124, 106
+  orig: 134, 112
+  offset: 5, 4
+  index: -1

+ 34 - 34
build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas

@@ -1,34 +1,34 @@
-
-yaoqing.png
-size: 162,135
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 36
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-hb1
-  rotate: false
-  xy: 101, 61
-  size: 59, 72
-  orig: 62, 75
-  offset: 0, 3
-  index: -1
-hb2
-  rotate: true
-  xy: 101, 8
-  size: 51, 59
-  orig: 52, 60
-  offset: 0, 1
-  index: -1
-xing
-  rotate: true
-  xy: 2, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+yaoqing.png
+size: 162,135
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 36
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+hb1
+  rotate: false
+  xy: 101, 61
+  size: 59, 72
+  orig: 62, 75
+  offset: 0, 3
+  index: -1
+hb2
+  rotate: true
+  xy: 101, 8
+  size: 51, 59
+  orig: 52, 60
+  offset: 0, 1
+  index: -1
+xing
+  rotate: true
+  xy: 2, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

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

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

+ 27 - 27
build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 172,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai1
-  rotate: false
-  xy: 101, 9
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-zhu
-  rotate: true
-  xy: 101, 28
-  size: 71, 69
-  orig: 71, 69
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 172,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai1
+  rotate: false
+  xy: 101, 9
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+zhu
+  rotate: true
+  xy: 101, 28
+  size: 71, 69
+  orig: 71, 69
+  offset: 0, 0
+  index: -1

+ 27 - 27
build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 427,355
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-icon_hb
-  rotate: false
-  xy: 360, 270
-  size: 65, 83
-  orig: 65, 83
-  offset: 0, 0
-  index: -1
-xing
-  rotate: false
-  xy: 360, 231
-  size: 33, 37
-  orig: 35, 39
-  offset: 1, 1
-  index: -1
-zhu
-  rotate: false
-  xy: 2, 2
-  size: 356, 351
-  orig: 356, 351
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 427,355
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+icon_hb
+  rotate: false
+  xy: 360, 270
+  size: 65, 83
+  orig: 65, 83
+  offset: 0, 0
+  index: -1
+xing
+  rotate: false
+  xy: 360, 231
+  size: 33, 37
+  orig: 35, 39
+  offset: 1, 1
+  index: -1
+zhu
+  rotate: false
+  xy: 2, 2
+  size: 356, 351
+  orig: 356, 351
+  offset: 0, 0
+  index: -1

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

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

+ 34 - 34
build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas

@@ -1,34 +1,34 @@
-
-fudai.png
-size: 177,107
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 8
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai
-  rotate: true
-  xy: 101, 36
-  size: 69, 74
-  orig: 70, 75
-  offset: 0, 1
-  index: -1
-fudai1
-  rotate: true
-  xy: 140, 8
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+fudai.png
+size: 177,107
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 8
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai
+  rotate: true
+  xy: 101, 36
+  size: 69, 74
+  orig: 70, 75
+  offset: 0, 1
+  index: -1
+fudai1
+  rotate: true
+  xy: 140, 8
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

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

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

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


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

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

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

@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1786486690/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/1786486690/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

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

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

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

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

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

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

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

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

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

@@ -3108,6 +3108,7 @@ e.prototype.clickSheepBtn = function() {
 var t = this;
 if (this.sheepMoveEnd) {
 mk.audio.playEffect("button");
+mk.ad.videoAdType = s.VideoAdType.video_init_10;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 this.sheepMoveEnd = !1;
 this.hb_btn.active = !1;
@@ -3157,13 +3158,13 @@ a = Math.floor(n / 3);
 i = n % 3;
 mk.audio.playEffect("redmoney");
 if ("bird_1" == t) {
-for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.flyBird_1.node, "", null, -1, a);
+if (a > 0) for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.flyBird_1.node, "", null, -1, a);
 i > 0 && mk.fly.PlayCoinAnim(1, 1, this.flyBird_1.node, "", null, -1, i);
 } else if ("bird_2" == t) {
-for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.flyBird_2.node, "", null, -1, a);
+if (a > 0) for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.flyBird_2.node, "", null, -1, a);
 i > 0 && mk.fly.PlayCoinAnim(1, 1, this.flyBird_2.node, "", null, -1, i);
 } else if ("dog" == t) {
-for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.dogMove.node, "", null, -1, a);
+if (a > 0) for (r = 0; 3 != r; ++r) mk.fly.PlayCoinAnim(1, 1, this.dogMove.node, "", null, -1, a);
 i > 0 && mk.fly.PlayCoinAnim(1, 1, this.dogMove.node, "", null, -1, i);
 }
 }
@@ -8082,7 +8083,7 @@ break;
 case s.FactroyState.Sick:
 mk.data.sendDataEvent(s.DataEventId.button_click, "停电icon");
 gData.adClearSickData.openPanel(this.tab, this.configID);
-mk.console.log("停电icon");
+mk.console.logSingle("VVVV  ", "停电icon");
 }
 return [ 2 ];
 });
@@ -9340,11 +9341,6 @@ e = "";
 e = gData.farmMapData.chooseType == l.ProductType.nzw ? "game/coregame/texture/plant_icons/plantIcon_" : "game/coregame/texture/factory_icons/factory_";
 o = gData.farmMapData.maxUnluckValue;
 if (!(t.picture <= o)) return [ 3, 2 ];
-n = this.sp_icon;
-return [ 4, mk.loader.load(e + t.picture, cc.SpriteFrame) ];
-
-case 1:
-n.spriteFrame = c.sent();
 this.lbl_nameDes.node.active = !0;
 this.lbl_nameDes.string = t.name + " " + t.time + "秒成熟";
 this.lbl_des.string = "最高收获" + t.menuRedBagCoin / 100 + "红包币";
@@ -9359,38 +9355,43 @@ this.node_ungetBtn.active = !0;
 this.node_unluckBtn.active = !1;
 this.node_redPoint.active = !0;
 }
+n = this.sp_icon;
+return [ 4, mk.loader.load(e + t.picture, cc.SpriteFrame) ];
+
+case 1:
+n.spriteFrame = c.sent();
 return [ 3, 6 ];
 
 case 2:
 if (t.picture - 1 != o) return [ 3, 4 ];
-a = this.sp_icon;
-return [ 4, mk.loader.load("module/farmMap/texture/gift", cc.SpriteFrame) ];
-
-case 3:
-a.spriteFrame = c.sent();
-i = gData.gameData.getProductMakeTimesById(t.picture - 1);
-r = gData.gameData.getProductMap(t.picture - 1).name;
-s = this.getDesByType();
-this.lbl_des.string = "" + s + this.data.value + "次" + r + "后解锁\n(" + i + "/" + t.value + ")";
+a = gData.gameData.getProductMakeTimesById(t.picture - 1);
+i = gData.gameData.getProductMap(t.picture - 1).name;
+r = this.getDesByType();
+this.lbl_des.string = "" + r + this.data.value + "次" + i + "后解锁\n(" + a + "/" + t.value + ")";
 this.node_getBtn.active = !1;
 this.node_ungetBtn.active = !1;
 this.node_unluckBtn.active = !0;
 this.lbl_nameDes.node.active = !1;
 this.node_redPoint.active = !1;
+s = this.sp_icon;
+return [ 4, mk.loader.load("module/farmMap/texture/gift", cc.SpriteFrame) ];
+
+case 3:
+s.spriteFrame = c.sent();
 return [ 3, 6 ];
 
 case 4:
-p = this.sp_icon;
-return [ 4, mk.loader.load("module/farmMap/texture/gift", cc.SpriteFrame) ];
-
-case 5:
-p.spriteFrame = c.sent();
 this.lbl_des.string = "神秘物种,等待发现";
 this.node_getBtn.active = !1;
 this.node_ungetBtn.active = !1;
 this.node_unluckBtn.active = !0;
 this.lbl_nameDes.node.active = !1;
 this.node_redPoint.active = !1;
+p = this.sp_icon;
+return [ 4, mk.loader.load("module/farmMap/texture/gift", cc.SpriteFrame) ];
+
+case 5:
+p.spriteFrame = c.sent();
 c.label = 6;
 
 case 6:
@@ -10061,10 +10062,10 @@ if (0 != (e = r.sent()).errcode) return [ 2 ];
 o = e.data.redMoneyAddition;
 console.log("addCoinByFarmer===============>", o);
 if (o > 0) {
-n = Math.floor(o / 3);
-a = o % 3;
+n = Math.floor(o / 2);
+a = o % 2;
 mk.audio.playEffect("redmoney");
-for (i = 0; 3 != i; ++i) mk.fly.PlayCoinAnim(1, 1, this.fly_node, "", null, -1, n);
+if (n > 0) for (i = 0; 2 != i; ++i) mk.fly.PlayCoinAnim(1, 1, this.fly_node, "", null, -1, n);
 a > 0 && mk.fly.PlayCoinAnim(1, 1, this.fly_node, "", null, -1, a);
 }
 return [ 2 ];
@@ -10580,7 +10581,6 @@ c = this.node.convertToNodeSpaceAR(u);
 cc.tween(e).to(r, {
 position: cc.v3(c)
 }, cc.easeSineOut()).call(function() {
-console.log("end_pos  ", e.position);
 -1 != a && i.showLabStrChange(a);
 if (null != n) {
 i.is_new_cb && n();
@@ -10855,15 +10855,12 @@ p = "Canvas/主界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb
 }
 o = p;
 }
-l = cc.find(o);
-mk.console.logSingle("end  ", o);
-var u = l.parent.convertToWorldSpaceAR(l.getPosition());
+var u = (l = cc.find(o)).parent.convertToWorldSpaceAR(l.getPosition());
 c = this.node.convertToNodeSpaceAR(u);
 } else c = this.node.convertToNodeSpaceAR(o);
 cc.tween(e).to(r, {
 position: cc.v3(c)
 }, cc.easeSineOut()).call(function() {
-console.log("end_pos  ", e.position);
 -1 != a && i.showLabStrChange(a);
 if (null != n) {
 i.is_new_cbArr[t] && n();
@@ -11423,7 +11420,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), j = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = t("./module/LineUpUIData"), U = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), M = t("../../before/main/PastureSystem"), j = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = t("./module/LineUpUIData"), U = function() {
 function t() {
 this.init();
 }
@@ -11436,7 +11433,7 @@ this.wechatData = new l.WechatData();
 this.httpData = new r.HttpData();
 this.adData = new y.AdData();
 this.storageData = new s.StorageData();
-this.guideData = new k.GuideData();
+this.guideData = new P.GuideData();
 this.guideWeakData = new O.default();
 this.reward = new g.RewardData();
 this.help = new p.HelpData();
@@ -11447,7 +11444,7 @@ this.sign = new h.SignData();
 this.receiptNotice = new _.ReceiptNoticeData();
 this.redBagCash = new D.RedBagCashData();
 this.cashNormal = new m.CashNormalData();
-this.setting = new P.SettingData();
+this.setting = new k.SettingData();
 this.moreGame = new A.MoreGameData();
 this.blessingBag = new v.BlessingBagData();
 this.cashPro = new b.default();
@@ -11458,8 +11455,8 @@ this.adUnlockData = new R.default();
 this.plantData = new C.default();
 this.harvestData = new N.default();
 this.adClearSickData = new F.default();
-this.pastureSystem = new j.default();
-this.factorySystem = new M.default();
+this.pastureSystem = new M.default();
+this.factorySystem = new j.default();
 this.farmSystem = new x.FarmSystem();
 this.farmMapData = new B.FarmMapData();
 this.farmGradeData = new L.GradeRewardData();
@@ -12401,20 +12398,22 @@ break;
 case p.dw:
 var c = 30001;
 r = !1;
-for (var s = 0; s < n; s++) {
-if ((a = this.getPastureDataMap(c)).state == l.Lock && this.playerProp.gradeLevel >= o[s].value) {
+for (var s = 0, d = 0; d < n; d++) {
+if ((a = this.getPastureDataMap(c)).state == l.Lock && this.playerProp.gradeLevel >= o[d].value) {
 a = {
 id: c,
 state: l.Empty,
-productID: o[s].picture,
+productID: o[d].picture,
 growSpan: 0
 };
 this.setPastureDataMap(c, a, !1);
 r = !0;
+s = o[d].picture;
 }
 c++;
 }
 if (r) {
+this.setMaxProduct(p.dw, s);
 this.setProp(i.pastureData, this._pastureData);
 this.setNextProduct();
 }
@@ -12422,15 +12421,15 @@ break;
 
 default:
 r = !1;
-var d = this.getConfigIDByTab(e);
-if ((a = this.getFactoryDataMap(d)).state == u.Lock && this.playerProp.gradeLevel >= o[0].value) {
+var h = this.getConfigIDByTab(e);
+if ((a = this.getFactoryDataMap(h)).state == u.Lock && this.playerProp.gradeLevel >= o[0].value) {
 a = {
 id: c,
 state: u.Empty,
 productID: 0,
 growSpan: 0
 };
-this.setFactoryDataMap(d, a, !1);
+this.setFactoryDataMap(h, a, !1);
 r = !0;
 this.setMaxProduct(e, o[0].picture);
 }
@@ -12551,6 +12550,7 @@ set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
 gData.gameData.init_wallet_redMoney = !0;
+mk.ui.invokeRefreshEventByName("refreshCoin");
 },
 enumerable: !1,
 configurable: !0
@@ -13258,9 +13258,6 @@ mk.storage.setStorage("lastTimeSpan", this.lastTimeSpan);
 gData.gameData.init_leftTimes = !1;
 };
 e.prototype.onCount = function() {};
-e.prototype.testFly = function() {
-mk.fly.PlayCoinAnim(1, 20, null, cc.v2(0, 0));
-};
 e.prototype.onClickHuTui = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "互推icon");
 };
@@ -13276,18 +13273,13 @@ mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 e.prototype.onClickRedBagCash = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "常规提现-提现icon");
 };
-e.prototype.onClickGoldPigCash = function() {};
-e.prototype.onClickPigBank = function() {};
 e.prototype.onClickTurntable = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "抽奖icon");
-mk.console.log("onClickTurntable");
+mk.console.logSingle("VVVV ", "onClickTurntable");
 };
 e.prototype.onClickSign = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "签到icon");
-mk.console.log("onClickSign");
-};
-e.prototype.onClickFudai = function() {
-mk.data.sendDataEvent(l.DataEventId.button_click, "福袋icon");
+mk.console.logSingle("VVVV ", "onClickSign");
 };
 e.prototype.onClickShare = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "互推icon");
@@ -17566,7 +17558,7 @@ cc._RF.push(e, "f0038hKHC9Nf5+ipaUV9rc5", "MKSystem");
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var n = t("../sdk/BuglySDK"), a = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), A = t("../../game/component/NumberAnim"), P = t("../sdk/aliRisk/AliRiskManager"), k = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = function() {
+var n = t("../sdk/BuglySDK"), a = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), A = t("../../game/component/NumberAnim"), k = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -17654,7 +17646,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "ad", {
 get: function() {
-return this._ad || (this._ad = new g.default(k.default.getInstance()));
+return this._ad || (this._ad = new g.default(P.default.getInstance()));
 },
 enumerable: !1,
 configurable: !0
@@ -17710,7 +17702,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "aliRiskManager", {
 get: function() {
-return this._aliRiskManager || (this._aliRiskManager = new P.default());
+return this._aliRiskManager || (this._aliRiskManager = new k.default());
 },
 enumerable: !1,
 configurable: !0
@@ -19505,7 +19497,6 @@ this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2)
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
 e.prototype.clickCloseBtn = function() {
-mk.audio.playEffect("closeButton");
 gData.gameData.init_redBagTask = !0;
 };
 i([ s({
@@ -19682,6 +19673,7 @@ this.showElectUI();
 }
 this.showChangePart();
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
+mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
 };
 e.prototype.showElectUI = function() {
 this.sendRecommendList();
@@ -19711,16 +19703,18 @@ gData.adData.checkPopInter(u.InterAdType.interstitial1_click_1);
 mk.ad.showBanner(u.BannerAdType.banner_click_3);
 };
 e.prototype.onDisable = function() {
+mk.ui.removeRefreshEvent(this.node);
 mk.ad.destoryBanner();
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.redMoney;
+this.lbl_progress.string = n + "/" + o.redMoney / 100;
 var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
@@ -21116,7 +21110,7 @@ this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
-1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && t.value >= gData.gameData.playerProp.gradeLevel && (i = !0);
+1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.gradeLevel >= t.value && (i = !0);
 this.mainNode.active = i;
 this.lockNode.active = !i;
 if (!i) {
@@ -23363,6 +23357,7 @@ this.initTaskProgressUI();
 this.showChangePart();
 }
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
+mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
 }
 };
 e.prototype.showNewTaskUI = function() {
@@ -23376,6 +23371,7 @@ e.prototype.onEnable = function() {
 mk.ad.showBanner(p.BannerAdType.banner_click_2);
 };
 e.prototype.onDisable = function() {
+mk.ui.removeRefreshEvent(this.node);
 mk.ad.destoryBanner();
 mk.guide.open(3);
 };
@@ -23477,12 +23473,13 @@ t.lbl_value[o].string = "" + n;
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.redMoney;
+this.lbl_progress.string = n + "/" + o.redMoney / 100;
 var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
@@ -24558,12 +24555,14 @@ this.watchVideoCall();
 };
 e.prototype.start = function() {
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
+mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
 };
 e.prototype.onEnable = function() {
 gData.adData.checkPopInter(l.InterAdType.interstitial1_click_2);
 mk.ad.showBanner(l.BannerAdType.banner_click_1);
 };
 e.prototype.onDisable = function() {
+mk.ui.removeRefreshEvent(this.node);
 mk.ad.destoryBanner();
 };
 e.prototype.update = function() {
@@ -24575,12 +24574,13 @@ gData.reward.adData = null;
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_cash.string = o.money / 100 + "元";
-this.lbl_cash_out.string = n + "/" + o.redMoney;
+this.lbl_cash_out.string = n + "/" + o.redMoney / 100;
 var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
@@ -26357,11 +26357,13 @@ return e;
 e.prototype.start = function() {
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
 this.lbl_remainTimes.string = "今日剩余次数:" + gData.gameData.playerProp.speedUpLeftTimes;
+mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
 };
 e.prototype.onEnable = function() {
 mk.ad.showBanner(s.BannerAdType.banner_click_5);
 };
 e.prototype.onDisable = function() {
+mk.ui.removeRefreshEvent(this.node);
 mk.ad.destoryBanner();
 };
 e.prototype.update = function() {
@@ -26373,12 +26375,13 @@ this.lbl_remainTimes.string = "今日剩余次数:" + gData.gameData.playerPro
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.redMoney;
+this.lbl_progress.string = n + "/" + o.redMoney / 100;
 var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
@@ -28075,6 +28078,7 @@ if (this.canTouch) {
 this.onInPolygon && this.onInPolygon.emit([]);
 this.onTouchTap && this.onTouchTap.emit([]);
 }
+mk.audio.playEffect("button");
 if (this.isScaleAct) {
 cc.tween(this.node).to(.1, {
 scale: 1
@@ -28593,18 +28597,20 @@ e.prototype.onLoad = function() {};
 e.prototype.start = function() {
 mk.ad.showBanner(r.BannerAdType.banner_click_9);
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
+mk.ui.registerRefreshEvent(this.node, this.initCashOutStyle.bind(this), "refreshCoin");
 };
 e.prototype.update = function() {
 gData.reward.add_redbag_value && this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.redMoney;
+this.lbl_progress.string = n + "/" + o.redMoney / 100;
 var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
@@ -28617,6 +28623,9 @@ mk.audio.playEffect("button");
 gData.reward.addReward();
 mk.ui.closePanel(this.node.name);
 };
+e.prototype.onDisable = function() {
+mk.ui.removeRefreshEvent(this.node);
+};
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("closeButton");
 mk.ad.destoryBanner();
@@ -29387,10 +29396,12 @@ e.isPanelOpeningArr = [];
 e.isPanelClosingArr = [];
 e.curOnPanelDic = {};
 e.lastOpenPanelName = "";
+e.registerCallBack = new Map();
 return e;
 }
 e.prototype.onLoad = function() {
 mk.ui = this;
+this.registerCallBack.clear();
 };
 e.prototype.start = function() {
 this.panelParent || (this.panelParent = this.node);
@@ -29480,6 +29491,26 @@ mk.event.emit("close-panel", e);
 mk.ad.destroyNativeAd();
 mk.ad.destoryBanner();
 };
+e.prototype.registerRefreshEvent = function(t, e, o) {
+void 0 === e && (e = null);
+void 0 === o && (o = "default");
+var n = this.registerCallBack.get(t);
+if (n) n.set(o, e); else {
+var a = new Map();
+a.set(o, e);
+this.registerCallBack.set(t, a);
+}
+};
+e.prototype.invokeRefreshEventByName = function(t) {
+this.registerCallBack.forEach(function(e) {
+e.forEach(function(e, o) {
+o == t && e && e();
+});
+});
+};
+e.prototype.removeRefreshEvent = function(t) {
+this.registerCallBack.get(t) && this.registerCallBack.delete(t);
+};
 return i([ s ], e);
 }(cc.Component));
 o.default = l;
@@ -30273,7 +30304,7 @@ this.initTip();
 };
 e.prototype.initTip = function() {
 this.lbl_redMoney.string = (gData.gameData.playerProp.redMoney / 100).toString();
-this.lbl_value.string = gData.gameData.playerProp.redMoney / 1e6 + "元";
+this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1e6).toFixed(3) + "元";
 if (-1 != this.curChooseIndex) {
 var t = gData.gameData.configs.CashCfg[this.curChooseIndex];
 if (gData.gameData.playerProp.redMoney - t.redMoney >= 0) {
@@ -30759,30 +30790,30 @@ var c = t[s = a + r];
 t[s] = 16711935 & (c << 8 | c >>> 24) | 4278255360 & (c << 24 | c >>> 8);
 }
 r = this._hash.words;
-var s = t[a + 0], l = (c = t[a + 1], t[a + 2]), u = t[a + 3], d = t[a + 4], h = t[a + 5], f = t[a + 6], y = t[a + 7], g = t[a + 8], m = t[a + 9], _ = t[a + 10], v = t[a + 11], b = t[a + 12], D = t[a + 13], w = t[a + 14], S = t[a + 15], A = e(A = r[0], O = r[1], k = r[2], P = r[3], s, 7, p[0]), P = e(P, A, O, k, c, 12, p[1]), k = e(k, P, A, O, l, 17, p[2]), O = e(O, k, P, A, u, 22, p[3]);
-A = e(A, O, k, P, d, 7, p[4]), P = e(P, A, O, k, h, 12, p[5]), k = e(k, P, A, O, f, 17, p[6]), 
-O = e(O, k, P, A, y, 22, p[7]), A = e(A, O, k, P, g, 7, p[8]), P = e(P, A, O, k, m, 12, p[9]), 
-k = e(k, P, A, O, _, 17, p[10]), O = e(O, k, P, A, v, 22, p[11]), A = e(A, O, k, P, b, 7, p[12]), 
-P = e(P, A, O, k, D, 12, p[13]), k = e(k, P, A, O, w, 17, p[14]), A = o(A, O = e(O, k, P, A, S, 22, p[15]), k, P, c, 5, p[16]), 
-P = o(P, A, O, k, f, 9, p[17]), k = o(k, P, A, O, v, 14, p[18]), O = o(O, k, P, A, s, 20, p[19]), 
-A = o(A, O, k, P, h, 5, p[20]), P = o(P, A, O, k, _, 9, p[21]), k = o(k, P, A, O, S, 14, p[22]), 
-O = o(O, k, P, A, d, 20, p[23]), A = o(A, O, k, P, m, 5, p[24]), P = o(P, A, O, k, w, 9, p[25]), 
-k = o(k, P, A, O, u, 14, p[26]), O = o(O, k, P, A, g, 20, p[27]), A = o(A, O, k, P, D, 5, p[28]), 
-P = o(P, A, O, k, l, 9, p[29]), k = o(k, P, A, O, y, 14, p[30]), A = n(A, O = o(O, k, P, A, b, 20, p[31]), k, P, h, 4, p[32]), 
-P = n(P, A, O, k, g, 11, p[33]), k = n(k, P, A, O, v, 16, p[34]), O = n(O, k, P, A, w, 23, p[35]), 
-A = n(A, O, k, P, c, 4, p[36]), P = n(P, A, O, k, d, 11, p[37]), k = n(k, P, A, O, y, 16, p[38]), 
-O = n(O, k, P, A, _, 23, p[39]), A = n(A, O, k, P, D, 4, p[40]), P = n(P, A, O, k, s, 11, p[41]), 
-k = n(k, P, A, O, u, 16, p[42]), O = n(O, k, P, A, f, 23, p[43]), A = n(A, O, k, P, m, 4, p[44]), 
-P = n(P, A, O, k, b, 11, p[45]), k = n(k, P, A, O, S, 16, p[46]), A = i(A, O = n(O, k, P, A, l, 23, p[47]), k, P, s, 6, p[48]), 
-P = i(P, A, O, k, y, 10, p[49]), k = i(k, P, A, O, w, 15, p[50]), O = i(O, k, P, A, h, 21, p[51]), 
-A = i(A, O, k, P, b, 6, p[52]), P = i(P, A, O, k, u, 10, p[53]), k = i(k, P, A, O, _, 15, p[54]), 
-O = i(O, k, P, A, c, 21, p[55]), A = i(A, O, k, P, g, 6, p[56]), P = i(P, A, O, k, S, 10, p[57]), 
-k = i(k, P, A, O, f, 15, p[58]), O = i(O, k, P, A, D, 21, p[59]), A = i(A, O, k, P, d, 6, p[60]), 
-P = i(P, A, O, k, v, 10, p[61]), k = i(k, P, A, O, l, 15, p[62]), O = i(O, k, P, A, m, 21, p[63]);
+var s = t[a + 0], l = (c = t[a + 1], t[a + 2]), u = t[a + 3], d = t[a + 4], h = t[a + 5], f = t[a + 6], y = t[a + 7], g = t[a + 8], m = t[a + 9], _ = t[a + 10], v = t[a + 11], b = t[a + 12], D = t[a + 13], w = t[a + 14], S = t[a + 15], A = e(A = r[0], O = r[1], P = r[2], k = r[3], s, 7, p[0]), k = e(k, A, O, P, c, 12, p[1]), P = e(P, k, A, O, l, 17, p[2]), O = e(O, P, k, A, u, 22, p[3]);
+A = e(A, O, P, k, d, 7, p[4]), k = e(k, A, O, P, h, 12, p[5]), P = e(P, k, A, O, f, 17, p[6]), 
+O = e(O, P, k, A, y, 22, p[7]), A = e(A, O, P, k, g, 7, p[8]), k = e(k, A, O, P, m, 12, p[9]), 
+P = e(P, k, A, O, _, 17, p[10]), O = e(O, P, k, A, v, 22, p[11]), A = e(A, O, P, k, b, 7, p[12]), 
+k = e(k, A, O, P, D, 12, p[13]), P = e(P, k, A, O, w, 17, p[14]), A = o(A, O = e(O, P, k, A, S, 22, p[15]), P, k, c, 5, p[16]), 
+k = o(k, A, O, P, f, 9, p[17]), P = o(P, k, A, O, v, 14, p[18]), O = o(O, P, k, A, s, 20, p[19]), 
+A = o(A, O, P, k, h, 5, p[20]), k = o(k, A, O, P, _, 9, p[21]), P = o(P, k, A, O, S, 14, p[22]), 
+O = o(O, P, k, A, d, 20, p[23]), A = o(A, O, P, k, m, 5, p[24]), k = o(k, A, O, P, w, 9, p[25]), 
+P = o(P, k, A, O, u, 14, p[26]), O = o(O, P, k, A, g, 20, p[27]), A = o(A, O, P, k, D, 5, p[28]), 
+k = o(k, A, O, P, l, 9, p[29]), P = o(P, k, A, O, y, 14, p[30]), A = n(A, O = o(O, P, k, A, b, 20, p[31]), P, k, h, 4, p[32]), 
+k = n(k, A, O, P, g, 11, p[33]), P = n(P, k, A, O, v, 16, p[34]), O = n(O, P, k, A, w, 23, p[35]), 
+A = n(A, O, P, k, c, 4, p[36]), k = n(k, A, O, P, d, 11, p[37]), P = n(P, k, A, O, y, 16, p[38]), 
+O = n(O, P, k, A, _, 23, p[39]), A = n(A, O, P, k, D, 4, p[40]), k = n(k, A, O, P, s, 11, p[41]), 
+P = n(P, k, A, O, u, 16, p[42]), O = n(O, P, k, A, f, 23, p[43]), A = n(A, O, P, k, m, 4, p[44]), 
+k = n(k, A, O, P, b, 11, p[45]), P = n(P, k, A, O, S, 16, p[46]), A = i(A, O = n(O, P, k, A, l, 23, p[47]), P, k, s, 6, p[48]), 
+k = i(k, A, O, P, y, 10, p[49]), P = i(P, k, A, O, w, 15, p[50]), O = i(O, P, k, A, h, 21, p[51]), 
+A = i(A, O, P, k, b, 6, p[52]), k = i(k, A, O, P, u, 10, p[53]), P = i(P, k, A, O, _, 15, p[54]), 
+O = i(O, P, k, A, c, 21, p[55]), A = i(A, O, P, k, g, 6, p[56]), k = i(k, A, O, P, S, 10, p[57]), 
+P = i(P, k, A, O, f, 15, p[58]), O = i(O, P, k, A, D, 21, p[59]), A = i(A, O, P, k, d, 6, p[60]), 
+k = i(k, A, O, P, v, 10, p[61]), P = i(P, k, A, O, l, 15, p[62]), O = i(O, P, k, A, m, 21, p[63]);
 r[0] = r[0] + A | 0;
 r[1] = r[1] + O | 0;
-r[2] = r[2] + k | 0;
-r[3] = r[3] + P | 0;
+r[2] = r[2] + P | 0;
+r[3] = r[3] + k | 0;
 },
 _doFinalize: function() {
 var e = this._data, o = e.words, n = 8 * this._nDataBytes, a = 8 * e.sigBytes;

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

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

Some files were not shown because too many files changed in this diff