|
|
@@ -7119,7 +7119,7 @@ e.prototype.onLoad = function() {};
|
|
|
e.prototype.start = function() {
|
|
|
var t = this;
|
|
|
if (this.isDelayOneFrame) {
|
|
|
-r.scale && (this.effect_par.opacity = 0);
|
|
|
+r.scale === this.open_effect && (this.effect_par.opacity = 0);
|
|
|
cc.tween(this.effect_par).delay(.16).call(function() {
|
|
|
t.showEffect();
|
|
|
}).start();
|
|
|
@@ -17432,7 +17432,7 @@ e.prototype.checkPrivacy = function() {
|
|
|
};
|
|
|
e.prototype.setProgress = function(t) {
|
|
|
var e = t / 100;
|
|
|
-if (e > this.bar.fillRange) {
|
|
|
+if (this.bar && e > this.bar.fillRange) {
|
|
|
this.bar.fillRange = e;
|
|
|
this.lbl_progress.string = "加载中 " + t + "%";
|
|
|
}
|
|
|
@@ -25454,9 +25454,7 @@ e.lbl_value = null;
|
|
|
e.node_rule = null;
|
|
|
return e;
|
|
|
}
|
|
|
-e.prototype.onLoad = function() {
|
|
|
-this.initData();
|
|
|
-};
|
|
|
+e.prototype.onLoad = function() {};
|
|
|
e.prototype.start = function() {};
|
|
|
e.prototype.initData = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
@@ -25489,12 +25487,16 @@ return [ 4, mk.loader.load("module/gradeReward/texture/name" + gData.gameData.pl
|
|
|
case 3:
|
|
|
a.spriteFrame = r.sent();
|
|
|
console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
|
|
|
-return [ 4, mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null) ];
|
|
|
+return "" == gData.wechatData.avatar ? [ 3, 5 ] : [ 4, mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null) ];
|
|
|
|
|
|
case 4:
|
|
|
-i = r.sent();
|
|
|
+if (i = r.sent()) {
|
|
|
this.img_head.spriteFrame = new cc.SpriteFrame(i);
|
|
|
console.log("=== loadHead:", i);
|
|
|
+}
|
|
|
+r.label = 5;
|
|
|
+
|
|
|
+case 5:
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|