Browse Source

Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework into master

fengcong 5 years ago
parent
commit
87490a9930
100 changed files with 2451 additions and 2461 deletions
  1. 12 0
      assets/resources/data/guide_weak_data.json
  2. 5 0
      assets/resources/data/guide_weak_data.json.meta
  3. 0 1
      assets/resources/game/hot/project.manifest
  4. 0 1
      assets/resources/game/hot/version.manifest
  5. 173 143
      assets/resources/game/prefab/game.prefab
  6. 4 0
      assets/resources/game/prefab/gameplay.prefab
  7. 142 184
      assets/resources/module/cashPro/cashPro.prefab
  8. 4 1
      assets/resources/module/guide/guide.prefab
  9. 12 0
      assets/resources/module/guideWeak.meta
  10. 127 0
      assets/resources/module/guideWeak/GuideWeak.prefab
  11. 8 0
      assets/resources/module/guideWeak/GuideWeak.prefab.meta
  12. 0 0
      assets/resources/module/login/hot.meta
  13. 0 0
      assets/resources/module/login/hot/project.manifest
  14. 0 0
      assets/resources/module/login/hot/project.manifest.meta
  15. 1 0
      assets/resources/module/login/hot/version.manifest
  16. 0 0
      assets/resources/module/login/hot/version.manifest.meta
  17. 3 0
      assets/resources/module/login/login.prefab
  18. 7 5
      assets/resources/module/receiptNotice/receiptNotice.prefab
  19. 26 22
      assets/resources/module/redeem/RedeemNode.prefab
  20. 165 143
      assets/resources/module/reward/reward.prefab
  21. 165 143
      assets/resources/module/reward/rewardLuck.prefab
  22. 165 143
      assets/resources/module/reward/rewardMission.prefab
  23. 24 9
      assets/resources/module/sign/sign.prefab
  24. BIN
      assets/resources/module/turnable/texture/zhuanpan2.png
  25. 6 6
      assets/resources/module/turnable/texture/zhuanpan2.png.meta
  26. 11 11
      assets/resources/module/turnable/turnable.prefab
  27. 10 10
      assets/resources/spine/game/changjing.json
  28. BIN
      assets/resources/spine/game/changjing.png
  29. 89 9
      assets/scene/MainScene.fire
  30. 0 5
      assets/script/Main.ts
  31. 11 0
      assets/script/before/GamePlay.ts
  32. 2 2
      assets/script/game/component/BangsFit.ts
  33. 10 0
      assets/script/game/component/BtnOpenPanel.ts
  34. 1 0
      assets/script/game/component/NumberAnim.ts
  35. 6 0
      assets/script/game/component/UIBG.ts
  36. 2 2
      assets/script/game/component/tween/EffectOpenAndClose.ts
  37. 1 1
      assets/script/game/data/AppData.ts
  38. 4 1
      assets/script/game/data/GData.ts
  39. 17 1
      assets/script/game/data/GameData.ts
  40. 58 44
      assets/script/game/data/LoginData.ts
  41. 2 2
      assets/script/game/data/StorageData.ts
  42. 1 0
      assets/script/game/data/module/CashProData.ts
  43. 21 29
      assets/script/game/data/module/GuideData.ts
  44. 99 0
      assets/script/game/data/module/GuideWeakData.ts
  45. 9 0
      assets/script/game/data/module/GuideWeakData.ts.meta
  46. 3 4
      assets/script/game/data/module/PigBankData.ts
  47. 9 4
      assets/script/game/data/module/RedBagCashData.ts
  48. 9 14
      assets/script/game/data/module/RewardData.ts
  49. 19 10
      assets/script/game/data/module/SignData.ts
  50. 3 1
      assets/script/game/game/FunBtns.ts
  51. 29 6
      assets/script/game/game/Game.ts
  52. 1 0
      assets/script/game/module/blessingBag/BlessingBag.ts
  53. 26 1
      assets/script/game/module/guide/Guide.ts
  54. 28 0
      assets/script/game/module/guide/GuideVO.ts
  55. 9 0
      assets/script/game/module/guide/GuideVO.ts.meta
  56. 12 0
      assets/script/game/module/guideWeak.meta
  57. 75 0
      assets/script/game/module/guideWeak/GuideWeak.ts
  58. 9 0
      assets/script/game/module/guideWeak/GuideWeak.ts.meta
  59. 69 6
      assets/script/game/module/login/Login.ts
  60. 2 1
      assets/script/game/module/moreGame/MoreGamePopNode.ts
  61. 12 0
      assets/script/game/module/pigBank/PigBank.ts
  62. 2 2
      assets/script/game/module/receiptNotice/ReceiptNotice.ts
  63. 10 0
      assets/script/game/module/redBagCash/RedBagCash.ts
  64. 7 3
      assets/script/game/module/redeem/RedeemNode.ts
  65. 35 4
      assets/script/game/module/reward/Reward.ts
  66. 4 3
      assets/script/game/module/setting/Setting.ts
  67. 1 1
      assets/script/game/module/sign/Sign.ts
  68. 2 2
      assets/script/game/module/sign/SignIconItem.ts
  69. 200 0
      assets/script/mk/sdk/HotUpdate.ts
  70. 9 0
      assets/script/mk/sdk/HotUpdate.ts.meta
  71. 15 2
      assets/script/mk/system/FlySystem.ts
  72. 12 0
      assets/script/mk/system/GuideSystem.ts
  73. 5 0
      assets/script/mk/system/MKSystem.ts
  74. 1 0
      assets/script/mk/system/UISystem.ts
  75. 1 1
      assets/script/mk/utils/EncryptUtil.ts
  76. 13 7
      assets/script/mk/utils/StorageUtil.ts
  77. 2 0
      build/jsb-link/.idea/.gitignore
  78. 116 0
      build/jsb-link/.idea/codeStyles/Project.xml
  79. 9 0
      build/jsb-link/.idea/jsb-link.iml
  80. 8 0
      build/jsb-link/.idea/modules.xml
  81. 6 0
      build/jsb-link/.idea/vcs.xml
  82. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  83. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml
  84. 18 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/jarRepositories.xml
  85. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  86. 0 99
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1746423203/libcocos2dx.iml
  87. 99 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/android-libcocos2dx.iml
  88. 156 156
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml
  89. 0 559
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build.json
  90. 0 18
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.command.txt
  91. 0 95
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt
  92. 0 375
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt
  93. 0 65
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_mini.json
  94. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.command.txt
  95. 0 7
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.stdout.txt
  96. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_command.txt
  97. 0 7
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt
  98. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build.json
  99. 0 18
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.command.txt
  100. 0 4
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

+ 12 - 0
assets/resources/data/guide_weak_data.json

@@ -0,0 +1,12 @@
+{
+	"panelWeight": {
+		"1": 10,
+		"2": 10,
+		"4": 10,
+		"5": 10,
+		"6": 10,
+		"7": 10,
+		"8": 10
+	},
+	"triggerTime": 10
+}

+ 5 - 0
assets/resources/data/guide_weak_data.json.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "6395adfa-2f63-47cf-9b41-4641bb2d41e1",
+  "subMetas": {}
+}

+ 0 - 1
assets/resources/game/hot/project.manifest

@@ -1 +0,0 @@
-{"version":"1.1.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/version.manifest","assets":{"src/cocos2d-jsb.js":{"size":1857837,"md5":"adeb5bfbaf0785ddbc8de255889e43ce"},"src/physics.js":{"size":232870,"md5":"a6d86e8c0f3b15a9f5cd81e64a48ecec"}},"searchPaths":[]}

+ 0 - 1
assets/resources/game/hot/version.manifest

@@ -1 +0,0 @@
-{"version":"1.1.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/APPHotUpdate/dailyEliminate/remote/version.manifest"}

File diff suppressed because it is too large
+ 173 - 143
assets/resources/game/prefab/game.prefab


+ 4 - 0
assets/resources/game/prefab/gameplay.prefab

@@ -1263,6 +1263,7 @@
     },
     "_enabled": true,
     "panel_name": "module/reward/rewardLuck",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [],
@@ -1684,6 +1685,7 @@
     },
     "_enabled": true,
     "panel_name": "module/reward/rewardLuck",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [],
@@ -2105,6 +2107,7 @@
     },
     "_enabled": true,
     "panel_name": "module/reward/rewardLuck",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [],
@@ -2526,6 +2529,7 @@
     },
     "_enabled": true,
     "panel_name": "module/reward/rewardLuck",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [],

File diff suppressed because it is too large
+ 142 - 184
assets/resources/module/cashPro/cashPro.prefab


+ 4 - 1
assets/resources/module/guide/guide.prefab

@@ -1202,7 +1202,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f9mlOp3ChKlY+khHxIF6IF",
+    "fileId": "a2HoJek5BHspfqhuFy74/k",
     "sync": false
   },
   {
@@ -1296,6 +1296,9 @@
     "node_bg": {
       "__id__": 3
     },
+    "node_dialog": {
+      "__id__": 17
+    },
     "node_finger": {
       "__id__": 15
     },

+ 12 - 0
assets/resources/module/guideWeak.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "ab5e8500-43f4-483b-a621-6ddbaaf94257",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 127 - 0
assets/resources/module/guideWeak/GuideWeak.prefab

@@ -0,0 +1,127 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "GuideWeak",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        375,
+        667,
+        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.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "f13f5zT97NMpINpXOCogVAt",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "ba2e33b2-5a64-424b-8b08-247fed4be0f0"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/module/guideWeak/GuideWeak.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "ba2e33b2-5a64-424b-8b08-247fed4be0f0",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 0 - 0
assets/resources/game/hot.meta → assets/resources/module/login/hot.meta


File diff suppressed because it is too large
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 0 - 0
assets/resources/game/hot/project.manifest.meta → assets/resources/module/login/hot/project.manifest.meta


+ 1 - 0
assets/resources/module/login/hot/version.manifest

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

+ 0 - 0
assets/resources/game/hot/version.manifest.meta → assets/resources/module/login/hot/version.manifest.meta


+ 3 - 0
assets/resources/module/login/login.prefab

@@ -1576,6 +1576,9 @@
     "lbl_privacy": {
       "__id__": 37
     },
+    "manifest": {
+      "__uuid__": "a81eb395-718d-4f3b-958c-cb871f7dd5fa"
+    },
     "_id": ""
   },
   {

+ 7 - 5
assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -1073,8 +1073,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "¥3.00元",
-    "_N$string": "¥3.00元",
+    "_string": "¥0.00元",
+    "_N$string": "¥0.00元",
     "_fontSize": 90,
     "_lineHeight": 90,
     "_enableWrapText": true,
@@ -1681,7 +1681,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 156.38,
+      "width": 143.16,
       "height": 45.36
     },
     "_anchorPoint": {
@@ -1733,8 +1733,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "¥15.00元",
-    "_N$string": "¥15.00元",
+    "_string": "¥0.00元",
+    "_N$string": "¥0.00元",
     "_fontSize": 36,
     "_lineHeight": 36,
     "_enableWrapText": true,
@@ -1951,6 +1951,7 @@
     },
     "_enabled": true,
     "panel_name": "module/cashNormal/cashNormal",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [],
@@ -2321,6 +2322,7 @@
     },
     "design_block_node": null,
     "bClickClose": false,
+    "onComplete": [],
     "_id": ""
   },
   {

+ 26 - 22
assets/resources/module/redeem/RedeemNode.prefab

@@ -516,15 +516,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 241,
+      "g": 160,
+      "b": 36,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 292,
-      "height": 35
+      "width": 144,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -561,7 +561,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -575,21 +575,22 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "228bd30f-23b1-44ad-986a-1352c203da41"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_string": "新手礼包",
+    "_N$string": "新手礼包",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
     "_id": ""
   },
   {
@@ -600,7 +601,7 @@
     "asset": {
       "__uuid__": "2115765a-89cf-4ed8-8984-9cc608d7cad4"
     },
-    "fileId": "7coDkmQaRPDKa56kqfPVt6",
+    "fileId": "4fyzkG+kRIH5LVDStXjUce",
     "sync": false
   },
   {
@@ -9627,6 +9628,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lab_title": {
+      "__id__": 13
+    },
     "txtGiftName": {
       "__id__": 134
     },

File diff suppressed because it is too large
+ 165 - 143
assets/resources/module/reward/reward.prefab


