Pārlūkot izejas kodu

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

薛鸿潇 5 gadi atpakaļ
vecāks
revīzija
13c3e1f650
100 mainītis faili ar 5581 papildinājumiem un 1737 dzēšanām
  1. 77 0
      assets/resources/animation/guideA.anim
  2. 5 0
      assets/resources/animation/guideA.anim.meta
  3. 0 1
      assets/resources/game/hot/project.manifest
  4. 0 1
      assets/resources/game/hot/version.manifest
  5. 114 3
      assets/resources/game/prefab/game.prefab
  6. 12 0
      assets/resources/module/forceUpdate.meta
  7. 122 0
      assets/resources/module/forceUpdate/DownLoadUI.ts
  8. 9 0
      assets/resources/module/forceUpdate/DownLoadUI.ts.meta
  9. 12 0
      assets/resources/module/forceUpdate/prefab.meta
  10. 3060 0
      assets/resources/module/forceUpdate/prefab/DownLoadUI.prefab
  11. 8 0
      assets/resources/module/forceUpdate/prefab/DownLoadUI.prefab.meta
  12. 12 0
      assets/resources/module/forceUpdate/texture.meta
  13. BIN
      assets/resources/module/forceUpdate/texture/bg.png
  14. 36 0
      assets/resources/module/forceUpdate/texture/bg.png.meta
  15. BIN
      assets/resources/module/forceUpdate/texture/bg1.png
  16. 36 0
      assets/resources/module/forceUpdate/texture/bg1.png.meta
  17. BIN
      assets/resources/module/forceUpdate/texture/button.png
  18. 36 0
      assets/resources/module/forceUpdate/texture/button.png.meta
  19. BIN
      assets/resources/module/forceUpdate/texture/button1.png
  20. 36 0
      assets/resources/module/forceUpdate/texture/button1.png.meta
  21. BIN
      assets/resources/module/forceUpdate/texture/button2.png
  22. 36 0
      assets/resources/module/forceUpdate/texture/button2.png.meta
  23. BIN
      assets/resources/module/forceUpdate/texture/fenge.png
  24. 36 0
      assets/resources/module/forceUpdate/texture/fenge.png.meta
  25. BIN
      assets/resources/module/forceUpdate/texture/title_gx.png
  26. 36 0
      assets/resources/module/forceUpdate/texture/title_gx.png.meta
  27. BIN
      assets/resources/module/forceUpdate/texture/wrod_bg.png
  28. 36 0
      assets/resources/module/forceUpdate/texture/wrod_bg.png.meta
  29. 4 1
      assets/resources/module/guide/guide.prefab
  30. 327 0
      assets/resources/module/guide/hand.prefab
  31. 8 0
      assets/resources/module/guide/hand.prefab.meta
  32. BIN
      assets/resources/module/guide/texture/common_img_guidecircle.png
  33. 36 0
      assets/resources/module/guide/texture/common_img_guidecircle.png.meta
  34. 12 0
      assets/resources/module/hotUpdate.meta
  35. 12 0
      assets/resources/module/hotUpdate/perfab.meta
  36. 0 0
      assets/resources/module/login/hot.meta
  37. 0 0
      assets/resources/module/login/hot/project.manifest
  38. 0 0
      assets/resources/module/login/hot/project.manifest.meta
  39. 1 0
      assets/resources/module/login/hot/version.manifest
  40. 0 0
      assets/resources/module/login/hot/version.manifest.meta
  41. 3 0
      assets/resources/module/login/login.prefab
  42. 0 1
      assets/scene/MainScene.fire
  43. 0 5
      assets/script/Main.ts
  44. 1 1
      assets/script/game/data/AppData.ts
  45. 60 40
      assets/script/game/data/LoginData.ts
  46. 2 2
      assets/script/game/data/StorageData.ts
  47. 3 0
      assets/script/game/data/module/GuideData.ts
  48. 24 0
      assets/script/game/module/guide/Guide.ts
  49. 6 0
      assets/script/game/module/guide/GuideVO.ts
  50. 12 0
      assets/script/game/module/hotUpdate.meta
  51. 69 6
      assets/script/game/module/login/Login.ts
  52. 200 0
      assets/script/mk/sdk/HotUpdate.ts
  53. 9 0
      assets/script/mk/sdk/HotUpdate.ts.meta
  54. 1 1
      assets/script/mk/utils/EncryptUtil.ts
  55. 13 7
      assets/script/mk/utils/StorageUtil.ts
  56. 2 0
      build/jsb-link/.idea/.gitignore
  57. 116 0
      build/jsb-link/.idea/codeStyles/Project.xml
  58. 9 0
      build/jsb-link/.idea/jsb-link.iml
  59. 8 0
      build/jsb-link/.idea/modules.xml
  60. 6 0
      build/jsb-link/.idea/vcs.xml
  61. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  62. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml
  63. 18 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/jarRepositories.xml
  64. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  65. 0 99
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1746423203/libcocos2dx.iml
  66. 99 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/android-libcocos2dx.iml
  67. 156 156
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml
  68. 0 559
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build.json
  69. 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
  70. 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
  71. 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
  72. 0 65
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_mini.json
  73. 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
  74. 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
  75. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_command.txt
  76. 0 7
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt
  77. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build.json
  78. 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
  79. 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
  80. 0 65
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_mini.json
  81. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.command.txt
  82. 0 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.stderr.txt
  83. 0 5
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_generate_ndk_build_json_armeabi-v7a.stdout.txt
  84. 0 21
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_build_command.txt
  85. 0 5
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_build_output.txt
  86. 1 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.gitignore
  87. 2 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java
  88. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  89. 550 78
      build/jsb-link/js backups (useful for debugging)/main.index.js
  90. 32 1
      build/jsb-link/main.js
  91. 13 0
      packages-hot-update/cfg.json
  92. 0 0
      packages-hot-update/manifest/project.manifest
  93. 1 0
      packages-hot-update/manifest/version.manifest
  94. BIN
      packages-hot-update/versions/ver_1_0.2.zip
  95. 0 0
      packages/1.txt
  96. 1 0
      packages/hot-update-tools/core/CfgUtil.js
  97. 39 0
      packages/hot-update-tools/core/GoogleAnalytics.js
  98. 1 0
      packages/hot-update-tools/core/OutPut.js
  99. 1 0
      packages/hot-update-tools/core/Util.js
  100. 1 0
      packages/hot-update-tools/i18n/en.js

