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

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

@@ -92,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');

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

@@ -1105,11 +1105,10 @@ hasAdReady: function() {
 if (null != this.proxy) return !!ATRewardedVideoJSSDK.hasAdReady(this.placementID());
 },
 onRewardedVideoAdLoaded: function(t) {
-console.log("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + t + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdLoaded(t);
 },
 onRewardedVideoAdFailed: function(t, e) {
-console.log("AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + t + ", " + e + ")");
+ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + t + ", " + e + ")");
 null != this.proxy && this.proxy.onRewardedVideoAdFailed(t, e);
 },
 onRewardedVideoAdPlayStart: function(t, e) {
@@ -1252,35 +1251,35 @@ userDataKey: "media_ext",
 ATRewardedVideoListener: {
 developerCallback: null,
 onRewardedVideoAdLoaded: function(t) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded(" + t + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded(" + t + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdLoaded && null != this.developerCallback.onRewardedVideoAdLoaded && this.developerCallback.onRewardedVideoAdLoaded(t);
 },
 onRewardedVideoAdFailed: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdFailed && null != this.developerCallback.onRewardedVideoAdFailed && this.developerCallback.onRewardedVideoAdFailed(t, e);
 },
 onRewardedVideoAdPlayStart: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdPlayStart && null != this.developerCallback.onRewardedVideoAdPlayStart && this.developerCallback.onRewardedVideoAdPlayStart(t, e);
 },
 onRewardedVideoAdPlayEnd: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdPlayEnd && null != this.developerCallback.onRewardedVideoAdPlayEnd && this.developerCallback.onRewardedVideoAdPlayEnd(t, e);
 },
 onRewardedVideoAdPlayFailed: function(t, e, n) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed(" + t + ", " + n + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed(" + t + ", " + n + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdPlayFailed && null != this.developerCallback.onRewardedVideoAdPlayFailed && this.developerCallback.onRewardedVideoAdPlayFailed(t, e, n);
 },
 onRewardedVideoAdClosed: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdClosed && null != this.developerCallback.onRewardedVideoAdClosed && this.developerCallback.onRewardedVideoAdClosed(t, e);
 },
 onRewardedVideoAdPlayClicked: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onRewardedVideoAdPlayClicked && null != this.developerCallback.onRewardedVideoAdPlayClicked && this.developerCallback.onRewardedVideoAdPlayClicked(t, e);
 },
 onReward: function(t, e) {
-console.log("ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward(" + t + ", " + e + ")");
+ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward(" + t + ", " + e + ")");
 null != this.developerCallback && null != this.developerCallback.onReward && null != this.developerCallback.onReward && this.developerCallback.onReward(t, e);
 }
 },
@@ -1395,6 +1394,7 @@ n = e;
 e.prototype.initSDK = function() {
 if (cc.sys.isNative) {
 this.getAdvertiseChannel();
+window.ATJSSDK.setLogDebug(!0);
 cc.ATSDKMgrJS.proxy = this;
 cc.ATSDKMgrJS.initATJSSDK(n.topon_android_appId, n.topon_android_appSecret);
 d.ATRewardVideo.getInstance().init();
@@ -8864,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();
@@ -8919,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() {
@@ -11562,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();
 }
@@ -11908,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;
 },
@@ -14683,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;
@@ -14700,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;
 }
 };
@@ -14747,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 ];
 }
@@ -14763,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];
 };
@@ -14778,7 +14790,8 @@ delayVideoTimes: e,
 money_type: e,
 num: e,
 moneyshow: e,
-summoney: e
+summoney: e,
+state: 1
 };
 this.c_data.push(n);
 }
@@ -14790,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";
@@ -14933,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;
@@ -14967,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");
@@ -15050,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) {
@@ -18094,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;
 };

packages-hot-update/cfg.json

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