File diff suppressed because it is too large
+ 165 - 143
assets/resources/module/reward/rewardLuck.prefab


File diff suppressed because it is too large
+ 165 - 143
assets/resources/module/reward/rewardMission.prefab


+ 24 - 9
assets/resources/module/sign/sign.prefab

@@ -36,11 +36,11 @@
         "__id__": 51
       },
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -212,7 +212,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        39.963,
+        152.918,
         0,
         0,
         0,
@@ -326,7 +326,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        35,
+        147.955,
         0,
         0,
         0,
@@ -620,7 +620,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        374.498,
+        487.453,
         0,
         0,
         0,
@@ -834,7 +834,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -377.921,
+        -264.966,
         0,
         0,
         0,
@@ -941,7 +941,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -379.526,
+        -266.571,
         0,
         0,
         0,
@@ -1074,7 +1074,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -431.993,
+        -319.038,
         0,
         0,
         0,
@@ -1587,7 +1587,7 @@
       "ctor": "Float64Array",
       "array": [
         303.19,
-        464.26,
+        577.215,
         0,
         0,
         0,
@@ -1813,9 +1813,24 @@
       "__id__": 3
     },
     "bClickClose": true,
+    "onComplete": [
+      {
+        "__id__": 52
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "92c1epESLhJSLrId9Dkn6Wd",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "ac053zwqaRD6IJmTlQWmefZ",
     "_name": "",
     "_objFlags": 0,

BIN
assets/resources/module/turnable/texture/zhuanpan2.png


+ 6 - 6
assets/resources/module/turnable/texture/zhuanpan2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 548,
-  "height": 535,
+  "width": 535,
+  "height": 545,
   "platformSettings": {},
   "subMetas": {
     "zhuanpan2": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 548,
-      "height": 535,
-      "rawWidth": 548,
-      "rawHeight": 535,
+      "width": 535,
+      "height": 545,
+      "rawWidth": 535,
+      "rawHeight": 545,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 11 - 11
assets/resources/module/turnable/turnable.prefab

@@ -1007,25 +1007,25 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 548,
-      "height": 535
+      "width": 535,
+      "height": 545
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.504,
-      "y": 0.499
+      "x": 0.5,
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        0.5,
         0,
         0,
         0,
         0,
-        1,
+        -0.26723837607825685,
+        0.963630453208623,
         1,
         1,
         1
@@ -1035,7 +1035,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -31
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -2026,7 +2026,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "eaCLbJlPRKEZBCfqME/KD7",
+    "fileId": "d3Z2dZPxlCqY3I/qqgj90n",
     "sync": false
   },
   {
@@ -2158,7 +2158,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "81/5BDdi1LIqwIWPzdjdur",
+    "fileId": "25gILcs+hPop60oprXEqBh",
     "sync": false
   },
   {
@@ -2290,7 +2290,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "59EpiRO/RJrLF6CHIaIWnb",
+    "fileId": "51Rdhj3hZEzLNg3SdsPRNG",
     "sync": false
   },
   {
@@ -2503,7 +2503,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "a4MpVqY8pOvqBtAyamKRuW",
+    "fileId": "0edKsBML9JobVgIidB0UVl",
     "sync": false
   },
   {

File diff suppressed because it is too large
+ 10 - 10
assets/resources/spine/game/changjing.json


BIN
assets/resources/spine/game/changjing.png


+ 89 - 9
assets/scene/MainScene.fire

@@ -90,16 +90,16 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 17
       },
       {
-        "__id__": 15
+        "__id__": 18
       },
       {
-        "__id__": 16
+        "__id__": 19
       },
       {
-        "__id__": 17
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -580,9 +580,17 @@
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 14
+      }
+    ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
     "_prefab": null,
     "_opacity": 255,
     "_color": {
@@ -594,8 +602,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -632,6 +640,79 @@
     "_id": "00l+e+JEJA2YTFgORvtX+s"
   },
   {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 13
+    },
+    "_prefab": {
+      "__id__": 15
+    },
+    "_name": "GuideWeak",
+    "_active": true,
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": "eanBXyELZLiLKDrC2BLhHQ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 14
+    },
+    "asset": {
+      "__uuid__": "ba2e33b2-5a64-424b-8b08-247fed4be0f0"
+    },
+    "fileId": "",
+    "sync": true
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "4a5t4pwQtJiI5cavWztbU0"
+  },
+  {
     "__type__": "cc.Canvas",
     "_name": "",
     "_objFlags": 0,
@@ -683,7 +764,6 @@
       "__id__": 2
     },
     "_enabled": true,
-    "mainfestUrl": null,
     "_id": "6fbJRZsUhE4p90rFOw/XX3"
   },
   {

+ 0 - 5
assets/script/Main.ts

@@ -2,11 +2,6 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class Main extends cc.Component {
-    @property({
-        type: cc.Asset,
-    })
-    mainfestUrl: cc.Asset = null;
-
     start() {
         mk.ui.openPanel("module/login/login");
     }

+ 11 - 0
assets/script/before/GamePlay.ts

@@ -194,6 +194,7 @@ export default class GamePlay extends cc.Component {
             cc.tween(this.btn_gameGetRed4).delay(0.4).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
 
         }).catch();
+        this.qipaoShow();
     }
 
     onEnable() {
@@ -1126,4 +1127,14 @@ export default class GamePlay extends cc.Component {
             clearInterval(this.interval_ShowGuide);
         }
     }
+
+    /**
+     * 气泡红包是否开启
+     */
+    private qipaoShow() {
+        for (let i = 0; i < 4; i++) {
+            this['btn_gameGetRed' + (i + 1)].active = gData.gameData.funBtns.btn8.active;
+        }
+
+    }
 }

+ 2 - 2
assets/script/game/component/BangsFit.ts

@@ -1,7 +1,7 @@
 
 const {ccclass, property} = cc._decorator;