+ 77 - 0
assets/resources/animation/guideA.anim

@@ -0,0 +1,77 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "guideA",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.6666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "paths": {
+      "out": {
+        "props": {
+          "scale": [
+            {
+              "frame": 0.3333333333333333,
+              "value": {
+                "__type__": "cc.Vec2",
+                "x": 0,
+                "y": 0
+              }
+            },
+            {
+              "frame": 0.6666666666666666,
+              "value": {
+                "__type__": "cc.Vec2",
+                "x": 3,
+                "y": 3
+              }
+            }
+          ],
+          "opacity": [
+            {
+              "frame": 0.3333333333333333,
+              "value": 255
+            },
+            {
+              "frame": 0.6666666666666666,
+              "value": 0
+            }
+          ]
+        }
+      },
+      "hand": {
+        "props": {
+          "position": [
+            {
+              "frame": 0,
+              "value": [
+                14,
+                -18,
+                0
+              ]
+            },
+            {
+              "frame": 0.3333333333333333,
+              "value": [
+                0,
+                0,
+                0
+              ]
+            },
+            {
+              "frame": 0.6666666666666666,
+              "value": [
+                14,
+                -18,
+                0
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/resources/animation/guideA.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "af2486bc-a70c-49b1-a6f0-3290670ebceb",
+  "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"}

+ 114 - 3
assets/resources/game/prefab/game.prefab

@@ -40,19 +40,22 @@
       },
       {
         "__id__": 105
+      },
+      {
+        "__id__": 173
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 173
+        "__id__": 176
       },
       {
-        "__id__": 174
+        "__id__": 177
       }
     ],
     "_prefab": {
-      "__id__": 175
+      "__id__": 178
     },
     "_opacity": 255,
     "_color": {
@@ -5720,6 +5723,114 @@
     "sync": true
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 174
+      }
+    ],
+    "_prefab": {
+      "__id__": 175
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 118.63,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        130.817,
+        91.572,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 173
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "111111",
+    "_N$string": "111111",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "b4H9DpE2ZHbrPSMoC/ScjU",
+    "sync": false
+  },
+  {
     "__type__": "8760dQYasROwLaLe1idTS07",
     "_name": "",
     "_objFlags": 0,

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

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e7e4aadc-b0e0-402b-8271-d1399ea6690b",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 122 - 0
assets/resources/module/forceUpdate/DownLoadUI.ts

@@ -0,0 +1,122 @@
+
+import Util from "../../../script/before/util/Util";
+import JsbSystem from "../../../script/mk/system/JsbSystem";
+
+
+/** 最新版本下载 */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class DownLoadUI extends cc.Component {
+    @property(cc.Toggle)
+    skipToggle: cc.Toggle = null
+
+    @property(cc.Label)
+    labUpdate: cc.Label = null
+
+    @property(cc.Label)
+    labFix: cc.Label = null
+
+    @property(cc.Node)
+    btnSure: cc.Node = null
+
+    @property(cc.Node)
+    btnCancel: cc.Node = null
+
+    @property(cc.Sprite)
+    fileProgress: cc.Sprite = null
+
+    @property(cc.Label)
+    labPro: cc.Label = null
+
+    /** 是否显示“不再提醒” */
+    showToggle = false
+
+    start() {
+        this.setText()
+    }
+
+    init(showToggle) {
+        this.skipToggle.node.active = showToggle
+        this.showToggle = showToggle
+        if (!showToggle) {
+            this.btnSure.y = -366
+        }
+    }
+
+
+
+    clickDownLoad() {
+        mk.audio.playEffect("ef_button_click")
+        this.btnSure.active = false
+        this.btnCancel.active = false
+        this.skipToggle.node.active = false
+
+        this.fileProgress.node.parent.active = true
+
+        let apkUrl = gData.appData.installUrl
+        let arr = apkUrl.split('/')
+        let apkName = arr[arr.length - 1]
+
+        let installUrl = Util.checkHasApk(apkName)
+        //已下载过
+        if (installUrl != '') {
+            JsbSystem.installApk(installUrl)
+        }
+        else {
+            //未下载过
+            JsbSystem.downFile2Local(apkUrl, apkName,
+                (locaPath) => {
+                    JsbSystem.installApk(locaPath)
+                },
+                (locaPath) => {
+                    let str = '下载失败,请检查网络后重试'
+                    // if (cc.director.getScene().name == 'Loader') {
+                    //     cc.find('Canvas').getComponent(Loader).PlayTip(str)
+                    // }
+                    // else {
+                    //     EffectNode.instance.PlayTip(str)
+                    // }
+
+                    this.fileProgress.node.parent.active = false
+                    this.fileProgress.fillRange = 0
+                    this.labPro.string = '0%'
+
+                    this.btnSure.active = true
+                    this.btnCancel.active = true
+                    this.skipToggle.node.active = this.showToggle
+
+                },
+                (bytesReceived, totalBytesReceived, totalBytesExpected) => {
+                    let pro = totalBytesReceived / totalBytesExpected
+                    this.setPro(pro)
+                })
+
+        }
+
+    }
+
+    //更新进度
+    setPro(pro) {
+        this.labPro.string = `${Math.floor(pro * 100)}%`
+        this.fileProgress.fillRange = pro
+    }
+
+    clickSkip() {
+        // mk.audio.playEffect(AUDIO_TYPE.button)
+        // if (this.skipToggle.isChecked) {
+        //     let installVersion = gData.appData.installVersion
+        //     GameM.globalStorage.setStorage('installVersion' + installVersion, 'skip', 1)
+        // }
+
+        // UiM.Instance.offPanel(PANEL_NAME.DownLoadUI)
+
+        // GameM.commonData.skipUpdate = true
+    }
+
+    /** 设置文本 */
+    setText() {
+        this.labUpdate.string = gData.appData.updateDes;
+        this.labFix.string = gData.appData.fixDes;
+    }
+}

+ 9 - 0
assets/resources/module/forceUpdate/DownLoadUI.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "4cd23ff6-52af-4453-8c35-7bdec4b67a74",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/module/forceUpdate/prefab.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "af3aa1a4-a487-4d63-b88f-753c1cae5c16",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 3060 - 0
assets/resources/module/forceUpdate/prefab/DownLoadUI.prefab

@@ -0,0 +1,3060 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DownLoadUI",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 82
+      }
+    ],
+    "_prefab": {
+      "__id__": 83
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 800,
+      "height": 600
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        82.106,
+        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.Node",
+    "_name": "New Sprite(Splash)",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 180,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 2000
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -82.106,
+        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.Sprite",
+    "_name": "New Sprite(Splash)<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "49kQU+n/VH9ZTV2HnnQjK6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Par",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 38
+      },
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 61
+      },
+      {
+        "__id__": 68
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 80
+      }
+    ],
+    "_prefab": {
+      "__id__": 81
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bgs",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Sprite(Splash)",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 680,
+      "height": 789
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -81,
+        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.Sprite",
+    "_name": "New Sprite(Splash)<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2f8eff00-90aa-4aa5-9efd-100ebd77411f"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "86E8gHZPpK4JM4qCHXJJbW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "fuli_list_1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 660,
+      "height": 525
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -11,
+        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.Sprite",
+    "_name": "fuli_list_1<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "43J+U81WZA3qSpFpksch9O",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 103,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        235,
+        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.Sprite",
+    "_name": "tip<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "b27c89be-a66f-47d6-b4dd-b5dc945acd05"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "84BkfYDxRBV7KXjXmQAr/a",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "d3uRhqQQ9DHYTJZ45dT23S",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "content",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 34
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 37
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -75.316,
+        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.Node",
+    "_name": "wrod_bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 594,
+      "height": 125
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        105,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "53370c84-b4fb-43c4-a948-1058ac6c013f"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "16IVQnT/pBpbVLKcelngT3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "wrod_bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 594,
+      "height": 125
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -115,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "53370c84-b4fb-43c4-a948-1058ac6c013f"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "d9R4r1mCtLgpbD/VhUjZT2",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labDes1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      }
+    ],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 180,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -294,
+        206,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "labDes1<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 25
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_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": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "7ecT+pn9xCpaDRHy9RXQOu",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labUpdate",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 112,
+      "g": 77,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 570,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -286.914,
+        155,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "labUpdate<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "sadasdassadsad",
+    "_N$string": "sadasdassadsad",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 3,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "5e7h1k+TFHiIA8ftibp9cE",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labDes2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 173.97,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -294,
+        -22,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "labDes2<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "bug修复:",
+    "_N$string": "bug修复:",
+    "_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": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "21NtFTnShJcJec1y2ImuwJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labFix",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 36
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 112,
+      "g": 77,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 590,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -294,
+        -52,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "labFix<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 34
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "",
+    "_N$string": "",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 3,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "8ey6x6/YlHdp8ZL9Dmyfmj",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "35jReDa9tB6KtrdfDPVGsm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "task_line_1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 39
+      },
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 46
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 50
+      }
+    ],
+    "_prefab": {
+      "__id__": 51
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 596,
+      "height": 54
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -400.913,
+        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.Node",
+    "_name": "task_line_2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 38
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 575,
+      "height": 37
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        4,
+        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.Sprite",
+    "_name": "task_line_2<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 3,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "43E8KCV5ZKbZovFrV1PrzQ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "labPro",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 38
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 44
+      }
+    ],
+    "_prefab": {
+      "__id__": 45
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        4,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "labPro<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "0%",
+    "_N$string": "0%",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 1,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 99,
+      "b": 147,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "71gotpIFtBS68pfvd7XW7G",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "info",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 38
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 48
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 157.34,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0.47,
+        80.934,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "info<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "更新中...",
+    "_N$string": "更新中...",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 50,
+      "g": 46,
+      "b": 39,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "d6IaGS535IWr4oZXqczrov",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "task_line_1<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 1,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "9e5fYys3NIpbXJBrxDEnuG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnSure",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 53
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 58
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 377,
+      "height": 95
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -338.631,
+        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.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 52
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 54
+      },
+      {
+        "__id__": 55
+      }
+    ],
+    "_prefab": {
+      "__id__": 56
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 206,
+      "height": 69
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "Label<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "立即更新",
+    "_N$string": "立即更新",
+    "_fontSize": 50,
+    "_lineHeight": 50,
+    "_enableWrapText": false,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 10,
+      "g": 129,
+      "b": 187,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "e3LfCDaHpHLb+1sjODVlBX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "btnSure<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 52
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a146193d-5429-43f1-9b2c-d2fda9944f2d"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 52
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 59
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 52
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "a2e6eJMVO5PS4wd0GqLXUwg",
+    "handler": "clickDownLoad",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "74nLDGM7dJB6mt0H1NY5YL",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnCancel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 62
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 67
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 280,
+      "height": 80
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -528.632,
+        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.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 64
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 144,
+      "height": 45.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        6,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "Label<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 62
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "下次再说",
+    "_N$string": "下次再说",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": false,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 4,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "8cGT2iefVH1qsdqtR/s8WA",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 66
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "hoverSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 61
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "a2e6eJMVO5PS4wd0GqLXUwg",
+    "handler": "clickSkip",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "27nAhpxWlK47ExOgHYgjgW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "skipToggle",
+    "_objFlags": 512,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 72
+      },
+      {
+        "__id__": 75
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 78
+      }
+    ],
+    "_prefab": {
+      "__id__": 79
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 28,
+      "height": 28
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -84.158,
+        -440.633,
+        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.Node",
+    "_name": "Background",
+    "_objFlags": 512,
+    "_parent": {
+      "__id__": 68
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 70
+      }
+    ],
+    "_prefab": {
+      "__id__": 71
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 37,
+      "height": 37
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "Background<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 69
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "59G95Ki6FJ67D8lhT7s+sj",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "checkmark",
+    "_objFlags": 512,
+    "_parent": {
+      "__id__": 68
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 73
+      }
+    ],
+    "_prefab": {
+      "__id__": 74
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 38,
+      "height": 37
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "checkmark<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 72
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 2,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "a905W1ipZDoLxPtVqcdjTc",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 68
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 76
+      }
+    ],
+    "_prefab": {
+      "__id__": 77
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 112,
+      "g": 77,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        30.842,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "New Label<Label>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 75
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "不再提醒",
+    "_N$string": "不再提醒",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "92gIMRwJ9NMKhHpYZOcodm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Toggle",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 68
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 69
+    },
+    "_N$isChecked": false,
+    "toggleGroup": null,
+    "checkMark": {
+      "__id__": 73
+    },
+    "checkEvents": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "305zrJuCJClb2jUKHkHSbc",
+    "sync": false
+  },
+  {
+    "__type__": "c303cMObORMP73Of1/g1ZVg",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "26dYwQnoBLfakw3bKbV45T",
+    "sync": false
+  },
+  {
+    "__type__": "4cd23/2Uq9EU4w1e97Etnp0",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "skipToggle": {
+      "__id__": 78
+    },
+    "labUpdate": {
+      "__id__": 29
+    },
+    "labFix": {
+      "__id__": 35
+    },
+    "btnSure": {
+      "__id__": 52
+    },
+    "btnCancel": {
+      "__id__": 61
+    },
+    "fileProgress": {
+      "__id__": 40
+    },
+    "labPro": {
+      "__id__": 43
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/module/forceUpdate/prefab/DownLoadUI.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "fd05a3e3-a1f8-41d3-a8aa-5d32136824d1",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/module/forceUpdate/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "c1040ee3-fcf6-4337-9498-6252beb3adb2",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/resources/module/forceUpdate/texture/bg.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "db444a88-03cc-48c2-b95a-f6531fc56008",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 630,
+  "height": 669,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "00220b88-1f47-4efe-b465-ebd263bb4e31",
+      "rawTextureUuid": "db444a88-03cc-48c2-b95a-f6531fc56008",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 630,
+      "height": 669,
+      "rawWidth": 630,
+      "rawHeight": 669,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/bg1.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/bg1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3f844127-a696-433f-9a96-4b5ca67367b9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 652,
+  "height": 691,
+  "platformSettings": {},
+  "subMetas": {
+    "bg1": {
+      "ver": "1.0.4",
+      "uuid": "2f8eff00-90aa-4aa5-9efd-100ebd77411f",
+      "rawTextureUuid": "3f844127-a696-433f-9a96-4b5ca67367b9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 652,
+      "height": 691,
+      "rawWidth": 652,
+      "rawHeight": 691,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/button.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c9c68365-758f-4f61-beb8-8e088ea80040",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 315,
+  "height": 111,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "545c017d-33f6-443b-9531-f6613e179357",
+      "rawTextureUuid": "c9c68365-758f-4f61-beb8-8e088ea80040",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 315,
+      "height": 111,
+      "rawWidth": 315,
+      "rawHeight": 111,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/button1.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/button1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "66e0bdcd-cc1b-4b24-a7db-ec95ec0d2f4c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 315,
+  "height": 111,
+  "platformSettings": {},
+  "subMetas": {
+    "button1": {
+      "ver": "1.0.4",
+      "uuid": "449b7886-bda3-4585-a330-1c59d7691e85",
+      "rawTextureUuid": "66e0bdcd-cc1b-4b24-a7db-ec95ec0d2f4c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 315,
+      "height": 111,
+      "rawWidth": 315,
+      "rawHeight": 111,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/button2.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/button2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "363c9640-66eb-45e2-bfad-d903430a3685",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 377,
+  "height": 95,
+  "platformSettings": {},
+  "subMetas": {
+    "button2": {
+      "ver": "1.0.4",
+      "uuid": "a146193d-5429-43f1-9b2c-d2fda9944f2d",
+      "rawTextureUuid": "363c9640-66eb-45e2-bfad-d903430a3685",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 377,
+      "height": 95,
+      "rawWidth": 377,
+      "rawHeight": 95,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/fenge.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/fenge.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "94af5d17-2e09-4842-a895-12a9a32ba6be",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 630,
+  "height": 1,
+  "platformSettings": {},
+  "subMetas": {
+    "fenge": {
+      "ver": "1.0.4",
+      "uuid": "522750f7-15e0-4c9e-a6de-de36ba71c076",
+      "rawTextureUuid": "94af5d17-2e09-4842-a895-12a9a32ba6be",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 630,
+      "height": 1,
+      "rawWidth": 630,
+      "rawHeight": 1,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/title_gx.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/title_gx.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a9960609-c6b2-4ac6-b74f-082a63867785",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 103,
+  "height": 45,
+  "platformSettings": {},
+  "subMetas": {
+    "title_gx": {
+      "ver": "1.0.4",
+      "uuid": "b27c89be-a66f-47d6-b4dd-b5dc945acd05",
+      "rawTextureUuid": "a9960609-c6b2-4ac6-b74f-082a63867785",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 103,
+      "height": 45,
+      "rawWidth": 103,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/forceUpdate/texture/wrod_bg.png


+ 36 - 0
assets/resources/module/forceUpdate/texture/wrod_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d9c667bb-284e-4f45-bd33-fe741d0f497f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 594,
+  "height": 125,
+  "platformSettings": {},
+  "subMetas": {
+    "wrod_bg": {
+      "ver": "1.0.4",
+      "uuid": "53370c84-b4fb-43c4-a948-1058ac6c013f",
+      "rawTextureUuid": "d9c667bb-284e-4f45-bd33-fe741d0f497f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 594,
+      "height": 125,
+      "rawWidth": 594,
+      "rawHeight": 125,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 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
     },

+ 327 - 0
assets/resources/module/guide/hand.prefab

@@ -0,0 +1,327 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hand",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -246.074,
+        753.9929999999999,
+        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.Node",
+    "_name": "out",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 129,
+      "height": 129
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_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
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "dcf79a6d-b107-430a-aef6-18af55e1131c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "73bde1e5-ca53-420e-9f68-ca130e46fc49"
+    },
+    "fileId": "978bAYRDtPN62WBQC4oG16",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hand",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 93,
+      "height": 111
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.049095744680851094,
+      "y": 0.9625196078431373
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        14,
+        -18,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "7703cd1c-b1a7-4207-8d63-ca26e03de71b"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "73bde1e5-ca53-420e-9f68-ca130e46fc49"
+    },
+    "fileId": "90ojC0TD9FTLLj2ZMEZ2+o",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "af2486bc-a70c-49b1-a6f0-3290670ebceb"
+    },
+    "_clips": [
+      {
+        "__uuid__": "af2486bc-a70c-49b1-a6f0-3290670ebceb"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "73bde1e5-ca53-420e-9f68-ca130e46fc49"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/module/guide/hand.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "73bde1e5-ca53-420e-9f68-ca130e46fc49",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

BIN
assets/resources/module/guide/texture/common_img_guidecircle.png


+ 36 - 0
assets/resources/module/guide/texture/common_img_guidecircle.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "368a1f2d-d6cc-4b87-8b2b-ff6e57e0d0ae",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 130,
+  "height": 131,
+  "platformSettings": {},
+  "subMetas": {
+    "common_img_guidecircle": {
+      "ver": "1.0.4",
+      "uuid": "dcf79a6d-b107-430a-aef6-18af55e1131c",
+      "rawTextureUuid": "368a1f2d-d6cc-4b87-8b2b-ff6e57e0d0ae",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 1,
+      "width": 129,
+      "height": 129,
+      "rawWidth": 130,
+      "rawHeight": 131,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "27ca9321-290b-4769-b0e6-bd95cdf80996",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/module/hotUpdate/perfab.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e45f4d0f-7aa3-4f6e-a64f-6b9bcde71855",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

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


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 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": ""
   },
   {

+ 0 - 1
assets/scene/MainScene.fire

@@ -764,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");
     }

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

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

+ 60 - 40
assets/script/game/data/LoginData.ts

@@ -58,6 +58,8 @@ export class LoginData {
         this.uin = uin ? uin : "";
         let sessionKey = mk.storage.getStorage(StorageKey.sessionKey);
         this.sessionKey = sessionKey ? sessionKey : "";
+        let loginTicket = mk.storage.getStorage(StorageKey.loginTicket);
+        this.loginTicket = loginTicket ? loginTicket : "";
     }
 
     /**
@@ -65,9 +67,9 @@ 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 != '') {
+        if (this.sessionKey != '' && this.uin != '' && this.loginTicket != '') {
             console.log("=== login 有登录记录直接跳转到登录流程最后一步");
             this.getAccountInfo();
             return;
@@ -97,7 +99,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();
@@ -139,7 +141,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);
@@ -193,13 +195,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();
@@ -223,37 +225,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);
+        }
 
         // }
 
@@ -265,11 +267,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();

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

@@ -35,6 +35,9 @@ export class GuideData {
             guide.tr_num = o.tr_num || o.trNum;
             guide.tr_form = o.tr_form || o.trForm;
             guide.dialog = o.dialog;
+            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 || '';

+ 24 - 0
assets/script/game/module/guide/Guide.ts

@@ -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;
             }

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

@@ -11,6 +11,12 @@ export default class GuideVO {
     tr_form: number;
     /** 对话内容 */
     dialog: string;
+    /** 对话框位置--全屏对齐 */
+    dialog_pos: string;
+    /** 对话框位置--显示区域偏移xy */
+    dialog_pos1: string;
+    /** 对话文字对齐方式 0左1中2右 */
+    dialog_alignment:string;
     /** 透明点击区域(与click_node不共存) */
     display_rect: string;
     /** 点击组件名字(必须在代码中预先设置) */

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

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "6ab0dcf5-b307-420f-ab3a-88befa72e960",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "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();

+ 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": {}
+}

+ 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>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 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 : 
-

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 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 : 
-

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 7
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 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

+ 0 - 65
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 clean"
-  ],
-  "libraries": {
-    "cocos2djs-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libcocos2djs.so"
-    },
-    "pvmp3dec-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libpvmp3dec.a"
-    },
-    "cocos2dandroid-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libcocos2dandroid.a"
-    },
-    "extension-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libextension.a"
-    },
-    "editorsupport-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libeditorsupport.a"
-    },
-    "vorbisidec-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libvorbisidec.a"
-    },
-    "audioengine-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libaudioengine.a"
-    },
-    "cocos2d-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libcocos2d.a"
-    },
-    "cpufeatures-release-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\u003d0 APP_PLATFORM\u003dandroid-16 NDK_OUT\u003dD:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/obj NDK_LIBS_OUT\u003dD:\\App\\mk_framework\\build\\jsb-link\\frameworks\\runtime-src\\proj.android-studio\\app\\build\\intermediates\\ndkBuild\\release\\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\u003d0 D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/release/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\\release\\obj\\local\\armeabi-v7a\\libcpufeatures.a"
-    }
-  }
-}

+ 0 - 21
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/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=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
-APP_SHORT_COMMANDS=false
-LOCAL_SHORT_COMMANDS=false
--B
--n
-jvmArgs : 
-

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


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 5
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/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/release/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=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
-APP_SHORT_COMMANDS=false
-LOCAL_SHORT_COMMANDS=false
--B
--n
-jvmArgs : 
-

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 5
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_build_output.txt


+ 1 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.gitignore

@@ -1,2 +1,3 @@
 /build
 /jniLibs
+/.externalNativeBuild

+ 2 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java

@@ -1,5 +1,6 @@
 package org.cocos2dx.javascript.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -80,6 +81,7 @@ public class DeviceUtil {
     }
 
     //-------- 获取Imei --------
+    @SuppressLint({"MissingPermission", "HardwareIds"})
     public static String getImei(Context context) {
         String imei = "";
         try {

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

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-RELEASE_STORE_FILE=D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
+RELEASE_STORE_FILE=D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
 RELEASE_STORE_PASSWORD=123456
 RELEASE_KEY_ALIAS=debug_keystore
 RELEASE_KEY_PASSWORD=123456

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 550 - 78
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 32 - 1
build/jsb-link/main.js

@@ -1,4 +1,35 @@
-window.boot = function () {
+(function () {
+    if (typeof window.jsb === 'object') {
+        var hotUpdateSearchPaths = localStorage.getItem('HotUpdateSearchPaths');
+        if (hotUpdateSearchPaths) {
+            var paths = JSON.parse(hotUpdateSearchPaths);
+            jsb.fileUtils.setSearchPaths(paths);
+
+            var fileList = [];
+            var storagePath = paths[0] || '';
+            var tempPath = storagePath + '_temp/';
+            var baseOffset = tempPath.length;
+
+            if (jsb.fileUtils.isDirectoryExist(tempPath) && !jsb.fileUtils.isFileExist(tempPath + 'project.manifest.temp')) {
+                jsb.fileUtils.listFilesRecursively(tempPath, fileList);
+                fileList.forEach(srcPath => {
+                    var relativePath = srcPath.substr(baseOffset);
+                    var dstPath = storagePath + relativePath;
+
+                    if (srcPath[srcPath.length] === '/') {
+                        jsb.fileUtils.createDirectory(dstPath);
+                    } else {
+                        if (jsb.fileUtils.isFileExist(dstPath)) {
+                            jsb.fileUtils.removeFile(dstPath);
+                        }
+                        jsb.fileUtils.renameFile(srcPath, dstPath);
+                    }
+                });
+                jsb.fileUtils.removeDirectory(tempPath);
+            }
+        }
+    }
+})();window.boot = function () {
     var settings = window._CCSettings;
     window._CCSettings = undefined;
     var onProgress = null;

+ 13 - 0
packages-hot-update/cfg.json

@@ -0,0 +1,13 @@
+{
+    "version": "1.0.2",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
+    "resourceRootDir": "D:\\App\\mk_framework\\build\\jsb-link",
+    "genManifestDir": "",
+    "hotAddressArray": [
+        "http://",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
+    ],
+    "buildTime": 1624685938783,
+    "genTime": 1624685938783,
+    "genVersion": null
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 0
packages-hot-update/manifest/version.manifest

@@ -0,0 +1 @@
+{"version":"1.0.2","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"}

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


+ 0 - 0
packages/1.txt


+ 1 - 0
packages/hot-update-tools/core/CfgUtil.js

@@ -0,0 +1 @@
+const Fs=require("fire-fs"),FsExtra=require("fs-extra"),Path=require("fire-path"),OutPut=Editor.require("packages://hot-update-tools/core/OutPut.js");module.exports={cfgData:{version:"",serverRootDir:"",resourceRootDir:"",genManifestDir:"",localServerPath:"",hotAddressArray:[],buildTime:null,genTime:null,genVersion:null},_save(){FsExtra.ensureFileSync(this.cfgFile),Fs.writeFileSync(this.cfgFile,JSON.stringify(this.cfgData,null,4))},get cfgFile(){return Path.join(OutPut.rootDir,"cfg.json")},initCfg(){return OutPut.initialization(),Fs.existsSync(this.cfgFile)?this.cfgData=JSON.parse(Fs.readFileSync(this.cfgFile,"utf-8")):this._save(),this.cfgData},updateBuildTimeByMain(e){let i=this.cfgFile;if(Fs.existsSync(i)){let t=Fs.readFileSync(i,"utf-8"),s=JSON.parse(t);s.buildTime=e,s.genTime=e,Fs.writeFileSync(i,JSON.stringify(s,null,4))}else Editor.log("热更新配置文件不存在: "+i)},updateBuildTime(e){this.cfgData.buildTime=e,this.cfgData.genTime=e,this._save()},updateGenTime(e,i){this.cfgData.genTime=e,this.cfgData.genVersion=i,this._save()},getBuildTimeGenTime(){let e={buildTime:null,genTime:null},i=this.cfgFile;if(Fs.existsSync(i)){let t=Fs.readFileSync(i,"utf-8"),s=JSON.parse(t);e.buildTime=s.buildTime,e.genTime=s.genTime,this.cfgData.buildTime=s.buildTime,this.cfgData.genTime=s.genTime}return e},saveConfig(e){this.cfgData.version=e.version,this.cfgData.serverRootDir=e.serverRootDir,this.cfgData.resourceRootDir=e.resourceRootDir,this.cfgData.localServerPath=e.localServerPath,this.cfgData.hotAddressArray=e.hotAddressArray,this._save()}};

+ 39 - 0
packages/hot-update-tools/core/GoogleAnalytics.js

@@ -0,0 +1,39 @@
+const UUID = Editor.require('packages://hot-update-tools/node_modules/uuid/v4');
+const {JSONStorage} = Editor.require('packages://hot-update-tools/node_modules/node-localstorage');
+const UA = Editor.require('packages://hot-update-tools/node_modules/universal-analytics');
+const {app} = require('electron').remote;
+const Package = Editor.require('packages://hot-update-tools/package.json');
+
+module.exports = {
+    nodeStorage: null,
+    user: null,
+
+    init() {
+        this.nodeStorage = new JSONStorage(app.getPath('userData'));
+        const userId = this.nodeStorage.getItem('userId') || UUID();
+        this.nodeStorage.setItem('userId', userId);
+        this.user = UA('UA-134924925-1', userId);
+    },
+    event(event) {
+        if (this.user) {
+            this.user.event({
+                ec: `${Package.name} : V${Package.version}`,// text 用户互动对象(video)
+                ea: event || '',// text 用户互动类型(paly)
+                el: '',// text 用于对事件进行分类
+                ev: 0,// int 与事件相关的数值
+            }).send();
+        }
+    },
+    eventOpen() {
+        this.event('open');
+    },
+    eventDoc() {
+        this.event(`${Package.name}-doc`);
+    },
+    eventQQ() {
+        this.event(`${Package.name}-qq`);
+    },
+    eventCustom(event) {
+        this.event(event);
+    },
+};

+ 1 - 0
packages/hot-update-tools/core/OutPut.js

@@ -0,0 +1 @@
+const Fs=require("fire-fs"),FsExtra=require("fs-extra"),Path=require("fire-path");module.exports={get rootDir(){return Path.join(Editor.Project.path,"packages-hot-update")},get manifestDir(){return Path.join(this.rootDir,"manifest")},get testServerDir(){return Path.join(this.rootDir,"test-server")},get versionsDir(){return Path.join(this.rootDir,"versions")},initialization(){FsExtra.ensureDirSync(this.rootDir),FsExtra.ensureDirSync(this.manifestDir),FsExtra.ensureDirSync(this.testServerDir),FsExtra.ensureDirSync(this.versionsDir)}};

+ 1 - 0
packages/hot-update-tools/core/Util.js

@@ -0,0 +1 @@
+let Fs=require("fire-fs"),Path=require("fire-path");const OutPut=Editor.require("packages://hot-update-tools/core/OutPut.js");module.exports={manifestResDir:null,getLocalIP(){let e="",r=require("os").networkInterfaces();return Object.keys(r).forEach(t=>{r[t].forEach(r=>{"IPv4"===r.family&&!1===r.internal&&(e=r.address)})}),e}};

+ 1 - 0
packages/hot-update-tools/i18n/en.js

@@ -0,0 +1 @@
+module.exports={title:"hotUpdateTools"};

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels