修复若干问题

kisence-mian · kisence-mian · commit cecd1befda3e · 2017-07-19T10:15:36.000+08:00
diff --git a/Assets/Script/Core/Application/ApplicationManager.cs b/Assets/Script/Core/Application/ApplicationManager.cs
@@ -116,6 +116,7 @@ public void AppLaunch()
     public static ApplicationBoolCallback s_OnApplicationFocus = null;
     public static ApplicationVoidCallback s_OnApplicationUpdate = null;
     public static ApplicationVoidCallback s_OnApplicationOnGUI = null;
+    public static ApplicationVoidCallback s_OnApplicationOnDrawGizmos = null;
 
     void OnApplicationQuit()
     {
@@ -178,9 +179,15 @@ void OnGUI()
             s_OnApplicationOnGUI();
     }
 
-#endregion
+    private void OnDrawGizmos()
+    {
+        if (s_OnApplicationOnDrawGizmos != null)
+            s_OnApplicationOnDrawGizmos();
+    }
+
+    #endregion
 
-#region 程序启动细节
+    #region 程序启动细节
     /// <summary>
     /// 设置资源加载方式
     /// </summary>
diff --git a/Assets/Script/Core/Editor/Network/Protocol/ProtocolHelper.cs b/Assets/Script/Core/Editor/Network/Protocol/ProtocolHelper.cs
@@ -14,6 +14,7 @@ public class ProtocolHelper
     {
         static List<Type> ModuleList = new List<Type>();
         static List<Type> msgList = new List<Type>();
+        static List<Type> StructList = new List<Type>();
 
         public const string PathName = "ProtocolGenerate";
         const string AnalysisCodeName  = "ProtocolAnalysisService";
@@ -34,6 +35,8 @@ static void StartGenerate()
             string protocolContent = GeneratePrototalContent();
             string protocolList = GeneratePrototalList();
 
+            Debug.Log(protocolContent);
+
             string ProtocolSavePath = Application.dataPath + "/Resources/Network/" + ProtocolService.c_ProtocolFileName + ".txt";
             ResourceIOTool.WriteStringByFile(ProtocolSavePath, protocolContent);
 
@@ -146,7 +149,7 @@ static string GenerateProtocolMessageField(FieldInfo field, ref int count)
             }
             else if (field.FieldType.Name == typeof(List<>).Name)
             {
-                string content = "repeated";
+                string content = "repeated ";
                 Type type = field.FieldType.GetGenericArguments()[0];
 
                 content += GetTypeName(type) + " " + GenerateProtocolFieldName(field) + " = " + count++ + ";\n";
@@ -189,7 +192,7 @@ static string GetTypeName(Type type)
             {
                 return "int8";
             }
-            else if (type.IsSubclassOf(typeof(Enum)))
+            else if (type == typeof(string))
             {
                 return "string";
             }
@@ -312,6 +315,9 @@ static void GenerateProtocolToCsharp()
                 else
                 {
                     string className = GetMessageNmae(item.Value);
+
+                    //Debug.Log(className + " -> " + item.Value);
+
                     if (GetAimType(className) == null)
                     {
                         string name = "m_" + item.Value + "_c";
@@ -356,7 +362,14 @@ static void GenerateProtocolToCsharp()
             output += GetTab(1) + "#region Struct\n";
             for (int i = 0; i < s_SubStruct.Count; i++)
             {
-                output += GenerateProtocolClass(2,SendMode.Both,null, s_SubStruct[i], protocolInfo[s_SubStruct[i]],true);
+                try
+                {
+                    output += GenerateProtocolClass(2, SendMode.Both, null, s_SubStruct[i], protocolInfo[s_SubStruct[i]], true);
+                }
+                catch
+                {
+                    throw new Exception("s_SubStruct[i] ->" + s_SubStruct[i]);
+                }
             }
             output += GetTab(1) + "#endregion \n";
 
@@ -401,7 +414,7 @@ static string GenerateProtocolClass(int tab,SendMode mode,string ModuleName, str
 
             if(isStruct)
             {
-                content = GetTab(tab) + "public class " + ClassName + " \n";
+                content = GetTab(tab) + "public class " + ClassName + " : IProtocolStructInterface \n";
             }
             else
             {
@@ -567,6 +580,11 @@ static string GetMessageNmae(string name)
                 }
             }
 
+            if(result == "")
+            {
+                return name;
+            }
+
             return result;
         }
 
@@ -614,6 +632,16 @@ static void GenerateList()
 
             //进行排序
             msgList.Sort(sort);
+
+            StructList.Clear();
+
+            for (int i = 0; i < types.Length; i++)
+            {
+                if (typeof(IProtocolStructInterface).IsAssignableFrom(types[i]))
+                {
+                    StructList.Add(types[i]);
+                }
+            }
         }
 
         static string GenerateCSharpContent()
@@ -808,6 +836,14 @@ static string GeneratePrototalContent()
                 content += "\n";
             }
 
