From a974a2621a6dcb90b8fe52b23d075814873c0960 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 23 十月 2018 20:53:49 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/GameEngine/Model/ConfigManager.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index a17ab51..27e4fc4 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -45,7 +45,7 @@
public IEnumerator Co_LoadConfigs()
{
- AddAsyncTask<LoginSeverListConfig>();
+ StartSyncTask<LoginSeverListConfig>(AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External);
AddAsyncTask<IconConfig>();
AddAsyncTask<ItemConfig>();
AddAsyncTask<SkillConfig>();
--
Gitblit v1.8.0