-const LeftPadding = 50;
-const RightPadding = 50;
+const LeftPadding = 65;
+const RightPadding = 65;
 /**
  * 刘海屏适配
  * @author 薛鸿潇

+ 10 - 0
assets/script/game/component/BtnOpenPanel.ts

@@ -1,5 +1,6 @@
 
 const { ccclass, property } = cc._decorator;
+import JsbSystem from '../../mk/system/JsbSystem';
 import { OpenActionType } from '../../mk/system/UISystem';
 /**
  * 打开指定名字的面板
@@ -10,6 +11,8 @@ export default class BtnOpenPanel extends cc.Component {
 
     @property({ displayName: '预制体路径', tooltip: '对应路径:resources/' })
     private panel_name = '';
+    @property({ displayName: '是否需要微信授权', tooltip: '授权勾选' })
+    private bool_Auth: boolean = false;
     @property({ displayName: '打开类型', tooltip: 'normal不操作,closeOther关闭其他,closeLast关闭上一个', type: cc.Enum(OpenActionType) })
     private open_type = OpenActionType.normal;
     @property({ displayName: '点击效果', tooltip: "仅支持 NONE 和 SCALE", type: cc.Enum(cc.Button.Transition) })
@@ -30,6 +33,13 @@ export default class BtnOpenPanel extends cc.Component {
 
     private async openPanel() {
         mk.audio.playEffect("button");
+        if (this.bool_Auth) {
+            if (!gData.loginData.isAuth) {
+                JsbSystem.WxAuth();
+                return;
+            }
+        }
+
         if (!this.panel_name) return;
         await mk.ui.openPanel(this.panel_name, this.open_type);
         const c_count = this.onComplete.length;

+ 1 - 0
assets/script/game/component/NumberAnim.ts

@@ -18,6 +18,7 @@ export default class NumberAnim extends cc.Component {
      * @param new_value 目标值
      */
     public setValue(new_value: number, toFixed: number = 0) {
+        if (!new_value || this.targetProgress == new_value) return;
         this.toFixed = toFixed;
         this.len_target = new_value.toString().length;
         this.targetProgress = new_value;

+ 6 - 0
assets/script/game/component/UIBG.ts

@@ -13,6 +13,8 @@ export default class UIBG extends cc.Component {
     private design_block_node: cc.Node = null!;
     @property({ displayName: '点击关闭' })
     private bClickClose: boolean = false;
+    @property({ displayName: '完成回调', tooltip: "面板打开完成后触发", type: cc.Component.EventHandler })
+    public onComplete: cc.Component.EventHandler[] = [];
 
     /** 背景节点 */
     private node_bg: cc.Node = null;
@@ -43,6 +45,10 @@ export default class UIBG extends cc.Component {
 
     private onClickClose() {
         mk.ui.closePanel(this.node.name);
+        const c_count = this.onComplete.length;
+        for (let i = 0; i < c_count; i++) {
+            if (this.onComplete[i].handler) this.onComplete[i].emit([])
+        }
     }
     /**
      * 创建背景蒙版 by 绘图组件

+ 2 - 2
assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -126,7 +126,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     }
                     break;
                 case EffectType.rightIn:
-                    mk.tween.move(this.effect_par, 0.3, this.effect_par.getPosition(), new cc.Vec2(this.effect_par.x, 1000), () => {
+                    mk.tween.move(this.effect_par, 0.3, this.effect_par.getPosition(), new cc.Vec2(1000, this.effect_par.y), () => {
                         this.effect_par.active = false;
                         cb && cb();
                     }, 'sineOut')
@@ -135,7 +135,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     //     .to(0.3, { x: 1000 }, cc.easeOut(3))
                     //     .call(() => {
                     //         this.effect_par.active = false;
-                    //         if (typeof cb == 'function') cb();
+                    //         cb && cb();
                     //     })
                     //     .start()
                     break;

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

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = 'c9:24:e2:12:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '5e:30:e2:12:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

+ 4 - 1
assets/script/game/data/GData.ts

@@ -22,6 +22,7 @@ import RedeemData from "./module/RedeemData";
 import { MoreGameData } from "./module/MoreGameData";
 import { SettingData } from "./module/SettingData";
 import { GuideData } from "./module/GuideData";
+import GuideWeakData from "./module/GuideWeakData";
 
 /**
  * 数据集合全局类
@@ -40,7 +41,8 @@ class GData {
     public httpData: HttpData;
     public adData: AdData;
     public storageData: StorageData;
-    public guideData:GuideData;
+    public guideData: GuideData;
+    public guideWeakData: GuideWeakData;
 
     //module
     /** 领取红包奖励 */
@@ -79,6 +81,7 @@ class GData {
         this.adData = new AdData();
         this.storageData = new StorageData();
         this.guideData = new GuideData();
+        this.guideWeakData = new GuideWeakData();
 
         this.reward = new RewardData();
         this.help = new HelpData();

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

@@ -1,3 +1,4 @@
+import FunBtns from "../game/FunBtns";
 import Game from "../game/Game";
 
 /**
@@ -37,6 +38,8 @@ export class GameData {
 
     /** 主页样式脚本 */
     public gameStyle: Game = null;
+    /** 入口按钮 */
+    public funBtns: FunBtns = null;
 
     /**
      * 初始化游戏数据:网络配置信息,用户信息
@@ -64,6 +67,8 @@ export class GameData {
         mk.console.logSingle("getInfoCrypt", response.data);
         this.initPlayerProp(response.data)
         this.initProps(response.data.gameUserData);
+        gData.guideData.init();
+        gData.guideWeakData.init();
         gData.moduleData.forEach(element => {
             element.init();
         });
@@ -104,6 +109,7 @@ export class GameData {
         this.gameData.turntableTimes = res_data.turntableTimes;
         this.gameData.userTuCaoInfo = res_data.userTuCaoInfo;
         this.gameData.versioncfg = res_data.versioncfg;
+        this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
     }
 
     /**
@@ -176,6 +182,8 @@ export class GameData {
     public resetProps() {
         let arr = [];
         arr.push({ key: GameProp.sign_can, value: 1 });
+        arr.push({ key: GameProp.isAutoOpenPanel, value: 1 });
+        arr.push({ key: GameProp.isOpenBankOnCloseCash, value: 0 });
 
         this.setProps(arr);
     }
@@ -192,10 +200,14 @@ export class GameData {
  */
 export enum GameProp {
     /** -------------------- 通用玩家数据 ------------------------- */
-    /** 是否新手 */
+    /** 是否新手 0新手 1老手 */
     newPlayer = 1,
     /** 当前新手引导步骤 */
     guideID = 2,
+    /** 需要自动弹界面 每次登录都弹 除首次 表示今日是否要自动开 1自动开 2不自动开 其他不处理*/
+    isAutoOpenPanel = 3,
+    /** 关闭常规提现时需要自动开存钱罐 每天一次 表示今日有没有开过 */
+    isOpenBankOnCloseCash = 4,
 
     /** ------------------ 游戏核心数据 --------------------------- */
     /** 关卡数 */
@@ -246,6 +258,7 @@ class PlayerProp {
     private _piggyBank: number = 0;
     /** 存钱罐存款 */
     set piggyBank(value: number) {
+        if (this._piggyBank === value) return;
         this._piggyBank = value;
         gData.gameData.init_coin = true;
         gData.pigbank.init_data = true;
@@ -295,6 +308,7 @@ class PlayerProp {
     _signInDay = 0;
     /** 累计签到次数 客户端理解 上次签到天数 */
     set signInDay(value: number) {
+        if (this._signInDay === value) return;
         this._signInDay = value;
         gData.sign.init_data = true;
     }
@@ -315,6 +329,8 @@ class PlayerProp {
     resetPropNum = 0;
     /** 变色道具数目 */
     changePropNum = 0;
+    /** 能免费领红包 1 表示是新人第一次产出红包币,不用看视频*/
+    isFirstRedMoney = 0;
 }
 
 /**

+ 58 - 44
assets/script/game/data/LoginData.ts

@@ -45,13 +45,9 @@ export class LoginData {
         if (result && result.json) {
             this.rule_data = result.json.server;
             this.privacy_data = result.json.privacy;
-        }
-
-        result = await mk.loader.load("data/guide_data", cc.JsonAsset);
-        if (result && result.json) {
-            gData.guideData.init(result.json);
             this.loadResCompelete = true;
         }
+
     }
 
     /**
@@ -69,7 +65,7 @@ export class LoginData {
      * @description initApp-->initAd-->connect-->wxLogin-->checkLogin-->getAccountInfo
      */
     public async login() {
-
+        mk.console.logSingle("login...", this.sessionKey + "..." + this.uin);
         //有登录记录直接跳转到登录流程最后一步
         if (this.sessionKey != '' && this.uin != '') {
             console.log("=== login 有登录记录直接跳转到登录流程最后一步");
@@ -101,7 +97,7 @@ export class LoginData {
             return;
         }
         data = mk.encrypt.decrypt(response.encrypt, this.randomKey, gData.appData.appId);
-        console.log("[FC]connectTest decryptData", data);
+        mk.console.logSingle("[FC]connectTest decryptData", data);
         this.tempUin = JSON.parse(data).tmp_uin;
         mk.storage.setStorage(StorageKey.uin, this.tempUin);
         this.wxLogin();
@@ -143,7 +139,7 @@ export class LoginData {
         }
         data = JSON.parse(data);
         this.loginTicket = data.login_ticket;
-        console.log("[FC]wxLoginTest decrypt", data);
+        mk.console.logSingle("[FC]wxLogin decrypt", data);
         mk.storage.setStorage(StorageKey.loginTicket, this.loginTicket);
 
         let isFirstIn = mk.storage.getStorage(StorageKey.isFirstIn);
@@ -197,13 +193,13 @@ export class LoginData {
 
         let parseData = JSON.parse(decryptData);
         this.sessionKey = parseData.session_key;
-        console.log("[FC]checkLogin decrypt", parseData);
+        mk.console.logSingle("[FC]checkLogin decrypt", parseData);
         mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
         this.getUserInfo();
     }
 
     private async getUserInfo() {
-        
+
         // if (gData.wechatData.code != null) {
         //     if (this.isNew) {//玩过此游戏并且本地数据是本机的
         //         this.getAccountInfo();
@@ -227,37 +223,37 @@ export class LoginData {
         //     gData.wechatData.nickName = nickname;
         // }
         // else {
-            let aa = {
-                "uin": this.uin,
-                "login_ticket": this.loginTicket
-            };
+        let aa = {
+            "uin": this.uin,
+            "login_ticket": this.loginTicket
+        };
 
-            let data: any = {
-                "uin": this.uin,
-                "encrypt": mk.encrypt.encrypt(JSON.stringify(aa), this.sessionKey, gData.appData.appId)
-            };
+        let data: any = {
+            "uin": this.uin,
+            "encrypt": mk.encrypt.encrypt(JSON.stringify(aa), this.sessionKey, gData.appData.appId)
+        };
 
-            let response = await mk.http.sendRequest('user', 'POST', JSON.stringify(data), false, false);
-            if (response.errcode != 0) {
-                if (response.errcode == -10003 || response.errcode == -20003) {
-                    //清除缓存
-                    this.reload();
-                }
-                return;
-            }
-            response = mk.http.checkData(response, true);
-            data = response.data;
-            mk.console.logSingle("[FC] getAccountInfo decrypt", data);
-            this.isAuth = data.is_auth;
-            if (this.isAuth) {
-                gData.wechatData.nickName = data.nickname;
-                gData.wechatData.avatar = data.headimgurl;
-                gData.wechatData.unionid = this.uin;
-                gData.gameData.init_head = true;
-                mk.storage.setStorage(StorageKey.isAuth, 1);
-                mk.storage.setStorage(StorageKey.nickname, gData.wechatData.nickName, false);
-                mk.storage.setStorage(StorageKey.avatar, gData.wechatData.avatar, false);
+        let response = await mk.http.sendRequest('user', 'POST', JSON.stringify(data), false, false);
+        if (response.errcode != 0) {
+            if (response.errcode == -10003 || response.errcode == -20003) {
+                //清除缓存
+                this.reload();
             }
+            return;
+        }
+        response = mk.http.checkData(response, true);
+        data = response.data;
+        mk.console.logSingle("[FC] getAccountInfo decrypt", data);
+        this.isAuth = data.is_auth;
+        if (this.isAuth) {
+            gData.wechatData.nickName = data.nickname;
+            gData.wechatData.avatar = data.headimgurl;
+            gData.wechatData.unionid = this.uin;
+            gData.gameData.init_head = true;
+            mk.storage.setStorage(StorageKey.isAuth, 1);
+            mk.storage.setStorage(StorageKey.nickname, gData.wechatData.nickName, false);
+            mk.storage.setStorage(StorageKey.avatar, gData.wechatData.avatar, false);
+        }
 
         // }
 
@@ -269,11 +265,29 @@ export class LoginData {
      * 本地数据不是本账户的 清空数据 重新登录游戏
      */
     public reload() {
-        let path = cc.sys.localStorage.getItem('HotUpdateSearchPaths');
-        gData.storageData.clear();
-        cc.sys.localStorage.setItem('HotUpdateSearchPaths', path);
-        cc.audioEngine.stopAll();
-        //调用Android的更好
-        cc.game.restart();
+        // let path = cc.sys.localStorage.getItem('HotUpdateSearchPaths');
+        // gData.storageData.clear();
+        // cc.sys.localStorage.setItem('HotUpdateSearchPaths', path);
+        setTimeout(() => {
+            this.sessionKey = '';
+            this.uin = '';
+            this.loginTicket = '';
+            this.isAuth = false;
+            this.tempUin = '';
+            this.randomKey = '';
+            gData.wechatData.nickName = '';
+            gData.wechatData.avatar = '';
+
+            cc.sys.localStorage.removeItem(StorageKey.sessionKey);
+            cc.sys.localStorage.removeItem(StorageKey.uin);
+            cc.sys.localStorage.removeItem(StorageKey.loginTicket);
+            cc.sys.localStorage.removeItem(StorageKey.isAuth);
+            cc.sys.localStorage.removeItem(StorageKey.nickname);
+            cc.sys.localStorage.removeItem(StorageKey.avatar);
+
+            cc.audioEngine.stopAll();
+            //调用Android的更好
+            cc.game.restart();
+        })
     }
 }

+ 2 - 2
assets/script/game/data/StorageData.ts

@@ -4,8 +4,8 @@
  */
 export class StorageData {
 
-    /** 本地缓存key */
-    public storageKey: string = 'wewishyouamerrychristmaswithout996';
+    /** 本地缓存key,必须是32位 */
+    public storageKey: string = 'mzmNr2s358irB3WQC3AmGaWMFkMx2HQs';
 
     public clear(){
         mk.storage.clear();

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

@@ -46,6 +46,7 @@ export default class CashProData extends Data {
                 }
                 break;
         }
+        gData.cashNormal.getRecord();// 请求新的提现记录
     }
 }
 

+ 21 - 29
assets/script/game/data/module/GuideData.ts

@@ -1,3 +1,6 @@
+import { Data } from "../../../mk/data/Data";
+import GuideVO from "../../module/guide/GuideVO";
+
 /**
  * @description 新手引导
  * @author 邹勇
@@ -10,7 +13,15 @@ export class GuideData {
     /** 当前引导id */
     public crtID: number = null;
 
-    public init(config) {
+    public async init() {
+        let config = gData.gameData.configs.Guide
+        if (!config) {
+            let result = await mk.loader.load("data/guide_data", cc.JsonAsset);
+            if (result && result.json) {
+                config = result.json;
+            }
+            cc.log('无远程引导数据,使用本地测试数据');
+        }
         this.data = new Map<number, GuideVO[]>();
         let arr = [];
         let id = 1;
@@ -21,13 +32,16 @@ export class GuideData {
             guide.id = parseInt(a[0]);
             guide.step = parseInt(a[1]);
             guide.trigger = o.trigger;
-            guide.tr_num = o.tr_num;
-            guide.tr_form = o.tr_form;
+            guide.tr_num = o.tr_num || o.trNum;
+            guide.tr_form = o.tr_form || o.trForm;
             guide.dialog = o.dialog;
-            guide.display_rect = o.display_rect;
-            guide.click_rect = o.click_rect;
-            guide.finger = o.finger;
-            guide.lag_next = o.lag_next;
+            guide.dialog_pos = o.dialog_pos;
+            guide.dialog_pos1 = o.dialog_pos1;
+            guide.dialog_alignment = o.dialog_alignment;
+            guide.display_rect = o.display_rect || o.displayRect;
+            guide.click_rect = o.click_rect || o.clickRect;
+            guide.finger = o.finger || '';
+            guide.lag_next = o.lag_next || o.lagNext;
             if (id != guide.id) {
                 this.data.set(id, arr);
                 arr = [];
@@ -42,26 +56,4 @@ export class GuideData {
         return this.data.get(id);
     }
 
-}
-export class GuideVO {
-    /** 大步骤 */
-    id: number;
-    /** 大步骤中的小步 */
-    step: number;
-    /** 触发方式 1固定 2等级 3任务 4关卡 5功能开启 */
-    trigger: number;
-    /** 触发条件的数据 如当trigger是关卡时关卡时,为触发关卡 */
-    tr_num: number;
-    /** 1头像 2形象 */
-    tr_form: number;
-    /** 对话内容 */
-    dialog: string;
-    /** 透明点击区域(与click_node不共存) */
-    display_rect: string;
-    /** 点击组件名字(必须在代码中预先设置) */
-    click_rect: string;
-    /** 手指位置 */
-    finger: string;
-    /** 下个时间 */
-    lag_next: 0;
 }

+ 99 - 0
assets/script/game/data/module/GuideWeakData.ts

@@ -0,0 +1,99 @@
+import { Data } from "../../../mk/data/Data";
+import GuideWeak from "../../module/guideWeak/GuideWeak";
+/**
+ * 弱引导数据
+ * - 主界面-弱引导
+    1. 弱引导启动:用户在主界面超过10秒未操作【配置】。
+    2. 弱引导效果:自动弹出以下界面中的一种:气泡红包界面、福袋界面、互推界面……【配置】
+    3. 配置需支持配置界面ID和对应的弹出概率。
+    - 关卡界面-弱引导
+    1. 弱引导启动:用户在关卡界面超过10秒未操作【配置】。
+    2. 弱引导效果:自动弹出以下界面中的一种:气泡红包界面、福袋界面、互推界面……【配置】
+    3. 配置需支持配置界面ID和对应的弹出概率。
+ * @author 薛鸿潇
+ */
+export default class GuideWeakData {
+
+    /**
+     * 数据初始化
+     */
+    public init() {
+        // this.data_config = data_config;
+        if (gData.gameData.configs.ServerConfig.triggerTime)
+            this.data_config.triggerTime = parseInt(gData.gameData.configs.ServerConfig.triggerTime);
+        if (gData.gameData.configs.ServerConfig.panelWeight) {
+            // 8:70,5:30
+            this.data_config.panelWeight = {}
+            let new_weight = gData.gameData.configs.ServerConfig.panelWeight.split(',')
+            for (let i = 0; i < new_weight.length; i++) {
+                const item_str = new_weight[i].split(':');
+                this.data_config.panelWeight[item_str[0]] = parseInt(item_str[1]);
+            }
+        }
+    }
+    /**
+     * 星云数据配置
+     * - 面板权重
+     * - 触发时间
+     */
+    public data_config = {
+        panelWeight: {
+        },
+        triggerTime: 5
+    }
+    /** 功能是否启动 */
+    public enable: boolean = false;
+    /** 引导正在运行 */
+
+    /** 样式类 */
+    public guideStyle: GuideWeak = null;
+
+    /**
+     * 玩家静默时间
+     * - 即:未进行任何操作的时间
+     */
+    public silent_time: number = 0;
+
+    /** 当前打开的界面id */
+    public cur_guide_id: number = 0;
+    /** 当前打开的界面名字 */
+    public cur_guide_panel: string = null;
+
+    public initGuideId() {
+        // gData.guideWeakData.cur_guide_id = 1 + 1;
+        const panelWeight = this.data_config.panelWeight;
+        let p_count = 0;
+        let total_weight = 0;
+        for (const key in panelWeight) {
+            total_weight += panelWeight[key];
+            p_count++;
+        }
+        /** 累计零时权重 */
+        let temp_weight_sum = 0;
+        // 根据奖池权重随机物品
+        let random = mk.math.random(1, total_weight);
+        for (const key in panelWeight) {
+            temp_weight_sum += panelWeight[key];
+            if (random < temp_weight_sum) {
+                // 中奖了
+                gData.guideWeakData.cur_guide_id = parseInt(key);
+                break;
+            }
+        }
+    }
+    public openPanelByBtn() {
+        const panel_id = gData.guideWeakData.cur_guide_id
+        if (gData.gameData.funBtns['btn' + panel_id])
+            gData.gameData.funBtns['btn' + panel_id].emit('click')
+    }
+    public panel_name_config = {
+        moreGame: 1,
+        turnable: 2,
+        none: 3,
+        pigBank: 4,
+        blessingBag: 5,
+        sign: 6,
+        redBagCash: 7,
+        rewardLuck: 8,
+    }
+}

+ 9 - 0
assets/script/game/data/module/GuideWeakData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "8cbac365-032d-482a-a894-53d83ede033c",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 3 - 4
assets/script/game/data/module/PigBankData.ts

@@ -29,9 +29,7 @@ export class PigBankData extends Data {
      * - 此处需要对接服务端数据
      */
     public async cashOP() {
-        let data = {};
-        let response = await mk.http.sendRequest('piggyBankCash', 'POST', JSON.stringify(data));
-        // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+        let response = await mk.http.sendData('piggyBankCash', {});
         if (response.errcode != 0) {
             mk.tip.pop('系统异常');
             return;
@@ -47,6 +45,7 @@ export class PigBankData extends Data {
 
         }
         gData.gameData.gameData.isWithdrawable = 0;
-        
+        gData.cashNormal.getRecord();// 请求新的提现记录
+
     }
 }

+ 9 - 4
assets/script/game/data/module/RedBagCashData.ts

@@ -61,20 +61,25 @@ export class RedBagCashData extends Data {
             mk.tip.pop(response.errmsg);
             return;
         }
+        let r_data = response.data;
+        if (r_data.CashMode == 0) {//星云打款
+        }
+        else if (r_data.CashMode == 1) {//公众号打款
+        }
         this.cash_bar++;
-        // gData.gameData.setProp(GameProp.redBag_cash_bar, this.cash_bar);
         gData.gameData.gameData.cashIndex++;
 
         // 扣除红包
-        this.sortList();
         let item_data = this.getItemDataByIndex(cash_index);
         gData.gameData.gameData.redMoney -= item_data.type_value;
-
         // 打开提现到账界面
-        gData.receiptNotice.receip_rmb = item_data.money;
+        gData.receiptNotice.receip_rmb = r_data.CashStatusList[0].amount;
         gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
         mk.ui.openPanel('module/receiptNotice/receiptNotice');
 
+        this.sortList();
+        gData.cashNormal.getRecord();// 请求新的提现记录
+
     }
 
     /**

+ 9 - 14
assets/script/game/data/module/RewardData.ts

@@ -6,7 +6,7 @@ import { RewardType } from "../GameData";
  * @author 邹勇 薛鸿潇
  */
 export class RewardData extends Data {
-    
+
     /** 增加的红包币 */
     public add_redbag_value: number = 0;
 
@@ -33,11 +33,15 @@ export class RewardData extends Data {
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType == RewardType.redBag) {
-                gData.gameData.gameData.redMoney += gData.reward.data[i].rewardNum;
+                if (gData.reward.data[i].rewardNum) {
+                    gData.gameData.gameData.redMoney += gData.reward.data[i].rewardNum;
+                }
             } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
                 // ?
             } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
-                gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
+                if (gData.reward.data[i].rewardNum) {
+                    gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
+                }
             }
         }
         gData.reward.data = [];
@@ -48,18 +52,9 @@ export class RewardData extends Data {
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
-            let target_node = gData.gameData.gameStyle.icon_hb;
-            if (gData.reward.data[i].rewardType == RewardType.redBag) {
-                target_node = gData.gameData.gameStyle.icon_hb;
-            } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
-                // target_node = gData.gameData.gameStyle.icon_zb;
-            } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
-                target_node = gData.gameData.gameStyle.icon_zb;
-            }
-            const end_world_pos = target_node.parent.convertToWorldSpaceAR(target_node.getPosition());
-            const end_node_pos = gData.gameData.gameStyle.node.parent.convertToNodeSpaceAR(end_world_pos);
+            if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
             let start_node_pos = new cc.Vec2(0, -300);
-            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, end_world_pos, () => {
+            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, '', () => {
                 is_add_money && this.addReward();
             })
         }

+ 19 - 10
assets/script/game/data/module/SignData.ts

@@ -106,6 +106,7 @@ export class SignData extends Data {
      * 签到完成
      */
     public async signComplete() {
+        cc.log('签到奖励', gData.sign.adData)
         gData.gameData.gameData.signInDay++;
         gData.gameData.gameData.isSignInToday = 1;
         // // 自定义状态
@@ -124,28 +125,36 @@ export class SignData extends Data {
         let reward_data = this.c_sign[gData.gameData.gameData.signInDay - 1];
         if (reward_data.rewardType === RewardType.redBag) {
             // 红包
-            gData.reward.data = [reward_data];// 数据列表
+            // gData.reward.data = [reward_data];// 数据列表
+            // gData.reward.data = gData.sign.adData.videoRedMoney.videoRewardList[0];
+            gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward')
         } else if (reward_data.rewardType === RewardType.rmb) {
+            const adData = gData.sign.adData;// adData下一帧被清空,此处需要保存数据
+
             // 现金提现
-            let data = {};
-            let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
             // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+            let response = await mk.http.sendData('readyCash', {});
+
             if (response.errcode != 0) {
                 mk.tip.pop('系统异常');
-                return;
+                // return;
             }
 
             if (response.CashMode == 0) {//星云打款
-                gData.receiptNotice.receip_rmb = reward_data.rewardNum;
-                gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
-                mk.ui.openPanel('module/receiptNotice/receiptNotice');
             } else if (response.CashMode == 1) {//公众号打款
-
             }
+
+            const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
+            gData.receiptNotice.receip_rmb = rewardNum;
+            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
+            gData.cashNormal.getRecord();// 请求新的提现记录
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
-            gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
+            // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
+            // gData.reward.data = gData.sign.adData.data.videoRewardList[0];
+            gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward');
         }
 
@@ -162,7 +171,7 @@ export class SignData extends Data {
         for (let i = 0; i < l_count; i++) {
             const i_count = this.list_data[i].length;
             for (let j = 0; j < i_count; j++) {
-                let state = this.getStateByDay(this.list_data[i][j].loginDay);
+                let state = this.getStateByDay(this.list_data[i][j].id);
                 if (gData.gameData.gameData.isSignInToday == 0) {
                     if (state === RewardState.unlock) {
                         index = i;

+ 3 - 1
assets/script/game/game/FunBtns.ts

@@ -18,11 +18,13 @@ export default class FunBtns extends cc.Component {
     btn6: cc.Node = null;
     @property({ type: cc.Node, displayName: "常规提现" })
     btn7: cc.Node = null;
+    @property({ type: cc.Node, displayName: "气泡红包组" })
+    btn8: cc.Node = null;
     @property({ type: cc.Node, displayName: "福利礼包" })
     btn_redeem: cc.Node = null;
 
     onLoad() {
-
+        gData.gameData.funBtns = this;
     }
 
     start() {

+ 29 - 6
assets/script/game/game/Game.ts

@@ -1,4 +1,5 @@
 import JsbSystem from "../../mk/system/JsbSystem";
+import NumberAnim from "../component/NumberAnim";
 import { GameProp } from "../data/GameData";
 import FunBtns from "./FunBtns";
 
@@ -49,11 +50,13 @@ export default class Game extends cc.Component {
         this.initBtns();
         this.initQiPaos();
         this.initInfo();
+        this.autoOpenPanel();
+        this.runGuideWeak();
 
-        // if(gData.gameData.isNewPlayer()){
-        //     this.initGuide();
-        //     gData.gameData.setProp(GameProp.newPlayer,0);
-        // }
+        if (gData.gameData.isNewPlayer()) {
+            this.initGuide();
+            gData.gameData.setProp(GameProp.newPlayer, 1);
+        }
     }
 
     private initGuide() {
@@ -105,10 +108,13 @@ export default class Game extends cc.Component {
     }
 
     private changeInfo() {
-        this.lbl_redMoney.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.redMoney);
+        this.lbl_redMoney.node.getComponent(NumberAnim).setValue(gData.gameData.gameData.redMoney);
         // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
+
         const new_count = gData.gameData.gameData.piggyBank / 100;
-        this.lbl_rmb.node.getComponent('NumberAnim').setValue(new_count.toFixed(2), 2);
+        if (new_count != 0 && this.lbl_rmb.string != new_count.toFixed(2)) {
+            this.lbl_rmb.node.getComponent(NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+        }
         gData.gameData.init_coin = false;
     }
 
@@ -117,6 +123,23 @@ export default class Game extends cc.Component {
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
     }
 
+    /**
+     * 自动打开面板
+     * - isAutoOpenPanel 1自动开 2不自动开 其他不处理
+     */
+    private autoOpenPanel() {
+        if (!gData.gameData.isNewPlayer()) {
+            mk.ui.openPanel('module/pigBank/pigBank');
+            gData.gameData.setProp(GameProp.isAutoOpenPanel, 1)
+        }
+    }
+    /**
+     * 开始运行弱引导
+     */
+    private runGuideWeak() {
+        gData.guideWeakData.enable = true;
+    }
+
     //测试道具获取效果
     private testFly() {
         mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));

+ 1 - 0
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -292,6 +292,7 @@ export default class BlessingBag extends cc.Component {
             if (response && response.data.code == 1) {
                 //弹红包码界面
                 this.CheckCashRedCode();
+                gData.cashNormal.getRecord();// 请求新的提现记录
             } else {
                 mk.tip.pop('请先完成提现任务');
             }

+ 26 - 1
assets/script/game/module/guide/Guide.ts

@@ -1,4 +1,4 @@
-import { GuideVO } from "../../data/module/GuideData";
+import GuideVO from "./GuideVO";
 
 /**
  * @description 新手引导
@@ -15,6 +15,8 @@ export default class Guide extends cc.Component {
     node_click: cc.Node = null;
     @property({ type: cc.Node, displayName: "背景" })
     node_bg: cc.Node = null;
+    @property({ type: cc.Node, displayName: "对话框" })
+    node_dialog: cc.Node = null;
     @property({ type: cc.Sprite, displayName: "手指" })
     node_finger: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "头像" })
@@ -31,6 +33,9 @@ export default class Guide extends cc.Component {
     private targetNode: cc.Node;
     private event_name: string;
 
+    /** 对话框对齐方式 上下左右中 */
+    private widgets: string[] = ['top', 'bottom', 'left', 'right', 'verticalCenter', 'horizontalCenter'];
+
     onLoad() {
 
     }
@@ -84,6 +89,25 @@ export default class Guide extends cc.Component {
                 this.node_display.setPosition(pos);
             }
 
+            //对话框位置
+            ////全屏对齐
+            if (this.crtGuide.dialog_pos != null && this.crtGuide.dialog_pos.length > 0) {
+                let arr = this.crtGuide.dialog_pos.split(":");
+                let wedgit = this.node_dialog.getComponent(cc.Widget);
+                for (let i = 0; i < this.widgets.length; i++) {
+                    wedgit[this.widgets[i]] = arr[i] == "" ? null : arr[i];
+                }
+            }
+            else {//显示区域偏移
+                let arr = this.crtGuide.dialog_pos1.split(":");
+                this.node_dialog.x = this.node_display.x + parseInt(arr[0]);
+                this.node_dialog.y = this.node_display.y + parseInt(arr[1]);
+            }
+
+            //对话文字对齐方式
+            let a = this.crtGuide.dialog_alignment;
+            this.rich_dialog.horizontalAlign = a == '0' ? cc.macro.TextAlignment.LEFT : (a == '1' ? cc.macro.TextAlignment.CENTER : cc.macro.TextAlignment.RIGHT);
+
             if (this.crtGuide.finger == "") {
                 this.node_finger.node.active = false;
             }
@@ -116,6 +140,7 @@ export default class Guide extends cc.Component {
             this.targetNode.getComponent(cc.Button).clickEvents[0].emit([]);
         }
         if (this.event_name) {
+            //event_guide_1_2 (1_2为新手引导的id)
             mk.event.emit(this.event_name);
         }
         if (this.crtGuide.lag_next > 0) {

+ 28 - 0
assets/script/game/module/guide/GuideVO.ts

@@ -0,0 +1,28 @@
+export default class GuideVO {
+    /** 大步骤 */
+    id: number;
+    /** 大步骤中的小步 */
+    step: number;
+    /** 触发方式 1固定 2等级 3任务 4关卡 5功能开启 */
+    trigger: number;
+    /** 触发条件的数据 如当trigger是关卡时关卡时,为触发关卡 */
+    tr_num: number;
+    /** 1头像 2形象 */
+    tr_form: number;
+    /** 对话内容 */
+    dialog: string;
+    /** 对话框位置--全屏对齐 */
+    dialog_pos: string;
+    /** 对话框位置--显示区域偏移xy */
+    dialog_pos1: string;
+    /** 对话文字对齐方式 0左1中2右 */
+    dialog_alignment:string;
+    /** 透明点击区域(与click_node不共存) */
+    display_rect: string;
+    /** 点击组件名字(必须在代码中预先设置) */
+    click_rect: string;
+    /** 手指位置 */
+    finger: string;
+    /** 下个时间 */
+    lag_next: 0;
+}

+ 9 - 0
assets/script/game/module/guide/GuideVO.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c9ea3570-a4f9-476b-ae99-517cab3051ac",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 12 - 0
assets/script/game/module/guideWeak.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e5435836-5de8-4f99-82ac-2ba5fa3b30ea",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 75 - 0
assets/script/game/module/guideWeak/GuideWeak.ts

@@ -0,0 +1,75 @@
+
+const { ccclass, property } = cc._decorator;
+/**
+ * @author 薛鸿潇
+ */
+@ccclass
+export default class GuideWeak extends cc.Component {
+
+    onLoad() {
+        gData.guideWeakData.guideStyle = this;
+        this.InitTouch();
+        mk.event.register('close-panel', this.onClosePanel, this);
+    }
+
+    update(dt) {
+        if (!gData.guideWeakData.enable) return;
+        if (!gData.guideWeakData.data_config.triggerTime) return;
+        if (gData.guideWeakData.cur_guide_id) return;
+        if (!mk.guide.isGuideComplete()) return;
+        if (gData.gameData.gameStyle.node.parent.childrenCount > 1) return;
+
+        gData.guideWeakData.silent_time += dt;
+        if (gData.guideWeakData.silent_time >= gData.guideWeakData.data_config.triggerTime) {
+            gData.guideWeakData.initGuideId();
+            gData.guideWeakData.openPanelByBtn();
+        }
+    }
+
+    /**
+     * 界面关闭
+     */
+    public onClosePanel(panel_name: string = '') {
+        cc.log(panel_name)
+        if (gData.guideWeakData.panel_name_config[panel_name] == gData.guideWeakData.cur_guide_id) {
+            gData.guideWeakData.cur_guide_id = 0;
+        }
+    }
+    /** 玩家的屏幕触摸操作 */
+    private onClickCall(touch) {
+        gData.guideWeakData.silent_time = 0;
+    }
+
+    ///////////////// 自定义触摸监听 /////////////////
+    private _eventManager = cc["internal"]["eventManager"];
+    private _touchListener: any;
+    private InitTouch() {
+        const EventListener = cc["EventListener"];
+        this._touchListener = EventListener.create({
+            event: EventListener.TOUCH_ONE_BY_ONE,
+            swallowTouches: false,//是否吞噬touch事件
+            owner: this.node,
+            mask: null,
+            onTouchBegan: this.onTouchStart.bind(this),
+            onTouchMoved: null,
+            onTouchEnded: this.onTouchEnded.bind(this),
+            onTouchCancelled: null,
+        });
+        this._eventManager.addListener(this._touchListener, this.node);
+    }
+
+    private onTouchStart(touch: cc.Touch, event: cc.Event.EventTouch): boolean {
+        // cc.log("touch start");
+        //此处必须返回true(表示接触到了节点),否则TOUCH_MOVE,TOUCH_END,TOUCH_CANCEL不触发。
+        return true;
+    }
+    private onTouchEnded(touch: cc.Touch, event: cc.Event.EventTouch): void {
+        // cc.log("touch end");
+        this.onClickCall(touch);
+    }
+    protected onDestroy(): void {
+        // super.onDestroy();
+        this._eventManager.removeListener(this._touchListener, this.node);
+        mk.event.remove('close-panel', this.onClosePanel, this);
+    }
+}

+ 9 - 0
assets/script/game/module/guideWeak/GuideWeak.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "f13f5cd3-f7b3-4ca4-8369-5ce0a881502d",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 69 - 6
assets/script/game/module/login/Login.ts

@@ -1,4 +1,5 @@
 
+import HotUpdate, { HotOptions } from "../../../mk/sdk/HotUpdate";
 import JsbSystem from "../../../mk/system/JsbSystem";
 import LoadingBar from "../../component/LoadingBar";
 
@@ -16,8 +17,48 @@ export default class Login extends cc.Component {
     @property({ displayName: '隐私协议', type: cc.Label })
     private lbl_privacy: cc.Label = null;
 
+    @property({ type: cc.Asset })
+    private manifest: cc.Asset = null;
+
+    /** 是否检查热更 */
+    hasCheck = false
+
+    private updateFinish = false;
+
     onLoad() {
         this.setProgress(0);
+
+        let options = new HotOptions();
+        options.OnUpdateProgress = (event: jsb.EventAssetsManager) => {
+            let bytes = event.getDownloadedBytes() + '/' + event.getTotalBytes();
+            let files = event.getDownloadedFiles() + '/' + event.getTotalFiles();
+
+            let file = event.getPercentByFile().toFixed(2);
+            let byte = event.getPercent().toFixed(2);
+            let msg = event.getMessage();
+
+            this.bar.setProgress(parseFloat(file) * 0.01);
+            this.lbl_progress.string = '更新中 ' + parseFloat(file) + "%";
+            console.log(msg);
+        };
+        options.OnNeedToUpdate = (data) => {
+            setTimeout(() => {
+                HotUpdate.hotUpdate();
+            }, 500);
+        };
+        options.OnNoNeedToUpdate = () => {
+            this.updateFinish = true;
+        };
+        options.OnUpdateFailed = () => {
+            setTimeout(() => {
+                HotUpdate.checkUpdate();
+            }, 300);
+        };
+        options.OnUpdateSucceed = () => {
+            cc.audioEngine.stopAll();
+            cc.game.restart();
+        };
+        HotUpdate.init(this.manifest, options);
     }
 
     start() {
@@ -37,20 +78,42 @@ export default class Login extends cc.Component {
 
     private process: number = 0;
     update() {
-        if (this.process < 100) {
-            this.process += 2;
-            this.setProgress(this.process);
+        if (this.hasCheck && !this.updateFinish) {
+
+        }
+        else {
+            if (this.process < 100) {
+                this.process += 2;
+                this.setProgress(this.process);
+            }
         }
+
+        if (cc.sys.isNative) {
+            //检查热更新
+            if (!this.hasCheck) {
+                HotUpdate.checkUpdate();
+
+                this.hasCheck = true
+                console.log('MMM  updateFinish NO ')
+                return
+            }
+
+            if (!this.updateFinish) {
+                console.log('MMM  updateFinish state false')
+                return
+            }
+        }
+
         if (gData.loginData.loadResCompelete) {
             if (gData.appData.getDeviceInfoCompelete) {
                 this.login();
                 gData.appData.getDeviceInfoCompelete = false;
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
-                if(gData.gameData.isNewPlayer()){
+                if (gData.gameData.isNewPlayer()) {
                     mk.ui.openPanel("module/agreementTip/agreementTip");
                 }
-                else{
+                else {
                     mk.ui.openPanel("game/prefab/game");
                 }
 
@@ -67,7 +130,7 @@ export default class Login extends cc.Component {
         mk.pool.init(gData.gameData.pools);
         //取消构造的时候自动初始化,手动初始化
         mk.ad.init();
-        
+
         gData.appData.init();
         gData.adData.init();
         gData.loginData.init();

+ 2 - 1
assets/script/game/module/moreGame/MoreGamePopNode.ts

@@ -4,6 +4,7 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
+import { RewardType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -71,6 +72,6 @@ export default class MoreGamePopNode extends cc.Component {
         // mk.audio.playEffect('getGold');
         mk.tip.pop('红包币+300');
         //     GameM.commonData.updateRedMoney(300, RecordTYPE.online)
-        mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));
+        mk.fly.PlayCoinAnim(RewardType.pigRmb, 20, cc.v2(0, -300));
     }
 }

+ 12 - 0
assets/script/game/module/pigBank/PigBank.ts

@@ -1,4 +1,5 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
+import { GameProp } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -109,4 +110,15 @@ export default class PigBank extends cc.Component {
     onClickClose() {
         mk.ad.checkShowInterByChance();
     }
+
+    onDestroy() {
+        const isAutoOpenPanel = gData.gameData.getProp(GameProp.isAutoOpenPanel);
+        if (isAutoOpenPanel === 1) {
+            // 必须是可签到才弹
+            if (!gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
+                mk.ui.openPanel('module/sign/sign');
+            }
+            gData.gameData.setProp(GameProp.isAutoOpenPanel, 2);
+        }
+    }
 }

+ 2 - 2
assets/script/game/module/receiptNotice/ReceiptNotice.ts

@@ -35,8 +35,8 @@ export default class ReceiptNotice extends cc.Component {
      * 初始化样式
      */
     private initStyle() {
-        this.lbl_receipt_rmb.string = '¥' + Math.floor(gData.receiptNotice.receip_rmb / 100) + '元';
-        this.lbl_rmb_total.string = '¥' + Math.floor(gData.cashNormal.receip_total_rmb / 100) + '元';
+        this.lbl_receipt_rmb.string = '¥' + (gData.receiptNotice.receip_rmb / 100).toFixed(2) + '元';
+        this.lbl_rmb_total.string = '¥' + (gData.cashNormal.receip_total_rmb / 100).toFixed(2) + '元';
         this.lbl_user_name.string = gData.wechatData.nickName || '';
     }
 }

+ 10 - 0
assets/script/game/module/redBagCash/RedBagCash.ts

@@ -1,4 +1,5 @@
 import TableView from "../../component/TableView";
+import { GameProp } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -74,4 +75,13 @@ export default class RedBagCash extends cc.Component {
         rmb = rmb > 1 ? Math.floor(rmb) : parseFloat(rmb.toFixed(2));
         this.lbl_rmb.string = `${rmb}`;
     }
+
+    onDestroy() {
+        // 是否需要打开存钱罐
+        const isOpenBankOnCloseCash = gData.gameData.getProp(GameProp.isOpenBankOnCloseCash);
+        if (!isOpenBankOnCloseCash) {
+            mk.ui.openPanel('module/pigBank/pigBank');
+            gData.gameData.setProp(GameProp.isOpenBankOnCloseCash, 1);
+        }
+    }
 }

+ 7 - 3
assets/script/game/module/redeem/RedeemNode.ts

@@ -10,6 +10,9 @@ const { ccclass, property } = cc._decorator;
 export default class RedeemNode extends cc.Component {
 
     @property(cc.Label)
+    lab_title: cc.Label = null;
+
+    @property(cc.Label)
     txtGiftName: cc.Label = null;
 
     @property(cc.Prefab)
@@ -57,10 +60,11 @@ export default class RedeemNode extends cc.Component {
 
     InitData() {
         let data = gData.redeem.redeemData.redemption;
-        if (!data.content) {
-            mk.ui.closePanel('module/redeem/RedeemNode');
+        if (!data) {
+            mk.ui.closePanel(this.node.name);
             return
         }
+        this.lab_title.string = data.title;
         this.txtGiftName.string = data.title;
         this.rewardData = data.content;
         for (let n of this.rds) {
@@ -142,7 +146,7 @@ export default class RedeemNode extends cc.Component {
 
         for (let i = 0; i < this.rewardData.length; i++) {
             mk.audio.playEffect('rewardClose');
-            mk.fly.PlayCoinAnim(this.rewardData[i].type, 5, cc.v2(0, -300), cc.v2(0, 0))
+            mk.fly.PlayCoinAnim(this.rewardData[i].type, 5, cc.v2(0, -300));
         }
 
 

+ 35 - 4
assets/script/game/module/reward/Reward.ts

@@ -1,6 +1,6 @@
 import GamePlay from "../../../before/GamePlay";
 import { AdFun } from "../../data/AdData";
-import { RewardType } from "../../data/GameData";
+import { GameProp, RewardType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -42,6 +42,9 @@ export default class Reward extends cc.Component {
     private lbl_reward_value: cc.Label = null;
     @property({ displayName: '星星闪闪效果', type: cc.Node })
     private hb_star: cc.Node = null;
+    @property({ displayName: '关闭按钮', type: cc.Node })
+    private btn_close: cc.Node = null;
+
 
     // 底部提现相关
     @property({ displayName: 'spr提现进度', type: cc.Sprite })
@@ -50,6 +53,9 @@ export default class Reward extends cc.Component {
     private lbl_cash_out: cc.Label = null;
     @property({ displayName: '提现金额', type: cc.Label })
     private lbl_cash: cc.Label = null;
+    @property({ displayName: '提现按钮', type: cc.Animation })
+    private node_cash: cc.Animation = null;
+
 
 
     /** 当前阶段 */
@@ -124,13 +130,31 @@ export default class Reward extends cc.Component {
         const fillRange = newRedMoney / cash_data.type_value >= 1 ? 1 : newRedMoney / cash_data.type_value;
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
+        if (redMoney >= cash_data.type_value) {
+            this.node_cash.play();
+        } else {
+            this.node_cash.stop();
+        }
     }
 
     /**
      * 看广告
      */
-    private clickWatchVideo() {
+    private async clickWatchVideo() {
         cc.log('看广告请求');
+        if (gData.gameData.gameData.isFirstRedMoney) {
+            gData.gameData.gameData.isFirstRedMoney = 0;
+            // 用户第一次看此视频时,可不需要看直接领取奖励
+            let response = await mk.http.sendData('getFreeRedMoney', {});
+            if (response.errcode != 0) {
+                mk.tip.pop(response.errmsg);
+                return;
+            }
+            gData.reward.adData = {}
+            gData.reward.adData.videoRedMoney = {}
+            gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: RewardType.redBag, rewardNum: response.data.freeRedMoney }]
+            return;
+        }
         if (this.lid_type === LidType.mission) {
             // 关卡结算红包
             mk.ad.watchAd((success: boolean) => {
@@ -163,8 +187,11 @@ export default class Reward extends cc.Component {
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
+        this.btn_close && (this.btn_close.active = false);
         mk.audio.playEffect("rewardOpen");
         this.hb_star.active = true;
+        this.hb_star.getComponent(sp.Skeleton).animation = 'animation';
+        this.hb_star.getComponent(sp.Skeleton).loop = false;
         this.cur_stage = LidType.none;
 
         // 数据排序:多条奖励,只展示红包,把红包放在首位
@@ -189,8 +216,12 @@ export default class Reward extends cc.Component {
             // this.node_redBag.active = false;
             // this.node_pig.active = true;
         }
-        let rewardNum = gData.reward.data[0].rewardNum || 0;
-        this.lbl_reward_value.string = `${rewardNum}`;
+        let rewardNum: number = gData.reward.data[0].rewardNum || 0;
+        if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
+            this.lbl_reward_value.string = (rewardNum / 100).toFixed(2);
+        } else {
+            this.lbl_reward_value.string = `${rewardNum}`;
+        }
 
         // 动画
         this.anim_open_redbag.play();

+ 4 - 3
assets/script/game/module/setting/Setting.ts

@@ -36,7 +36,7 @@ export default class Setting extends cc.Component {
     private async initData() {
         console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
         console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
-        this.lbl_id.string = "ID:" + gData.wechatData.unionid;
+        this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
@@ -81,6 +81,7 @@ export default class Setting extends cc.Component {
         if (!gData.loginData.isAuth) {
             mk.ui.closePanel(this.node.name);
             JsbSystem.WxAuth();
+            this.onClickClose();
         }
     }
 
@@ -97,7 +98,7 @@ export default class Setting extends cc.Component {
     }
 
     onClickClose() {
-       mk.ad.destroyNativeAd();
-       mk.ad.checkShowInterByChance();
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
     }
 }

+ 1 - 1
assets/script/game/module/sign/Sign.ts

@@ -59,7 +59,6 @@ export default class Sign extends cc.Component {
     }
 
     lateUpdate() {
-        gData.sign.init_data = false;
         gData.sign.adData = null;
     }
 
@@ -114,6 +113,7 @@ export default class Sign extends cc.Component {
             this.anim_btn.node.scale = 1;
             this.anim_btn.getComponent('SetGray').setGray(true);
         }
+        gData.sign.init_data = false;
     }
 
     onClickClose() {

+ 2 - 2
assets/script/game/module/sign/SignIconItem.ts

@@ -50,7 +50,7 @@ export default class SignIconItem extends cc.Component {
             this.node.active = false;
             return
         }
-        this.lbl_day.string = '第' + this.icon_data.loginDay + '天';
+        this.lbl_day.string = '第' + this.icon_data.id + '天';
         if (this.icon_data.rewardType == RewardType.rmb || this.icon_data.rewardType == RewardType.pigRmb) {
             this.node_cash.active = true;
             this.node_redbag.active = false;
@@ -62,7 +62,7 @@ export default class SignIconItem extends cc.Component {
         }
 
         // 状态样式
-        let state = gData.sign.getStateByDay(this.icon_data.loginDay);
+        let state = gData.sign.getStateByDay(this.icon_data.id);
         if (state == RewardState.none) {
             this.node_mask.active = true;
             this.node_gou.active = true;

+ 200 - 0
assets/script/mk/sdk/HotUpdate.ts

@@ -0,0 +1,200 @@
+export class HotOptions {
+    // OnVersionInfo: Function;
+    OnNeedToUpdate: Function;
+    OnNoNeedToUpdate: Function;
+    OnUpdateFailed: Function;
+    OnUpdateSucceed: Function;
+    OnUpdateProgress: Function;
+
+    check() {
+        for (let key in this) {
+            if (key !== 'check') {
+                if (!this[key]) {
+                    console.log(`参数HotOptions.${key}未设置!`);
+                    return false;
+                }
+            }
+        }
+        return true
+    }
+}
+
+class Hot {
+    _assetsMgr: jsb.AssetsManager = null;
+    _options: HotOptions = null;
+    _state = Hot.State.None;
+
+    static State = {
+        None: 0,
+        Check: 1,
+        Update: 2,
+    }
+
+    // 检查更新
+    checkUpdate() {
+        if (!this._assetsMgr) {
+            console.log('请先初始化')
+            return;
+        }
+
+        if (this._assetsMgr.getState() === jsb.AssetsManager.State.UNINITED) {
+            cc.error('未初始化')
+            return;
+        }
+        if (!this._assetsMgr.getLocalManifest().isLoaded()) {
+            console.log('加载本地 manifest 失败 ...');
+            return;
+        }
+        this._assetsMgr.setEventCallback(this._hotUpdateCallBack.bind(this));
+        this._state = Hot.State.Check;
+        // 下载version.manifest,进行版本比对
+        this._assetsMgr.checkUpdate();
+    }
+
+    hotUpdate() {
+        if (!this._assetsMgr) {
+            console.log('请先初始化')
+            return
+        }
+        this._assetsMgr.setEventCallback(this._hotUpdateCallBack.bind(this));
+        this._state = Hot.State.Update;
+        this._assetsMgr.update();
+    }
+
+    _hotUpdateCallBack(event: jsb.EventAssetsManager) {
+        let code = event.getEventCode();
+        console.log(`hotUpdate Code: ${code}`);
+        switch (code) {
+            case jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST:
+            case jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST:
+            case jsb.EventAssetsManager.ERROR_PARSE_MANIFEST:
+                console.log("无远程资源");
+                this._options.OnNoNeedToUpdate && this._options.OnNoNeedToUpdate(code)
+                break;
+            case jsb.EventAssetsManager.ALREADY_UP_TO_DATE:
+                console.log("已经和远程版本一致,无须更新");
+                this._options.OnNoNeedToUpdate && this._options.OnNoNeedToUpdate(code)
+                break;
+            case jsb.EventAssetsManager.NEW_VERSION_FOUND:
+                console.log('发现新版本,请更新');
+                this._options.OnNeedToUpdate && this._options.OnNeedToUpdate(code);
+                break;
+            case jsb.EventAssetsManager.UPDATE_PROGRESSION:
+                console.log('更新中...')
+                if (this._state === Hot.State.Update) {
+                    this._options.OnUpdateProgress && this._options.OnUpdateProgress(event);
+                } else {
+                    // 检查状态下,不回调更新进度
+                }
+                break;
+            case jsb.EventAssetsManager.UPDATE_FINISHED:
+                console.log('更新成功');
+                this._onUpdateFinished();
+                break;
+            case jsb.EventAssetsManager.ASSET_UPDATED:
+                // 不予理会的消息事件
+                break;
+            default:
+                this._onUpdateFailed(code);
+                break;
+        }
+    }
+
+    _onUpdateFailed(code) {
+        this._assetsMgr.setEventCallback(null)
+        this._options.OnUpdateFailed && this._options.OnUpdateFailed(code);
+    }
+
+    // 更新完成
+    _onUpdateFinished() {
+        this._assetsMgr.setEventCallback(null)
+        let searchPaths = jsb.fileUtils.getSearchPaths();
+        let newPaths = this._assetsMgr.getLocalManifest().getSearchPaths();
+        console.log("[HotUpdate] 搜索路径: " + JSON.stringify(newPaths));
+        Array.prototype.unshift(searchPaths, newPaths);
+        cc.sys.localStorage.setItem('HotUpdateSearchPaths', JSON.stringify(searchPaths));
+
+        jsb.fileUtils.setSearchPaths(searchPaths);
+        this._options.OnUpdateSucceed && this._options.OnUpdateSucceed();
+    }
+
+    showSearchPath() {
+        console.log("========================搜索路径========================");
+        let searchPaths = jsb.fileUtils.getSearchPaths();
+        for (let i = 0; i < searchPaths.length; i++) {
+            console.log("[" + i + "]: " + searchPaths[i]);
+        }
+        console.log("======================================================");
+    }
+
+    // ------------------------------初始化------------------------------
+    init(manifest: cc.Asset, opt: HotOptions) {
+        console.log('aaaaaaaaa ')
+        if (!cc.sys.isNative) {
+            console.log('111  ');
+
+            return;
+        }
+        if (!opt.check()) {
+            console.log('222  ');
+            return;
+        }
+        this._options = opt;
+
+        if (this._assetsMgr) {
+            console.log('333  ');
+            return;
+        }
+
+        console.log('444  ');
+        this.showSearchPath();
+        let url = manifest.nativeUrl;
+        if (cc.loader.md5Pipe) {
+            url = cc.loader.md5Pipe.transformURL(url)
+        }
+        let storagePath = ((jsb.fileUtils ? jsb.fileUtils.getWritablePath() : '/') + 'remote-asset');
+        console.log('555  ');
+        this._assetsMgr = new jsb.AssetsManager(url, storagePath, (versionA, versionB) => {
+            // 比较版本
+            console.log("客户端版本: " + versionA + ', 当前最新版本: ' + versionB);
+            // this._options.OnVersionInfo({ local: versionA, server: versionB });
+            let vA = versionA.split('.');
+            let vB = versionB.split('.');
+            for (let i = 0; i < vA.length; ++i) {
+                let a = parseInt(vA[i]);
+                let b = parseInt(vB[i] || '0');
+                if (a !== b) {
+                    return a - b;
+                }
+            }
+            if (vB.length > vA.length) {
+                return -1;
+            } else {
+                return 0;
+            }
+        });
+        this._assetsMgr.setVerifyCallback((assetsFullPath, asset) => {
+            let { compressed, md5, path, size } = asset;
+            if (compressed) {
+                return true;
+            } else {
+                return true;
+            }
+        })
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            // 安卓手机设置 最大并发任务数量限制为2
+            // this._assetsMgr.setMaxConcurrentTask(10);
+        }
+
+        let localManifest = this._assetsMgr.getLocalManifest()
+        console.log('[HotUpdate] 热更新资源存放路径: ' + storagePath);
+        console.log('[HotUpdate] 本地manifest路径: ' + url);
+        console.log('[HotUpdate] local packageUrl: ' + localManifest.getPackageUrl());
+        console.log('[HotUpdate] project.manifest remote url: ' + localManifest.getManifestFileUrl());
+        console.log('[HotUpdate] version.manifest remote url: ' + localManifest.getVersionFileUrl());
+    }
+}
+
+let hotInstance = new Hot();
+
+export default hotInstance;

+ 9 - 0
assets/script/mk/sdk/HotUpdate.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "92f89076-7529-4105-94a5-d7d98a975032",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 15 - 2
assets/script/mk/system/FlySystem.ts

@@ -1,3 +1,5 @@
+import { RewardType } from "../../game/data/GameData";
+
 /** 
  * @description 获取道具特效
  * @author kaka 
@@ -15,10 +17,10 @@ export default class FlySystem extends cc.Component {
      * @param type 类型 道具id  10001,10002
      * @param num 特效数量
      * @param pos 起始位置
-     * @param endpos 飞行目标的世界坐标 或目标对象路径
+     * @param endpos 飞行目标的世界坐标 或目标对象路径  如果为"",则飞到主界面货币按钮处 默认""
      * @param cb 动画结束回调
     */
-    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, item_cb: Function = null) {
+    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string = '', item_cb: Function = null) {
         for (let i = 0; i < num; i++) {
             let copyCoin = await mk.pool.getPrefab('game/prefab/coin');
             let url = 'game/texture/coin/' + type;
@@ -56,6 +58,17 @@ export default class FlySystem extends cc.Component {
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {
+            if (end == '') {
+                let url = ''
+                if (type == RewardType.redBag) {
+                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/红包币按钮/icon_hb';
+                }
+                else if (type == RewardType.pigRmb) {
+                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
+                }
+                end = url;
+            }
+
             end_node = cc.find(end as string);
             let world_pos = end_node.parent.convertToWorldSpaceAR(end_node.getPosition());
             end_pos = this.node.convertToNodeSpaceAR(world_pos);

+ 12 - 0
assets/script/mk/system/GuideSystem.ts

@@ -31,4 +31,16 @@ export default class GuideSystem {
         }
         gData.gameData.setProp(GameProp.guideID, this.crtGuideID);
     }
+
+    /**
+     * 引导是否完成
+     * @returns true 已完成
+     */
+    public isGuideComplete(): Boolean {
+        if (!this.crtGuideID || this.crtGuideID === 999) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

+ 5 - 0
assets/script/mk/system/MKSystem.ts

@@ -21,6 +21,7 @@ import PoolSystem from "./PoolSystem";
 import TweenUtil from "../utils/TweenUtil";
 import FlySystem from "./FlySystem";
 import GuideSystem from "./GuideSystem";
+import StringUtil from "../utils/StringUtil";
 
 /**
  * @description mk系统
@@ -64,6 +65,10 @@ class MKSystem {
     public get math(): MathUtil {
         return this._math || (this._math = new MathUtil());
     }
+    private _string: StringUtil;
+    public get string(): StringUtil {
+        return this._string || (this._string = new StringUtil());
+    }
     private _tween: TweenUtil;
     public get tween(): TweenUtil {
         return this._tween || (this._tween = new TweenUtil())

+ 1 - 0
assets/script/mk/system/UISystem.ts

@@ -122,6 +122,7 @@ export default class UISystem extends cc.Component {
         } else {
             this.destroyNode(node_panel, panelName, callBack);
         }
+        mk.event.emit('close-panel', panelName);
     }
 
     private destroyNode(node_panel, panelName, callBack) {

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

@@ -47,7 +47,7 @@ export class EncryptUtil {
      * 
      * aes加密
      * @param   word    需要加密的字符串
-     * @param   tkey    加密key,一般为sessionkey
+     * @param   tkey    !!!加密key,32位字符串,一般为sessionkey
      * @param   appid   游戏的appid
      * @param   state   true 存包长 false /r/n
      * @returns 

+ 13 - 7
assets/script/mk/utils/StorageUtil.ts

@@ -12,12 +12,14 @@ export default class StorageUtil {
     public getStorage(key: string, decrypt = true): any {
         let value = cc.sys.localStorage.getItem(key);
         if (value) {
-            if (decrypt) {
-
-            }
             try {
-                let new_value = JSON.parse(value)
-                return new_value;
+                if (decrypt) {
+                    value = mk.encrypt.decrypt(value, gData.storageData.storageKey, gData.appData.appId);
+                }
+                else {
+                    value = JSON.parse(value);
+                }
+                return value;
             }
             catch (err) {
                 return value;
@@ -37,14 +39,18 @@ export default class StorageUtil {
     public setStorage(key: string, value: any, encrypt: boolean = true) {
         if (encrypt) {
             value = mk.encrypt.encrypt(value, gData.storageData.storageKey, gData.appData.appId);
+            cc.sys.localStorage.setItem(key, value);
         }
-        cc.sys.localStorage.setItem(key, JSON.stringify(value));
+        else {
+            cc.sys.localStorage.setItem(key, JSON.stringify(value));
+        }
+
     }
 
     /**
      * 清除所有缓存
      */
-    public clear(){
+    public clear() {
         cc.sys.localStorage.clear();
     }
 }

+ 2 - 0
build/jsb-link/.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

+ 116 - 0
build/jsb-link/.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

+ 9 - 0
build/jsb-link/.idea/jsb-link.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 8 - 0
build/jsb-link/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jsb-link.iml" filepath="$PROJECT_DIR$/.idea/jsb-link.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
build/jsb-link/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

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,9 +10,9 @@
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
+            <option value="D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

+ 18 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/jarRepositories.xml

@@ -44,17 +44,32 @@
     <remote-repository>
       <option name="id" value="D:\work\android\sdk\extras\android\m2repository" />
       <option name="name" value="D:\work\android\sdk\extras\android\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../../../../../../android/sdk/extras/android/m2repository" />
+      <option name="url" value="file:/D:/android/sdk/extras/android/m2repository" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="D:\work\android\sdk\extras\google\m2repository" />
       <option name="name" value="D:\work\android\sdk\extras\google\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../../../../../../android/sdk/extras/google/m2repository" />
+      <option name="url" value="file:/D:/android/sdk/extras/google/m2repository" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="D:\work\android\sdk\extras\m2repository" />
       <option name="name" value="D:\work\android\sdk\extras\m2repository" />
-      <option name="url" value="file:/$PROJECT_DIR$/../../../../../../../android/sdk/extras/m2repository" />
+      <option name="url" value="file:/D:/android/sdk/extras/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\android\m2repository" />
+      <option name="name" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\android\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\google\m2repository" />
+      <option name="name" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\google\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\m2repository" />
+      <option name="name" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
     </remote-repository>
   </component>
 </project>

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

@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/EasyEliminate.iml" filepath="$PROJECT_DIR$/.idea/modules/app/EasyEliminate.iml" group="proj.android-studio/EasyEliminate" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1746423203/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1746423203/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1786486690/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/1786486690/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

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

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

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

@@ -0,0 +1,99 @@
+<?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>

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

@@ -33,23 +33,170 @@
     <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://D:/Android/SDK/ndk/21.3.6528147/sources/android/cpufeatures">
-      <sourceFolder url="file://D:/Android/SDK/ndk/21.3.6528147/sources/android/cpufeatures" 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://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
+    </content>
+    <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../Classes">
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -117,153 +264,6 @@
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
-    </content>
-    <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
-    </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
@@ -271,9 +271,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: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../../Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./../../../../../../../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: com.android.support:collections:28.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
@@ -333,6 +333,6 @@
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="module" module-name="libcocos2dx" />
+    <orderEntry type="module" module-name="android-libcocos2dx" />
   </component>
 </module>

File diff suppressed because it is too large
+ 0 - 559
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build.json


+ 0 - 18
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.command.txt

@@ -1,18 +0,0 @@
-Executable : D:\Android\SDK\ndk\21.3.6528147\ndk-build.cmd
-arguments : 
-NDK_PROJECT_PATH=null
-APP_BUILD_SCRIPT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Android.mk
-NDK_APPLICATION_MK=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Application.mk
-APP_ABI=armeabi-v7a
-NDK_ALL_ABIS=armeabi-v7a
-NDK_DEBUG=1
-APP_PLATFORM=android-16
-NDK_OUT=D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj
-NDK_LIBS_OUT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\debug\lib
-NDK_TOOLCHAIN_VERSION=clang
-NDK_MODULE_PATH=D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\cocos;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\external
--j8
-NDK_DEBUG=1
-D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcocos2djs.so
-jvmArgs : 
-

+ 0 - 95
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt

@@ -1,95 +0,0 @@
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp:47:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1 warning generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.cc:1:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1 warning generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
-  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-2 warnings generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:6:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:402:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    obj->Set(env->context(), env->errno_string(), Integer::New(env->isolate(), errorno));
-    ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:403:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    obj->Set(env->context(), env->code_string(), estring);
-    ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:406:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        obj->Set(env->context(), env->path_string(), path_string);
-        ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:410:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        obj->Set(env->context(), env->syscall_string(), OneByteString(env->isolate(), syscall));
-        ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:480:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    e->Set(env->context(), env->errno_string(), Integer::New(isolate, errorno));
-    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:481:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    e->Set(env->context(), env->code_string(), js_code);
-    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:482:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    e->Set(env->context(), env->syscall_string(), js_syscall);
-    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:484:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        e->Set(env->context(), env->path_string(), js_path);
-        ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:486:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        e->Set(env->context(), env->dest_string(), js_dest);
-        ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:805:66: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
-                      OneByteString(env->isolate(), NODE_VERSION + 1));
-                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:731:9: note: expanded from macro 'READONLY_PROPERTY'
-        var,                                               \
-        ^~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:805:66: note: use array indexing to silence this warning
-                      OneByteString(env->isolate(), NODE_VERSION + 1));
-                                                                 ^
-                                                    &            [
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:731:9: note: expanded from macro 'READONLY_PROPERTY'
-        var,                                               \
-        ^
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:911:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        arguments->Set(env->context(), i, String::NewFromUtf8(env->isolate(), argv[i], v8::NewStringType::kNormal).ToLocalChecked());
-        ^~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:913:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    process->Set(env->context(), FIXED_ONE_BYTE_STRING(env->isolate(), "argv"), arguments);
-    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:918:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-        exec_arguments->Set(env->context(), i, String::NewFromUtf8(env->isolate(), exec_argv[i], v8::NewStringType::kNormal).ToLocalChecked());
-        ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:920:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    process->Set(env->context(), FIXED_ONE_BYTE_STRING(env->isolate(), "execArgv"),
-    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:1130:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    process->Set(env->context(),env->events_string(), events_obj);
-    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-16 warnings generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cc:5:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1 warning generated.
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser/JSONDataParser.cpp:498:13: warning: enumeration value 'Path' not handled in switch [-Wswitch]
-    switch (type)
-            ^
-1 warning generated.
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo/floor0.c:61:13: warning: shifting a negative signed value is undefined [-Wshift-negative-value]
-  if(a<(-140<<12)) return 0;
-        ~~~~^
-1 warning generated.
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni/JniImp.cpp:313:5: warning: control reaches end of non-void function [-Wreturn-type]
-    }
-    ^
-1 warning generated.

+ 0 - 375
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,375 +0,0 @@
-Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
-Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectVariant.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_video_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_webview_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocketServer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket_server.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= tinysndfile.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= mp3reader.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2djs <= main.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= cocos2d.cpp
-[armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_dragonbones_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MathUtil.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
-[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGeometry.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCVertex.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat4.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Quaternion.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec2.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec3.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec4.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat3.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCAutoreleasePool.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCData.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRef.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCConfiguration.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= base64.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= TGAlib.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCValue.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCThreadPool.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ZipUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccRandom.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc1.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc2.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= pvr.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUTF8.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLog.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGLUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCScheduler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= csscolorparser.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= LocalStorage-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_opengl_utils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Uri.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HttpClient-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= JavaScriptJavaBridge.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_classtype.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_extension_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= config.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_opengl_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MappingUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_conversions.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RefCounter.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_platform_android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Value.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ObjectWrap.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Object.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= tinyxml2.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi_mem.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Utils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= unzip.cpp
-[armeabi-v7a] Compile arm    : cocos2dx_static <= ConvertUTF.c
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= edtaa3func.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SHA1.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EditBox-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontAtlas.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontFreetype.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelAtlasCache.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= util.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= env.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelRenderer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket.cc
-[armeabi-v7a] Compile arm    : cocos2dx_static <= http_parser.c
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFXUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_agent.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket_server.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_io.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Types.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= FrameBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFX.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= DeviceGraphics.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GraphicsHandle.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= IndexBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderTarget.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture2D.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VertexBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VertexFormat.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Config.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= InputAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Effect.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Camera.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Light.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Model.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Pass.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= View.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Scene.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Technique.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ProgramLib.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerBase.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CustomAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Assembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ForwardRenderer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= TiledMapAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerSprite.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite3D.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite3D.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite2D.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Particle3DAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= StencilManager.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ParallelTask.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MemPool.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeMemPool.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderFlow.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeProxy.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VideoPlayer-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebViewImpl-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos_extension_static <= CCEventAssetsManagerEx.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AssetFd.cpp
-[armeabi-v7a] Compile++ arm  : cocos_extension_static <= CCAsyncTaskPool.cpp
-[armeabi-v7a] Compile++ arm  : cocos_extension_static <= Manifest.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoder.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderProvider.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderSLES.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderOgg.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
-[armeabi-v7a] Compile++ arm  : cocos_extension_static <= AssetsManagerEx.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderWav.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResampler.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmBufferProvider.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioPlayer.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= UrlAudioPlayer.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixerController.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= Track.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixer.cpp
-[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
-[armeabi-v7a] Compile++ thumb: audioengine_static <= minifloat.cpp
-[armeabi-v7a] Compile thumb  : audioengine_static <= primitives.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_helper.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= Utils.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= IOBuffer.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MeshBuffer.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= middleware-adapter.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= IOTypedArray.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationStateData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Atlas.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AtlasAttachmentLoader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Attachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentLoader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_editor_support_auto.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BoneData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ClippingAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ColorTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CurveTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DeformTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DrawOrderTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Event.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= EventData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= EventTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Extension.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraintData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraintTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Json.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= LinkedMesh.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MathUtil.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MeshAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintMixTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintPositionTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintSpacingTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= PointAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= RegionAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= RotateTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= RTTI.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ScaleTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ShearTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Skeleton.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonBinary.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonBounds.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonClipping.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonJson.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Skin.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SlotData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SpineObject.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TextureLoader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Timeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TranslateTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Triangulator.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Updatable.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexAttachment.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffect.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentVertices.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonDataMgr.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffectDelegate.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonAnimation.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= spine-cocos2dx.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonRenderer.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCacheMgr.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCache.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCacheAnimation.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= WorldClock.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseTimelineState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TimelineState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Armature.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DeformVertices.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformObject.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseObject.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Point.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Transform.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationConfig.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseFactory.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DisplayData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= SkinData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TextureAtlasData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= UserData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DataParser.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= BinaryDataParser.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CCTextureAtlasData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureDisplay.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CCSlot.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CCFactory.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= bitwise.c
-[armeabi-v7a] Compile arm    : vorbisidec <= dsp.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCacheMgr.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= floor0.c
-[armeabi-v7a] Compile arm    : vorbisidec <= floor1.c
-[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
-[armeabi-v7a] Compile arm    : vorbisidec <= floor_lookup.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureCacheDisplay.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= info.c
-[armeabi-v7a] Compile arm    : vorbisidec <= mapping0.c
-[armeabi-v7a] Compile arm    : vorbisidec <= framing.c
-[armeabi-v7a] Compile arm    : vorbisidec <= misc.c
-[armeabi-v7a] Compile arm    : vorbisidec <= mdct.c
-[armeabi-v7a] Compile arm    : vorbisidec <= res012.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= vorbisfile.c
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_crc.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_header.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_huff_cw.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_getbits.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dequantize_sample.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_main_data_size.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_side_info.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_data.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_factors.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_stereo_proc.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_decoding.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_parsing.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_tables.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_imdct_synth.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mdct_6.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dct_6.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_poly_phase_synthesis.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_equalizer.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_seek_synch.cpp
-[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_polyphase_filter_window_gcc.s
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
-[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_mdct_18_gcc.s
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
-[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_9_gcc.s
-[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_16_gcc.s
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCDevice-android.cpp
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCFileUtils-android.cpp
-[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
-[armeabi-v7a] StaticLibrary  : libextension.a
-[armeabi-v7a] StaticLibrary  : libaudioengine.a
-[armeabi-v7a] StaticLibrary  : libvorbisidec.a
-[armeabi-v7a] StaticLibrary  : libcpufeatures.a
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniHelper.cpp
-[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCApplication-android.cpp
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniImp.cpp
-[armeabi-v7a] StaticLibrary  : libeditorsupport.a
-[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCCanvasRenderingContext2D-android.cpp
-[armeabi-v7a] StaticLibrary  : libcocos2d.a
-[armeabi-v7a] StaticLibrary  : libcocos2dandroid.a
-[armeabi-v7a] SharedLibrary  : libcocos2djs.so

+ 0 - 65
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_mini.json

@@ -1,65 +0,0 @@
-{
-  "buildFiles": [
-    "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk",
-    "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk"
-  ],
-  "cleanCommands": [
-    "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external NDK_DEBUG\u003d1 clean"
-  ],
-  "libraries": {
-    "cocos2dandroid-debug-armeabi-v7a": {
-      "artifactName": "cocos2dandroid",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcocos2dandroid.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libcocos2dandroid.a"
-    },
-    "editorsupport-debug-armeabi-v7a": {
-      "artifactName": "editorsupport",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libeditorsupport.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libeditorsupport.a"
-    },
-    "cocos2d-debug-armeabi-v7a": {
-      "artifactName": "cocos2d",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcocos2d.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libcocos2d.a"
-    },
-    "cocos2djs-debug-armeabi-v7a": {
-      "artifactName": "cocos2djs",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcocos2djs.so",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libcocos2djs.so"
-    },
-    "pvmp3dec-debug-armeabi-v7a": {
-      "artifactName": "pvmp3dec",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libpvmp3dec.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libpvmp3dec.a"
-    },
-    "extension-debug-armeabi-v7a": {
-      "artifactName": "extension",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libextension.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libextension.a"
-    },
-    "vorbisidec-debug-armeabi-v7a": {
-      "artifactName": "vorbisidec",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libvorbisidec.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libvorbisidec.a"
-    },
-    "audioengine-debug-armeabi-v7a": {
-      "artifactName": "audioengine",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libaudioengine.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libaudioengine.a"
-    },
-    "cpufeatures-debug-armeabi-v7a": {
-      "artifactName": "cpufeatures",
-      "buildCommand": "D:\\Android\\SDK\\ndk\\21.3.6528147\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Android.mk NDK_APPLICATION_MK\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\jni\\Application.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib NDK_TOOLCHAIN_VERSION\u003dclang NDK_MODULE_PATH\u003dD:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\cocos;D:\\Develop\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\resources\\cocos2d-x\\external -j8 NDK_DEBUG\u003d1 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcpufeatures.a",
-      "abi": "armeabi-v7a",
-      "output": "D:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\armeabi-v7a\\libcpufeatures.a"
-    }
-  }
-}

+ 0 - 21
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.command.txt

@@ -1,21 +0,0 @@
-Executable : D:\Android\SDK\ndk\21.3.6528147\ndk-build.cmd
-arguments : 
-NDK_PROJECT_PATH=null
-APP_BUILD_SCRIPT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Android.mk
-NDK_APPLICATION_MK=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Application.mk
-APP_ABI=armeabi-v7a
-NDK_ALL_ABIS=armeabi-v7a
-NDK_DEBUG=1
-APP_PLATFORM=android-16
-NDK_OUT=D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj
-NDK_LIBS_OUT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\debug\lib
-NDK_TOOLCHAIN_VERSION=clang
-NDK_MODULE_PATH=D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\cocos;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\external
--j8
-NDK_DEBUG=1
-APP_SHORT_COMMANDS=false
-LOCAL_SHORT_COMMANDS=false
--B
--n
-jvmArgs : 
-

File diff suppressed because it is too large
+ 0 - 7
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.stdout.txt


+ 0 - 21
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_command.txt

@@ -1,21 +0,0 @@
-Executable : D:\Android\SDK\ndk\21.3.6528147\ndk-build.cmd
-arguments : 
-NDK_PROJECT_PATH=null
-APP_BUILD_SCRIPT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Android.mk
-NDK_APPLICATION_MK=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Application.mk
-APP_ABI=armeabi-v7a
-NDK_ALL_ABIS=armeabi-v7a
-NDK_DEBUG=1
-APP_PLATFORM=android-16
-NDK_OUT=D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj
-NDK_LIBS_OUT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\debug\lib
-NDK_TOOLCHAIN_VERSION=clang
-NDK_MODULE_PATH=D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\cocos;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\external
--j8
-NDK_DEBUG=1
-APP_SHORT_COMMANDS=false
-LOCAL_SHORT_COMMANDS=false
--B
--n
-jvmArgs : 
-

File diff suppressed because it is too large
+ 0 - 7
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt


File diff suppressed because it is too large
+ 0 - 21
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build.json


+ 0 - 18
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.command.txt

@@ -1,18 +0,0 @@
-Executable : D:\Android\SDK\ndk\21.3.6528147\ndk-build.cmd
-arguments : 
-NDK_PROJECT_PATH=null
-APP_BUILD_SCRIPT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Android.mk
-NDK_APPLICATION_MK=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Application.mk
-APP_ABI=armeabi-v7a
-NDK_ALL_ABIS=armeabi-v7a
-NDK_DEBUG=0
-APP_PLATFORM=android-16
-NDK_OUT=D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj
-NDK_LIBS_OUT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\release\lib
-NDK_TOOLCHAIN_VERSION=clang
-NDK_MODULE_PATH=D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\cocos;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\external
--j8
-NDK_DEBUG=0
-D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj/local/armeabi-v7a/libcocos2djs.so
-jvmArgs : 
-

+ 0 - 4
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,4 +0,0 @@
-Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
-Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
-[armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
-[armeabi-v7a] SharedLibrary  : libcocos2djs.so

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