+            Debug.Log("StructList " + StructList.Count);
+
+            for (int i = 0; i < StructList.Count; i++)
+            {
+                content += "message " + GenerateProtocolName(StructList[i]) + "\n";
+                content += GenerateProtocolMessageNoHead(StructList[i]);
+            }
+
             return content;
         }
 
diff --git a/Assets/Script/Core/GuideSystem/GuideSystemBase.cs b/Assets/Script/Core/GuideSystem/GuideSystemBase.cs
@@ -306,10 +306,10 @@ void StartGuide()
 
             ApplicationManager.s_OnApplicationUpdate += Update;
 
+            OnStart();
+
             SetCurrent(LoadFirstGuide());
             GuideLogic();
-
-            OnStart();
         }
 
         void EndGuide()
diff --git a/Assets/Script/Core/Network/Protocol/ProtocolService.cs b/Assets/Script/Core/Network/Protocol/ProtocolService.cs
@@ -1249,6 +1249,11 @@ public enum SendMode
     /// </summary>
     public interface IProtocolMessageInterface { }
 
+    /// <summary>
+    /// 自动被Protocol解析的结构
+    /// </summary>
+    public interface IProtocolStructInterface { }
+
     /// <summary>
     /// 
     /// </summary>
diff --git a/Assets/Script/Core/UI/Model/UIBase.cs b/Assets/Script/Core/UI/Model/UIBase.cs
@@ -155,7 +155,14 @@ public GameObject GetGameObject(string name)
 
         if (m_objects.ContainsKey(name))
         {
-            return m_objects[name];
+            GameObject go = m_objects[name];
+
+            if (go == null)
+            {
+                throw new Exception("UIWindowBase GetGameObject error: " + UIName + " m_objects[" + name + "] is null !!");
+            }
+
+            return go;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public class ProtocolHelper`
`14`	`14`	`{`
`15`	`15`	`static List<Type> ModuleList = new List<Type>();`
`16`	`16`	`static List<Type> msgList = new List<Type>();`
	`17`	`+ static List<Type> StructList = new List<Type>();`
`17`	`18`
`18`	`19`	`public const string PathName = "ProtocolGenerate";`
`19`	`20`	`const string AnalysisCodeName = "ProtocolAnalysisService";`
`@@ -34,6 +35,8 @@ static void StartGenerate()`
`34`	`35`	`string protocolContent = GeneratePrototalContent();`
`35`	`36`	`string protocolList = GeneratePrototalList();`
`36`	`37`
	`38`	`+ Debug.Log(protocolContent);`
	`39`	`+`
`37`	`40`	`string ProtocolSavePath = Application.dataPath + "/Resources/Network/" + ProtocolService.c_ProtocolFileName + ".txt";`
`38`	`41`	`ResourceIOTool.WriteStringByFile(ProtocolSavePath, protocolContent);`
`39`	`42`
`@@ -146,7 +149,7 @@ static string GenerateProtocolMessageField(FieldInfo field, ref int count)`
`146`	`149`	`}`
`147`	`150`	`else if (field.FieldType.Name == typeof(List<>).Name)`
`148`	`151`	`{`
`149`		`- string content = "repeated";`
	`152`	`+ string content = "repeated ";`
`150`	`153`	`Type type = field.FieldType.GetGenericArguments()[0];`
`151`	`154`
`152`	`155`	`content += GetTypeName(type) + " " + GenerateProtocolFieldName(field) + " = " + count++ + ";\n";`
`@@ -189,7 +192,7 @@ static string GetTypeName(Type type)`
`189`	`192`	`{`
`190`	`193`	`return "int8";`
`191`	`194`	`}`
`192`		`- else if (type.IsSubclassOf(typeof(Enum)))`
	`195`	`+ else if (type == typeof(string))`
`193`	`196`	`{`
`194`	`197`	`return "string";`
`195`	`198`	`}`
`@@ -312,6 +315,9 @@ static void GenerateProtocolToCsharp()`
`312`	`315`	`else`
`313`	`316`	`{`
`314`	`317`	`string className = GetMessageNmae(item.Value);`
	`318`	`+`
	`319`	`+ //Debug.Log(className + " -> " + item.Value);`
	`320`	`+`
`315`	`321`	`if (GetAimType(className) == null)`
`316`	`322`	`{`
`317`	`323`	`string name = "m_" + item.Value + "_c";`
`@@ -356,7 +362,14 @@ static void GenerateProtocolToCsharp()`
`356`	`362`	`output += GetTab(1) + "#region Struct\n";`
`357`	`363`	`for (int i = 0; i < s_SubStruct.Count; i++)`
`358`	`364`	`{`
`359`		`- output += GenerateProtocolClass(2,SendMode.Both,null, s_SubStruct[i], protocolInfo[s_SubStruct[i]],true);`
	`365`	`+ try`
	`366`	`+ {`
	`367`	`+ output += GenerateProtocolClass(2, SendMode.Both, null, s_SubStruct[i], protocolInfo[s_SubStruct[i]], true);`
	`368`	`+ }`
	`369`	`+ catch`
	`370`	`+ {`
	`371`	`+ throw new Exception("s_SubStruct[i] ->" + s_SubStruct[i]);`
	`372`	`+ }`
`360`	`373`	`}`
`361`	`374`	`output += GetTab(1) + "#endregion \n";`
`362`	`375`
`@@ -401,7 +414,7 @@ static string GenerateProtocolClass(int tab,SendMode mode,string ModuleName, str`
`401`	`414`
`402`	`415`	`if(isStruct)`
`403`	`416`	`{`
`404`		`- content = GetTab(tab) + "public class " + ClassName + " \n";`
	`417`	`+ content = GetTab(tab) + "public class " + ClassName + " : IProtocolStructInterface \n";`
`405`	`418`	`}`
`406`	`419`	`else`
`407`	`420`	`{`
`@@ -567,6 +580,11 @@ static string GetMessageNmae(string name)`
`567`	`580`	`}`
`568`	`581`	`}`
`569`	`582`
	`583`	`+ if(result == "")`
	`584`	`+ {`
	`585`	`+ return name;`
	`586`	`+ }`
	`587`	`+`
`570`	`588`	`return result;`
`571`	`589`	`}`
`572`	`590`
`@@ -614,6 +632,16 @@ static void GenerateList()`
`614`	`632`
`615`	`633`	`//进行排序`
`616`	`634`	`msgList.Sort(sort);`
	`635`	`+`
	`636`	`+ StructList.Clear();`
	`637`	`+`
	`638`	`+ for (int i = 0; i < types.Length; i++)`
	`639`	`+ {`
	`640`	`+ if (typeof(IProtocolStructInterface).IsAssignableFrom(types[i]))`
	`641`	`+ {`
	`642`	`+ StructList.Add(types[i]);`
	`643`	`+ }`
	`644`	`+ }`
`617`	`645`	`}`
`618`	`646`
`619`	`647`	`static string GenerateCSharpContent()`
`@@ -808,6 +836,14 @@ static string GeneratePrototalContent()`
`808`	`836`	`content += "\n";`
`809`	`837`	`}`
`810`	`838`
	`839`	`+ Debug.Log("StructList " + StructList.Count);`
	`840`	`+`
	`841`	`+ for (int i = 0; i < StructList.Count; i++)`
	`842`	`+ {`
	`843`	`+ content += "message " + GenerateProtocolName(StructList[i]) + "\n";`
	`844`	`+ content += GenerateProtocolMessageNoHead(StructList[i]);`
	`845`	`+ }`
	`846`	`+`
`811`	`847`	`return content;`
`812`	`848`	`}`
`813`	`849`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,14 @@ public GameObject GetGameObject(string name)`
`155`	`155`
`156`	`156`	`if (m_objects.ContainsKey(name))`
`157`	`157`	`{`
`158`		`- return m_objects[name];`
	`158`	`+ GameObject go = m_objects[name];`
	`159`	`+`
	`160`	`+ if (go == null)`
	`161`	`+ {`
	`162`	`+ throw new Exception("UIWindowBase GetGameObject error: " + UIName + " m_objects[" + name + "] is null !!");`
	`163`	`+ }`
	`164`	`+`
	`165`	`+ return go;`
`159`	`166`	`}`
`160`	`167`	`else`
`161`	`168`	`{`