Commit 617344cc authored by wjf's avatar wjf

l

parent fec81c79
...@@ -18511,16 +18511,24 @@ var LoadingScene = (function (_super) { ...@@ -18511,16 +18511,24 @@ var LoadingScene = (function (_super) {
Tools_1.Tools.baseInfo.prizeLevels.push(+k.split('_')[1]); Tools_1.Tools.baseInfo.prizeLevels.push(+k.split('_')[1]);
} }
this.dispatchEvent(FYGE.Event.PROGRESS, 0.5); this.dispatchEvent(FYGE.Event.PROGRESS, 0.5);
return [4, Promise.all([ return [4, RES_1.RES.loadGroup("map")];
'map',
'mapCrabEffect',
'mapOwlEffect',
'mapWhaleEffect',
'mapCheckPrizeEffect'
].map(function (e) {
return RES_1.RES.loadGroup(e);
}))];
case 4: case 4:
_a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.6);
return [4, RES_1.RES.loadGroup("mapCrabEffect")];
case 5:
_a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.7);
return [4, RES_1.RES.loadGroup("mapOwlEffect")];
case 6:
_a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.8);
return [4, RES_1.RES.loadGroup("mapWhaleEffect")];
case 7:
_a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.9);
return [4, RES_1.RES.loadGroup("mapCheckPrizeEffect")];
case 8:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 1); this.dispatchEvent(FYGE.Event.PROGRESS, 1);
return [2]; return [2];
...@@ -21815,7 +21823,6 @@ var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/i ...@@ -21815,7 +21823,6 @@ var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/i
var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts"); var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts");
var PrizePanel_1 = __webpack_require__(/*! ../../panels/PrizePanel */ "./src/panels/PrizePanel.ts"); var PrizePanel_1 = __webpack_require__(/*! ../../panels/PrizePanel */ "./src/panels/PrizePanel.ts");
var GTool_1 = __webpack_require__(/*! ../../../module/tools/GTool */ "./module/tools/GTool.ts"); var GTool_1 = __webpack_require__(/*! ../../../module/tools/GTool */ "./module/tools/GTool.ts");
var NoPrizePanel_1 = __webpack_require__(/*! ../../panels/NoPrizePanel */ "./src/panels/NoPrizePanel.ts");
var MapScene = (function (_super) { var MapScene = (function (_super) {
__extends(MapScene, _super); __extends(MapScene, _super);
function MapScene() { function MapScene() {
...@@ -21859,7 +21866,6 @@ var MapScene = (function (_super) { ...@@ -21859,7 +21866,6 @@ var MapScene = (function (_super) {
ctrls_1.showPanel(PrizePanel_1.PrizePanel, JSON.parse(JSON.stringify(Tools_1.Tools.gameData.topAward.prize))); ctrls_1.showPanel(PrizePanel_1.PrizePanel, JSON.parse(JSON.stringify(Tools_1.Tools.gameData.topAward.prize)));
} }
else { else {
ctrls_1.showPanel(NoPrizePanel_1.NoPrizePanel);
} }
Tools_1.Tools.gameData.topAward = null; Tools_1.Tools.gameData.topAward = null;
} }
...@@ -22406,20 +22412,20 @@ var PrizeBox = (function (_super) { ...@@ -22406,20 +22412,20 @@ var PrizeBox = (function (_super) {
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize["level_" + upLevel_1]); this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize["level_" + upLevel_1]);
this.addEventListener(FYGE.MouseEvent.CLICK, function () { this.addEventListener(FYGE.MouseEvent.CLICK, function () {
Tools_1.Tools.btnDelay(_this); Tools_1.Tools.btnDelay(_this);
ctrls_1.showToast(_this.checkTip.text + "才可以抽奖哦"); ctrls_1.showToast("\u518D\u95EF" + dLevel_1 + "\u5173\u624D\u53EF\u4EE5\u62BD\u5956\u54E6");
}, this); }, this);
} }
else if (prizes.length == 1 && +prizes[0].level == 120) { else if (prizes.length == 1 && +prizes[0].level == 120) {
var index_1 = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.getIndex).data; var index_1 = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.getIndex).data;
this.checkTip.text = index_1.topAward.openPrizeStatus this.checkTip.text = index_1.topAward.openPrizeStatus
? '已开奖' : '8月31日10点'; ? '已开奖' : '8月31日9点开奖';
this.checkTip.size = 18; this.checkTip.size = 18;
this.tip.text = ""; this.tip.text = "";
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize['level_120']); this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize['level_120']);
this.addEventListener(FYGE.MouseEvent.CLICK, function () { this.addEventListener(FYGE.MouseEvent.CLICK, function () {
Tools_1.Tools.btnDelay(_this); Tools_1.Tools.btnDelay(_this);
ctrls_1.showToast(index_1.topAward.openPrizeStatus ctrls_1.showToast(index_1.topAward.openPrizeStatus
? '已开奖' : '8月31日10点开奖'); ? '已开奖' : '8月31日9点开奖');
}, this); }, this);
} }
else { else {
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -126,15 +126,25 @@ export class LoadingScene extends Scene { ...@@ -126,15 +126,25 @@ export class LoadingScene extends Scene {
// } // }
//加载地图资源 //加载地图资源
await Promise.all([ // await Promise.all([
'map', // 'map',
'mapCrabEffect', // 'mapCrabEffect',
'mapOwlEffect', // 'mapOwlEffect',
'mapWhaleEffect', // 'mapWhaleEffect',
'mapCheckPrizeEffect' // 'mapCheckPrizeEffect'
].map((e) => { // ].map((e) => {
return RES.loadGroup(e) // return RES.loadGroup(e)
})) // }))
await RES.loadGroup("map")
this.dispatchEvent(FYGE.Event.PROGRESS, 0.6);
await RES.loadGroup("mapCrabEffect")
this.dispatchEvent(FYGE.Event.PROGRESS, 0.7);
await RES.loadGroup("mapOwlEffect")
this.dispatchEvent(FYGE.Event.PROGRESS, 0.8);
await RES.loadGroup("mapWhaleEffect")
this.dispatchEvent(FYGE.Event.PROGRESS, 0.9);
await RES.loadGroup("mapCheckPrizeEffect")
this.dispatchEvent(FYGE.Event.PROGRESS, 1); this.dispatchEvent(FYGE.Event.PROGRESS, 1);
} }
......
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