From 496d2bcebd3dbae9a50fe2f7726ae22a948ea0fa Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 01 二月 2019 17:05:34 +0800
Subject: [PATCH] 3335 fixed：从诛仙塔回到主场景后没有打开诛仙界面
---
Fight/Stage/StageLoad.cs | 13 ++++++++++++-
System/MainInterfacePanel/MainInterfaceWin.cs | 11 -----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Fight/Stage/StageLoad.cs b/Fight/Stage/StageLoad.cs
index e7bb40c..8dd378d 100644
--- a/Fight/Stage/StageLoad.cs
+++ b/Fight/Stage/StageLoad.cs
@@ -52,7 +52,17 @@
public void PushSceneLoadCommand(StageLoadCommand command)
{
- commands.Enqueue(command);
+ if (!isLoading && commands.Count == 0)
+ {
+ currentCommand = command;
+ currentCommand.fromMapId = mapIdRecord;
+ currentCommand.fromLineId = lineIdRecord;
+ ExcuteCommand(currentCommand);
+ }
+ else
+ {
+ commands.Enqueue(command);
+ }
}
private void ExcuteCommand(StageLoadCommand command)
@@ -136,6 +146,7 @@
stageLoadProcessor.Begin(tasks);
StageLoadTimeOutCatcher.Begin(command.toMapId);
+ WindowCenter.Instance.Close<MainInterfaceWin>();
loadStartTime = Time.time;
isLoading = true;
}
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 6d64272..9ed1637 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -688,17 +688,6 @@
}
}
- if (jadeDynastyTowerModel.specialUnLockFloor > 0 && !IsDungeon())
- {
- if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))
- {
- if (!WindowCenter.Instance.IsOpen("JadeDynastyTowerUnLockWin"))
- {
- WindowCenter.Instance.Open<JadeDynastyTowerUnLockWin>();
- }
- }
- }
-
if (jadeDynastyTowerModel.openJadeDynastyTower && !IsDungeon())
{
if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))
--
Gitblit v1.8.0