Commit e39d71a6 authored by wjf's avatar wjf

1

parent 01b0d3b0
...@@ -11415,7 +11415,7 @@ var Tools = (function () { ...@@ -11415,7 +11415,7 @@ var Tools = (function () {
if (!data.isVisitSuccess) { if (!data.isVisitSuccess) {
ctrls_2.showPanel(FailedPanel_1.FailedPanel, data); ctrls_2.showPanel(FailedPanel_1.FailedPanel, data);
} }
else if (data.prize || data.tool) { else if (data.prize.image || data.tool.type) {
ctrls_2.showPanel(SuccessPrizePanel_1.SuccessPrizePanel, data); ctrls_2.showPanel(SuccessPrizePanel_1.SuccessPrizePanel, data);
} }
else { else {
...@@ -21369,6 +21369,56 @@ var FailedPanel = (function (_super) { ...@@ -21369,6 +21369,56 @@ var FailedPanel = (function (_super) {
exports.FailedPanel = FailedPanel; exports.FailedPanel = FailedPanel;
/***/ }),
/***/ "./src/panels/FreePowerPanel.ts":
/*!**************************************!*\
!*** ./src/panels/FreePowerPanel.ts ***!
\**************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var FreePowerPanel = (function (_super) {
__extends(FreePowerPanel, _super);
function FreePowerPanel() {
return _super !== null && _super.apply(this, arguments) || this;
}
Object.defineProperty(FreePowerPanel.prototype, "groupNames", {
get: function () { return ["FreePowerPanel"]; },
enumerable: true,
configurable: true
});
Object.defineProperty(FreePowerPanel.prototype, "skinName", {
get: function () { return "FreePowerPanel"; },
enumerable: true,
configurable: true
});
Object.defineProperty(FreePowerPanel.prototype, "closeBtns", {
get: function () {
return [this.closeBtn, this.acceptBtn];
},
enumerable: true,
configurable: true
});
return FreePowerPanel;
}(Panel_1.Panel));
exports.FreePowerPanel = FreePowerPanel;
/***/ }), /***/ }),
/***/ "./src/panels/JoinPanel.ts": /***/ "./src/panels/JoinPanel.ts":
...@@ -22238,7 +22288,7 @@ var SuccessPrizePanel = (function (_super) { ...@@ -22238,7 +22288,7 @@ var SuccessPrizePanel = (function (_super) {
this.starGroup.play(this.data.stars); this.starGroup.play(this.data.stars);
var propImg = this.prop.getChildByName('img'); var propImg = this.prop.getChildByName('img');
var propLabel = this.prop.getChildByName('label'); var propLabel = this.prop.getChildByName('label');
if (this.data.tool) { if (this.data.tool && this.data.tool.type) {
this.againBtn.visible = false; this.againBtn.visible = false;
this.goPrizeBtn.visible = false; this.goPrizeBtn.visible = false;
this.prizeImg.visible = false; this.prizeImg.visible = false;
...@@ -22260,7 +22310,7 @@ var SuccessPrizePanel = (function (_super) { ...@@ -22260,7 +22310,7 @@ var SuccessPrizePanel = (function (_super) {
break; break;
} }
} }
else if (this.data.prize) { else if (this.data.prize && this.data.prize.image) {
this.noPrizeAgainBtn.visible = false; this.noPrizeAgainBtn.visible = false;
this.prop.visible = false; this.prop.visible = false;
this.prizeImg.texture = Texture.fromUrl(this.data.prize.image); this.prizeImg.texture = Texture.fromUrl(this.data.prize.image);
...@@ -23139,10 +23189,8 @@ var PlayScene = (function (_super) { ...@@ -23139,10 +23189,8 @@ var PlayScene = (function (_super) {
this.settingBtn.position.set(618, 16); this.settingBtn.position.set(618, 16);
}; };
PlayScene.prototype.start = function (data) { PlayScene.prototype.start = function (data) {
var _this = this;
_super.prototype.start.call(this); _super.prototype.start.call(this);
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
this.chapter = 6;
this.chapterData = getChapter_1.getChapterData(this.chapter); this.chapterData = getChapter_1.getChapterData(this.chapter);
this.initTarget(); this.initTarget();
Tool_1.Tool.init(Tool_1.Tool.getColOddEven(this.chapterData.map.lattices), !!(this.passElements && this.passElements[ElementType_1.ElementType.LOLLIPOP])); Tool_1.Tool.init(Tool_1.Tool.getColOddEven(this.chapterData.map.lattices), !!(this.passElements && this.passElements[ElementType_1.ElementType.LOLLIPOP]));
...@@ -23173,11 +23221,6 @@ var PlayScene = (function (_super) { ...@@ -23173,11 +23221,6 @@ var PlayScene = (function (_super) {
} }
this.initSvgas(); this.initSvgas();
AiControl_1.AiControl.ins.init(this.lattices); AiControl_1.AiControl.ins.init(this.lattices);
var fun = function () {
RectsWaveAni_1.RectsWaveAni(_this.lattices, _this.map, fun);
console.log(1);
};
fun();
}; };
PlayScene.prototype.initSvgas = function () { PlayScene.prototype.initSvgas = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
...@@ -25783,6 +25826,8 @@ var Sprite = FYGE.Sprite; ...@@ -25783,6 +25826,8 @@ var Sprite = FYGE.Sprite;
var Texture = FYGE.Texture; var Texture = FYGE.Texture;
var Tween = FYGE.Tween; var Tween = FYGE.Tween;
var Ease = FYGE.Ease; var Ease = FYGE.Ease;
var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/index.ts");
var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts");
var MapScene = (function (_super) { var MapScene = (function (_super) {
__extends(MapScene, _super); __extends(MapScene, _super);
function MapScene() { function MapScene() {
...@@ -25816,6 +25861,10 @@ var MapScene = (function (_super) { ...@@ -25816,6 +25861,10 @@ var MapScene = (function (_super) {
this.uiLayer = this.addChild(new MapUI_1.default()); this.uiLayer = this.addChild(new MapUI_1.default());
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if (Tools_1.Tools.gameData.loginAddPower && !Tools_1.Tools.gameData.isFristLogin) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
Tools_1.Tools.gameData.loginAddPower = false;
}
}; };
MapScene.prototype.updateMapCheck = function () { MapScene.prototype.updateMapCheck = function () {
var _this = this; var _this = this;
This diff is collapsed.
...@@ -275,7 +275,7 @@ export class PlayScene extends Scene { ...@@ -275,7 +275,7 @@ export class PlayScene extends Scene {
// data = { chapter: 1 } // data = { chapter: 1 }
//第几关 //第几关
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
this.chapter = 6; // this.chapter = 6;
//关卡数据 //关卡数据
this.chapterData = getChapterData(this.chapter); this.chapterData = getChapterData(this.chapter);
// this.chapterData.stepCount = 4 // this.chapterData.stepCount = 4
...@@ -327,11 +327,11 @@ export class PlayScene extends Scene { ...@@ -327,11 +327,11 @@ export class PlayScene extends Scene {
AiControl.ins.init(this.lattices); AiControl.ins.init(this.lattices);
//测试波纹 //测试波纹
let fun = ()=>{ // let fun = ()=>{
RectsWaveAni(this.lattices,this.map,fun); // RectsWaveAni(this.lattices,this.map,fun);
console.log(1) // console.log(1)
} // }
fun() // fun()
} }
/** /**
......
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