弥补git失误

Lixue9jiu · Apr 21, 2018 · 3018a90 · 3018a90
1 parent 567df5a
commit 3018a90
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 69 deletions.
diff --git a/Assets/_Scripts/Core/GlobalObjManager.cs b/Assets/_Scripts/Core/GlobalObjManager.cs
diff --git a/Assets/_Scripts/Core/GlobalObjManager.cs.meta b/Assets/_Scripts/Core/GlobalObjManager.cs.meta
diff --git a/Assets/_Scripts/UI/ConsoleWindow.cs b/Assets/_Scripts/UI/ConsoleWindow.cs
@@ -9,34 +9,9 @@ public class ConsoleWindow : BaseWindow
 
     int currentHistory = 0;
 
-<<<<<<< HEAD
 	private void OnEnable()
-=======
-    private void Start()
-    {
-        currentHistory = history.Count;
-    }
-
-    private void Awake()
-    {
-        AssignCommand("help", (args) =>
-        {
-            foreach (string s in commands.Keys)
-            {
-                ConsoleLog.Log(s);
-            }
-        });
-    }
-
-    public void AssignCommand(string name, System.Action<string[]> action)
-    {
-        commands.Add(name, action);
-    }
-
-	public void RemoveCommand(string name)
->>>>>>> b63ce56b5cda98e10e93d15b0b6f72ae85fb4c08
 	{
-        currentHistory = Console.history.Count;
+		currentHistory = Console.history.Count;
 	}
 
     private void Update()
@@ -98,17 +73,11 @@ public static string text
     static StringBuilder strBuilder = new StringBuilder();
     public static bool needFresh = false;
 
-<<<<<<< HEAD
     public static ILogHandler logHandler;
 
 	static ConsoleLog()
 	{
         logHandler = new Handler ();
-=======
-	static ConsoleLog()
-	{
-		new Handler ();
->>>>>>> b63ce56b5cda98e10e93d15b0b6f72ae85fb4c08
 	}
 
     public static void Log(string str)