Rogue Battle

Rogue battle system ouch
aps16104 · Mar 24, 2020 · 2a13bbf · 2a13bbf
1 parent beec105
commit 2a13bbf
Show file tree

Hide file tree

Showing 40 changed files with 2,991 additions and 245 deletions.
diff --git a/RPG/Assets/EnemyAnimations/Enemy.controller b/RPG/Assets/EnemyAnimations/Enemy.controller
@@ -14,19 +14,19 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: EHurt
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: EAttack
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -40,139 +40,14 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1101 &1101328346348381784
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: EHurt
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102765959320503236}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.5
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101584694540992774
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: EDead
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102180150596978962}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.78571427
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101744317989511542
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: EAttack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102765959320503236}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.64285725
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101807688134903310
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: EHurt
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102410806809194256}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.78571427
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101851545024304438
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: EAttack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102507741475534842}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.78571427
-  m_HasExitTime: 0
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1102 &1102180150596978962
+--- !u!1102 &1102387675937374448
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: E_Dead
+  m_Name: Idle_1
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -185,90 +60,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 1580d0b16bf16d24682f59ee212d5306, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102410806809194256
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: E_Hurt
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101328346348381784}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: c024eb4186e2a054b90e920ebba9956c, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102507741475534842
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: E_Attack
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101744317989511542}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 48862c1bce961ae4bb2b92b3265733c5, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &1102765959320503236
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: E_Idle
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101807688134903310}
-  - {fileID: 1101851545024304438}
-  - {fileID: 1101584694540992774}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 06c3ffc876e6b5a4e9b55dc00f0865a7, type: 2}
+  m_Motion: {fileID: 7400000, guid: 92fa84ca2ff3979468299f2a7c6efa64, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -284,17 +76,8 @@ AnimatorStateMachine:
   m_Name: Base Layer
   m_ChildStates:
   - serializedVersion: 1
-    m_State: {fileID: 1102410806809194256}
-    m_Position: {x: 120, y: 0, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102765959320503236}
-    m_Position: {x: 120, y: 84, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102180150596978962}
-    m_Position: {x: 372, y: 84, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102507741475534842}
-    m_Position: {x: 132, y: 192, z: 0}
+    m_State: {fileID: 1102387675937374448}
+    m_Position: {x: 200, y: 0, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -304,4 +87,4 @@ AnimatorStateMachine:
   m_EntryPosition: {x: -36, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 1102765959320503236}
+  m_DefaultState: {fileID: 1102387675937374448}
diff --git a/RPG/Assets/EnemyAnimations/Scene1.meta → RPG/Assets/EnemyAnimations/Mage.meta b/RPG/Assets/EnemyAnimations/Scene1.meta → RPG/Assets/EnemyAnimations/Mage.meta
diff --git a/RPG/Assets/EnemyAnimations/E_Attack.anim → ...Assets/EnemyAnimations/Mage/E_Attack.anim b/RPG/Assets/EnemyAnimations/E_Attack.anim → ...Assets/EnemyAnimations/Mage/E_Attack.anim
diff --git a/RPG/Assets/EnemyAnimations/Mage/E_Attack.anim.meta b/RPG/Assets/EnemyAnimations/Mage/E_Attack.anim.meta
diff --git a/RPG/Assets/EnemyAnimations/E_Dead.anim → RPG/Assets/EnemyAnimations/Mage/E_Dead.anim b/RPG/Assets/EnemyAnimations/E_Dead.anim → RPG/Assets/EnemyAnimations/Mage/E_Dead.anim
diff --git a/RPG/Assets/EnemyAnimations/Mage/E_Dead.anim.meta b/RPG/Assets/EnemyAnimations/Mage/E_Dead.anim.meta
diff --git a/RPG/Assets/EnemyAnimations/E_Hurt.anim → RPG/Assets/EnemyAnimations/Mage/E_Hurt.anim b/RPG/Assets/EnemyAnimations/E_Hurt.anim → RPG/Assets/EnemyAnimations/Mage/E_Hurt.anim
diff --git a/RPG/Assets/EnemyAnimations/Mage/E_Hurt.anim.meta b/RPG/Assets/EnemyAnimations/Mage/E_Hurt.anim.meta
diff --git a/RPG/Assets/EnemyAnimations/E_Idle.anim → RPG/Assets/EnemyAnimations/Mage/E_Idle.anim b/RPG/Assets/EnemyAnimations/E_Idle.anim → RPG/Assets/EnemyAnimations/Mage/E_Idle.anim
diff --git a/RPG/Assets/EnemyAnimations/Mage/E_Idle.anim.meta b/RPG/Assets/EnemyAnimations/Mage/E_Idle.anim.meta
diff --git a/RPG/Assets/EnemyAnimations/Scene1/Idle.anim → RPG/Assets/EnemyAnimations/Mage/Idle.anim b/RPG/Assets/EnemyAnimations/Scene1/Idle.anim → RPG/Assets/EnemyAnimations/Mage/Idle.anim
diff --git a/...ets/EnemyAnimations/Scene1/Idle.anim.meta → ...ssets/EnemyAnimations/Mage/Idle.anim.meta b/...ets/EnemyAnimations/Scene1/Idle.anim.meta → ...ssets/EnemyAnimations/Mage/Idle.anim.meta
diff --git a/...ts/EnemyAnimations/Scene1/mage.controller → ...sets/EnemyAnimations/Mage/mage.controller b/...ts/EnemyAnimations/Scene1/mage.controller → ...sets/EnemyAnimations/Mage/mage.controller
diff --git a/...emyAnimations/Scene1/mage.controller.meta → ...EnemyAnimations/Mage/mage.controller.meta b/...emyAnimations/Scene1/mage.controller.meta → ...EnemyAnimations/Mage/mage.controller.meta
diff --git a/RPG/Assets/EnemyAnimations/Rogue.meta b/RPG/Assets/EnemyAnimations/Rogue.meta
diff --git a/RPG/Assets/EnemyAnimations/Rogue/Attack.anim b/RPG/Assets/EnemyAnimations/Rogue/Attack.anim
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/...Assets/EnemyAnimations/E_Attack.anim.meta → ...ts/EnemyAnimations/Rogue/Attack.anim.meta b/...Assets/EnemyAnimations/E_Attack.anim.meta → ...ts/EnemyAnimations/Rogue/Attack.anim.meta