From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
Fight/Stage/StageManager.cs | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/Fight/Stage/StageManager.cs b/Fight/Stage/StageManager.cs
index 1fbd82a..adf8ca8 100644
--- a/Fight/Stage/StageManager.cs
+++ b/Fight/Stage/StageManager.cs
@@ -17,40 +17,32 @@
public event Action<float> loadingProgressEvent;
bool m_IsServerPreparing = false;
- public bool isServerPreparing
- {
+ public bool isServerPreparing {
get { return m_IsServerPreparing; }
set { m_IsServerPreparing = value; }
}
- public Stage.E_StageType StageType
- {
- get
- {
+ public Stage.E_StageType StageType {
+ get {
return m_StageType;
}
}
- public Stage CurrentStage
- {
- get
- {
+ public Stage CurrentStage {
+ get {
return m_CurrentStage;
}
}
int m_CurrentMapId;
- public int currentMapId
- {
+ public int currentMapId {
get { return m_CurrentMapId; }
private set { m_CurrentMapId = value; }
}
int m_CurrentMapResID;
- public int currentMapResId
- {
- get
- {
+ public int currentMapResId {
+ get {
return m_CurrentMapResID;
}
private set { m_CurrentMapResID = value; }
@@ -61,11 +53,9 @@
float m_LoadingProgress = 0f;
- float loadingProgress
- {
+ float loadingProgress {
get { return m_LoadingProgress; }
- set
- {
+ set {
m_LoadingProgress = value;
if (loadingProgressEvent != null)
{
@@ -98,7 +88,7 @@
else
{
var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));
- if (assetVersion.IsPriorAsset())
+ if (assetVersion != null && assetVersion.IsPriorAsset())
{
SnxxzGame.Instance.StartCoroutine(LoadCoroutine<T>(stageId, mapResConfig.ID, mapResConfig.MapResources, true));
}
--
Gitblit v1.8.0