Commit 7384c513 authored by haiyoucuv's avatar haiyoucuv

1

parent ecd4fc12
...@@ -21707,10 +21707,10 @@ var PlayScene = (function (_super) { ...@@ -21707,10 +21707,10 @@ var PlayScene = (function (_super) {
} }
else { else {
this.enableMouseEvt(true); this.enableMouseEvt(true);
if (this.chapter == 1 && Tools_1.Tools.baseInfo.isFirstLogin) { if (this.chapter == 1 && Tools_1.Tools.globalData.isFirstLogin) {
this.addChild(new FirstPropGift_1.FirstPropGift()) this.addChild(new FirstPropGift_1.FirstPropGift())
.once(FYGE.MouseEvent.CLICK, function (e) { .once(FYGE.MouseEvent.CLICK, function (e) {
Tools_1.Tools.baseInfo.isFirstLogin = false; Tools_1.Tools.globalData.isFirstLogin = false;
_this.removeChild(e.target); _this.removeChild(e.target);
_this.initGuide(); _this.initGuide();
}, this); }, this);
...@@ -24401,9 +24401,9 @@ var MapScene = (function (_super) { ...@@ -24401,9 +24401,9 @@ var MapScene = (function (_super) {
this.mapContainer = this.scrollPage.view.addChild(new Container()); this.mapContainer = this.scrollPage.view.addChild(new Container());
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if (Tools_1.Tools.baseInfo.loginAddPower && !Tools_1.Tools.baseInfo.isFirstLogin) { if (Tools_1.Tools.globalData.loginAddPower && !Tools_1.Tools.globalData.isFirstLogin) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel); ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
Tools_1.Tools.baseInfo.loginAddPower = false; Tools_1.Tools.globalData.loginAddPower = false;
} }
}; };
MapScene.prototype.updateMapCheck = function () { MapScene.prototype.updateMapCheck = function () {
...@@ -24411,7 +24411,7 @@ var MapScene = (function (_super) { ...@@ -24411,7 +24411,7 @@ var MapScene = (function (_super) {
if (this.data && this.data.from == 'loading') { if (this.data && this.data.from == 'loading') {
this.uiLayer = this.addChild(new MapUI_1.default()); this.uiLayer = this.addChild(new MapUI_1.default());
this.initMapByData(); this.initMapByData();
if (Tools_1.Tools.baseInfo.isFirstLogin) { if (Tools_1.Tools.globalData.isFirstLogin) {
this.initGuide(); this.initGuide();
} }
} }
...@@ -24427,7 +24427,6 @@ var MapScene = (function (_super) { ...@@ -24427,7 +24427,6 @@ var MapScene = (function (_super) {
MapScene.prototype.initGuide = function () { MapScene.prototype.initGuide = function () {
var guide = this.addChild(new Container()); var guide = this.addChild(new Container());
guide.y = -layers_1.layers.stageOffsetY; guide.y = -layers_1.layers.stageOffsetY;
guide.y = -layers_1.layers.stageOffsetY;
var g = guide.addChild(new Graphics()); var g = guide.addChild(new Graphics());
g.beginFill(0, 0.6); g.beginFill(0, 0.6);
g.drawRect(0, 0, 750, 1624); g.drawRect(0, 0, 750, 1624);
...@@ -24439,7 +24438,7 @@ var MapScene = (function (_super) { ...@@ -24439,7 +24438,7 @@ var MapScene = (function (_super) {
var guide_check = guide.addChild(new CheckBtn_1.default({ check: 1 })); var guide_check = guide.addChild(new CheckBtn_1.default({ check: 1 }));
guide_check.enabled = true; guide_check.enabled = true;
guide_check.type = CheckBtn_1.CHECK_TYPE.CUR; guide_check.type = CheckBtn_1.CHECK_TYPE.CUR;
guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y); guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y + 140 * layers_1.layers.stageOffsetY / 812);
guide_check.addChild(new MapAvatar()); guide_check.addChild(new MapAvatar());
var guide_hand = guide.addChild(Tools_1.Tools.getSprite('guide_hand.png')); var guide_hand = guide.addChild(Tools_1.Tools.getSprite('guide_hand.png'));
guide_hand.position.set(guide_check.x + 90, guide_check.y + 40); guide_hand.position.set(guide_check.x + 90, guide_check.y + 40);
...@@ -24467,7 +24466,6 @@ var MapScene = (function (_super) { ...@@ -24467,7 +24466,6 @@ var MapScene = (function (_super) {
MapScene.checkArr[i].type = CheckBtn_1.CHECK_TYPE.COM; MapScene.checkArr[i].type = CheckBtn_1.CHECK_TYPE.COM;
MapScene.checkArr[i].enabled = false; MapScene.checkArr[i].enabled = false;
} }
console.log(data.records);
if (!Array.isArray(data.records)) if (!Array.isArray(data.records))
data.records = []; data.records = [];
data.records.forEach(function (v) { data.records.forEach(function (v) {
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -101,7 +101,7 @@ export const SkinJson = { ...@@ -101,7 +101,7 @@ export const SkinJson = {
"alpha": 1, "alpha": 1,
"type": "text", "type": "text",
"props": { "props": {
"text": "太厉害了!获得抽奖资格!", "text": "太厉害了!获得奖励:",
"size": 34, "size": 34,
"fillColor": "#df5942", "fillColor": "#df5942",
"bold": true "bold": true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment