From bfa73f860bfcde5d905910dd767390671024efa8 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 28 九月 2018 10:24:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/ConfigManager.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 8358d24..40529d1 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -14,8 +14,7 @@
bool isPlaying = true;
bool m_Inited = false;
- public bool inited
- {
+ public bool inited {
get { return m_Inited; }
private set { m_Inited = value; }
}
@@ -376,7 +375,7 @@
}
else
{
- path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".txt");
+ path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("config/", fileName, ".txt"));
}
var task = new ConfigTask(typeof(T), AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External, path);
--
Gitblit v1.8.0