Merge branch 'master' of warmcat.org:/home/git-repo/Erika

1 files changed, 10 insertions, 4 deletions

diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs
index f8eb327d..54322cd6 100644
--- a/Assets/ActionTool/Editor/ActionManager.cs
+++ b/Assets/ActionTool/Editor/ActionManager.cs
@@ -7,7 +7,10 @@ using UnityEngine;
 

 namespace ActionTool

 {

-    public static class ActionManager

+	// ActionTool callback delegates

+	public delegate void CallbackHandler(params object[] objs);

+

+	public static class ActionManager

     {

         public enum UnitType

         {

@@ -146,7 +149,9 @@ namespace ActionTool
 

         public static int colliderIndex;

 

-        public static void OnSelectObj(GameObject obj)

+		public static CallbackHandler onSelectObj;

+

+		public static void OnSelectObj(GameObject obj)

         {

             Release();

 			s_CurrentUnit = obj;

@@ -159,7 +164,8 @@ namespace ActionTool
 				s_UnitInstance = GameObject.Instantiate(obj);

 				InitializeUnitInstance(s_UnitInstance);

             }

-        }

+			onSelectObj?.Invoke(obj);

+		}

 

         public static void OnSelectAnimation(string animation)

         {

@@ -521,4 +527,4 @@ namespace ActionTool
 			copiedAnimationEvent = UnityEngine.Object.Instantiate(animEvent);

 		}

     }

-} 
\ No newline at end of file
+}
\ No newline at end of file