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

assets/script/game/game/Game.ts

@@ -35,6 +35,7 @@ export default class Game extends cc.Component {
         this.initMusic();
         this.initBtns();
         this.initQiPaos();
+        this.initInfo();
     }
 
     private initMusic() {
@@ -55,6 +56,11 @@ export default class Game extends cc.Component {
         cc.tween(this.btn_getRed3).delay(0.6).to(2, { y: -50 }).to(2, { y: -150 }).union().repeatForever().start();
     }
 
+    private initInfo(){
+        this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
+        this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+    }
+
     //测试道具获取效果
     private testFly() {
         mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));

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

@@ -2765,7 +2765,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../../data/AdData"), l = t("../../../data/module/CashProData"), u = cc._decorator, p = u.ccclass, d = u.property, h = function(t) {
+var s = t("../../data/AdData"), l = t("../../data/module/CashProData"), 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;
@@ -3001,8 +3001,8 @@ return r([ p ], e);
 n.default = h;
 cc._RF.pop();
 }, {
-"../../../data/AdData": "AdData",
-"../../../data/module/CashProData": "CashProData"
+"../../data/AdData": "AdData",
+"../../data/module/CashProData": "CashProData"
 } ],
 BtnClosePanel: [ function(t, e, n) {
 "use strict";
@@ -5578,16 +5578,17 @@ e.btn4 = null;
 e.btn5 = null;
 e.btn6 = null;
 e.btn7 = null;
+e.btn_redeem = null;
 return e;
 }
 e.prototype.onLoad = function() {};
 e.prototype.start = function() {};
 e.prototype.init = function() {
-for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) "0" == t[e] && (this["btn" + (e + 1)].active = "1" == t[e]);
+for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) this["btn" + (e + 1)].active = "1" == t[e];
 this.updateRedeem();
 };
 e.prototype.updateRedeem = function() {
-this.btn1.active = gData.redeem.showBtn;
+this.btn_redeem.active = gData.redeem.showBtn;
 };
 e.prototype.update = function() {
 if (gData.redeem.init_btnChange) {
@@ -5623,6 +5624,10 @@ r([ s({
 type: cc.Node,
 displayName: "常规提现"
 }) ], e.prototype, "btn7", void 0);
+r([ s({
+type: cc.Node,
+displayName: "福利礼包"
+}) ], e.prototype, "btn_redeem", void 0);
 return r([ c ], e);
 }(cc.Component);
 n.default = l;
@@ -6073,6 +6078,7 @@ e.prototype.start = function() {
 this.initMusic();
 this.initBtns();
 this.initQiPaos();
+this.initInfo();
 };
 e.prototype.initMusic = function() {
 mk.audio.playMusic("bgm");
@@ -6097,6 +6103,10 @@ y: -50
 y: -150
 }).union().repeatForever().start();
 };
+e.prototype.initInfo = function() {
+this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
+this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+};
 e.prototype.testFly = function() {
 mk.fly.PlayCoinAnim(1, 20, cc.v2(0, -300), cc.v2(0, 0));
 };
@@ -8033,7 +8043,7 @@ return [ 4, mk.http.sendData("/fission/recommendList", t) ];
 
 case 1:
 if (0 != (e = n.sent()).errcode) return [ 2 ];
-this.moreGameList(e.data);
+this.moreGameList = e.data;
 return [ 3, 3 ];
 
 case 2:
