修复bug

kisence-mian · kisence-mian · commit f0417ce4f58d · 2017-07-25T16:42:03.000+08:00
diff --git a/Assets/Script/Core/Config/ConfigManager.cs b/Assets/Script/Core/Config/ConfigManager.cs
@@ -24,10 +24,18 @@ public static bool GetIsExistConfig(string ConfigName)
         string dataJson = "";
 
         #if UNITY_EDITOR
-            dataJson = ResourceIOTool.ReadStringByResource(
-                PathTool.GetRelativelyPath(c_directoryName,
-                                            ConfigName,
-                                            c_expandName));
+            if(!Application.isPlaying)
+            {
+                dataJson = ResourceIOTool.ReadStringByResource(
+                    PathTool.GetRelativelyPath(c_directoryName,
+                                ConfigName,
+                                c_expandName));
+            }
+            else
+            {
+                dataJson = ResourceManager.ReadTextFile(ConfigName);
+            }
+
         #else
              dataJson = ResourceManager.ReadTextFile(ConfigName);
         #endif
@@ -51,14 +59,21 @@ public static Dictionary<string, SingleField> GetData(string ConfigName)
 
         string dataJson = "";
 
-        #if UNITY_EDITOR
-                dataJson = ResourceIOTool.ReadStringByResource( 
-                    PathTool.GetRelativelyPath(c_directoryName,
-                                                ConfigName,
-                                                c_expandName));
-        #else
+#if UNITY_EDITOR
+        if (!Application.isPlaying)
+        {
+            dataJson = ResourceIOTool.ReadStringByResource(
+                PathTool.GetRelativelyPath(c_directoryName,
+                            ConfigName,
+                            c_expandName));
+        }
+        else
+        {
+            dataJson = ResourceManager.ReadTextFile(ConfigName);
+        }
+#else
                 dataJson = ResourceManager.ReadTextFile(ConfigName);
-        #endif
+#endif
 
         if (dataJson == "")
         {
diff --git a/Assets/Script/Core/GameObject/GameObjectManager.cs b/Assets/Script/Core/GameObject/GameObjectManager.cs
@@ -155,6 +155,11 @@ public static void DestroyGameObjectByPool(GameObject obj, bool isSetActive = tr
             s_objectPool.Add(key, new List<GameObject>());
         }
 
+        if(s_objectPool[key].Contains(obj))
+        {
+            throw new Exception("DestroyGameObjectByPool:-> Repeat Destroy GameObject !" + obj);
+        }
+
         s_objectPool[key].Add(obj);
 
         if(isSetActive)
@@ -369,6 +374,11 @@ public static void DestroyPoolObject(PoolObject obj)
             s_objectPool_new.Add(key, new List<PoolObject>());
         }
 
+        if (s_objectPool_new[key].Contains(obj))
+        {
+            throw new Exception("DestroyPoolObject:-> Repeat Destroy GameObject !" + obj);
+        }
+
         s_objectPool_new[key].Add(obj);
 
         if (obj.SetActive)
diff --git a/Assets/Script/Core/HotUpdate/HotUpdateManager.cs b/Assets/Script/Core/HotUpdate/HotUpdateManager.cs
@@ -1,5 +1,4 @@
 ﻿
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -329,7 +328,7 @@ static float GetHotUpdateProgress(bool isDownLoadVersion,bool isDownLoadMd5,floa
 
     static float GetDownLoadFileProgress(int index)
     {
-        if (s_downLoadList.Count ==0)
+        if (s_downLoadList.Count == 0)
         {
             Debug.Log("更新列表为 0");
             return 0.95f;
@@ -383,8 +382,6 @@ public static string ReadVersionContent()
                     dataJson = text.text;
                     ab.Unload(true);
             }
-
-
         }
 
         return dataJson;
diff --git a/Assets/Script/Core/SDKManager/SDKManager.cs b/Assets/Script/Core/SDKManager/SDKManager.cs
@@ -371,19 +371,25 @@ public static void CloseAD<T>(string SDKName, ADType adType, string tag = "") wh
     /// 数据上报
     /// </summary>
     /// <param name="data"></param>
-    public static void Log(string eventID,Dictionary<string,object> data)
+    public static void Log(string eventID, Dictionary<string, object> data)
     {
-        try
+        if(s_logServiceList == null)
+        {
+            throw new Exception("logServiceList is null ,please check SDKManager Init");
+        }
+
+        for (int i = 0; i < s_logServiceList.Count; i++)
         {
-            for (int i = 0; i < s_logServiceList.Count; i++)
+            try
             {
                 s_logServiceList[i].Log(eventID, data);
             }
+            catch (Exception e)
+            {
+                Debug.LogError("SDKManager Log Exception: " + e.ToString());
+            }
         }
-        catch (Exception e)
-        {
-            Debug.LogError("SDKManager Log Exception: " + e.ToString());
-        }
+
     }
     #endregion
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`
`2`		`-`
`3`	`2`	`using System;`
`4`	`3`	`using System.Collections;`
`5`	`4`	`using System.Collections.Generic;`
`@@ -329,7 +328,7 @@ static float GetHotUpdateProgress(bool isDownLoadVersion,bool isDownLoadMd5,floa`
`329`	`328`
`330`	`329`	`static float GetDownLoadFileProgress(int index)`
`331`	`330`	`{`
`332`		`- if (s_downLoadList.Count ==0)`
	`331`	`+ if (s_downLoadList.Count == 0)`
`333`	`332`	`{`
`334`	`333`	`Debug.Log("更新列表为 0");`
`335`	`334`	`return 0.95f;`
`@@ -383,8 +382,6 @@ public static string ReadVersionContent()`
`383`	`382`	`dataJson = text.text;`
`384`	`383`	`ab.Unload(true);`
`385`	`384`	`}`
`386`		`-`
`387`		`-`
`388`	`385`	`}`
`389`	`386`
`390`	`387`	`return dataJson;`
Original file line number	Diff line number	Diff line change
`@@ -371,19 +371,25 @@ public static void CloseAD<T>(string SDKName, ADType adType, string tag = "") wh`
`371`	`371`	`/// 数据上报`
`372`	`372`	`/// </summary>`
`373`	`373`	`/// <param name="data"></param>`
`374`		`- public static void Log(string eventID,Dictionary<string,object> data)`
	`374`	`+ public static void Log(string eventID, Dictionary<string, object> data)`
`375`	`375`	`{`
`376`		`- try`
	`376`	`+ if(s_logServiceList == null)`
	`377`	`+ {`
	`378`	`+ throw new Exception("logServiceList is null ,please check SDKManager Init");`
	`379`	`+ }`
	`380`	`+`
	`381`	`+ for (int i = 0; i < s_logServiceList.Count; i++)`
`377`	`382`	`{`
`378`		`- for (int i = 0; i < s_logServiceList.Count; i++)`
	`383`	`+ try`
`379`	`384`	`{`
`380`	`385`	`s_logServiceList[i].Log(eventID, data);`
`381`	`386`	`}`
	`387`	`+ catch (Exception e)`
	`388`	`+ {`
	`389`	`+ Debug.LogError("SDKManager Log Exception: " + e.ToString());`
	`390`	`+ }`
`382`	`391`	`}`
`383`		`- catch (Exception e)`
`384`		`- {`
`385`		`- Debug.LogError("SDKManager Log Exception: " + e.ToString());`
`386`		`- }`
	`392`	`+`
`387`	`393`	`}`
`388`	`394`	`#endregion`
`389`	`395`