整包更新修复

弹出奖励展示界面时不要弹互推插屏

assets/resources/module/setting/setting.prefab

@@ -2705,6 +2705,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -2951,6 +2952,7 @@
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [
@@ -3281,6 +3283,7 @@
     },
     "design_block_node": null,
     "bClickClose": false,
+    "onComplete": [],
     "_id": ""
   },
   {

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

@@ -196,7 +196,7 @@ export class MoreGameData extends Data {
 
     /** 弹出互推红包弹窗 */
     popMoreGamePopNode() {
-        if (mk.guide.isGuiding) {
+        if (mk.guide.isGuiding || mk.ui.getCurOnPanel('reward')) {
             return;
         }
 

assets/script/game/module/forceUpdate/ForceUpdate.ts

@@ -41,34 +41,38 @@ export default class ForceUpdate extends cc.Component {
         let arr = apkUrl.split('/')
         let apkName = arr[arr.length - 1]
 
-        let installUrl = Util.checkHasApk(apkName)
-        //已下载过
-        if (installUrl != '') {
-            JsbSystem.installApk(installUrl)
-        }
-        else {
-            //未下载过
-            JsbSystem.downFile2Local(apkUrl, apkName,
-                (locaPath) => {
-                    JsbSystem.installApk(locaPath)
-                },
-                (locaPath) => {
-                    let str = '下载失败，请检查网络后重试'
-                    mk.tip.pop(str);
-
-                    this.fileProgress.node.parent.active = false
-                    this.fileProgress.fillRange = 0
-                    this.labPro.string = '0%'
-
-                    this.btnSure.active = true
-                    this.btnCancel.active = true
-                },
-                (bytesReceived, totalBytesReceived, totalBytesExpected) => {
-                    let pro = totalBytesReceived / totalBytesExpected
-                    this.setPro(pro)
-                })
+        console.log('apkName  ', apkName)
+
+        let installUrl = apkName.replace('.apk', '');
+        if (JsbSystem.isFileExist(installUrl)) {
+            console.log('installUrl  ', installUrl)
+            //已下载过
+            JsbSystem.installApk(installUrl);
+            return null;
         }
 
+        //未下载过
+        JsbSystem.downFile2Local(apkUrl, apkName,
+            (locaPath) => {
+                setTimeout(() => {
+                    JsbSystem.installApk(installUrl)
+                }, 1)
+            },
+            (locaPath) => {
+                let str = '下载失败，请检查网络后重试'
+                mk.tip.pop(str);
+
+                this.fileProgress.node.parent.active = false
+                this.fileProgress.fillRange = 0
+                this.labPro.string = '0%'
+
+                this.btnSure.active = true
+                this.btnCancel.active = true
+            },
+            (bytesReceived, totalBytesReceived, totalBytesExpected) => {
+                let pro = totalBytesReceived / totalBytesExpected
+                this.setPro(pro)
+            })
     }
 
     //更新进度

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

@@ -131,9 +131,9 @@ export default class Login extends cc.Component {
     //发送请求整包更新
     public async getForceVersionInfo() {
         let data: any = {
-            "appId": "wxcf31f0e54f7fefda",
-            "channel": "1",
-            "version": "1.0.0"
+            appId: gData.appData.appId,
+            channel: gData.appData.tfChannel,
+            version: gData.appData.appVersion
         }
 
         let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)

assets/script/game/module/setting/Setting.ts

@@ -38,6 +38,8 @@ export default class Setting extends cc.Component {
         console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
         this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
+        this.lbl_version.string = gData.appData.appVersion;
+        
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
@@ -47,6 +49,7 @@ export default class Setting extends cc.Component {
         let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
         console.log("=== loadHead:", result);
+
         // this.img_head.spriteFrame = result;
     }
 

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

@@ -7,11 +7,11 @@ android {
     buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId "com.aries.qsllx.mz"
+        applicationId PACKAGE_NAME
         minSdkVersion PROP_MIN_SDK_VERSION
         targetSdkVersion PROP_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
+        versionCode VERSION_CODE.toInteger()
+        versionName VERSION_NAME.toString()
         multiDexEnabled true
         ndk {
             abiFilters 'armeabi-v7a'
@@ -62,12 +62,10 @@ android {
     signingConfigs {
 
        release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
-            }
+           storeFile file(new File('./keystore/eliminate.keystore'))
+           storePassword RELEASE_STORE_PASSWORD
+           keyAlias RELEASE_KEY_ALIAS
+           keyPassword RELEASE_KEY_PASSWORD
         }
     }
 

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

@@ -13,6 +13,6 @@ PACKAGE_NAME=com.aries.qsllx.mz
 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";
+APP_CONFIG_CODE="1.0.0"
 
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"EasyEliminate-release.apk","fullName":"release","baseName":"release"},"path":"EasyEliminate-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"EasyEliminate-release.apk","fullName":"release","baseName":"release"},"path":"EasyEliminate-release.apk","properties":{}}]

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

@@ -6594,7 +6594,7 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = t("../../../before/util/Util"), c = t("../../../mk/system/JsbSystem"), s = t("../../data/AppData"), l = t("../../data/GameData"), u = cc._decorator, p = u.ccclass, d = u.property, h = function(t) {
+var r = t("../../../mk/system/JsbSystem"), c = t("../../data/AppData"), 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;
@@ -6615,9 +6615,18 @@ mk.audio.playEffect("ef_button_click");
 this.btnSure.active = !1;
 this.btnCancel.active = !1;
 this.fileProgress.node.parent.active = !0;
-var e = gData.appData.installUrl, n = e.split("/"), o = n[n.length - 1], i = r.default.checkHasApk(o);
-"" != i ? c.default.installApk(i) : c.default.downFile2Local(e, o, function(t) {
-c.default.installApk(t);
+var e = gData.appData.installUrl, n = e.split("/"), o = n[n.length - 1];
+console.log("apkName  ", o);
+var i = o.replace(".apk", "");
+if (r.default.isFileExist(i)) {
+console.log("installUrl  ", i);
+r.default.installApk(i);
+return null;
+}
+r.default.downFile2Local(e, o, function() {
+setTimeout(function() {
+r.default.installApk(i);
+}, 1);
 }, function() {
 mk.tip.pop("下载失败，请检查网络后重试");
 t.fileProgress.node.parent.active = !1;
@@ -6635,26 +6644,25 @@ this.labPro.string = Math.floor(100 * t) + "%";
 this.fileProgress.fillRange = t;
 };
 e.prototype.clickSkip = function() {
-mk.audio.playEffect(l.AUDIO_TYPE.button);
+mk.audio.playEffect(s.AUDIO_TYPE.button);
 mk.ui.closePanel(this.node.name);
-gData.appData.updateState = s.UpdateState.ForceUpdateFinish;
+gData.appData.updateState = c.UpdateState.ForceUpdateFinish;
 };
 e.prototype.setText = function() {
 this.labUpdate.string = gData.appData.updateDes;
 this.labFix.string = gData.appData.fixDes;
 };
-a([ d(cc.Label) ], e.prototype, "labUpdate", void 0);
-a([ d(cc.Label) ], e.prototype, "labFix", void 0);
-a([ d(cc.Node) ], e.prototype, "btnSure", void 0);
-a([ d(cc.Node) ], e.prototype, "btnCancel", void 0);
-a([ d(cc.Sprite) ], e.prototype, "fileProgress", void 0);
-a([ d(cc.Label) ], e.prototype, "labPro", void 0);
-return a([ p ], e);
+a([ p(cc.Label) ], e.prototype, "labUpdate", void 0);
+a([ p(cc.Label) ], e.prototype, "labFix", void 0);
+a([ p(cc.Node) ], e.prototype, "btnSure", void 0);
+a([ p(cc.Node) ], e.prototype, "btnCancel", void 0);
+a([ p(cc.Sprite) ], e.prototype, "fileProgress", void 0);
+a([ p(cc.Label) ], e.prototype, "labPro", void 0);
+return a([ u ], e);
 }(cc.Component);
-n.default = h;
+n.default = d;
 cc._RF.pop();
 }, {
-"../../../before/util/Util": "Util",
 "../../../mk/system/JsbSystem": "JsbSystem",
 "../../data/AppData": "AppData",
 "../../data/GameData": "GameData"
@@ -17259,6 +17267,7 @@ console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
 console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
 this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);
 this.lbl_nickname.string = gData.wechatData.nickName;
+this.lbl_version.string = gData.appData.appVersion;
 t = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
 e = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
 n = this.img_music;

packages-hot-update/cfg.json

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

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1624417441258,
+  "last-module-event-record-time": 1625031035708,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }