From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
Fight/Stage/StageManager.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Fight/Stage/StageManager.cs b/Fight/Stage/StageManager.cs
index 0fa1aec..b0a6f9f 100644
--- a/Fight/Stage/StageManager.cs
+++ b/Fight/Stage/StageManager.cs
@@ -319,6 +319,9 @@
catch (System.Exception ex)
{
ExceptionCatcher.ReportException("鍦烘櫙鍔犺浇 Step6 鎵ц鍒�: " + m_InitHeroStep, ex);
+#if UNITY_EDITOR
+ Debug.Log(ex.StackTrace);
+#endif
}
}
@@ -380,6 +383,8 @@
Debug.LogFormat("涓嶅彂鍖�0107锛氬綋鍓峉tage:{0}", CurrentStage);
}
+ isLoading = false;
+
switch (this.socketType)
{
case GameNetSystem.SocketType.Main:
@@ -418,7 +423,6 @@
loadTimeOutCatcher = null;
Application.backgroundLoadingPriority = ThreadPriority.BelowNormal;
- isLoading = false;
DebugEx.LogFormat("StageManager => Load Scene : {0} Finished.", _resources);
WindowCenter.Instance.Close<LoadingWin>();
--
Gitblit v1.8.0