@@ -8287,7 +8297,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("../../../mk/system/JsbSystem"), 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;
@@ -8362,7 +8372,7 @@ return r([ u ], e);
 n.default = d;
 cc._RF.pop();
 }, {
-"../../../../mk/system/JsbSystem": "JsbSystem"
+"../../../mk/system/JsbSystem": "JsbSystem"
 } ],
 MoreGamePicItem: [ function(t, e, n) {
 "use strict";
@@ -8389,7 +8399,7 @@ return r > 3 && a && Object.defineProperty(e, n, a), a;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var a = t("../../../../mk/system/JsbSystem"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
+var a = t("../../../mk/system/JsbSystem"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -8453,7 +8463,7 @@ return r([ s ], e);
 n.default = u;
 cc._RF.pop();
 }, {
-"../../../../mk/system/JsbSystem": "JsbSystem"
+"../../../mk/system/JsbSystem": "JsbSystem"
 } ],
 MoreGamePopNode: [ function(t, e, n) {
 "use strict";
@@ -8480,7 +8490,7 @@ return r > 3 && a && Object.defineProperty(e, n, a), a;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var a = t("../../../../mk/system/JsbSystem"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
+var a = t("../../../mk/system/JsbSystem"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -8530,7 +8540,7 @@ return r([ s ], e);
 n.default = u;
 cc._RF.pop();
 }, {
-"../../../../mk/system/JsbSystem": "JsbSystem"
+"../../../mk/system/JsbSystem": "JsbSystem"
 } ],
 MoreGame: [ function(t, e, n) {
 "use strict";
@@ -9995,7 +10005,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("../../../mk/system/JsbSystem"), 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;
@@ -10043,7 +10053,7 @@ return r([ u ], e);
 n.default = d;
 cc._RF.pop();
 }, {
-"../../../../mk/system/JsbSystem": "JsbSystem"
+"../../../mk/system/JsbSystem": "JsbSystem"
 } ],
 RedBagCode: [ function(t, e, n) {
 "use strict";
@@ -10800,7 +10810,7 @@ return r > 3 && a && Object.defineProperty(e, n, a), a;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var a = t("../../../data/AdData"), c = t("../../../data/GameData"), s = cc._decorator, l = s.ccclass, u = s.property, p = function(t) {
+var a = t("../../data/AdData"), c = t("../../data/GameData"), s = cc._decorator, l = s.ccclass, u = s.property, p = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -10940,8 +10950,8 @@ return r([ l ], e);
 n.default = p;
 cc._RF.pop();
 }, {
-"../../../data/AdData": "AdData",
-"../../../data/GameData": "GameData"
+"../../data/AdData": "AdData",
+"../../data/GameData": "GameData"
 } ],
 RopeSwung: [ function(t, e, n) {
 "use strict";
@@ -11483,7 +11493,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../../../mk/system/JsbSystem"), l = t("./Rule"), u = cc._decorator, p = u.ccclass, d = u.property, h = function(t) {
+var s = t("../../../mk/system/JsbSystem"), l = t("./Rule"), 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;
@@ -11608,7 +11618,7 @@ return r([ p ], e);
 n.default = h;
 cc._RF.pop();
 }, {
-"../../../../mk/system/JsbSystem": "JsbSystem",
+"../../../mk/system/JsbSystem": "JsbSystem",
 "./Rule": "Rule"
 } ],
 SignData: [ function(t, e, n) {
@@ -11879,7 +11889,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s, l = t("../../../data/GameData"), u = cc._decorator, p = u.ccclass, d = u.property, h = function(t) {
+var s, l = t("../../data/GameData"), 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;
@@ -11972,7 +11982,7 @@ t[t.cash = "#2AB718"] = "cash";
 })(s || (s = {}));
 cc._RF.pop();
 }, {
-"../../../data/GameData": "GameData"
+"../../data/GameData": "GameData"
 } ],
 SignItem: [ function(t, e, n) {
 "use strict";
@@ -12184,7 +12194,7 @@ return r > 3 && a && Object.defineProperty(e, n, a), a;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var a = t("../../../data/AdData"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
+var a = t("../../data/AdData"), c = cc._decorator, s = c.ccclass, l = c.property, u = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -12246,7 +12256,7 @@ return r([ s ], e);
 n.default = u;
 cc._RF.pop();
 }, {
-"../../../data/AdData": "AdData"
+"../../data/AdData": "AdData"
 } ],
 StorageData: [ function(t, e, n) {
 "use strict";
@@ -13763,7 +13773,7 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../../component/BtnClosePanel"), l = t("../../../data/AdData"), u = t("./TurnableItem"), p = cc._decorator, d = p.ccclass, h = p.property, f = function(t) {
+var s = t("../../component/BtnClosePanel"), l = t("../../data/AdData"), u = t("./TurnableItem"), p = cc._decorator, d = p.ccclass, h = p.property, f = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -13842,8 +13852,8 @@ return r([ d ], e);
 n.default = f;
 cc._RF.pop();
 }, {
-"../../../component/BtnClosePanel": "BtnClosePanel",
-"../../../data/AdData": "AdData",
+"../../component/BtnClosePanel": "BtnClosePanel",
+"../../data/AdData": "AdData",
 "./TurnableItem": "TurnableItem"
 } ],
 TweenCast: [ function(t, e, n) {