From d7b690ed51305bbd98bae30a8e206e4b672a2dd3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 21 八月 2018 21:37:26 +0800
Subject: [PATCH] 前端代码整理
---
Assets/Editor/Tool/ClientPackage.cs | 2
Assets/Editor/Tool/SpriteManageTool.cs | 4 +-
Assets/Editor/Actor/ModelResourcesBuilder.cs | 8 ++--
Assets/Editor/Actor/NpcResourcesBuilder.cs | 8 ++--
Assets/Editor/Tool/ExcelParseTool.cs | 16 ++++----
Assets/Editor/Actor/ActorEditor.cs | 16 ++++----
Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs | 8 ++--
7 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/Assets/Editor/Actor/ActorEditor.cs b/Assets/Editor/Actor/ActorEditor.cs
index 76cf160..79e4e63 100644
--- a/Assets/Editor/Actor/ActorEditor.cs
+++ b/Assets/Editor/Actor/ActorEditor.cs
@@ -29,7 +29,7 @@
private void OnEnable()
{
- ConfigManager.Instance.SyncLoadConfigs();
+ Config.Instance.SyncLoadConfigs();
m_NpcResBuilder = new NpcResourcesBuilder();
m_ModelResBuilder = new ModelResourcesBuilder();
}
@@ -63,7 +63,7 @@
bool _result = EditorUtility.DisplayDialog("娓╅Θ鎻愰啋", "鐢熸垚鎵�鏈夋崲瑁呰祫婧愬皢浼氳�楄垂姣旇緝闀跨殑鏃堕棿, 璇疯寰楀嚑鐐�, 鏄惁鏄渶瑕佺敓鎴愭墍鏈夌殑璧勬簮, 濡傛灉涓嶆槸, 璁板緱鍙互鍘绘帀涓嶇敓鎴愮殑璧勬簮,鏄笉鏄笉闇�瑕佺敓鎴愬凡缁忓瓨鍦ㄧ殑璧勬簮, 濡傛灉涓嶉渶瑕�, 璁板緱鍕鹃�塠鍙敓鎴愪笉瀛樺湪鐨刔", "纭鐢熸垚", "鎴戞寜閿欎簡");
if (_result)
{
- var _dict = ConfigManager.Instance.GetAllValues<NPCConfig>();
+ var _dict = Config.Instance.GetAllValues<NPCConfig>();
foreach (var _model in _dict)
{
if (string.IsNullOrEmpty(_model.MODE))
@@ -90,7 +90,7 @@
if (GUILayout.Button("鎵�鏈夌繀鑶�", GUILayout.Height(24)))
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
if (_item.Type == (int)E_ModelResType.Wing)
@@ -103,7 +103,7 @@
if (GUILayout.Button("鎵�鏈夋鍣�", GUILayout.Height(24)))
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
if (_item.Type == (int)E_ModelResType.Weapon)
@@ -116,7 +116,7 @@
if (GUILayout.Button("鎵�鏈夊壇鎵�", GUILayout.Height(24)))
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
if (_item.Type == (int)E_ModelResType.Secondary)
@@ -129,7 +129,7 @@
if (GUILayout.Button("鎵�鏈夎。鏈�", GUILayout.Height(24)))
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
if (_item.Type == (int)E_ModelResType.Suit)
@@ -142,7 +142,7 @@
if (GUILayout.Button("鎵�鏈夊潗楠�", GUILayout.Height(24)))
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
if (_item.Type == (int)E_ModelResType.Horse)
@@ -157,7 +157,7 @@
bool _result = EditorUtility.DisplayDialog("娓╅Θ鎻愰啋", "鐢熸垚鎵�鏈夋崲瑁呰祫婧愬皢浼氳�楄垂姣旇緝闀跨殑鏃堕棿, 璇疯寰楀嚑鐐�, 鏄惁鏄渶瑕佺敓鎴愭墍鏈夌殑璧勬簮, 濡傛灉涓嶆槸, 璁板緱鍙互鍘绘帀涓嶇敓鎴愮殑璧勬簮,鏄笉鏄笉闇�瑕佺敓鎴愬凡缁忓瓨鍦ㄧ殑璧勬簮, 濡傛灉涓嶉渶瑕�, 璁板緱鍕鹃�塠鍙敓鎴愪笉瀛樺湪鐨刔", "纭鐢熸垚", "鎴戞寜閿欎簡");
if (_result)
{
- var _dict = ConfigManager.Instance.GetAllValues<ModelResConfig>();
+ var _dict = Config.Instance.GetAllValues<ModelResConfig>();
foreach (var _item in _dict)
{
m_ModelResBuilder.BuildModelRes(_item.ID);
diff --git a/Assets/Editor/Actor/ModelResourcesBuilder.cs b/Assets/Editor/Actor/ModelResourcesBuilder.cs
index 19877cc..59586af 100644
--- a/Assets/Editor/Actor/ModelResourcesBuilder.cs
+++ b/Assets/Editor/Actor/ModelResourcesBuilder.cs
@@ -6,7 +6,7 @@
{
public void BuildModelRes(int id)
{
- ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
if (_modelRes == null)
{
Debug.LogWarningFormat("瑕佺敓鎴愮殑ModelRes璧勬簮id: {0} 骞朵笉瀛樺湪浜庨厤缃〃涓�, 璇风‘璁ゆ槸鍚﹀～鍐欐湁閿�.", id);
@@ -70,7 +70,7 @@
return;
}
- ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
string _path = _modelRes.ResourcesName;
string _resName = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
@@ -89,7 +89,7 @@
return;
}
- ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
string _path = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
{
@@ -106,7 +106,7 @@
return;
}
- ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
string _path = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
{
diff --git a/Assets/Editor/Actor/NpcResourcesBuilder.cs b/Assets/Editor/Actor/NpcResourcesBuilder.cs
index 1e20367..94adb29 100644
--- a/Assets/Editor/Actor/NpcResourcesBuilder.cs
+++ b/Assets/Editor/Actor/NpcResourcesBuilder.cs
@@ -15,13 +15,13 @@
BuildAnimationClip1(modelName);
BuildAnimatorController(modelName);
- var showConfigs = ConfigManager.Instance.GetAllValues<ActorShowConfig>();
+ var showConfigs = Config.Instance.GetAllValues<ActorShowConfig>();
NPCConfig _npcModel = null;
foreach (var _item in showConfigs)
{
for (int i = 0; i < _item.showNpcs.Length; i++)
{
- _npcModel = ConfigManager.Instance.GetTemplate<NPCConfig>(_item.showNpcs[i]);
+ _npcModel = Config.Instance.Get<NPCConfig>(_item.showNpcs[i]);
if (_npcModel == null)
{
continue;
@@ -35,10 +35,10 @@
}
}
- var realmConfigs = ConfigManager.Instance.GetAllValues<RealmConfig>();
+ var realmConfigs = Config.Instance.GetAllValues<RealmConfig>();
foreach (var _realmConfig in realmConfigs)
{
- _npcModel = ConfigManager.Instance.GetTemplate<NPCConfig>(_realmConfig.BossID);
+ _npcModel = Config.Instance.Get<NPCConfig>(_realmConfig.BossID);
if (_npcModel == null)
{
continue;
diff --git a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
index 3b84134..c7d1308 100644
--- a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
+++ b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
@@ -451,10 +451,10 @@
void DrawNewbieGuides()
{
- if (ConfigManager.Instance.inited && newbieGuides == null)
+ if (Config.Instance.inited && newbieGuides == null)
{
newbieGuides = new List<NewBieGuide>();
- var guides = ConfigManager.Instance.GetAllValues<GuideConfig>();
+ var guides = Config.Instance.GetAllValues<GuideConfig>();
foreach (var config in guides)
{
if (config.Type == 1)
@@ -507,10 +507,10 @@
void DrawFunctionalGuides()
{
- if (ConfigManager.Instance.inited && functionalGuides == null)
+ if (Config.Instance.inited && functionalGuides == null)
{
functionalGuides = new List<FunctionalGuide>();
- var guides = ConfigManager.Instance.GetAllValues<GuideConfig>();
+ var guides = Config.Instance.GetAllValues<GuideConfig>();
foreach (var config in guides)
{
if (config.Type == 2)
diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index 88ba3e0..9b2739e 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -102,7 +102,7 @@
if (halfPackages.Count > 0)
{
- ConfigManager.Instance.PreLoadConfigs();
+ Config.Instance.PreLoadConfigs();
FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath);
var files = new List<FileInfo>();
diff --git a/Assets/Editor/Tool/ExcelParseTool.cs b/Assets/Editor/Tool/ExcelParseTool.cs
index 3f1c570..d1b7dfe 100644
--- a/Assets/Editor/Tool/ExcelParseTool.cs
+++ b/Assets/Editor/Tool/ExcelParseTool.cs
@@ -51,11 +51,11 @@
if (GUILayout.Button("瑙ｆ瀽"))
{
m_Englishs.Clear();
- ConfigManager.Instance.SyncLoadConfigs();
+ Config.Instance.SyncLoadConfigs();
m_FitterKeys.Clear();
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<LanguageConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<SysInfoConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<IconConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
FindEnglishLabel();
}
@@ -84,11 +84,11 @@
{
DebugEx.LogError(e.ToString());
}
- ConfigManager.Instance.SyncLoadConfigs();
+ Config.Instance.SyncLoadConfigs();
m_FitterKeys.Clear();
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<LanguageConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<SysInfoConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<IconConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
FindEnglishLabel(true);
}
}
diff --git a/Assets/Editor/Tool/SpriteManageTool.cs b/Assets/Editor/Tool/SpriteManageTool.cs
index fec7fcf..dfb8dd7 100644
--- a/Assets/Editor/Tool/SpriteManageTool.cs
+++ b/Assets/Editor/Tool/SpriteManageTool.cs
@@ -125,8 +125,8 @@
private void OnEnable()
{
- ConfigManager.Instance.SyncLoadConfigs();
- m_IconCfgs = ConfigManager.Instance.GetAllValues<IconConfig>();
+ Config.Instance.SyncLoadConfigs();
+ m_IconCfgs = Config.Instance.GetAllValues<IconConfig>();
m_DeleteTexture = EditorGUIUtility.FindTexture("TreeEditor.Trash");
InitStyle();
--
Gitblit v1.8.0