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

assets/resources/module/forceUpdate/prefab/DownLoadUI.prefab

@@ -27,11 +27,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -228,13 +228,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 80
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 81
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -2995,16 +2991,6 @@
     "sync": false
   },
   {
-    "__type__": "c303cMObORMP73Of1/g1ZVg",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

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

@@ -26,8 +26,8 @@
       "height": 669,
       "rawWidth": 630,
       "rawHeight": 669,
-      "borderTop": 0,
-      "borderBottom": 0,
+      "borderTop": 140,
+      "borderBottom": 16,
       "borderLeft": 0,
       "borderRight": 0,
       "subMetas": {}

assets/resources/module/login/agreementTip.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 56
-      },
-      {
         "__id__": 57
       },
       {
         "__id__": 58
+      },
+      {
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -194,7 +194,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 630,
-      "height": 608
+      "height": 400
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -206,7 +206,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        107,
+        127.582,
         0,
         0,
         0,
@@ -313,7 +313,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        356,
+        263.582,
         0,
         0,
         0,
@@ -357,8 +357,10 @@
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -427,7 +429,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        281.064,
+        212.4,
         0,
         0,
         0,
@@ -530,8 +532,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "欢迎使用本软件，本软件非常重视您的隐私和个人信息保护。在您使用本软件之前，请认真阅读",
-    "_N$string": "欢迎使用本软件，本软件非常重视您的隐私和个人信息保护。在您使用本软件之前，请认真阅读",
+    "_string": "       欢迎使用本软件，本软件非常重视您的隐私和信息保护。使用本软件之前，请阅读",
+    "_N$string": "       欢迎使用本软件，本软件非常重视您的隐私和信息保护。使用本软件之前，请阅读",
     "_fontSize": 32,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -608,8 +610,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -178,
+        72.906,
+        -114.105,
         0,
         0,
         0,
@@ -1104,7 +1106,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -240,
+        -154.806,
         0,
         0,
         0,
@@ -1223,7 +1225,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -84,
+        -176.418,
         0,
         0,
         0,
@@ -1333,7 +1335,7 @@
       "ctor": "Float64Array",
       "array": [
         -157.5,
-        -140,
+        -119.824,
         0,
         0,
         0,
@@ -1601,11 +1603,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1630,7 +1632,7 @@
       "ctor": "Float64Array",
       "array": [
         157.5,
-        -140,
+        -119.824,
         0,
         0,
         0,
@@ -1773,10 +1775,13 @@
     "_components": [
       {
         "__id__": 49
+      },
+      {
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1788,8 +1793,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 50.4
+      "width": 182,
+      "height": 52.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1845,8 +1850,10 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -1859,6 +1866,24 @@
     "_id": ""
   },
   {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 32,
+      "g": 67,
+      "b": 182,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1883,7 +1908,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_id": ""

assets/script/game/data/module/MoreGameData.ts

@@ -112,9 +112,9 @@ export class MoreGameData extends Data {
      * @returns 下载任务
      */
     createNewTask(data): DownloadTaskClazz {
-        let name = data.nebulaAppId + ".apk"
-        let url = data.downloadUrl
-        let packageName = data.packageName
+        let name = data.nebulaAppId;
+        let url = data.downloadUrl;
+        let packageName = data.packageName;
 
         if (packageName != "") {
             let isExist = JsbSystem.ifCanStartGame(packageName, true)

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

@@ -93,7 +93,7 @@ export default class Login extends cc.Component {
         await this.getForceVersionInfo();
         console.log("===[Login] checkHotUpdate ", gData.appData.needForceUpdate);
         if (gData.appData.needForceUpdate === 1) {
-
+            this.updateState = UpdateState.UpdateFinish;
         }
         else {
 
@@ -105,38 +105,28 @@ export default class Login extends cc.Component {
 
         console.log("===[Login] getForceVersionInfo发送请求整包更新")
         mk.console.log("===[Login] getForceVersionInfo", gData.loginData.uin, gData.loginData.sessionKey);
-        let data: any = {
-            "appId": gData.appData.appId,
-            'channel': gData.appData.tfChannel,
-            'version': gData.appData.appVersion,
-        }
+        // let data: any = {
+        //     "appId": gData.appData.appId,
+        //     'channel': gData.appData.tfChannel,
+        //     'version': gData.appData.appVersion,
+        // }
         mk.console.log("===[Login] getForceVersionInfo appId", gData.appData.appId);
         mk.console.log("===[Login] getForceVersionInfo channel", gData.appData.tfChannel);
         mk.console.log("===[Login] getForceVersionInfo version", gData.appData.appVersion);
-        // let data :any = {
-        //     "appId": "wxcf31f0e54f7fefda",
-        //     "channel": "1",
-        //     "version": "1.0.1"
-        // }
-     
-
-        // data.timestamp = Math.floor(new Date().getTime() * 0.001)
-        // data.appVersion = gData.appData.appVersion;
-        // data.tfChannel = gData.appData.tfChannel;
-        // data.versioncfg = gData.appData.version;
+        let data: any = {
+            "appId": "wxcf31f0e54f7fefda",
+            "channel": "1",
+            "version": "1.0.0"
+        }
 
-        // let encode = mk.encrypt.encrypt(JSON.stringify(data), gData.loginData.sessionKey, gData.loginData.sessionKey);
-        // let bodyData = {
-        //     "uin": gData.loginData.uin,
-        //     "encrypt": data
-        // }
         let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)
-        mk.console.logSingle("===[Login] getForceVersionInfo response", response);
-        gData.appData.needForceUpdate = response.isForceUpdate;
-        gData.appData.installVersion = response.version;
-        gData.appData.installUrl = response.downloadAddress;
-        gData.appData.updateDes = response.versionRemark;
-        gData.appData.fixDes = response.bugRestoreRemark;
+        // mk.console.logSingle("===[Login] getForceVersionInfo response", response);
+        gData.appData.needForceUpdate = response.data.isForceUpdate;
+        gData.appData.installVersion = response.data.version;
+        gData.appData.installUrl = response.data.downloadAddress;
+        gData.appData.updateDes = response.data.versionRemark;
+        gData.appData.fixDes = response.data.bugRestoreRemark;
+        mk.console.log("===[Login] gData.appData.needForceUpdate", gData.appData.needForceUpdate, response.data.isForceUpdate);
     }
 
     //热更新-----------------------------------------------------------------

assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -30,7 +30,6 @@ export default class MoreGameNormalItem extends cc.Component {
     @property(cc.Node)
     spRed: cc.Node = null;
 
-    private bData = null;
     private data = null
 
     /**
@@ -42,8 +41,11 @@ export default class MoreGameNormalItem extends cc.Component {
             return;
         }
 
-        this.bData = bData;
-        this.data = bData.item_data;
+        this.setInfo(bData.item_data)
+    }
+
+    setInfo(data) {
+        this.data = data;
         cc.loader.load(this.data.icon, (err, res) => {
             if (err) {
                 console.log('err:', err);
@@ -64,7 +66,7 @@ export default class MoreGameNormalItem extends cc.Component {
                 this.btnDown.active = false
                 this.btnOpen.active = true
             } else {
-                if (JsbSystem.isFileExist(this.data.nebulaAppId + ".apk")) {
+                if (JsbSystem.isFileExist(this.data.nebulaAppId)) {
                     this.btnDown.active = false
                     this.btnOpen.active = true
                 } else {
@@ -129,10 +131,10 @@ export default class MoreGameNormalItem extends cc.Component {
                 // LogUtil.logV("showDownloadProgress", "three")
                 this.progressLabel.string = ((info.progress / info.totalBytesReceives) * 100).toFixed(1) + "%"
             } else {
-                this.setItemData(this.bData)
+                this.setInfo(this.data)
             }
         } else {
-            this.setItemData(this.bData)
+            this.setInfo(this.data)
         }
     }
 }

assets/script/game/module/moreGame/MoreGamePicItem.ts

@@ -53,7 +53,7 @@ export default class MoreGamePicItem extends cc.Component {
                 this.spRed.active = false
                 this.btnStart.active = true
             } else {
-                if (JsbSystem.isFileExist(data.nebulaAppId + ".apk")) {
+                if (JsbSystem.isFileExist(data.nebulaAppId)) {
                     //安装
                     this.spRed.active = false
                     this.btnStart.active = true

assets/script/mk/system/JsbSystem.ts

@@ -1,5 +1,3 @@
-import { StorageKey } from "../../game/data/StorageData";
-
 /**
  * Jsb管理类(与安卓Java类或者IOS交互)
  * @description
@@ -43,7 +41,8 @@ export default class JsbSystem {
      * @param parameters      参数：是java方法需要传入的参数（可以多个，与methodSignature中（）内的数量和类型一一对应）
      */
     public static callStaticMethod(path: string, methodName: string, methodSignature: string, ...parameters: any): any {
-        jsb.reflection.callStaticMethod(path, methodName, methodSignature, ...parameters);
+        let value = jsb.reflection.callStaticMethod(path, methodName, methodSignature, ...parameters);
+        return value;
     }
 
     /**
@@ -76,9 +75,9 @@ export default class JsbSystem {
     public static getDeviceInfo() {
         let deviceInfo = "";
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-          deviceInfo =  this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
-          console.log("===[JsbSystem] getDeviceInfo ",deviceInfo);
-          return deviceInfo;
+            deviceInfo = this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
+            console.log("===[JsbSystem] getDeviceInfo ", deviceInfo);
+            return deviceInfo;
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");
@@ -230,7 +229,7 @@ export default class JsbSystem {
      * @param apkName apkName
      */
     public static installApk(apkName: string) {
-        let fullPath = this.getWritablePath() + apkName;
+        let fullPath = this.getWritablePath() + apkName + ".apk";
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             this.callStaticMethod(this._JSB_ANDROID_PATH, "installApk", "(Ljava/lang/String;)V", fullPath);
         }
@@ -245,10 +244,11 @@ export default class JsbSystem {
      * @param start       如存在是否启动
      * @returns ifCan         
      */
-    static ifCanStartGame(packageName: string, start: boolean): boolean {
+    public static ifCanStartGame(packageName: string, start: boolean): boolean {
         let isCan = false;
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             isCan = this.callStaticMethod(this._JSB_ANDROID_PATH, "isStartGame", "(Ljava/lang/String;Z)Z", packageName, start);
+            return isCan;
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             isCan = this.callStaticMethod("GameConfig", "installApk:", "");

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" />

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>

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

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>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -250,10 +250,10 @@ public class AppActivity extends Cocos2dxActivity {
 
     public boolean checkStartApp(String pkg, boolean start){
         PackageManager packageManager = getPackageManager();
-        Intent intent=new Intent();
+        Intent intent = new Intent();
         intent.setPackage(null); // 加上这句代码
-        intent =packageManager.getLaunchIntentForPackage(pkg);
-        if(intent==null){
+        intent = packageManager.getLaunchIntentForPackage(pkg);
+        if(intent == null){
             return false;
         }else{
             if(start){

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -84,14 +84,14 @@ public class ThirdSdkMgr {
         //获取安卓版本
         String androidVersion = DevicesUtil.getSystemModel();
 
-        updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
+        //updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
 
         String param =  ANDROID_ID + "#" + "" + "#" + imei1 + "#" + mac + "#" + mOAID + "#" + BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL +
                 "#" + versionName + "#" + umengChannel + "#" + deviceType + "#" + androidVersion ;
         Log.d("===[ThridSdkMgr ",param);
 //        return param;
 
-        return  BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL;
+        return param;
     }
 
     /** 更新设备信息 */
@@ -133,12 +133,12 @@ public class ThirdSdkMgr {
     //安装apk相关 ----------------------------------------------------------------------------------
     /** 安装apk*/
     public static void installApk(String fileName){
-        appActivity.installApk(fileName);
+        ThirdSdkMgr.appActivity.installApk(fileName);
     }
 
     /** 启动apk*/
-    public static boolean isStartGame(String pkg,boolean start){
-        boolean isExist =  appActivity.checkStartApp(pkg,start);
+    public static boolean isStartGame(String pkg, boolean start){
+        boolean isExist = ThirdSdkMgr.appActivity.checkStartApp(pkg, start);
         return isExist;
     }
 }

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

@@ -36,9 +36,9 @@ 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_PASSWORD=123456
-RELEASE_KEY_ALIAS=debug_keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/mk_framework/keystore/eliminate.keystore
+RELEASE_STORE_PASSWORD=666888
+RELEASE_KEY_ALIAS=eliminate_1
 RELEASE_KEY_PASSWORD=123456
 
 android.injected.testOnly=false

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

@@ -7830,7 +7830,7 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = t("./view/uiItem/CellItem"), c = t("./data/Enum"), s = t("./mgr/PoolMgr"), l = t("./data/GameConst"), u = t("./util/GameLogic"), p = t("./view/effect/BonusTip"), d = t("./mgr/DataMgr"), h = t("./mgr/EffectMgr"), f = t("./mgr/GameMgr"), y = t("../game/data/GameData"), g = cc._decorator, _ = g.ccclass, m = g.property, v = function(t) {
+var r = t("./view/uiItem/CellItem"), c = t("./data/Enum"), s = t("./mgr/PoolMgr"), l = t("./data/GameConst"), u = t("./util/GameLogic"), p = t("./view/effect/BonusTip"), d = t("./mgr/DataMgr"), h = t("./mgr/EffectMgr"), f = t("./mgr/GameMgr"), y = t("../game/data/GameData"), g = t("../mk/system/JsbSystem"), _ = cc._decorator, m = _.ccclass, v = _.property, b = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -7919,7 +7919,7 @@ this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
 this.cellItemDic[0][2] && this.cellItemDic[0][2].onClick();
 this.cellItemDic[0][3] && this.cellItemDic[0][3].onClick();
 this.cellItemDic[0][4] && this.cellItemDic[0][4].onClick();
-} else if ("1_6" == t) {
+} else if ("1_7" == t) {
 this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
 this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
 }
@@ -8124,6 +8124,9 @@ e.prototype.onClickPauseBtn = function() {
 f.default.Inst.sendEvent(f.UI_NAME.Game, "点击暂停按钮");
 mk.ui.openPanel("game/prefab/uiPanel/PauseUI");
 };
+e.prototype.onClickShare = function() {
+gData.loginData.isAuth ? g.default.sharePic() : g.default.WxAuth();
+};
 e.prototype.onClickResetBtn = function() {
 f.default.Inst.sendEvent(f.UI_NAME.Game, "点击重置道具按钮");
 this.setCurSelectPropBtn(this.node_resetBtn);
@@ -8464,47 +8467,48 @@ for (var t = 0; t < 4; t++) this["btn_gameGetRed" + (t + 1)].active = gData.game
 };
 var n;
 e.Inst = null;
-a([ m(cc.Node) ], e.prototype, "node_bg", void 0);
-a([ m(cc.Node) ], e.prototype, "node_top", void 0);
-a([ m(cc.Label) ], e.prototype, "label_level", void 0);
-a([ m(cc.Node) ], e.prototype, "node_redPacketIcon", void 0);
-a([ m({
+a([ v(cc.Node) ], e.prototype, "node_bg", void 0);
+a([ v(cc.Node) ], e.prototype, "node_top", void 0);
+a([ v(cc.Label) ], e.prototype, "label_level", void 0);
+a([ v(cc.Node) ], e.prototype, "node_redPacketIcon", void 0);
+a([ v({
 type: cc.Node,
 displayName: "气泡红包1"
 }) ], e.prototype, "btn_gameGetRed1", void 0);
-a([ m({
+a([ v({
 type: cc.Node,
 displayName: "气泡红包2"
 }) ], e.prototype, "btn_gameGetRed2", void 0);
-a([ m({
+a([ v({
 type: cc.Node,
 displayName: "气泡红包3"
 }) ], e.prototype, "btn_gameGetRed3", void 0);
-a([ m({
+a([ v({
 type: cc.Node,
 displayName: "气泡红包3"
 }) ], e.prototype, "btn_gameGetRed4", void 0);
-a([ m(cc.Node) ], e.prototype, "node_content", void 0);
-a([ m(cc.Node) ], e.prototype, "node_cellBg", void 0);
-a([ m(cc.Node) ], e.prototype, "node_pauseBtn", void 0);
-a([ m(cc.Node) ], e.prototype, "node_progressUI", void 0);
-a([ m(cc.Sprite) ], e.prototype, "spr_progress", void 0);
-a([ m(cc.Node) ], e.prototype, "node_resetBtn", void 0);
-a([ m(cc.Label) ], e.prototype, "label_resetPropNum", void 0);
-a([ m(cc.Node) ], e.prototype, "node_hammerBtn", void 0);
-a([ m(cc.Label) ], e.prototype, "label_hammerPropNum", void 0);
-a([ m(cc.Node) ], e.prototype, "node_changeBtn", void 0);
-a([ m(cc.Label) ], e.prototype, "label_changePropNum", void 0);
-a([ m(cc.Node) ], e.prototype, "node_changeCellItemUI", void 0);
-a([ m(cc.Node) ], e.prototype, "node_effectUI", void 0);
-a([ m(cc.Node) ], e.prototype, "node_levelRedPacketUI", void 0);
-a([ m(cc.Node) ], e.prototype, "node_touchListenMask", void 0);
-return n = a([ _ ], e);
+a([ v(cc.Node) ], e.prototype, "node_content", void 0);
+a([ v(cc.Node) ], e.prototype, "node_cellBg", void 0);
+a([ v(cc.Node) ], e.prototype, "node_pauseBtn", void 0);
+a([ v(cc.Node) ], e.prototype, "node_progressUI", void 0);
+a([ v(cc.Sprite) ], e.prototype, "spr_progress", void 0);
+a([ v(cc.Node) ], e.prototype, "node_resetBtn", void 0);
+a([ v(cc.Label) ], e.prototype, "label_resetPropNum", void 0);
+a([ v(cc.Node) ], e.prototype, "node_hammerBtn", void 0);
+a([ v(cc.Label) ], e.prototype, "label_hammerPropNum", void 0);
+a([ v(cc.Node) ], e.prototype, "node_changeBtn", void 0);
+a([ v(cc.Label) ], e.prototype, "label_changePropNum", void 0);
+a([ v(cc.Node) ], e.prototype, "node_changeCellItemUI", void 0);
+a([ v(cc.Node) ], e.prototype, "node_effectUI", void 0);
+a([ v(cc.Node) ], e.prototype, "node_levelRedPacketUI", void 0);
+a([ v(cc.Node) ], e.prototype, "node_touchListenMask", void 0);
+return n = a([ m ], e);
 }(cc.Component);
-n.default = v;
+n.default = b;
 cc._RF.pop();
 }, {
 "../game/data/GameData": "GameData",
+"../mk/system/JsbSystem": "JsbSystem",
 "./data/Enum": "Enum",
 "./data/GameConst": "GameConst",
 "./mgr/DataMgr": "DataMgr",
@@ -10558,7 +10562,8 @@ return jsb.fileUtils.getWritablePath();
 };
 t.callStaticMethod = function(t, e, n) {
 for (var i, a = [], r = 3; r < arguments.length; r++) a[r - 3] = arguments[r];
-(i = jsb.reflection).callStaticMethod.apply(i, o([ t, e, n ], a));
+var c = (i = jsb.reflection).callStaticMethod.apply(i, o([ t, e, n ], a));
+return c;
 };
 t.backTest = function() {};
 t.updateDeviceInfo = function(t) {
@@ -10627,12 +10632,13 @@ t.setAppVersion = function() {
 cc.sys.os == cc.sys.OS_ANDROID || (cc.sys.os, cc.sys.OS_IOS);
 };
 t.installApk = function(t) {
-var e = this.getWritablePath() + t;
+var e = this.getWritablePath() + t + ".apk";
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "installApk", "(Ljava/lang/String;)V", e) : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("GameConfig", "installApk:", "");
 };
 t.ifCanStartGame = function(t, e) {
 var n = !1;
-cc.sys.os == cc.sys.OS_ANDROID ? n = this.callStaticMethod(this._JSB_ANDROID_PATH, "isStartGame", "(Ljava/lang/String;Z)Z", t, e) : cc.sys.os == cc.sys.OS_IOS && (n = this.callStaticMethod("GameConfig", "installApk:", ""));
+if (cc.sys.os == cc.sys.OS_ANDROID) return this.callStaticMethod(this._JSB_ANDROID_PATH, "isStartGame", "(Ljava/lang/String;Z)Z", t, e);
+cc.sys.os == cc.sys.OS_IOS && (n = this.callStaticMethod("GameConfig", "installApk:", ""));
 return n;
 };
 t.setTAEventRegister = function() {
@@ -12529,7 +12535,7 @@ return [ 2 ];
 });
 };
 e.prototype.createNewTask = function(t) {
-var n = this, o = t.nebulaAppId + ".apk", i = t.downloadUrl, a = t.packageName;
+var n = this, o = t.nebulaAppId, i = t.downloadUrl, a = t.packageName;
 if ("" != a && s.default.ifCanStartGame(a, !0)) return null;
 if (s.default.isFileExist(o)) {
 s.default.installApk(o);
@@ -12798,17 +12804,21 @@ e.btnOpen = null;
 e.labName = null;
 e.labDes = null;
 e.spRed = null;
-e.bData = null;
 e.data = null;
 e.cool = !1;
 return e;
 }
 e.prototype.setItemData = function(t) {
 return r(this, void 0, void 0, function() {
-var e = this;
 return c(this, function() {
-this.bData = t;
-this.data = t.item_data;
+this.setInfo(t.item_data);
+return [ 2 ];
+});
+});
+};
+e.prototype.setInfo = function(t) {
+var e = this;
+this.data = t;
 cc.loader.load(this.data.icon, function(t, n) {
 if (t) console.log("err:", t); else if (cc.isValid(e.iconNode)) {
 var o = n;
@@ -12821,7 +12831,7 @@ this.spRed.active = !1;
 if (1 == this.data.appType) if (s.default.ifCanStartGame(this.data.packageName, !1)) {
 this.btnDown.active = !1;
 this.btnOpen.active = !0;
-} else if (s.default.isFileExist(this.data.nebulaAppId + ".apk")) {
+} else if (s.default.isFileExist(this.data.nebulaAppId)) {
 this.btnDown.active = !1;
 this.btnOpen.active = !0;
 } else {
@@ -12834,9 +12844,6 @@ e.showDownloadProgress();
 this.btnDown.active = !1;
 this.btnOpen.active = !0;
 }
-return [ 2 ];
-});
-});
 };
 e.prototype.creatorDownLoadTask = function() {
 var t = this;
@@ -12853,7 +12860,7 @@ t.showDownloadProgress();
 };
 e.prototype.showDownloadProgress = function() {
 var t = gData.moreGame.getTaskInfo(this.data.nebulaAppId);
-null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setItemData(this.bData);
+null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setInfo(this.data);
 };
 a([ p(cc.Sprite) ], e.prototype, "iconNode", void 0);
 a([ p(cc.Label) ], e.prototype, "progressLabel", void 0);
@@ -12922,7 +12929,7 @@ this.labPro.string = "";
 if (1 == t.appType) if (r.default.ifCanStartGame(t.packageName, !1)) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
-} else if (r.default.isFileExist(t.nebulaAppId + ".apk")) {
+} else if (r.default.isFileExist(t.nebulaAppId)) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
 } else this.spRed.active = !0; else if (2 == t.appType) {

packages-hot-update/cfg.json

@@ -7,7 +7,7 @@
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
     ],
-    "buildTime": 1624887911852,
-    "genTime": 1624887911852,
+    "buildTime": 1624932437670,
+    "genTime": 1624932437670,
     "genVersion": null
 }