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

assets/script/game/game/Game.ts

@@ -70,7 +70,7 @@ export default class Game extends cc.Component {
         this.autoOpenPanel();
         this.runGuideWeak();
 
-        mk.guide.open(1);
+        // mk.guide.open(1);
         // // 测试代码
         // this.schedule(() => {
 
@@ -146,13 +146,13 @@ export default class Game extends cc.Component {
     }
 
     private changeInfo() {
-        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);
         // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
 
         const new_count = gData.gameData.gameData.piggyBank / 100;
         if (parseInt(this.lbl_rmb.string) == 0 && new_count != 0 || parseInt(this.lbl_rmb.string) != 0 && new_count == 0) {
             if (this.lbl_rmb.string != new_count.toFixed(2)) {
-                this.lbl_rmb.node.getComponent(mk.component.NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+                this.lbl_rmb.node.getComponent(mk.component.numberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
             }
         }
         gData.gameData.init_coin = false;

assets/script/game/module/cashPro/CashPro.ts

@@ -93,7 +93,7 @@ export default class CashPro extends cc.Component {
         console.log('tixianFail  ')
         this.loadPart.active = false
 
-        mk.ui.closePanel('module/cashPro/cashPro')
+        mk.ui.closePanel(this.node.name)
     }
 
     authBack() {

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

@@ -79,7 +79,7 @@ export default class ForceUpdate extends cc.Component {
 
     clickSkip() {
         mk.audio.playEffect(AUDIO_TYPE.button)
-        mk.ui.closePanel('module/forceUpdate/forceUpdate');
+        mk.ui.closePanel(this.node.name);
         gData.appData.updateState = UpdateState.ForceUpdateFinish;
     }
 

assets/script/game/module/sign/Sign.ts

@@ -109,12 +109,12 @@ export default class Sign extends cc.Component {
         if (gData.gameData.gameData.isSignInToday == 0 && gData.sign.haveSignDay()) {
             this.anim_btn.play();
             // this.anim_btn.getComponent(SetGray).setGray(false);
-            this.anim_btn.getComponent(mk.component.SetGray).setGray(false)
+            this.anim_btn.getComponent(mk.component.setGray).setGray(false)
         } else {
             this.anim_btn.stop();
             this.anim_btn.node.scale = 1;
             // this.anim_btn.getComponent('SetGray').setGray(true);
-            this.anim_btn.getComponent(mk.component.SetGray).setGray(true)
+            this.anim_btn.getComponent(mk.component.setGray).setGray(true)
         }
         gData.sign.init_data = false;
     }

assets/script/mk/system/MKSystem.ts

@@ -158,11 +158,11 @@ class MKSystem {
  */
 class comp_type {
     /** 置灰组件 */
-    get SetGray() {
+    get setGray() {
         return SetGray;
     }
     /** 置灰组件 */
-    get NumberAnim() {
+    get numberAnim() {
         return NumberAnim;
     }
 }

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

@@ -1,120 +1,26 @@
-window.__require = function t(e, o, r) {
-function n(c, l) {
-if (!o[c]) {
-if (!e[c]) {
-var a = c.split("/");
-a = a[a.length - 1];
-if (!e[a]) {
+(function r(e, n, t) {
+function i(u, f) {
+if (!n[u]) {
+if (!e[u]) {
+var _ = u.split("/");
+_ = _[_.length - 1];
+if (!e[_]) {
 var p = "function" == typeof __require && __require;
-if (!l && p) return p(a, !0);
-if (i) return i(a, !0);
-throw new Error("Cannot find module '" + c + "'");
+if (!f && p) return p(_, !0);
+if (o) return o(_, !0);
+throw new Error("Cannot find module '" + u + "'");
 }
-c = a;
+u = _;
 }
-var s = o[c] = {
+var a = n[u] = {
 exports: {}
 };
-e[c][0].call(s.exports, function(t) {
-return n(e[c][1][t] || t);
-}, s, s.exports, t, e, o, r);
+e[u][0].call(a.exports, function(r) {
+return i(e[u][1][r] || r);
+}, a, a.exports, r, e, n, t);
 }
-return o[c].exports;
+return n[u].exports;
 }
-for (var i = "function" == typeof __require && __require, c = 0; c < r.length; c++) n(r[c]);
-return n;
-}({
-DownLoadUI: [ function(t, e, o) {
-"use strict";
-cc._RF.push(e, "4cd23/2Uq9EU4w1e97Etnp0", "DownLoadUI");
-var r, n = this && this.__extends || (r = function(t, e) {
-return (r = Object.setPrototypeOf || {
-__proto__: []
-} instanceof Array && function(t, e) {
-t.__proto__ = e;
-} || function(t, e) {
-for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (t[o] = e[o]);
-})(t, e);
-}, function(t, e) {
-r(t, e);
-function o() {
-this.constructor = t;
-}
-t.prototype = null === e ? Object.create(e) : (o.prototype = e.prototype, new o());
-}), i = this && this.__decorate || function(t, e, o, r) {
-var n, i = arguments.length, c = i < 3 ? e : null === r ? r = Object.getOwnPropertyDescriptor(e, o) : r;
-if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) c = Reflect.decorate(t, e, o, r); else for (var l = t.length - 1; l >= 0; l--) (n = t[l]) && (c = (i < 3 ? n(c) : i > 3 ? n(e, o, c) : n(e, o)) || c);
-return i > 3 && c && Object.defineProperty(e, o, c), c;
-};
-Object.defineProperty(o, "__esModule", {
-value: !0
-});
-var c = t("../../../script/before/util/Util"), l = t("../../../script/mk/system/JsbSystem"), a = cc._decorator, p = a.ccclass, s = a.property, u = function(t) {
-n(e, t);
-function e() {
-var e = null !== t && t.apply(this, arguments) || this;
-e.skipToggle = null;
-e.labUpdate = null;
-e.labFix = null;
-e.btnSure = null;
-e.btnCancel = null;
-e.fileProgress = null;
-e.labPro = null;
-e.showToggle = !1;
-return e;
-}
-e.prototype.start = function() {
-this.setText();
-};
-e.prototype.init = function(t) {
-this.skipToggle.node.active = t;
-this.showToggle = t;
-t || (this.btnSure.y = -366);
-};
-e.prototype.clickDownLoad = function() {
-var t = this;
-mk.audio.playEffect("ef_button_click");
-this.btnSure.active = !1;
-this.btnCancel.active = !1;
-this.skipToggle.node.active = !1;
-this.fileProgress.node.parent.active = !0;
-var e = gData.appData.installUrl, o = e.split("/"), r = o[o.length - 1], n = c.default.checkHasApk(r);
-"" != n ? l.default.installApk(n) : l.default.downFile2Local(e, r, function(t) {
-l.default.installApk(t);
-}, function() {
-t.fileProgress.node.parent.active = !1;
-t.fileProgress.fillRange = 0;
-t.labPro.string = "0%";
-t.btnSure.active = !0;
-t.btnCancel.active = !0;
-t.skipToggle.node.active = t.showToggle;
-}, function(e, o, r) {
-var n = o / r;
-t.setPro(n);
-});
-};
-e.prototype.setPro = function(t) {
-this.labPro.string = Math.floor(100 * t) + "%";
-this.fileProgress.fillRange = t;
-};
-e.prototype.clickSkip = function() {};
-e.prototype.setText = function() {
-this.labUpdate.string = gData.appData.updateDes;
-this.labFix.string = gData.appData.fixDes;
-};
-i([ s(cc.Toggle) ], e.prototype, "skipToggle", void 0);
-i([ s(cc.Label) ], e.prototype, "labUpdate", void 0);
-i([ s(cc.Label) ], e.prototype, "labFix", void 0);
-i([ s(cc.Node) ], e.prototype, "btnSure", void 0);
-i([ s(cc.Node) ], e.prototype, "btnCancel", void 0);
-i([ s(cc.Sprite) ], e.prototype, "fileProgress", void 0);
-i([ s(cc.Label) ], e.prototype, "labPro", void 0);
-return i([ p ], e);
-}(cc.Component);
-o.default = u;
-cc._RF.pop();
-}, {
-"../../../script/before/util/Util": void 0,
-"../../../script/mk/system/JsbSystem": void 0
-} ]
-}, {}, [ "DownLoadUI" ]);
+for (var o = "function" == typeof __require && __require, u = 0; u < t.length; u++) i(t[u]);
+return i;
+})({}, {}, []);

packages-hot-update/cfg.json

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