From c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 10:30:32 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
Core/GameEngine/Model/ConfigManager.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 6b9a043..f237163 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -27,10 +27,16 @@
SnxxzGame.Instance.AddApplicationOutAction(OnApplicationOut);
}
+ public void LoadPriorBundleConfig()
+ {
+ StartSyncTask<PriorBundleConfig>(AssetPath.Resource);
+ }
+
public void PreLoadConfigs()
{
StartSyncTask<PriorBundleConfig>(AssetPath.Resource);
StartSyncTask<PriorLanguageConfig>(AssetPath.Resource);
+ StartSyncTask<LoginSeverListConfig>(AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External);
}
List<ConfigTask> configTasks = new List<ConfigTask>();
@@ -204,7 +210,7 @@
}
}
- var allowTaskCount = completedCount <= 7 ? GetMinWorkingTaskCount() : GetMaxWorkingTaskCount();
+ var allowTaskCount = completedCount <= 8 ? GetMinWorkingTaskCount() : GetMaxWorkingTaskCount();
var workingCount = 0;
for (int i = 0; i < configTasks.Count; i++)
{
--
Gitblit v1.8.0