From 54b8092a18df967587195cefff1f929e8348f4e7 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 12:01:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/Stage/StageManager.cs | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Fight/Stage/StageManager.cs b/Fight/Stage/StageManager.cs
index 3d3b8dc..0faa26d 100644
--- a/Fight/Stage/StageManager.cs
+++ b/Fight/Stage/StageManager.cs
@@ -269,32 +269,32 @@
yield return null;
}
- if (_stageId == 10010)
- {
- while (!PreFightMission.Instance.IsHandleMissionState)
- {
- yield return null;
- }
+ // if (_stageId == 10010)
+ // {
+ // while (!PreFightMission.Instance.IsHandleMissionState)
+ // {
+ // yield return null;
+ // }
- try
- {
- // 濡傛灉鐢ㄦ埛灏氭湭瀹屾垚鍓嶆湡鎴樻枟閮ㄥ垎
- if (!PreFightMission.Instance.IsFinished())
- {
- if (!AssetSource.sceneFromEditor)
- {
- AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt");
- }
- SceneManager.LoadScene("Map000_Xsdt", LoadSceneMode.Additive);
- }
- }
- catch (System.Exception ex)
- {
- ExceptionCatcher.ReportException("鍦烘櫙鍔犺浇 Step5", ex);
- }
- }
+ // try
+ // {
+ // // 濡傛灉鐢ㄦ埛灏氭湭瀹屾垚鍓嶆湡鎴樻枟閮ㄥ垎
+ // if (!PreFightMission.Instance.IsFinished())
+ // {
+ // if (!AssetSource.sceneFromEditor)
+ // {
+ // AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt");
+ // }
+ // SceneManager.LoadScene("Map000_Xsdt", LoadSceneMode.Additive);
+ // }
+ // }
+ // catch (System.Exception ex)
+ // {
+ // ExceptionCatcher.ReportException("鍦烘櫙鍔犺浇 Step5", ex);
+ // }
+ // }
- yield return null;
+ // yield return null;
loadingProgress = loadingProgress + 0.1f;
// 鍦烘櫙鍔犺浇瀹屽氨鍙互纭畾鐜╁浣嶇疆浜�, 涓嶉渶瑕佺瓑寰呭叿浣撳満鏅殑閫昏緫鍒濆鍖�
--
Gitblit v1.8.0