提交

Author: kisence-mian

Assets/Script/Core/Application/ApplicationManager.cs

@@ -23,6 +23,8 @@ public static ApplicationManager Instance
 
     public bool m_useAssetsBundle = false;
 
+
+
     public static AppMode AppMode
     {
         get
@@ -36,7 +38,7 @@ public static AppMode AppMode
 #else
             return instance.m_AppMode;
 #endif
-        }
+        } 
     }
 
     public bool UseAssetsBundle
@@ -59,6 +61,19 @@ public static string Version
         }
     }
 
+    public static SystemLanguage Langguage
+    {
+        get
+        {
+            return instance.langguage;
+        }
+
+        set
+        {
+            instance.langguage = value;
+        }
+    }
+
     [Tooltip("是否记录输入到本地")]
     public bool m_recordInput = true;
 
@@ -72,6 +87,11 @@ public static string Version
     public List<string> m_globalLogic;
     [HideInInspector]
     public string currentStatus;
+
+    /// <summary>
+    /// 语言
+    /// </summary>
+    public SystemLanguage langguage = SystemLanguage.ChineseSimplified;
     /// <summary>
     /// 显示括号标识多语言转换的字段
     /// </summary>

Assets/Script/Core/AudioManager/AudioButtonClickComponent.cs

@@ -19,6 +19,13 @@ void Awake ()
 
     private void OnClick()
     {
-        AudioPlayManager.PlaySFX2D(audioName, volume);
+        if (ResourcesConfigManager.GetIsExitRes(audioName))
+        {
+            AudioPlayManager.PlaySFX2D(audioName, volume);
+        }
+        else
+        {
+            Debug.LogError("不存在音频文件：" + audioName);
+        }
     }
 }

Assets/Script/Core/Config/ConfigManager.cs

@@ -4,7 +4,6 @@
 using FrameWork;
 using System.Text;
 using System;
-using LuaInterface;
 
 /// <summary>
 /// 配置管理器，只读

Assets/Script/Core/Data/DataTable.cs

@@ -491,6 +491,24 @@ public void SetFieldType(string key,FieldType type ,string enumType)
         }
     }
 
+    public void SetAssetTypes(string key, DataFieldAssetType type)
+    {
+        //主键只能是String类型
+        if (key == TableKeys[0])
+        {
+            return;
+        }
+
+        if (m_fieldAssetTypes.ContainsKey(key))
+        {
+            m_fieldAssetTypes[key] = type;
+        }
+        else
+        {
+            m_fieldAssetTypes.Add(key, type);
+        }
+    }
+
     public SingleData GetLineFromKey(string key)
     {
         //主键只能是String类型

Assets/Script/Core/Develop/Log.cs

@@ -22,11 +22,19 @@ public static void Init(bool isOpenLog = true)
         if (isOpenLog)
         {
             s_LogOutPutThread.Init();
+            ApplicationManager.s_OnApplicationQuit += OnApplicationQuit;
             Application.logMessageReceivedThreaded += UnityLogCallBackThread;
             Application.logMessageReceived += UnityLogCallBack;
         }
     }
 
+    private static void OnApplicationQuit()
+    {
+        Application.logMessageReceivedThreaded -= UnityLogCallBackThread;
+        Application.logMessageReceived -= UnityLogCallBack;
+        s_LogOutPutThread.Close();
+    }
+
     static void UnityLogCallBackThread(string log, string track, LogType type)
     {
         LogInfo l_logInfo = new LogInfo

Assets/Script/Core/Develop/LogOutPutThread.cs

@@ -21,7 +21,7 @@ public void Init()
 #if !(UNITY_WEBGL && !UNITY_EDITOR)
         try
         {
-            ApplicationManager.s_OnApplicationQuit += Close;
+           // ApplicationManager.s_OnApplicationQuit += Close;
 
             string prefix = Application.productName;
 

Assets/Script/Core/Editor/Data/Extends.meta

@@ -723,8 +723,16 @@ private DataFieldAssetType GetDataFieldAssetType(string field)
 
     private FieldType GetFieldType(int index, string field)
     {
-        FieldType fieldValueType = index == 0 ? FieldType.String : m_currentData.m_tableTypes[field];
-        return fieldValueType;
+        try
+        {
+            FieldType fieldValueType = index == 0 ? FieldType.String : m_currentData.m_tableTypes[field];
+            return fieldValueType;
+        }
+        catch(Exception e)
+        {
+            Debug.Log("field " + field + " exception " + e.ToString());
+            return FieldType.String;
+        }
     }
     private string GetEnumType(FieldType fieldValueType,  string field)
     {

Assets/Script/Core/Editor/Data/TableDataEditor.cs

@@ -69,6 +69,7 @@ private void OnGUI()
          });
 
         GUILayout.FlexibleSpace();
+        bool isClose = false;
         EditorDrawGUIUtil.DrawHorizontalCenter(() =>
         {
             if (GUILayout.Button("OK",GUILayout.Width( position.width/4)))
@@ -84,14 +85,17 @@ private void OnGUI()
                 }
                 if (otherWindow)
                     otherWindow.Repaint();
-                Close();
+                isClose = true;
             }
 
             if (GUILayout.Button("Cancel", GUILayout.Width(position.width / 4)))
             {
-                Close();
+                isClose = true;
             }
         });
         GUILayout.Space(6);
+
+        if (isClose)
+            Close();
     }
 }

Assets/Script/Core/Editor/General/GeneralDataModificationWindow.cs

@@ -20,7 +20,7 @@ public static void SaveData(SystemLanguage langeuageName, string fullkeyFileName
         string text = DataTable.Serialize(data);
 
         FileUtils.CreateTextFile(path, text);
-        UnityEditor.AssetDatabase.Refresh();
+       
     }
 
     /// <summary>