From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/GameEngine/Model/ConfigManager.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 27e4fc4..b3e78f2 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -523,9 +523,17 @@
switch (_assetPath)
{
case AssetPath.Resource:
- path = StringUtility.Contact("Config/", fileName);
- var textAsset = Resources.Load<TextAsset>(path);
- lines = textAsset.text.Split(new string[] { "\r\n" }, StringSplitOptions.None);
+ path = AssetVersionUtility.GetBuiltInAssetFilePath(StringUtility.Contact("config/", fileName, ".txt"));
+ if (File.Exists(path))
+ {
+ lines = File.ReadAllLines(path, Encoding.UTF8);
+ }
+ else
+ {
+ path = StringUtility.Contact("Config/", fileName);
+ var textAsset = Resources.Load<TextAsset>(path);
+ lines = textAsset.text.Split(new string[] { "\r\n" }, StringSplitOptions.None);
+ }
break;
case AssetPath.ResourceOut:
path = StringUtility.Contact(ResourcesPath.CONFIG_FODLER, "/", fileName, ".txt");
--
Gitblit v1.8.0