fix: 百人赛失败和暂停弹窗的zindex冲突
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "491356dd-e7a1-43b9-8d71-79a8ae4c56a5",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -235,7 +235,7 @@ export default class CloudRiseView extends cc.Component {
|
||||
if (!reuse) {
|
||||
this.retainResources();
|
||||
const resources = Promise.all([CloudRiseService.pagePrefab(),
|
||||
CloudRiseService.pageFragment("stage", item ? item.after.stage : CloudRiseService.stage().stage)]).then(([prefab]) => prefab);
|
||||
CloudRiseService.pageFragment("stage", item ? item.after.stage : CloudRiseService.stage().stage)]).then(([prefab]) => prefab);
|
||||
const prefab = await Promise.race([resources, new Promise<cc.Prefab>((_, reject) => {
|
||||
loadTimer = setTimeout(() => reject(new Error("百人赛动画资源待加载")), 2500);
|
||||
})]);
|
||||
@@ -247,7 +247,7 @@ export default class CloudRiseView extends cc.Component {
|
||||
if (!item && !CloudRiseService.unseenResult()) return;
|
||||
}
|
||||
this.overlay = cc.instantiate(prefab);
|
||||
this.host.addChild(this.overlay); this.overlay.zIndex = 99;
|
||||
this.host.addChild(this.overlay); this.overlay.zIndex = 1001;
|
||||
this.panel = this.overlay.getComponent("CloudRisePanel");
|
||||
}
|
||||
await this.panel.preparePage(item ? "elimination" : "result", item && item.after.stage);
|
||||
@@ -267,7 +267,7 @@ export default class CloudRiseView extends cc.Component {
|
||||
if (this.eliminationDone) this.eliminationDone();
|
||||
};
|
||||
if (reuse) this.panel.beginSettlement(item ? "elimination" : "result", close);
|
||||
else this.panel.initialize(item ? "elimination" : "result", !!this.map, close, () => {});
|
||||
else this.panel.initialize(item ? "elimination" : "result", !!this.map, close, () => { });
|
||||
await new Promise<void>(resolve => {
|
||||
this.eliminationDone = resolve;
|
||||
// The cloud motion may already be acknowledged while its stage result is still unseen.
|
||||
@@ -323,7 +323,7 @@ export default class CloudRiseView extends cc.Component {
|
||||
if (!cc.isValid(this.node, true) || !canOpen()) return;
|
||||
if (locked()) return;
|
||||
this.overlay = cc.instantiate(prefab);
|
||||
this.host.addChild(this.overlay); this.overlay.zIndex = 99;
|
||||
this.host.addChild(this.overlay); this.overlay.zIndex = 1001;
|
||||
this.panel = this.overlay.getComponent("CloudRisePanel");
|
||||
await this.panel.preparePage(pageMode);
|
||||
if (!cc.isValid(this.node, true)) return;
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "0e9d3080-403b-4aee-85bc-cdd2e7b97b42",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "d98e8c38-ed42-4ab5-bb4f-2e1060e26cb6",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "dc95500c-537d-42ee-9197-f4bfcae93325",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "56ffd962-0771-4946-bc03-6981dbf5f019",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "70901048-9a6e-4080-97ca-5d5a7ccfc8a9",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "8536fa82-6028-4b02-9d18-fd7d6f32ad81",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
Reference in New Issue
Block a user