-log

7 files changed, 9 insertions, 13 deletions

diff --git a/Documents/模型.xlsx b/Documents/模型.xlsx
index ecfb7c57..c6bcedda 100644
--- a/Documents/模型.xlsx
+++ b/Documents/模型.xlsx
diff --git a/Erika/Assets/Scripts/Input/InputManager.cs b/Erika/Assets/Scripts/Input/InputManager.cs
index 06e4f02f..57bc3399 100644
--- a/Erika/Assets/Scripts/Input/InputManager.cs
+++ b/Erika/Assets/Scripts/Input/InputManager.cs
@@ -38,11 +38,6 @@ public class InputManager : SingletonMB<InputManager>
 				cmd.key = vKey;

 				cmd.time = Time.time;

 				m_CommandQueue.Add(cmd);

-

-                //Debug.Log(cmd.time);

-                string cmdStr = "";

-                m_CommandQueue.ForEach(s => cmdStr += s.key.ToString() + ",");

-                Debug.Log(cmdStr);

             }

 		}

 		float curTime = Time.time;

diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
index c2a581b1..5c1280be 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
@@ -41,7 +41,7 @@ public class MonsterState : UnitState
         if (!IsChange(nextState, bForce))
             return;
 
-        LogHelper.Log("Monster UnitState: " + m_State.ToString() + " -> " + nextState.ToString());
+        //LogHelper.Log("Monster UnitState: " + m_State.ToString() + " -> " + nextState.ToString());
 
         StopAllCoroutines();
 
@@ -54,7 +54,7 @@ public class MonsterState : UnitState
         }
         else
         {
-            LogHelper.LogError("缺少 " + methodFunc);
+            LogHelper.LogError(LogTag.UnitState, "缺少 " + methodFunc);
         }
         m_State = nextState;
 
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs
index 6a326431..98eb2f6a 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState.cs
@@ -63,7 +63,7 @@ public partial class PCState : UnitState
         if (!IsChange(nextState, bForce))
             return;
 
-        LogHelper.Log("UnitState: " + m_State.ToString() + " -> " + nextState.ToString());
+        //LogHelper.Log(LogTag.UnitState, m_State.ToString() + " -> " + nextState.ToString());
 
         StopAllCoroutines();
 
@@ -75,7 +75,7 @@ public partial class PCState : UnitState
         }
         else
         {
-            LogHelper.LogError("缺少 " + methodFunc);
+            LogHelper.LogError(LogTag.UnitState, "缺少 " + methodFunc);
         }

         m_PrevState = m_State;
         m_State = nextState;

diff --git a/Erika/Assets/Scripts/Unit/UnitActionData.cs b/Erika/Assets/Scripts/Unit/UnitActionData.cs
index bfafd4df..cdc7636f 100644
--- a/Erika/Assets/Scripts/Unit/UnitActionData.cs
+++ b/Erika/Assets/Scripts/Unit/UnitActionData.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 
 [Serializable]
-public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationClip> { }
+public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationData> { }
 
 /// <summary>
 /// 角色动作配置，状态名-动作
@@ -13,6 +13,4 @@ public class TriggerAnimationDictionary : SerializableDictionary<string/*overrid
 public class UnitActionData : ScriptableObject
 {
 	public TriggerAnimationDictionary actions; 
-
-
 }
diff --git a/Erika/Assets/Scripts/Utils/LogHelper.cs b/Erika/Assets/Scripts/Utils/LogHelper.cs
index f0d8c180..00e33421 100644
--- a/Erika/Assets/Scripts/Utils/LogHelper.cs
+++ b/Erika/Assets/Scripts/Utils/LogHelper.cs
@@ -18,7 +18,7 @@ public static class LogHelper
 		Debug.LogError("[" + tag + "]" + msg);
 	}
 
-    private static void Log(LogTag tag, string msg)
+    public static void Log(LogTag tag, string msg)
     {
         Log(tag.ToString(), msg);
     }
diff --git a/Erika/Assets/Scripts/Utils/LogTag.cs b/Erika/Assets/Scripts/Utils/LogTag.cs
index 3e3c43b4..65dbfd54 100644
--- a/Erika/Assets/Scripts/Utils/LogTag.cs
+++ b/Erika/Assets/Scripts/Utils/LogTag.cs
@@ -5,5 +5,8 @@ using UnityEngine;
 public enum LogTag
 {
     Resources, 
+
     UnitAnimation,
+	UnitState,
+
 }