Merge pull request #35 from NicolasLaure/minion_spawner

Minion spawner
NicolasLaure · Sep 24, 2024 · 224f415 · 224f415
2 parents fdc5f97 + fed335a
commit 224f415
Show file tree

Hide file tree

Showing 36 changed files with 948 additions and 328 deletions.
diff --git a/Assets/Prefabs/Minion/Minion.prefab b/Assets/Prefabs/Minion/Minion.prefab
@@ -163,9 +163,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   health: {fileID: 5575126865424349212}
   slider: {fileID: 5135750954969982833}
-  onTakeDamage: {fileID: 11400000, guid: d7c92d4ecc5578245b7e8d6eca51d765, type: 2}
-  onResetDamage: {fileID: 11400000, guid: abe3ae86baf3a6143af44a83fa066bee, type: 2}
   shouldStartHided: 0
+  onTakeDamage: {fileID: 11400000, guid: d7c92d4ecc5578245b7e8d6eca51d765, type: 2}
+  onResetDamage: {fileID: 0}
 --- !u!1 &3481237237909825566
 GameObject:
   m_ObjectHideFlags: 0
@@ -802,8 +802,8 @@ GameObject:
   - component: {fileID: 4310436236341836283}
   - component: {fileID: 4389868529216407606}
   - component: {fileID: 154755272736235517}
-  - component: {fileID: 4097841218994226417}
   - component: {fileID: 2562709963566903697}
+  - component: {fileID: 4097841218994226417}
   m_Layer: 6
   m_Name: Minion
   m_TagString: Enemy
@@ -862,16 +862,171 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3915ca53d56c23b44bd662973a6a792f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  timeBetweenStates: 3
-  player: {fileID: 0}
   model: {fileID: 8240765325717695887}
   onCollidePlayerEventChannel: {fileID: 11400000, guid: 94a2de087d2d288459b928f536c58af1, type: 2}
   healthPoints: {fileID: 5575126865424349212}
-  minionAnimationController: {fileID: 4097841218994226417}
-  minionIdleController: {fileID: 4389868529216407606}
-  minionMoveController: {fileID: 154755272736235517}
-  minionChargeAttackController: {fileID: 4310436236341836283}
-  minionAttackController: {fileID: 2562709963566903697}
+  onMinionDeletedEvent: {fileID: 11400000, guid: d0b8cbd5af6d2924ea50203f22ee5183, type: 2}
+  idleEvents:
+    onEnter:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 4389868529216407606}
+          m_TargetAssemblyTypeName: Minion.Controllers.MinionIdleController, Assembly-CSharp
+          m_MethodName: Enter
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onUpdate:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 0}
+          m_TargetAssemblyTypeName: 
+          m_MethodName: 
+          m_Mode: 0
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: 
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onExit:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 0}
+          m_TargetAssemblyTypeName: 
+          m_MethodName: 
+          m_Mode: 0
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: 
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+  moveEvents:
+    onEnter:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 154755272736235517}
+          m_TargetAssemblyTypeName: Minion.Controllers.MinionMoveController, Assembly-CSharp
+          m_MethodName: Enter
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+        - m_Target: {fileID: 4097841218994226417}
+          m_TargetAssemblyTypeName: Minion.MinionAnimationController, Assembly-CSharp
+          m_MethodName: Aim
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onUpdate:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 154755272736235517}
+          m_TargetAssemblyTypeName: Minion.Controllers.MinionMoveController, Assembly-CSharp
+          m_MethodName: OnUpdate
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onExit:
+      m_PersistentCalls:
+        m_Calls: []
+  chargeAttackEvents:
+    onEnter:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 4310436236341836283}
+          m_TargetAssemblyTypeName: Minion.Controllers.MinionChargeAttackController,
+            Assembly-CSharp
+          m_MethodName: Enter
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+        - m_Target: {fileID: 4097841218994226417}
+          m_TargetAssemblyTypeName: Minion.MinionAnimationController, Assembly-CSharp
+          m_MethodName: PrepareAttack
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onUpdate:
+      m_PersistentCalls:
+        m_Calls: []
+    onExit:
+      m_PersistentCalls:
+        m_Calls: []
+  attackEvents:
+    onEnter:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 2562709963566903697}
+          m_TargetAssemblyTypeName: Minion.Controllers.MinionAttackController, Assembly-CSharp
+          m_MethodName: Enter
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+        - m_Target: {fileID: 4097841218994226417}
+          m_TargetAssemblyTypeName: Minion.MinionAnimationController, Assembly-CSharp
+          m_MethodName: Attack
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+    onUpdate:
+      m_PersistentCalls:
+        m_Calls: []
+    onExit:
+      m_PersistentCalls:
+        m_Calls: []
 --- !u!114 &5575126865424349212
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -887,9 +1042,39 @@ MonoBehaviour:
   maxHealth: 6
   initHealth: 6
   canTakeDamage: 1
