From a9b646633461fe6d6eead5c252b659dfdd877337 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Fri, 26 Aug 2022 15:38:52 +0800 Subject: [PATCH] Update ResConfigUtil.cs --- .../Scripts/Runtime/Config/ResConfigUtil.cs | 61 +++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/Assets/TEngine/Scripts/Runtime/Config/ResConfigUtil.cs b/Assets/TEngine/Scripts/Runtime/Config/ResConfigUtil.cs index 3f48445c..0bf51d03 100644 --- a/Assets/TEngine/Scripts/Runtime/Config/ResConfigUtil.cs +++ b/Assets/TEngine/Scripts/Runtime/Config/ResConfigUtil.cs @@ -12,6 +12,7 @@ namespace TEngine.Runtime /// /// public delegate bool FilterResBin(TType val); + /// /// 计算拼接Key /// @@ -21,19 +22,21 @@ namespace TEngine.Runtime /// public delegate TKey ConvertDictionaryKey(TValue val); - public class ResConfigUtil + public class ResConfigUtil { - private static StringBuilder m_strBuilder = new StringBuilder(); - private static readonly string m_split = "_"; + private static StringBuilder _mStrBuilder = new StringBuilder(); + private static readonly string MSplit = "_"; #region 读取接口 + public static List ReadConfigListRes(string fileName = "") { if (string.IsNullOrEmpty(fileName)) { fileName = typeof(T).Name; } - string resPath = string.Format("Config/{0}.json",fileName); + + string resPath = string.Format("Config/{0}.json", fileName); TextAsset jsonStr = TResources.Load(resPath); if (jsonStr == null) { @@ -47,7 +50,8 @@ namespace TEngine.Runtime return list; } - public static List ReadResBinDict(Dictionary dic,ConvertDictionaryKey convKey ,string fileName = "") + public static List ReadResBinDict(Dictionary dic, ConvertDictionaryKey convKey, + string fileName = "") { if (string.IsNullOrEmpty(fileName)) { @@ -66,7 +70,7 @@ namespace TEngine.Runtime var etr = jsonData.GetEnumerator(); - if(dic == null) + if (dic == null) { dic = new Dictionary(); } @@ -81,8 +85,10 @@ namespace TEngine.Runtime { if (dic.ContainsKey(key)) { - TLogger.LogError("Config {0} Load Error, Repeat config {1}",typeof(T).ToString(),key.ToString()); + TLogger.LogError("Config {0} Load Error, Repeat config {1}", typeof(T).ToString(), + key.ToString()); } + dic.Add(key, etr.Current); } } @@ -92,7 +98,8 @@ namespace TEngine.Runtime return jsonData; } - public static List ReadResBinDict(Dictionary> dict, ConvertDictionaryKey convKey, string fileName = "") + public static List ReadResBinDict(Dictionary> dict, ConvertDictionaryKey convKey, + string fileName = "") { if (string.IsNullOrEmpty(fileName)) { @@ -118,6 +125,7 @@ namespace TEngine.Runtime { dict.Clear(); } + while (etr.MoveNext()) { var data = etr.Current; @@ -128,12 +136,15 @@ namespace TEngine.Runtime listItem = new List(); dict.Add(key, listItem); } + listItem.Add(data); } + etr.Dispose(); return jsonData; } + #endregion public static UInt64 Make64Key(uint key1, uint key2) @@ -143,31 +154,31 @@ namespace TEngine.Runtime public static string MakeStringKey(uint key1, uint key2, uint key3) { - m_strBuilder.Length = 0; - m_strBuilder.Append(key1); - m_strBuilder.Append(m_split); - m_strBuilder.Append(key2); - m_strBuilder.Append(m_split); - m_strBuilder.Append(key3); - return m_strBuilder.ToString(); + _mStrBuilder.Length = 0; + _mStrBuilder.Append(key1); + _mStrBuilder.Append(MSplit); + _mStrBuilder.Append(key2); + _mStrBuilder.Append(MSplit); + _mStrBuilder.Append(key3); + return _mStrBuilder.ToString(); } public static string MakeStringKey(string key1, uint key2) { - m_strBuilder.Length = 0; - m_strBuilder.Append(key1); - m_strBuilder.Append(m_split); - m_strBuilder.Append(key2); - return m_strBuilder.ToString(); + _mStrBuilder.Length = 0; + _mStrBuilder.Append(key1); + _mStrBuilder.Append(MSplit); + _mStrBuilder.Append(key2); + return _mStrBuilder.ToString(); } public static string MakeStringKey(string key1, string key2) { - m_strBuilder.Length = 0; - m_strBuilder.Append(key1); - m_strBuilder.Append(m_split); - m_strBuilder.Append(key2); - return m_strBuilder.ToString(); + _mStrBuilder.Length = 0; + _mStrBuilder.Append(key1); + _mStrBuilder.Append(MSplit); + _mStrBuilder.Append(key2); + return _mStrBuilder.ToString(); } } }