From 20baf61378585ba4e390601ced6e6b1cc5370309 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 十月 2018 11:20:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
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 8edf810..adc8a4b 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -522,9 +522,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.GetAssetFilePath(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