-  onDeathEvent: {fileID: 11400000, guid: c865da2c04eab7440a28ab0a5cad2306, type: 2}
+  onDeathEvent: {fileID: 0}
   onTakeDamageEvent: {fileID: 11400000, guid: d7c92d4ecc5578245b7e8d6eca51d765, type: 2}
-  onResetPointsEvent: {fileID: 11400000, guid: abe3ae86baf3a6143af44a83fa066bee, type: 2}
+  onResetPointsEvent: {fileID: 0}
+  onInternalDeathEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 938812201743576552}
+        m_TargetAssemblyTypeName: Minion.MinionAgent, Assembly-CSharp
+        m_MethodName: Die
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onInternalResetEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4749338615536808895}
+        m_TargetAssemblyTypeName: UI.HealthBar, Assembly-CSharp
+        m_MethodName: HandleReset
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &4310436236341836283
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -903,11 +1088,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   target: {fileID: 0}
-  preparationDuration: 0.75
-  attackDamage: 15
-  ChargeLength: 7
-  onCollidePlayerEventChannel: {fileID: 11400000, guid: 94a2de087d2d288459b928f536c58af1, type: 2}
-  minionAgent: {fileID: 938812201743576552}
+  minionConfig: {fileID: 11400000, guid: 0a4091bb2b815e646b3a1f5e68314944, type: 2}
 --- !u!114 &4389868529216407606
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -921,8 +1102,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   target: {fileID: 0}
-  timeInIdle: 2
-  minionAgent: {fileID: 938812201743576552}
+  minionConfig: {fileID: 11400000, guid: 0a4091bb2b815e646b3a1f5e68314944, type: 2}
 --- !u!114 &154755272736235517
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -936,11 +1116,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   target: {fileID: 0}
-  timeMoving: 2
-  speed: 4
-  minDistance: 3
-  minionAgent: {fileID: 938812201743576552}
---- !u!114 &4097841218994226417
+  minionConfig: {fileID: 11400000, guid: 0a4091bb2b815e646b3a1f5e68314944, type: 2}
+--- !u!114 &2562709963566903697
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -949,15 +1126,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 9068004531541268373}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bfd5cded5352132459787c4b99bcf973, type: 3}
+  m_Script: {fileID: 11500000, guid: 9073bb33d3a38f340bb21b890d7c2026, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  animator: {fileID: 791774486863146205}
-  aim: AIM
-  prepareAttack: PREPARE_ATTACK
-  attack: ATTACK
-  getHit: GET_HIT
---- !u!114 &2562709963566903697
+  target: {fileID: 0}
+  minionConfig: {fileID: 11400000, guid: 0a4091bb2b815e646b3a1f5e68314944, type: 2}
+  onCollidePlayerEventChannel: {fileID: 11400000, guid: 94a2de087d2d288459b928f536c58af1, type: 2}
+--- !u!114 &4097841218994226417
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -966,13 +1141,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 9068004531541268373}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9073bb33d3a38f340bb21b890d7c2026, type: 3}
+  m_Script: {fileID: 11500000, guid: bfd5cded5352132459787c4b99bcf973, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  target: {fileID: 0}
-  minionAgent: {fileID: 938812201743576552}
-  ChargeLength: 7
-  ChargeSpeed: 10
+  animator: {fileID: 791774486863146205}
+  aim: AIM
+  prepareAttack: PREPARE_ATTACK
+  attack: ATTACK
+  getHit: GET_HIT
 --- !u!1001 &6599575667949523276
 PrefabInstance:
   m_ObjectHideFlags: 0