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

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

assets/resources/module/cashNormal/cashNormal.prefab

@@ -1570,7 +1570,7 @@
     "_target": {
       "__id__": 2
     },
-    "_alignFlags": 1,
+    "_alignFlags": 5,
     "_left": 0,
     "_right": 0,
     "_top": 151.99699999999996,

assets/resources/module/moreGame/moreGame.prefab

@@ -27,17 +27,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 58
       },
       {
-        "__id__": 56
+        "__id__": 59
       },
       {
-        "__id__": 57
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -218,20 +218,23 @@
         "__id__": 7
       },
       {
-        "__id__": 19
+        "__id__": 22
       },
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 55
+      },
+      {
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -292,20 +295,20 @@
         "__id__": 8
       },
       {
-        "__id__": 13
+        "__id__": 12
+      },
+      {
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -356,7 +359,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "关闭按钮",
+    "_name": "node_bg",
     "_objFlags": 0,
     "_parent": {
       "__id__": 7
@@ -372,7 +375,144 @@
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 400
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -84.36500000000001,
+        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__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "eff0124b-bbfd-4aa6-a934-eb8c1bd87103"
+    },
+    "_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.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": -245.135,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "14a93b23-e3dc-45f3-b1e1-63266d0f6f12"
+    },
+    "fileId": "5cdi65hrtKC5ccso5p2ZXV",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -426,7 +566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -458,7 +598,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 12
     },
     "_enabled": true,
     "node_panel": {
@@ -467,7 +607,7 @@
     "transition_type": 0,
     "onComplete": [
       {
-        "__id__": 11
+        "__id__": 15
       }
     ],
     "_id": ""
@@ -504,11 +644,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -562,7 +702,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -601,38 +741,6 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "eff0124b-bbfd-4aa6-a934-eb8c1bd87103"
-    },
-    "_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.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -679,20 +787,20 @@
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 23
       },
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -746,27 +854,27 @@
     "_name": "moreGame_bg_item",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 22
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 24
       },
       {
-        "__id__": 24
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 30
       },
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -820,17 +928,17 @@
     "_name": "moreGame_icon_begin",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -884,7 +992,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -927,17 +1035,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -991,7 +1099,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1035,7 +1143,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -1067,7 +1175,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 23
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1105,27 +1213,27 @@
     "_name": "New ScrollView",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 22
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 41
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1179,24 +1287,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       },
       {
-        "__id__": 37
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1250,20 +1358,17 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 31
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
-      },
-      {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1313,38 +1418,11 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 32
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 5,
-    "_left": 90,
-    "_right": 90,
-    "_top": 5.000000000000028,
-    "_bottom": 1005,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 550,
-    "_originalHeight": 400,
-    "_id": ""
-  },
-  {
     "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 35
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1387,7 +1465,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1407,7 +1485,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 34
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1445,7 +1523,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "horizontal": false,
@@ -1457,10 +1535,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 32
+      "__id__": 35
     },
     "content": {
-      "__id__": 32
+      "__id__": 35
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1471,7 +1549,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "pre_item": [
@@ -1494,7 +1572,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1532,7 +1610,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1574,20 +1652,20 @@
     },
     "_children": [
       {
-        "__id__": 46
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 52
       },
       {
-        "__id__": 51
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1641,20 +1719,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 45
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 49
       },
       {
-        "__id__": 48
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1708,7 +1786,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1741,7 +1819,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1779,7 +1857,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -1811,7 +1889,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1872,6 +1950,16 @@
     "_id": ""
   },
   {
+    "__type__": "173866Ll/lFN6TBCxDmQuqC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1901,7 +1989,7 @@
     },
     "_enabled": true,
     "node_sv": {
-      "__id__": 30
+      "__id__": 33
     },
     "moreGameNormalNode": {
       "__uuid__": "0acc5eb1-6666-4231-8d4e-796b2a1c57e9"

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

@@ -1,7 +1,7 @@
 
 import { Data } from "../../../mk/data/Data";
 import JsbSystem from "../../../mk/system/JsbSystem";
-import { GameProp } from "../GameData";
+import { GameProp, RewardState } from "../GameData";
 /**
  * 红包提现数据
  * - 跨Index不可提现，提示：请按顺序提现。
@@ -26,6 +26,7 @@ export class RedBagCashData extends Data {
             });
             this.c_data = gData.gameData.configs.CashCfg;
             this.sortList();
+            this.initState();
             this.init_list = true;
         }
     }
@@ -81,6 +82,7 @@ export class RedBagCashData extends Data {
         mk.ui.openPanel('module/receiptNotice/receiptNotice');
 
         this.sortList();
+        this.initState();
         gData.cashNormal.getRecord();// 请求新的提现记录
 
     }
@@ -102,6 +104,42 @@ export class RedBagCashData extends Data {
         }
     }
 
+    /**
+     * 初始化状态
+     */
+    public initState() {
+        let total = gData.gameData.gameData.redMoney + 0;
+        const l_count = this.c_data.length;
+        for (let i = 0; i < l_count; i++) {
+            // 已提现
+            if (this.c_data[i].index < gData.redBagCash.cash_bar) {
+                this.c_data[i].state = RewardState.none;
+            } else {
+                total = this.itemAllowCash(total, this.c_data[i].type_value);
+                if (total > 0) {
+                    this.c_data[i].state = RewardState.unlock;
+                } else {
+                    this.c_data[i].state = RewardState.lock;
+                }
+            }
+        }
+    }
+
+    /**
+     * 当前红包币足够提现多少条
+     * @param total 兑换后的红包币数量，逐条递减
+     * @param type_value 条目要求的红包币数量
+     * @returns 
+     */
+    private itemAllowCash(total: number, type_value: number): number {
+        if (total >= type_value) {
+            total -= type_value;
+            return total;
+        } else {
+            return 0;
+        }
+    }
+
 
     /**
      * 获取条目，通过index
@@ -133,7 +171,8 @@ export class RedBagCashData extends Data {
                 money_type: id,
                 num: id,
                 moneyshow: id,
-                summoney: id
+                summoney: id,
+                state: 1
             };
             this.c_data.push(obj)
         }
@@ -167,6 +206,8 @@ export type CDataType = {
     money_type: number,
     num: number,
     moneyshow: number,
-    summoney: number
+    summoney: number,
+    /** 提现状态 - 客户端加 */
+    state: number,
 }
 

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

@@ -76,14 +76,11 @@ export default class Login extends cc.Component {
 
     /** 初始化 */
     public async init() {
-        //获取微信id
-        let wxAppId = JsbSystem.getWxAppId();
-        if (!!wxAppId) {
-            gData.appData.appId = wxAppId;
-        }
-
+        //获取appid 和 配置version
+        JsbSystem.getWxAppId();
         //获取设备信息
         JsbSystem.getDeviceInfo();
+        console.log('appversion   ', gData.appData.appVersion);
         //获取强根版本需要sessionkey
         gData.loginData.init();
         this.checkRemoveLocalHot();
@@ -95,9 +92,10 @@ export default class Login extends cc.Component {
     /** 新包覆盖安装后清除热更版本,重启 */
     checkRemoveLocalHot() {
         let currentVersion = mk.storage.getStorage('currentVersion');
+        mk.storage.setStorage('currentVersion', gData.appData.appVersion);
         if (currentVersion) {
-            mk.storage.setStorage('currentVersion', gData.appData.appVersion);
             let compareVer = Util.versionCompareHandle(currentVersion, gData.appData.appVersion)
+            console.log('compareVer  ', compareVer)
             if (compareVer < 0) {
                 // 热更新的储存路径，如果旧版本中有多个，可能需要记录在列表中，全部清理
                 var storagePath = localStorage.getItem('HotUpdateSearchPaths');

assets/script/game/module/redBagCash/RedBagCash.ts

@@ -26,6 +26,7 @@ export default class RedBagCash extends cc.Component {
 
     start() {
         gData.redBagCash.init_list = true;
+        gData.redBagCash.initState();
         // this.initMoney();
         // this.initScrollView();
     }

assets/script/game/module/redBagCash/RedBagCashItem.ts

@@ -1,3 +1,4 @@
+import { RewardState } from "../../data/GameData";
 import { CDataType } from "../../data/module/RedBagCashData";
 
 const { ccclass, property } = cc._decorator;
@@ -57,23 +58,21 @@ export default class RedBagCashItem extends cc.Component {
         rmb_value = rmb_value > 1 ? rmb_value : parseFloat(rmb_value.toFixed(2))
         this.lbl_rmb_value.string = rmb_value + '元';
 
-        if (this.item_data.index < gData.redBagCash.cash_bar) {
+        if (this.item_data.state === RewardState.none) {
             // 已提现
             this.node_none.active = true;
             this.node_lock.active = false;
             this.node_unlock.active = false;
-        } else {
-            // 可提现
-            if (gData.gameData.gameData.redMoney >= this.item_data.type_value) {
-                this.node_none.active = false;
-                this.node_lock.active = false;
-                this.node_unlock.active = true;
-            } else {
-                // 未达成
-                this.node_none.active = false;
-                this.node_lock.active = true;
-                this.node_unlock.active = false;
-            }
+        } else if (this.item_data.state === RewardState.lock) {
+            // 未达成
+            this.node_none.active = false;
+            this.node_lock.active = true;
+            this.node_unlock.active = false;
+        } else if (this.item_data.state === RewardState.unlock) {
+            // 已解锁
+            this.node_none.active = false;
+            this.node_lock.active = false;
+            this.node_unlock.active = true;
         }
     }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -19,7 +19,6 @@ export class ATRewardVideo extends zgSingleton {
     public ifWatchEnd: boolean = false;
 
     init() {
-
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
         this.ATRewardVideoJS.proxy = this;
         this.ATRewardVideoJS.init();
@@ -51,6 +50,8 @@ export class ATRewardVideo extends zgSingleton {
         if (this.reawardAdState == RewardAdState.Loading) {
             return;
         }
+
+        console.log("anythink === 加载激励视频广告 onload", RewardAdState[this.reawardAdState]);
         this.reawardAdState = RewardAdState.Loading;
         this.ATRewardVideoJS.loadAd("userIdKey", "userDataKey");
     }

assets/script/mk/system/JsbSystem.ts

@@ -77,7 +77,7 @@ export default class JsbSystem {
         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;
+            gData.appData.updateDeviceInfo(deviceInfo);
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");
@@ -104,19 +104,24 @@ export default class JsbSystem {
     }
 
     /** 
-     * 获取微信appid
+     * 获取appid 和 配置version
      * @description 自定义功能 CocosToJava
      * @returns     appid 
      */
     public static getWxAppId() {
-        let appid = "";
+        let unicodeStr = "";
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            appid = this.callStaticMethod(this._JSB_ANDROID_PATH, "getWxAppId", "()Ljava/lang/String;");
+            unicodeStr = this.callStaticMethod(this._JSB_ANDROID_PATH, "getWxAppId", "()Ljava/lang/String;");
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
-            appid = this.callStaticMethod("CsjAdReward", "getWxAppId", "",);
+            unicodeStr = this.callStaticMethod("CsjAdReward", "getWxAppId", "",);
+        }
+
+        let unicodeArr = unicodeStr.split(';');
+        if (!unicodeArr) {
+            gData.appData.appId = unicodeArr[0];
+            gData.appData.version = unicodeArr[1];
         }
-        return appid;
     }
 
     /**

build/jsb-link/.cocos-project.json

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "EasyEliminate",
-  "packageName": "com.aries.qsllx"
+  "packageName": "com.aries.qsllx.mz"
 }

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

@@ -33,8 +33,155 @@
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
-    <content url="file://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" />
@@ -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: androidx.multidex:multidex-instrumentation:2.0.0@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: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
@@ -333,6 +333,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="libcocos2dx" />
+    <orderEntry type="module" module-name="android-libcocos2dx" />
   </component>
 </module>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aries.qsllx"
+    package="com.aries.qsllx.mz"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -47,11 +47,11 @@
         </activity>
 
         <activity
-            android:name="com.aries.qsllx.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.mz.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx"
+            android:taskAffinity="com.aries.qsllx.mz"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -7,7 +7,7 @@ android {
     buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId "com.aries.qsllx"
+        applicationId "com.aries.qsllx.mz"
         minSdkVersion PROP_MIN_SDK_VERSION
         targetSdkVersion PROP_TARGET_SDK_VERSION
         versionCode 1
@@ -101,6 +101,7 @@ android {
             buildConfigField "String", "UM_SECRET", "${UM_SECRET}"
             buildConfigField "String", "WX_APP_ID", "${WX_APP_ID}"
             buildConfigField "String", "TOPON", "${TOPON}"
+            buildConfigField "String", "APP_CONFIG_CODE", "${APP_CONFIG_CODE}"
         }
 
         debug {
@@ -125,6 +126,7 @@ android {
             buildConfigField "String", "UM_SECRET", "${UM_SECRET}"
             buildConfigField "String", "WX_APP_ID", "${WX_APP_ID}"
             buildConfigField "String", "TOPON", "${TOPON}"
+            buildConfigField "String", "APP_CONFIG_CODE", "${APP_CONFIG_CODE}"
         }
 
     }

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

@@ -10,8 +10,9 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appid
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.1.4
-VERSION_CODE=9
+VERSION_NAME=1.0.0
+VERSION_CODE=1
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，全屏开屏
+APP_CONFIG_CODE="1.0.0";
 
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/wxapi/WXEntryActivity.java → build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/mz/wxapi/WXEntryActivity.java

@@ -1,4 +1,4 @@
-package com.aries.qsllx.wxapi;
+package com.aries.qsllx.mz.wxapi;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -14,8 +14,8 @@ import android.widget.Toast;
 
 //import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
 
-import com.aries.qsllx.BuildConfig;
-import com.aries.qsllx.R;
+import com.aries.qsllx.mz.BuildConfig;
+import com.aries.qsllx.mz.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;

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

@@ -1,22 +1,13 @@
 package org.cocos2dx.javascript.thirdSdk;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.util.Log;
 
 import org.cocos2dx.javascript.AppActivity;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
-import com.aries.qsllx.BuildConfig;
-import com.aries.qsllx.R;
-import com.aries.qsllx.wxapi.WXEntryActivity;
-import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
-import com.tencent.mm.opensdk.modelmsg.WXImageObject;
-import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.aries.qsllx.mz.BuildConfig;
+import com.aries.qsllx.mz.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 
@@ -87,31 +78,12 @@ public class ThirdSdkMgr {
         //获取安卓版本
         String androidVersion = DevicesUtil.getSystemModel();
 
-        //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 param;
     }
 
-    /** 更新设备信息 */
-    public static void updateDeviceInfo(final String android_id, final String idfa, final String imei, final String mac,
-                                        final String oaid, final String umid, final String versionName,
-                                        final String umengChannel, final String deviceType, final String androidVersion) {
-//        android_id, idfa, imei, mac, oaid, umid
-        appActivity.runOnGLThread(new Runnable() {
-            @Override
-            public void run() {
-                String param =  android_id + "#" + idfa + "#" + imei + "#" + mac + "#" + oaid + "#" + umid + "#" + BuildConfig.TF_CHANNEL +
-                        "#" + versionName + "#" + umengChannel + "#" + deviceType + "#" + androidVersion ;
-                Cocos2dxJavascriptJavaBridge.evalString(cocosJsbMgrName + "updateDeviceInfo('" + param + "');");
-            }
-        });
-    }
-
     /**获取广告配置*/
     public static String getAdvertisingChannel(){
         //Log.d("adadasdsad",BuildConfig.WX_APP_ID);
@@ -124,7 +96,7 @@ public class ThirdSdkMgr {
     /**获取微信appid*/
     public static String getWxAppId(){
 //        Log.d(">>>>> ", "getWXAppId: " + BuildConfig.WX_APP_ID);
-        return BuildConfig.WX_APP_ID;
+        return BuildConfig.WX_APP_ID + ";" + BuildConfig.APP_CONFIG_CODE;
     }
     public static void requestPermission() {
 
@@ -162,7 +134,6 @@ public class ThirdSdkMgr {
     }
 
 
-
     //安装apk相关 ----------------------------------------------------------------------------------
     /** 安装apk*/
     public static void installApk(String fileName){

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

@@ -1,15 +1,13 @@
 package org.cocos2dx.javascript.thirdSdk.umeng;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.qsllx.BuildConfig;
+import com.aries.qsllx.mz.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 
-import java.security.PublicKey;
 import java.util.HashMap;
 import java.util.Map;
 

build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist

@@ -11,7 +11,7 @@
     <key>CFBundleIcons~ipad</key>
     <dict/>
     <key>CFBundleIdentifier</key>
-    <string>com.aries.qsllx</string>
+    <string>com.aries.qsllx.mz</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.aries.qsllx</string>
+	<string>com.aries.qsllx.mz</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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

@@ -1184,6 +1184,7 @@ return this.ATRewardVideoJS.hasAdReady();
 e.prototype.loadAd = function() {
 console.log("anythink === 加载激励视频广告", a[this.reawardAdState]);
 if (this.reawardAdState != a.Loading) {
+console.log("anythink === 加载激励视频广告 onload", a[this.reawardAdState]);
 this.reawardAdState = a.Loading;
 this.ATRewardVideoJS.loadAd("userIdKey", "userDataKey");
 }
@@ -4969,7 +4970,7 @@ this.labMoney.string = "¥" + this.money;
 e.prototype.tixianFail = function() {
 console.log("tixianFail  ");
 this.loadPart.active = !1;
-mk.ui.closePanel("module/cashPro/cashPro");
+mk.ui.closePanel(this.node.name);
 };
 e.prototype.authBack = function() {
 this.btnAuth.active = !1;
@@ -6635,7 +6636,7 @@ this.fileProgress.fillRange = t;
 };
 e.prototype.clickSkip = function() {
 mk.audio.playEffect(l.AUDIO_TYPE.button);
-mk.ui.closePanel("module/forceUpdate/forceUpdate");
+mk.ui.closePanel(this.node.name);
 gData.appData.updateState = s.UpdateState.ForceUpdateFinish;
 };
 e.prototype.setText = function() {
@@ -8863,7 +8864,6 @@ this.initQiPaos();
 this.initInfo();
 this.autoOpenPanel();
 this.runGuideWeak();
-mk.guide.open(1);
 };
 e.prototype.update = function() {
 gData.gameData.init_coin && this.changeInfo();
@@ -8918,9 +8918,9 @@ this.lbl_rmb.string = t.toFixed(2);
 gData.gameData.init_coin = !1;
 };
 e.prototype.changeInfo = function() {
-this.lbl_redMoney.node.getComponent(mk.component.NumberAnim).setValue(gData.gameData.gameData.redMoney);
+this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.gameData.redMoney);
 var t = gData.gameData.gameData.piggyBank / 100;
-(0 == parseInt(this.lbl_rmb.string) && 0 != t || 0 != parseInt(this.lbl_rmb.string) && 0 == t) && this.lbl_rmb.string != t.toFixed(2) && this.lbl_rmb.node.getComponent(mk.component.NumberAnim).setValue(parseFloat(t.toFixed(2)), 2);
+(0 == parseInt(this.lbl_rmb.string) && 0 != t || 0 != parseInt(this.lbl_rmb.string) && 0 == t) && this.lbl_rmb.string != t.toFixed(2) && this.lbl_rmb.node.getComponent(mk.component.numberAnim).setValue(parseFloat(t.toFixed(2)), 2);
 gData.gameData.init_coin = !1;
 };
 e.prototype.initHead = function() {
@@ -10664,9 +10664,8 @@ var t = "";
 if (cc.sys.os == cc.sys.OS_ANDROID) {
 t = this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
 console.log("===[JsbSystem] getDeviceInfo ", t);
-return t;
-}
-cc.sys.os == cc.sys.OS_IOS ? this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "") : gData.appData.getDeviceInfoCompelete = !0;
+gData.appData.updateDeviceInfo(t);
+} else cc.sys.os == cc.sys.OS_IOS ? this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "") : gData.appData.getDeviceInfoCompelete = !0;
 };
 t.getPackageName = function() {
 var t = "";
@@ -10676,7 +10675,11 @@ return t;
 t.getWxAppId = function() {
 var t = "";
 cc.sys.os == cc.sys.OS_ANDROID ? t = this.callStaticMethod(this._JSB_ANDROID_PATH, "getWxAppId", "()Ljava/lang/String;") : cc.sys.os == cc.sys.OS_IOS && (t = this.callStaticMethod("CsjAdReward", "getWxAppId", ""));
-return t;
+var e = t.split(";");
+if (!e) {
+gData.appData.appId = e[0];
+gData.appData.version = e[1];
+}
 };
 t.getAdvertisingChannel = function() {
 var t = "";
@@ -11538,18 +11541,18 @@ this.lbl_progress.string = "加载不消耗流量 " + t + "%";
 };
 e.prototype.init = function() {
 return r(this, void 0, void 0, function() {
-var t;
-return c(this, function(e) {
-switch (e.label) {
+return c(this, function(t) {
+switch (t.label) {
 case 0:
-(t = l.default.getWxAppId()) && (gData.appData.appId = t);
+l.default.getWxAppId();
 l.default.getDeviceInfo();
+console.log("appversion   ", gData.appData.appVersion);
 gData.loginData.init();
 this.checkRemoveLocalHot();
 return [ 4, this.checkForceUpate() ];
 
 case 1:
-e.sent();
+t.sent();
 mk.audio.init();
 return [ 2 ];
 }
@@ -11558,17 +11561,19 @@ return [ 2 ];
 };
 e.prototype.checkRemoveLocalHot = function() {
 var t = mk.storage.getStorage("currentVersion");
-if (t) {
 mk.storage.setStorage("currentVersion", gData.appData.appVersion);
-if (s.default.versionCompareHandle(t, gData.appData.appVersion) < 0) {
-var e = localStorage.getItem("HotUpdateSearchPaths");
-if (e) {
-for (var n = JSON.parse(e), o = n.length - 2, i = 0; i < o; i++) {
-var a = n.shift();
-jsb.fileUtils.removeDirectory(a);
+if (t) {
+var e = s.default.versionCompareHandle(t, gData.appData.appVersion);
+console.log("compareVer  ", e);
+if (e < 0) {
+var n = localStorage.getItem("HotUpdateSearchPaths");
+if (n) {
+for (var o = JSON.parse(n), i = o.length - 2, a = 0; a < i; a++) {
+var r = o.shift();
+jsb.fileUtils.removeDirectory(r);
 }
 cc.sys.localStorage.removeItem("HotUpdateSearchPaths");
-jsb.fileUtils.setSearchPaths(n);
+jsb.fileUtils.setSearchPaths(o);
 cc.audioEngine.stopAll();
 cc.game.restart();
 }
@@ -11904,14 +11909,14 @@ configurable: !0
 return t;
 }(), I = function() {
 function t() {}
-Object.defineProperty(t.prototype, "SetGray", {
+Object.defineProperty(t.prototype, "setGray", {
 get: function() {
 return D.default;
 },
 enumerable: !1,
 configurable: !0
 });
-Object.defineProperty(t.prototype, "NumberAnim", {
+Object.defineProperty(t.prototype, "numberAnim", {
 get: function() {
 return P.default;
 },
@@ -14679,7 +14684,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.RedBagCashData = void 0;
-var c = t("../../../mk/data/Data"), s = t("../../../mk/system/JsbSystem"), l = function(t) {
+var c = t("../../../mk/data/Data"), s = t("../../../mk/system/JsbSystem"), l = t("../GameData"), u = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -14696,6 +14701,7 @@ for (var e in t) t[e] = parseInt(t[e]);
 });
 this.c_data = gData.gameData.configs.CashCfg;
 this.sortList();
+this.initState();
 this.init_list = !0;
 }
 };
@@ -14743,6 +14749,7 @@ gData.receiptNotice.receip_rmb = o.CashStatusList[0].amount;
 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
 mk.ui.openPanel("module/receiptNotice/receiptNotice");
 this.sortList();
+this.initState();
 gData.cashNormal.getRecord();
 return [ 2 ];
 }
@@ -14759,6 +14766,15 @@ e--;
 e++;
 }
 };
+e.prototype.initState = function() {
+for (var t = gData.gameData.gameData.redMoney + 0, e = this.c_data.length, n = 0; n < e; n++) if (this.c_data[n].index < gData.redBagCash.cash_bar) this.c_data[n].state = l.RewardState.none; else {
+t = this.itemAllowCash(t, this.c_data[n].type_value);
+this.c_data[n].state = t > 0 ? l.RewardState.unlock : l.RewardState.lock;
+}
+};
+e.prototype.itemAllowCash = function(t, e) {
+return t >= e ? t -= e : 0;
+};
 e.prototype.getItemDataByIndex = function(t) {
 for (var e = this.c_data.length, n = 0; n < e; n++) if (this.c_data[n].index === t) return this.c_data[n];
 };
@@ -14774,7 +14790,8 @@ delayVideoTimes: e,
 money_type: e,
 num: e,
 moneyshow: e,
-summoney: e
+summoney: e,
+state: 1
 };
 this.c_data.push(n);
 }
@@ -14786,11 +14803,12 @@ return !1;
 };
 return e;
 }(c.Data);
-n.RedBagCashData = l;
+n.RedBagCashData = u;
 cc._RF.pop();
 }, {
 "../../../mk/data/Data": "Data",
-"../../../mk/system/JsbSystem": "JsbSystem"
+"../../../mk/system/JsbSystem": "JsbSystem",
+"../GameData": "GameData"
 } ],
 RedBagCashItem: [ function(t, e, n) {
 "use strict";
@@ -14929,7 +14947,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = cc._decorator, l = s.ccclass, u = s.property, p = function(t) {
+var s = t("../../data/GameData"), l = cc._decorator, u = l.ccclass, p = l.property, d = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -14963,48 +14981,50 @@ this.lbl_red_value.string = "" + this.item_data.type_value;
 var e = this.item_data.money / 100;
 e = e > 1 ? e : parseFloat(e.toFixed(2));
 this.lbl_rmb_value.string = e + "元";
-if (this.item_data.index < gData.redBagCash.cash_bar) {
+if (this.item_data.state === s.RewardState.none) {
 this.node_none.active = !0;
 this.node_lock.active = !1;
 this.node_unlock.active = !1;
-} else if (gData.gameData.gameData.redMoney >= this.item_data.type_value) {
-this.node_none.active = !1;
-this.node_lock.active = !1;
-this.node_unlock.active = !0;
-} else {
+} else if (this.item_data.state === s.RewardState.lock) {
 this.node_none.active = !1;
 this.node_lock.active = !0;
 this.node_unlock.active = !1;
+} else if (this.item_data.state === s.RewardState.unlock) {
+this.node_none.active = !1;
+this.node_lock.active = !1;
+this.node_unlock.active = !0;
 }
 };
 e.prototype.clickCashOP = function() {
 this.item_data.index > gData.redBagCash.cash_bar + 1 ? mk.tip.pop("请按顺序提现") : gData.redBagCash.cashOP();
 };
-a([ u({
+a([ p({
 displayName: "已领取",
 type: cc.Node
 }) ], e.prototype, "node_none", void 0);
-a([ u({
+a([ p({
 displayName: "未达成",
 type: cc.Node
 }) ], e.prototype, "node_lock", void 0);
-a([ u({
+a([ p({
 displayName: "可领取",
 type: cc.Node
 }) ], e.prototype, "node_unlock", void 0);
-a([ u({
+a([ p({
 displayName: "红包数量",
 type: cc.Label
 }) ], e.prototype, "lbl_red_value", void 0);
-a([ u({
+a([ p({
 displayName: "毛币数量",
 type: cc.Label
 }) ], e.prototype, "lbl_rmb_value", void 0);
-return a([ l ], e);
+return a([ u ], e);
 }(cc.Component);
-n.default = p;
+n.default = d;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../data/GameData": "GameData"
+} ],
 RedBagCash: [ function(t, e, n) {
 "use strict";
 cc._RF.push(e, "e7d9eMVnCBChaITA71Rl9/B", "RedBagCash");
@@ -15046,6 +15066,7 @@ this.tableview = this.sroll_view.getComponent("TableView");
 };
 e.prototype.start = function() {
 gData.redBagCash.init_list = !0;
+gData.redBagCash.initState();
 };
 e.prototype.update = function() {
 if (gData.redBagCash.init_list) {
@@ -18090,11 +18111,11 @@ this.tableview.resetItemData(t, gData.sign.list_data[t]);
 e.prototype.initBtnStyle = function() {
 if (0 == gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
 this.anim_btn.play();
-this.anim_btn.getComponent(mk.component.SetGray).setGray(!1);
+this.anim_btn.getComponent(mk.component.setGray).setGray(!1);
 } else {
 this.anim_btn.stop();
 this.anim_btn.node.scale = 1;
-this.anim_btn.getComponent(mk.component.SetGray).setGray(!0);
+this.anim_btn.getComponent(mk.component.setGray).setGray(!0);
 }
 gData.sign.init_data = !1;
 };