设置界面整包更新

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

@@ -1,3 +1,4 @@
+import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
 import Rule from "./Rule";
 
@@ -39,7 +40,7 @@ export default class Setting extends cc.Component {
         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);
@@ -76,7 +77,16 @@ export default class Setting extends cc.Component {
     }
 
     clickUpdate() {
+        mk.audio.playEffect("button");
 
+        let installVersion = gData.appData.installVersion
+        let compare = Util.versionCompareHandle(gData.appData.appVersion, installVersion)
+        if (compare < 0) {
+            mk.ui.openPanel('module/forceUpdate/forceUpdate');
+        }
+        else {
+            mk.tip.pop('当前已是最新版本')
+        }
     }
 
     /** 点击微信授权 */

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

@@ -10,8 +10,8 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appid
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.0.0
-VERSION_CODE=1
+VERSION_NAME=1.0.1
+VERSION_CODE=2
 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/release/output.json

@@ -1 +1 @@
-[{"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":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","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

@@ -9860,6 +9860,7 @@ return e;
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {
 if (null != gData.guideData.crtID) {
+this.reset();
 this.guides = gData.guideData.getGuidesByID(gData.guideData.crtID);
 this.crtStep = -1;
 this.nextStep();
@@ -9920,7 +9921,7 @@ if (null != n && null != o && null != i && null != a) if (0 == this.crtGuide.dis
 this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
 this.node_display.width = this.node.width;
 this.node_display.height = this.node.height;
-cc.tween(this.node_display).to(.1, {
+cc.tween(this.node_display).to(.2, {
 x: n,
 y: o,
 width: i,
@@ -9936,7 +9937,7 @@ this.node_bg.x = this.node_display.x = n;
 this.node_bg.y = this.node_display.y = o;
 this.node_display.width = this.node_display.height = this.node_bg.width = this.node_bg.height = 2 * this.node.height;
 var l = this.crtGuide.display_type;
-cc.tween(this.node_display).to(.1, {
+cc.tween(this.node_display).to(.2, {
 width: l,
 height: l
 }).start();
@@ -9945,7 +9946,8 @@ if (null != this.crtGuide.dialog_pos && this.crtGuide.dialog_pos.length > 0) {
 r = this.crtGuide.dialog_pos.split(":");
 for (var u = this.node_dialog.getComponent(cc.Widget), p = 0; p < this.widgets.length; p++) u[this.widgets[p]] = "" == r[p] ? null : parseInt(r[p]);
 } else {
-r = this.crtGuide.dialog_pos1.split(",");
+for (r = this.crtGuide.dialog_pos1.split(","), u = this.node_dialog.getComponent(cc.Widget), 
+p = 0; p < this.widgets.length; p++) u[this.widgets[p]] = null;
 this.node_dialog.x = n + parseInt(r[0]);
 this.node_dialog.y = o + parseInt(r[1]);
 }
@@ -11615,9 +11617,9 @@ return c(this, function(n) {
 switch (n.label) {
 case 0:
 t = {
-appId: "wxcf31f0e54f7fefda",
-channel: "1",
-version: "1.0.0"
+appId: gData.appData.appId,
+channel: gData.appData.tfChannel,
+version: gData.appData.appVersion
 };
 return [ 4, mk.http.sendRequest("getForceVersionInfo", "POST", JSON.stringify(t), !1, !1) ];
 
@@ -12717,7 +12719,7 @@ var t = mk.math.random(0, this.moreGameList.normal.length - 1);
 return this.moreGameList.normal[t];
 };
 e.prototype.popMoreGamePopNode = function() {
-mk.guide.isGuiding || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
+mk.guide.isGuiding || mk.ui.getCurOnPanel("reward") || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
 };
 e.prototype.popNodeGetRedBag = function() {
 return a(this, void 0, void 0, function() {
@@ -17238,7 +17240,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../../mk/system/JsbSystem"), l = cc._decorator, u = l.ccclass, p = l.property, d = function(t) {
+var s = t("../../../before/util/Util"), l = t("../../../mk/system/JsbSystem"), u = cc._decorator, p = u.ccclass, d = u.property, h = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -17294,7 +17296,7 @@ return [ 2 ];
 };
 e.prototype.clickCopy = function() {
 mk.audio.playEffect("button");
-s.default.setClipboard(gData.wechatData.unionid);
+l.default.setClipboard(gData.wechatData.unionid);
 mk.tip.pop("复制成功");
 };
 e.prototype.clickMusic = function() {
@@ -17335,11 +17337,15 @@ return [ 2 ];
 });
 });
 };
-e.prototype.clickUpdate = function() {};
+e.prototype.clickUpdate = function() {
+mk.audio.playEffect("button");
+var t = gData.appData.installVersion;
+s.default.versionCompareHandle(gData.appData.appVersion, t) < 0 ? mk.ui.openPanel("module/forceUpdate/forceUpdate") : mk.tip.pop("当前已是最新版本");
+};
 e.prototype.onClickWxAuth = function() {
 if (!gData.loginData.isAuth) {
 mk.ui.closePanel(this.node.name);
-s.default.WxAuth();
+l.default.WxAuth();
 this.onClickClose();
 }
 };
@@ -17357,35 +17363,36 @@ e.prototype.onClickClose = function() {
 mk.ad.destroyNativeAd();
 mk.ad.checkShowInterByChance();
 };
-a([ p({
+a([ d({
 type: cc.Sprite,
 displayName: "头像"
 }) ], e.prototype, "img_head", void 0);
-a([ p({
+a([ d({
 type: cc.Label,
 displayName: "昵称"
 }) ], e.prototype, "lbl_nickname", void 0);
-a([ p({
+a([ d({
 type: cc.Label,
 displayName: "ID"
 }) ], e.prototype, "lbl_id", void 0);
-a([ p({
+a([ d({
 type: cc.Sprite,
 displayName: "音乐开关"
 }) ], e.prototype, "img_music", void 0);
-a([ p({
+a([ d({
 type: cc.Sprite,
 displayName: "音效开关"
 }) ], e.prototype, "img_effect", void 0);
-a([ p({
+a([ d({
 type: cc.Label,
 displayName: "版本号"
 }) ], e.prototype, "lbl_version", void 0);
-return a([ u ], e);
+return a([ p ], e);
 }(cc.Component);
-n.default = d;
+n.default = h;
 cc._RF.pop();
 }, {
+"../../../before/util/Util": "Util",
 "../../../mk/system/JsbSystem": "JsbSystem"
 } ],
 SignData: [ function(t, e, n) {

packages-hot-update/cfg.json

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