From 3d3910b8ccfcea768b92925b41a3467bddd2ded5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Wed, 29 Nov 2023 20:23:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EB=8B=9B=20=EC=84=B8=ED=8C=85=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=9C=A0=EB=8B=9B=EC=9D=B4=20=EC=A3=BD?= =?UTF-8?q?=EC=96=B4=EB=8F=84=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/1_Script/Info/UnitCtrl.cs | 8 +- Client/Assets/Resources/Unit/AxeGoblin.prefab | 4 +- Client/Assets/Resources/Unit/AxeOrc.prefab | 163 ++++---- Client/Assets/Resources/Unit/BossOrc.prefab | 165 ++++---- .../Assets/Resources/Unit/BottleGoblin.prefab | 167 ++++---- Client/Assets/Resources/Unit/BowGoblin.prefab | 167 ++++---- Client/Assets/Resources/Unit/SniperOrc.prefab | 165 ++++---- .../Assets/Resources/Unit/SpearGoblin.prefab | 167 ++++---- Client/Assets/Resources/Unit/SpearOrc.prefab | 165 ++++---- Client/Assets/Resources/Unit/SwordOrc.prefab | 165 ++++---- Client/Assets/Resources/Unit/WizardOcr.prefab | 165 ++++---- .../Orc/2.Animation/Goblin.meta | 8 + .../2.Animation/{ => Goblin}/Attack_Axe.anim | 0 .../{ => Goblin}/Attack_Axe.anim.meta | 0 .../2.Animation/{ => Goblin}/Attack_Bow.anim | 0 .../{ => Goblin}/Attack_Bow.anim.meta | 0 .../{ => Goblin}/Attack_FireBottle.anim | 0 .../{ => Goblin}/Attack_FireBottle.anim.meta | 0 .../{ => Goblin}/Attack_Spear.anim | 0 .../{ => Goblin}/Attack_Spear.anim.meta | 0 .../{ => Goblin}/Attack_Sword.anim | 0 .../{ => Goblin}/Attack_Sword.anim.meta | 0 .../Orc/2.Animation/{ => Goblin}/Die.anim | 0 .../2.Animation/{ => Goblin}/Die.anim.meta | 0 .../{ => Goblin}/Goblin_Axe_Anim.controller | 8 +- .../Goblin_Axe_Anim.controller.meta | 0 .../Goblin_Bottle_Anim.controller} | 244 ++++++++++-- .../Goblin_Bottle_Anim.controller.meta} | 2 +- .../{ => Goblin}/Goblin_Bow_Anim.controller | 196 ++++++++- .../Goblin_Bow_Anim.controller.meta | 2 +- .../{ => Goblin}/Goblin_Spear_Anim.controller | 242 +++++++++-- .../Goblin_Spear_Anim.controller.meta | 2 +- .../Orc/2.Animation/{ => Goblin}/Idle.anim | 0 .../2.Animation/{ => Goblin}/Idle.anim.meta | 0 .../Orc/2.Animation/{ => Goblin}/Run.anim | 0 .../2.Animation/{ => Goblin}/Run.anim.meta | 0 .../Orc/2.Animation/Orc/Attack_Axe.anim | 2 +- .../Orc/2.Animation/Orc/Attack_Bow.anim | 34 +- .../Orc/2.Animation/Orc/Attack_Hammer.anim | 250 +++++++++--- .../Orc/2.Animation/Orc/Attack_Riple.anim | 24 +- .../Orc/2.Animation/Orc/Attack_Spear.anim | 2 +- .../Orc/2.Animation/Orc/Attack_Sword.anim | 2 +- .../Orc/2.Animation/Orc/Attack_Wizard.anim | 2 +- .../Orc/2.Animation/Orc/Orc.controller | 377 ------------------ .../2.Animation/Orc/Orc_Axe_Anim.controller | 356 +++++++++++++++++ ...ller.meta => Orc_Axe_Anim.controller.meta} | 0 .../Orc/Orc_Sniper_Anim.controller | 356 +++++++++++++++++ .../Orc/Orc_Sniper_Anim.controller.meta | 8 + .../2.Animation/Orc/Orc_Spear_Anim.controller | 356 +++++++++++++++++ .../Orc/Orc_Spear_Anim.controller.meta | 8 + .../2.Animation/Orc/Orc_Sword_Anim.controller | 356 +++++++++++++++++ .../Orc/Orc_Sword_Anim.controller.meta | 8 + .../Orc/Orc_Wizard_Anim.controller | 356 +++++++++++++++++ .../Orc/Orc_Wizard_Anim.controller.meta | 8 + .../2.Animation/Orc_Boss/Orc_boss.controller | 287 ++++++++++--- 55 files changed, 3661 insertions(+), 1336 deletions(-) create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin.meta rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Axe.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Axe.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Bow.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Bow.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_FireBottle.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_FireBottle.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Spear.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Spear.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Sword.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Attack_Sword.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Die.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Die.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Axe_Anim.controller (98%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Axe_Anim.controller.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{Goblin_FireBottle_Anim.controller => Goblin/Goblin_Bottle_Anim.controller} (50%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{Goblin_FireBottle_Anim.controller.meta => Goblin/Goblin_Bottle_Anim.controller.meta} (79%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Bow_Anim.controller (50%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Bow_Anim.controller.meta (79%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Spear_Anim.controller (50%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Goblin_Spear_Anim.controller.meta (79%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Idle.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Idle.anim.meta (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Run.anim (100%) rename Client/Assets/SimpleCharacter/Orc/2.Animation/{ => Goblin}/Run.anim.meta (100%) delete mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller rename Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/{Orc.controller.meta => Orc_Axe_Anim.controller.meta} (100%) create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller.meta create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller.meta create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller.meta create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller create mode 100644 Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller.meta diff --git a/Client/Assets/1_Script/Info/UnitCtrl.cs b/Client/Assets/1_Script/Info/UnitCtrl.cs index 0f773ff4..e351f547 100644 --- a/Client/Assets/1_Script/Info/UnitCtrl.cs +++ b/Client/Assets/1_Script/Info/UnitCtrl.cs @@ -17,6 +17,8 @@ public class UnitCtrl : MonoBehaviour float delay; + bool isDie = false; + public void DataSet(UnitData ud) { unit.name = ud.name; @@ -33,6 +35,7 @@ public class UnitCtrl : MonoBehaviour enemyUnits = new List(); isHomeAttack = false; delay = 0; + isDie = false; } private void Start() { @@ -49,7 +52,7 @@ public class UnitCtrl : MonoBehaviour } private void Update() { - if (PlayCtrl.Instance.isEndGame) + if (PlayCtrl.Instance.isEndGame || isDie) return; delay -= Time.deltaTime; if (delay > 0) @@ -144,7 +147,8 @@ public class UnitCtrl : MonoBehaviour //임시로 삭제하게 처리 추후 재활용 할수 있게 처리할것 anim.SetBool("isDie", true); components[0].enabled = false; - components[1].enabled = false; + components[1].enabled = false; + isDie = true; Destroy(gameObject, 1.0f); } } diff --git a/Client/Assets/Resources/Unit/AxeGoblin.prefab b/Client/Assets/Resources/Unit/AxeGoblin.prefab index fce1eb9f..9e06c6fb 100644 --- a/Client/Assets/Resources/Unit/AxeGoblin.prefab +++ b/Client/Assets/Resources/Unit/AxeGoblin.prefab @@ -435,7 +435,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.5, y: 0} + m_Offset: {x: -1, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -446,7 +446,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 3} + m_Size: {x: 2, y: 6} m_EdgeRadius: 0 --- !u!50 &6841604708067326488 Rigidbody2D: diff --git a/Client/Assets/Resources/Unit/AxeOrc.prefab b/Client/Assets/Resources/Unit/AxeOrc.prefab index 8f7d1bfe..11be8146 100644 --- a/Client/Assets/Resources/Unit/AxeOrc.prefab +++ b/Client/Assets/Resources/Unit/AxeOrc.prefab @@ -378,8 +378,6 @@ GameObject: m_Component: - component: {fileID: 2483927644818548074} - component: {fileID: 329423649963977767} - - component: {fileID: 1391838057119166371} - - component: {fileID: 2718408380340403328} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -403,7 +401,6 @@ Transform: - {fileID: 1089565411040809704} - {fileID: 7512437731049582488} - {fileID: 3505208489114043596} - - {fileID: 8308941068281965807} m_Father: {fileID: 8529852409354240127} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &329423649963977767 @@ -427,78 +424,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &1391838057119166371 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5202567711704549509} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.8, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 3} - m_EdgeRadius: 0 ---- !u!50 &2718408380340403328 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5202567711704549509} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &5305616451715979426 GameObject: m_ObjectHideFlags: 0 @@ -612,10 +537,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2483927644818548074} + m_Father: {fileID: 8529852409354240127} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &2701044855310260780 BoxCollider2D: @@ -672,9 +597,11 @@ GameObject: m_Component: - component: {fileID: 8529852409354240127} - component: {fileID: 2589336159898910466} - m_Layer: 0 + - component: {fileID: 7625460201478623383} + - component: {fileID: 6952714118688121201} + m_Layer: 7 m_Name: AxeOrc - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -693,6 +620,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2483927644818548074} + - {fileID: 8308941068281965807} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2589336159898910466 @@ -716,9 +644,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 329423649963977767} - defensObj: {fileID: 5202567711704549509} + defensObj: {fileID: 5457694140059682744} unitSprite: {fileID: 21300000, guid: ed4edea9d1655314ebdbb0d64eb3b9f5, type: 3} + components: + - {fileID: 2701044855310260780} + - {fileID: 7625460201478623383} isEnemy: 0 +--- !u!61 &7625460201478623383 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5519776136511728592} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -1.6, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 6} + m_EdgeRadius: 0 +--- !u!50 &6952714118688121201 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5519776136511728592} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &5940268361533643883 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Unit/BossOrc.prefab b/Client/Assets/Resources/Unit/BossOrc.prefab index 607dea90..dd272032 100644 --- a/Client/Assets/Resources/Unit/BossOrc.prefab +++ b/Client/Assets/Resources/Unit/BossOrc.prefab @@ -478,12 +478,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5394410446367396617} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4582880172862623588} + m_Father: {fileID: 193799572164042617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &5510248541106892167 BoxCollider2D: @@ -540,8 +540,6 @@ GameObject: m_Component: - component: {fileID: 4582880172862623588} - component: {fileID: 7172599124787281636} - - component: {fileID: 1665130328834246110} - - component: {fileID: 601810425142103701} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -565,7 +563,6 @@ Transform: - {fileID: 2598613287243255669} - {fileID: 7356139521278242397} - {fileID: 8248822358364676371} - - {fileID: 5641403754949759843} m_Father: {fileID: 193799572164042617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7172599124787281636 @@ -589,78 +586,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &1665130328834246110 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5803878416357459924} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -1, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 4} - m_EdgeRadius: 0 ---- !u!50 &601810425142103701 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5803878416357459924} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &7975896103464280258 GameObject: m_ObjectHideFlags: 0 @@ -757,9 +682,11 @@ GameObject: m_Component: - component: {fileID: 193799572164042617} - component: {fileID: 4901234637459740715} - m_Layer: 0 + - component: {fileID: 2916361249833597681} + - component: {fileID: 8443339126854552340} + m_Layer: 7 m_Name: BossOrc - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -778,6 +705,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4582880172862623588} + - {fileID: 5641403754949759843} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4901234637459740715 @@ -801,6 +729,81 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 7172599124787281636} - defensObj: {fileID: 5803878416357459924} + defensObj: {fileID: 5394410446367396617} unitSprite: {fileID: 21300000, guid: 672cca89551c12949a58273b65648f5d, type: 3} + components: + - {fileID: 5510248541106892167} + - {fileID: 2916361249833597681} isEnemy: 0 +--- !u!61 &2916361249833597681 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8147751665159809164} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -2, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4, y: 8} + m_EdgeRadius: 0 +--- !u!50 &8443339126854552340 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8147751665159809164} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Client/Assets/Resources/Unit/BottleGoblin.prefab b/Client/Assets/Resources/Unit/BottleGoblin.prefab index 78c0c00d..1dc4d76d 100644 --- a/Client/Assets/Resources/Unit/BottleGoblin.prefab +++ b/Client/Assets/Resources/Unit/BottleGoblin.prefab @@ -10,9 +10,11 @@ GameObject: m_Component: - component: {fileID: 3436199915513243441} - component: {fileID: 2776803815121232242} - m_Layer: 0 + - component: {fileID: 5738870732902892297} + - component: {fileID: 4185426624014061997} + m_Layer: 7 m_Name: BottleGoblin - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -31,6 +33,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 504896847942789921} + - {fileID: 4757198726986367761} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2776803815121232242 @@ -54,9 +57,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 5131019610558876714} - defensObj: {fileID: 4796920336096767917} - unitSprite: {fileID: 21300000, guid: 7237ab503fcd87f4d8f7da4988a39481, type: 3} + defensObj: {fileID: 4865289560172948698} + unitSprite: {fileID: 21300000, guid: 778b2014b5fa98a4386312e310d5d32a, type: 3} + components: + - {fileID: 8344799157953162368} + - {fileID: 4185426624014061997} isEnemy: 0 +--- !u!50 &5738870732902892297 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739751794992017665} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &4185426624014061997 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739751794992017665} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -4, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7, y: 6} + m_EdgeRadius: 0 --- !u!1 &765694612334037139 GameObject: m_ObjectHideFlags: 0 @@ -437,8 +515,6 @@ GameObject: m_Component: - component: {fileID: 504896847942789921} - component: {fileID: 5131019610558876714} - - component: {fileID: 1111267764396992459} - - component: {fileID: 3763579585478257792} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -462,7 +538,6 @@ Transform: - {fileID: 5647638377885378446} - {fileID: 4501720829375321897} - {fileID: 8747858190793172412} - - {fileID: 4757198726986367761} m_Father: {fileID: 3436199915513243441} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5131019610558876714 @@ -475,7 +550,7 @@ Animator: m_GameObject: {fileID: 4796920336096767917} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: dc0e2d11f7cec5349a3226313745ef8f, type: 2} + m_Controller: {fileID: 9100000, guid: a7d0d001894be75408c42ba92f961852, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -486,78 +561,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &1111267764396992459 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4796920336096767917} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -2, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 3.5, y: 3} - m_EdgeRadius: 0 ---- !u!50 &3763579585478257792 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4796920336096767917} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &4865289560172948698 GameObject: m_ObjectHideFlags: 0 @@ -585,10 +588,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 504896847942789921} + m_Father: {fileID: 3436199915513243441} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &8344799157953162368 BoxCollider2D: diff --git a/Client/Assets/Resources/Unit/BowGoblin.prefab b/Client/Assets/Resources/Unit/BowGoblin.prefab index 62ac8589..bef431d8 100644 --- a/Client/Assets/Resources/Unit/BowGoblin.prefab +++ b/Client/Assets/Resources/Unit/BowGoblin.prefab @@ -178,9 +178,11 @@ GameObject: m_Component: - component: {fileID: 3623094926497331022} - component: {fileID: 1769621809454940063} - m_Layer: 0 + - component: {fileID: -1829243753822022747} + - component: {fileID: 1912085603985074863} + m_Layer: 7 m_Name: BowGoblin - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -199,6 +201,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7811760244381764632} + - {fileID: 238538050986594859} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1769621809454940063 @@ -222,9 +225,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 5792288329294744231} - defensObj: {fileID: 7430483768640828660} + defensObj: {fileID: 5687174848202237927} unitSprite: {fileID: 21300000, guid: 7237ab503fcd87f4d8f7da4988a39481, type: 3} + components: + - {fileID: 6559031917799904799} + - {fileID: 1912085603985074863} isEnemy: 0 +--- !u!50 &-1829243753822022747 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3080024144302177418} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1912085603985074863 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3080024144302177418} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -4, y: 2} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7, y: 20} + m_EdgeRadius: 0 --- !u!1 &5163627630782012302 GameObject: m_ObjectHideFlags: 0 @@ -283,12 +361,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5687174848202237927} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7811760244381764632} + m_Father: {fileID: 3623094926497331022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &6559031917799904799 BoxCollider2D: @@ -515,8 +593,6 @@ GameObject: m_Component: - component: {fileID: 7811760244381764632} - component: {fileID: 5792288329294744231} - - component: {fileID: 8929573063855443596} - - component: {fileID: 7740350645226134980} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -540,7 +616,6 @@ Transform: - {fileID: 9094885751350206744} - {fileID: 3081040858620092368} - {fileID: 2650422636621369406} - - {fileID: 238538050986594859} m_Father: {fileID: 3623094926497331022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5792288329294744231 @@ -553,7 +628,7 @@ Animator: m_GameObject: {fileID: 7430483768640828660} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: dabda1a8471594a4fbd3596fcf86b531, type: 2} + m_Controller: {fileID: 9100000, guid: 4b01465cc9b6e5b47946ae46c3a1afe4, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -564,78 +639,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &8929573063855443596 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7430483768640828660} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -2, y: 1} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 3.5, y: 10} - m_EdgeRadius: 0 ---- !u!50 &7740350645226134980 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7430483768640828660} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &8284918912792215329 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Unit/SniperOrc.prefab b/Client/Assets/Resources/Unit/SniperOrc.prefab index 2d46b073..801ec65c 100644 --- a/Client/Assets/Resources/Unit/SniperOrc.prefab +++ b/Client/Assets/Resources/Unit/SniperOrc.prefab @@ -94,8 +94,6 @@ GameObject: m_Component: - component: {fileID: 847770706864166317} - component: {fileID: 1932800304912715772} - - component: {fileID: 1789689179983760857} - - component: {fileID: 4101304970097824490} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -119,7 +117,6 @@ Transform: - {fileID: 2854076572505984862} - {fileID: 664091468388663800} - {fileID: 1621451106998775156} - - {fileID: 5909239242552943093} m_Father: {fileID: 8372963211402671670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1932800304912715772 @@ -132,7 +129,7 @@ Animator: m_GameObject: {fileID: 917017725654204708} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0ab67aa14e183a142b60fb3da9577326, type: 2} + m_Controller: {fileID: 9100000, guid: 707742545596c914f965ced4d1e44107, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -143,78 +140,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &1789689179983760857 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917017725654204708} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -3, y: 1} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 6, y: 10} - m_EdgeRadius: 0 ---- !u!50 &4101304970097824490 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917017725654204708} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &1399126606851360232 GameObject: m_ObjectHideFlags: 0 @@ -242,10 +167,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 847770706864166317} + m_Father: {fileID: 8372963211402671670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &2276292251516339873 BoxCollider2D: @@ -302,9 +227,11 @@ GameObject: m_Component: - component: {fileID: 8372963211402671670} - component: {fileID: 7468181147198415131} - m_Layer: 0 + - component: {fileID: -2046672948471792156} + - component: {fileID: 70567308966960723} + m_Layer: 7 m_Name: SniperOrc - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -323,6 +250,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 847770706864166317} + - {fileID: 5909239242552943093} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7468181147198415131 @@ -346,9 +274,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 1932800304912715772} - defensObj: {fileID: 917017725654204708} + defensObj: {fileID: 1399126606851360232} unitSprite: {fileID: 21300000, guid: e5ee985ce8c781f40b3fa4462adce853, type: 3} + components: + - {fileID: 2276292251516339873} + - {fileID: 70567308966960723} isEnemy: 0 +--- !u!50 &-2046672948471792156 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650462630939677643} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &70567308966960723 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650462630939677643} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -6, y: 2} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 12, y: 20} + m_EdgeRadius: 0 --- !u!1 &2266151494579388493 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Unit/SpearGoblin.prefab b/Client/Assets/Resources/Unit/SpearGoblin.prefab index 6cca81ad..deb0e13c 100644 --- a/Client/Assets/Resources/Unit/SpearGoblin.prefab +++ b/Client/Assets/Resources/Unit/SpearGoblin.prefab @@ -380,8 +380,6 @@ GameObject: m_Component: - component: {fileID: 3643426941479537728} - component: {fileID: 903457003136911245} - - component: {fileID: 4546833238784465106} - - component: {fileID: 6029731378227638698} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -405,7 +403,6 @@ Transform: - {fileID: 8734329714844297652} - {fileID: 1145321000044139182} - {fileID: 943163044372240768} - - {fileID: 8961760370526988830} m_Father: {fileID: 1727881365108548452} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &903457003136911245 @@ -418,7 +415,7 @@ Animator: m_GameObject: {fileID: 3795239891175335840} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6f6f58ffe0d8bde4b8082055a3f2e0dd, type: 2} + m_Controller: {fileID: 9100000, guid: 35a15ec5eb099a14c80880e78adb8af7, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -429,78 +426,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &4546833238784465106 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3795239891175335840} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.65, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.3, y: 3} - m_EdgeRadius: 0 ---- !u!50 &6029731378227638698 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3795239891175335840} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &5730867798969329870 GameObject: m_ObjectHideFlags: 0 @@ -528,10 +453,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3643426941479537728} + m_Father: {fileID: 1727881365108548452} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &6478065243806984494 BoxCollider2D: @@ -757,9 +682,11 @@ GameObject: m_Component: - component: {fileID: 1727881365108548452} - component: {fileID: 8474998885444812674} - m_Layer: 0 + - component: {fileID: 2203462276162188} + - component: {fileID: 7980000761330293153} + m_Layer: 7 m_Name: SpearGoblin - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -778,6 +705,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3643426941479537728} + - {fileID: 8961760370526988830} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8474998885444812674 @@ -801,6 +729,81 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 903457003136911245} - defensObj: {fileID: 3795239891175335840} - unitSprite: {fileID: 21300000, guid: 7237ab503fcd87f4d8f7da4988a39481, type: 3} + defensObj: {fileID: 5730867798969329870} + unitSprite: {fileID: 21300000, guid: 37d45d8e4e525d74dbeea0227a54edfd, type: 3} + components: + - {fileID: 6478065243806984494} + - {fileID: 7980000761330293153} isEnemy: 0 +--- !u!50 &2203462276162188 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510901469564046753} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &7980000761330293153 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510901469564046753} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -1.3, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.6, y: 6} + m_EdgeRadius: 0 diff --git a/Client/Assets/Resources/Unit/SpearOrc.prefab b/Client/Assets/Resources/Unit/SpearOrc.prefab index 137197c0..45d4ec33 100644 --- a/Client/Assets/Resources/Unit/SpearOrc.prefab +++ b/Client/Assets/Resources/Unit/SpearOrc.prefab @@ -535,10 +535,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 432078035831360686} + m_Father: {fileID: 2492754288297474295} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &3837055167809668209 BoxCollider2D: @@ -627,9 +627,11 @@ GameObject: m_Component: - component: {fileID: 2492754288297474295} - component: {fileID: 7995012865909342350} - m_Layer: 0 + - component: {fileID: 4987523579565879674} + - component: {fileID: 1688149060366882039} + m_Layer: 7 m_Name: SpearOrc - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -648,6 +650,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 432078035831360686} + - {fileID: 6878726150125682665} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7995012865909342350 @@ -671,9 +674,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 407053826467451253} - defensObj: {fileID: 8437527142586342063} + defensObj: {fileID: 5259662300957496984} unitSprite: {fileID: 21300000, guid: c6bf3ca8c989fdf47ae764c4397d8d53, type: 3} + components: + - {fileID: 3837055167809668209} + - {fileID: 1688149060366882039} isEnemy: 0 +--- !u!50 &4987523579565879674 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7452448973010949785} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1688149060366882039 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7452448973010949785} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -2, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4, y: 6} + m_EdgeRadius: 0 --- !u!1 &8437527142586342063 GameObject: m_ObjectHideFlags: 0 @@ -684,8 +762,6 @@ GameObject: m_Component: - component: {fileID: 432078035831360686} - component: {fileID: 407053826467451253} - - component: {fileID: 1615018545498178512} - - component: {fileID: 4768894310616850642} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -709,7 +785,6 @@ Transform: - {fileID: 8278266391377380754} - {fileID: 6019344069990322395} - {fileID: 7684009866734031208} - - {fileID: 6878726150125682665} m_Father: {fileID: 2492754288297474295} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &407053826467451253 @@ -722,7 +797,7 @@ Animator: m_GameObject: {fileID: 8437527142586342063} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0ab67aa14e183a142b60fb3da9577326, type: 2} + m_Controller: {fileID: 9100000, guid: 036873cbd1875944b952f0b414406c6b, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -733,78 +808,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &1615018545498178512 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8437527142586342063} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -1, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 3} - m_EdgeRadius: 0 ---- !u!50 &4768894310616850642 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8437527142586342063} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &8995202878877031745 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Unit/SwordOrc.prefab b/Client/Assets/Resources/Unit/SwordOrc.prefab index a2bdf56f..f5a5812e 100644 --- a/Client/Assets/Resources/Unit/SwordOrc.prefab +++ b/Client/Assets/Resources/Unit/SwordOrc.prefab @@ -10,8 +10,6 @@ GameObject: m_Component: - component: {fileID: 4898648979220021324} - component: {fileID: 1714589236296335755} - - component: {fileID: 7331825330341503889} - - component: {fileID: 2179414487157667128} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -35,7 +33,6 @@ Transform: - {fileID: 5639495657751042350} - {fileID: 8789508997091260270} - {fileID: 8391164906952258745} - - {fileID: 7082007186438420077} m_Father: {fileID: 4386556694652690157} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1714589236296335755 @@ -48,7 +45,7 @@ Animator: m_GameObject: {fileID: 110732632985933204} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0ab67aa14e183a142b60fb3da9577326, type: 2} + m_Controller: {fileID: 9100000, guid: 0d1d38e78b381734fab4df6975ddb63c, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -59,78 +56,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &7331825330341503889 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110732632985933204} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -1, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.5, y: 3} - m_EdgeRadius: 0 ---- !u!50 &2179414487157667128 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110732632985933204} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &1147901913054829164 GameObject: m_ObjectHideFlags: 0 @@ -274,10 +199,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4898648979220021324} + m_Father: {fileID: 4386556694652690157} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &7976496776608135340 BoxCollider2D: @@ -334,9 +259,11 @@ GameObject: m_Component: - component: {fileID: 4386556694652690157} - component: {fileID: 824116206199136150} - m_Layer: 0 + - component: {fileID: 6588770850448157605} + - component: {fileID: 781230066196702268} + m_Layer: 7 m_Name: SwordOrc - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -355,6 +282,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4898648979220021324} + - {fileID: 7082007186438420077} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &824116206199136150 @@ -378,9 +306,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 1714589236296335755} - defensObj: {fileID: 110732632985933204} + defensObj: {fileID: 2291396644892617575} unitSprite: {fileID: 21300000, guid: 7e27c4f59b7647f418ee62e474276e76, type: 3} + components: + - {fileID: 7976496776608135340} + - {fileID: 781230066196702268} isEnemy: 0 +--- !u!50 &6588770850448157605 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3373440992565980114} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &781230066196702268 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3373440992565980114} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -2, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3, y: 6} + m_EdgeRadius: 0 --- !u!1 &5611546276501702048 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Unit/WizardOcr.prefab b/Client/Assets/Resources/Unit/WizardOcr.prefab index ba815d5f..ac65b620 100644 --- a/Client/Assets/Resources/Unit/WizardOcr.prefab +++ b/Client/Assets/Resources/Unit/WizardOcr.prefab @@ -280,10 +280,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2164464801400682957} + m_Father: {fileID: 5995982595438387061} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &3938316645550884337 BoxCollider2D: @@ -372,9 +372,11 @@ GameObject: m_Component: - component: {fileID: 5995982595438387061} - component: {fileID: 2789618061690570302} - m_Layer: 0 + - component: {fileID: 3097212180987962942} + - component: {fileID: 3641096084635743930} + m_Layer: 7 m_Name: WizardOcr - m_TagString: Untagged + m_TagString: GameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -393,6 +395,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2164464801400682957} + - {fileID: 5941941750141837487} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2789618061690570302 @@ -416,9 +419,84 @@ MonoBehaviour: moveSpeed: 5 buy: e8030000e8030000e8030000e8030000e8030000 anim: {fileID: 5565512821897120660} - defensObj: {fileID: 4166535683744910937} + defensObj: {fileID: 2802841651036052064} unitSprite: {fileID: 21300000, guid: 17c61b61d759c43479969b04c1cef76b, type: 3} + components: + - {fileID: 3938316645550884337} + - {fileID: 3641096084635743930} isEnemy: 0 +--- !u!50 &3097212180987962942 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3829017953174338138} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &3641096084635743930 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3829017953174338138} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -8, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 16, y: 13.5} + m_EdgeRadius: 0 --- !u!1 &4166535683744910937 GameObject: m_ObjectHideFlags: 0 @@ -429,8 +507,6 @@ GameObject: m_Component: - component: {fileID: 2164464801400682957} - component: {fileID: 5565512821897120660} - - component: {fileID: 4980703596400346743} - - component: {fileID: 1874504088528107702} m_Layer: 7 m_Name: Unit m_TagString: GameController @@ -454,7 +530,6 @@ Transform: - {fileID: 6867524867820925868} - {fileID: 2765254711698571548} - {fileID: 4959118832617229222} - - {fileID: 5941941750141837487} m_Father: {fileID: 5995982595438387061} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5565512821897120660 @@ -467,7 +542,7 @@ Animator: m_GameObject: {fileID: 4166535683744910937} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0ab67aa14e183a142b60fb3da9577326, type: 2} + m_Controller: {fileID: 9100000, guid: cd2f7a12ef231114e8655a1fc04d9e4d, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -478,78 +553,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!61 &4980703596400346743 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4166535683744910937} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.09324181, y: 0.17130476} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.0043368, y: 1.429346} - m_EdgeRadius: 0 ---- !u!50 &1874504088528107702 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4166535683744910937} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1 &4947475015731931345 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin.meta new file mode 100644 index 00000000..533bda9c --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6222ce5f4221e1e4b8241954c5062078 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Axe.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Axe.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Axe.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Axe.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Axe.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Axe.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Axe.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Axe.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Bow.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Bow.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Bow.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Bow.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Bow.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Bow.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Bow.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Bow.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_FireBottle.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_FireBottle.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_FireBottle.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_FireBottle.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_FireBottle.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_FireBottle.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_FireBottle.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_FireBottle.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Spear.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Spear.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Spear.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Spear.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Spear.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Spear.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Spear.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Spear.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Sword.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Sword.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Sword.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Sword.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Sword.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Sword.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Attack_Sword.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Attack_Sword.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Die.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Die.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Die.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Die.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Die.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Die.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Die.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Die.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Axe_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Axe_Anim.controller similarity index 98% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Axe_Anim.controller rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Axe_Anim.controller index 1e8d17d9..1ac17d2b 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Axe_Anim.controller +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Axe_Anim.controller @@ -136,19 +136,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: attack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: isDie 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 @@ -277,7 +277,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Attack_Axe + m_Name: Attack m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Axe_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Axe_Anim.controller.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Axe_Anim.controller.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Axe_Anim.controller.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller similarity index 50% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller index 4b849d91..ae89e152 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller @@ -1,6 +1,106 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8460645439575629097 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102720897247939294} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.0000000011261556 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7525655733782091643 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3784529877871834267 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102171259484972298} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.000000025404411 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1043987878687160456 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102924555222422638} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 7.69423e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-123055428736890784 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -9,14 +109,14 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102171259484972298} + m_DstState: {fileID: 1102720897247939294} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.57142854 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -28,9 +128,27 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Goblin_FireBottle_Anim + m_Name: Goblin_Bottle_Anim serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +162,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &159584805761107944 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1102171259484972298 AnimatorState: serializedVersion: 6 @@ -54,7 +197,9 @@ AnimatorState: m_Name: Run m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8460645439575629097} + - {fileID: 159584805761107944} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -70,32 +215,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102240354912787348 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack_FireBottle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: dde7965814791ba4b8fd39a8e4b3bac7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102720897247939294 AnimatorState: serializedVersion: 6 @@ -108,6 +227,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3784529877871834267} + - {fileID: -1043987878687160456} + - {fileID: 8017598158396156684} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -149,6 +270,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102924555222422638 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -123055428736890784} + - {fileID: -7525655733782091643} + 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: dde7965814791ba4b8fd39a8e4b3bac7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &1107984067613276302 AnimatorStateMachine: serializedVersion: 6 @@ -163,13 +312,13 @@ AnimatorStateMachine: m_Position: {x: 150, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: 1102802062255864104} - m_Position: {x: 353.45068, y: 75.57909, z: 0} + m_Position: {x: 390, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 1102171259484972298} m_Position: {x: 150, y: 360, z: 0} - serializedVersion: 1 - m_State: {fileID: 1102240354912787348} - m_Position: {x: 444, y: 552, z: 0} + m_State: {fileID: 1102924555222422638} + m_Position: {x: 500, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -180,3 +329,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102720897247939294} +--- !u!1101 &8017598158396156684 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 3.0776923e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller.meta similarity index 79% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller.meta index 595c2385..127d61c7 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_FireBottle_Anim.controller.meta +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bottle_Anim.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc0e2d11f7cec5349a3226313745ef8f +guid: a7d0d001894be75408c42ba92f961852 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller similarity index 50% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller index c5f5a9e6..a78a1567 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller @@ -1,6 +1,106 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8460645439575629097 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102720897247939294} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.0000000011261556 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7525655733782091643 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3784529877871834267 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102171259484972298} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.000000025404411 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1043987878687160456 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102924555222422638} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 7.69423e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-123055428736890784 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -9,14 +109,14 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102171259484972298} + m_DstState: {fileID: 1102720897247939294} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.57142854 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -30,7 +130,25 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Goblin_Bow_Anim serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +162,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &159584805761107944 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1102171259484972298 AnimatorState: serializedVersion: 6 @@ -54,7 +197,9 @@ AnimatorState: m_Name: Run m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8460645439575629097} + - {fileID: 159584805761107944} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -82,6 +227,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3784529877871834267} + - {fileID: -1043987878687160456} + - {fileID: 8017598158396156684} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -123,17 +270,19 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102849415135785816 +--- !u!1102 &1102924555222422638 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Attack_Bow + m_Name: Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -123055428736890784} + - {fileID: -7525655733782091643} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -163,13 +312,13 @@ AnimatorStateMachine: m_Position: {x: 150, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: 1102802062255864104} - m_Position: {x: 353.45068, y: 75.57909, z: 0} + m_Position: {x: 390, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 1102171259484972298} m_Position: {x: 150, y: 360, z: 0} - serializedVersion: 1 - m_State: {fileID: 1102849415135785816} - m_Position: {x: 420, y: 396, z: 0} + m_State: {fileID: 1102924555222422638} + m_Position: {x: 500, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -180,3 +329,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102720897247939294} +--- !u!1101 &8017598158396156684 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 3.0776923e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller.meta similarity index 79% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller.meta index a79e6a9f..2b4904eb 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Bow_Anim.controller.meta +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Bow_Anim.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dabda1a8471594a4fbd3596fcf86b531 +guid: 4b01465cc9b6e5b47946ae46c3a1afe4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller similarity index 50% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller index 07780766..ff4bf0ad 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller @@ -1,6 +1,106 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8460645439575629097 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102720897247939294} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.0000000011261556 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7525655733782091643 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3784529877871834267 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102171259484972298} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.000000025404411 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1043987878687160456 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102924555222422638} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 7.69423e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-123055428736890784 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -9,14 +109,14 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102171259484972298} + m_DstState: {fileID: 1102720897247939294} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.57142854 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -30,7 +130,25 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Goblin_Spear_Anim serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +162,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &159584805761107944 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1102171259484972298 AnimatorState: serializedVersion: 6 @@ -54,7 +197,9 @@ AnimatorState: m_Name: Run m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8460645439575629097} + - {fileID: 159584805761107944} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -70,32 +215,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102579883343695344 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack_Spear - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: cac02dac160bde74b97aeda53755853c, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102720897247939294 AnimatorState: serializedVersion: 6 @@ -108,6 +227,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3784529877871834267} + - {fileID: -1043987878687160456} + - {fileID: 8017598158396156684} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -149,6 +270,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102924555222422638 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -123055428736890784} + - {fileID: -7525655733782091643} + 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: cac02dac160bde74b97aeda53755853c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &1107984067613276302 AnimatorStateMachine: serializedVersion: 6 @@ -163,13 +312,13 @@ AnimatorStateMachine: m_Position: {x: 150, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: 1102802062255864104} - m_Position: {x: 353.45068, y: 75.57909, z: 0} + m_Position: {x: 390, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 1102171259484972298} m_Position: {x: 150, y: 360, z: 0} - serializedVersion: 1 - m_State: {fileID: 1102579883343695344} - m_Position: {x: 220, y: 460, z: 0} + m_State: {fileID: 1102924555222422638} + m_Position: {x: 500, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -180,3 +329,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102720897247939294} +--- !u!1101 &8017598158396156684 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102802062255864104} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 3.0776923e-10 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller.meta similarity index 79% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller.meta index 194a0fc0..1d652db2 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin_Spear_Anim.controller.meta +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Goblin_Spear_Anim.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f6f58ffe0d8bde4b8082055a3f2e0dd +guid: 35a15ec5eb099a14c80880e78adb8af7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Idle.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Idle.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Idle.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Idle.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Idle.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Idle.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Idle.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Idle.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Run.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Run.anim similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Run.anim rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Run.anim diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Run.anim.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Run.anim.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Run.anim.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Goblin/Run.anim.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Axe.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Axe.anim index a4c0a520..c89a1c69 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Axe.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Axe.anim @@ -594,7 +594,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Bow.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Bow.anim index 8c046d1e..dfcd52aa 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Bow.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Bow.anim @@ -3,10 +3,11 @@ --- !u!74 &7400000 AnimationClip: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Attack_Bow - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -50,7 +51,8 @@ AnimationClip: path: Body/WeaponSocket/arrow m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -78,6 +80,7 @@ AnimationClip: path: Body/WeaponSocket/arrow classID: 1 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -93,6 +96,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1854698855 attribute: 2086281974 @@ -100,6 +105,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -111,7 +118,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -122,7 +129,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -159,7 +167,9 @@ AnimationClip: path: Body/WeaponSocket/arrow classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -196,7 +206,9 @@ AnimationClip: path: Body/WeaponSocket/arrow classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -233,7 +245,9 @@ AnimationClip: path: Body/WeaponSocket/arrow classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -261,8 +275,8 @@ AnimationClip: path: Body/WeaponSocket/arrow classID: 1 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 m_Events: [] diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Hammer.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Hammer.anim index f55bf2d3..d9424ae8 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Hammer.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Hammer.anim @@ -3,10 +3,11 @@ --- !u!74 &7400000 AnimationClip: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Attack_Hammer - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -754,6 +755,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 694448277 attribute: 1 @@ -761,6 +764,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1476973793 attribute: 1 @@ -768,6 +773,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3205427958 attribute: 1 @@ -775,6 +782,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2073732236 attribute: 1 @@ -782,6 +791,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 694585260 attribute: 1 @@ -789,6 +800,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 4114949537 attribute: 4 @@ -796,6 +809,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 694448277 attribute: 4 @@ -803,6 +818,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1476973793 attribute: 4 @@ -810,6 +827,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3205427958 attribute: 4 @@ -817,6 +836,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 694585260 attribute: 4 @@ -824,6 +845,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2073732236 attribute: 4 @@ -831,6 +854,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -842,7 +867,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -853,7 +878,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -908,7 +934,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -963,7 +991,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1018,7 +1048,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1073,7 +1105,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1128,7 +1162,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1183,7 +1219,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1256,7 +1294,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1329,7 +1369,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1402,7 +1444,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1475,7 +1519,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1548,7 +1594,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1621,7 +1669,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1676,7 +1726,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1731,7 +1783,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1786,7 +1840,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1850,7 +1906,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1914,7 +1972,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -1978,7 +2038,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2042,7 +2104,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2106,7 +2170,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2170,7 +2236,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2234,7 +2302,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2298,7 +2368,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2362,7 +2434,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2426,7 +2500,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2490,7 +2566,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2554,7 +2632,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2618,7 +2698,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2682,7 +2764,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2746,7 +2830,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2810,7 +2896,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2874,7 +2962,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -2938,7 +3028,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -3002,7 +3094,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -3066,7 +3160,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -3130,8 +3226,10 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3141,7 +3239,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3151,7 +3251,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3161,7 +3263,9 @@ AnimationClip: path: Body/WeaponSocket classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3171,7 +3275,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3181,7 +3287,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3191,7 +3299,9 @@ AnimationClip: path: Body classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3201,7 +3311,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3211,7 +3323,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3221,7 +3335,9 @@ AnimationClip: path: Leg_L classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3231,7 +3347,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3241,7 +3359,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3251,7 +3371,9 @@ AnimationClip: path: Body/Head classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3261,7 +3383,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3271,7 +3395,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3281,7 +3407,9 @@ AnimationClip: path: Body/Head/hair classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3291,7 +3419,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3301,7 +3431,9 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -3311,7 +3443,7 @@ AnimationClip: path: Leg-R classID: 4 script: {fileID: 0} + flags: 16 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 m_Events: [] diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Riple.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Riple.anim index 297471b9..356ae4f7 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Riple.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Riple.anim @@ -3,10 +3,11 @@ --- !u!74 &7400000 AnimationClip: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Attack_Riple - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -74,6 +75,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -85,7 +88,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -96,7 +99,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -142,7 +146,9 @@ AnimationClip: path: Body/WeaponSocket/rifle classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -188,7 +194,9 @@ AnimationClip: path: Body/WeaponSocket/rifle classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -234,8 +242,8 @@ AnimationClip: path: Body/WeaponSocket/rifle classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 m_Events: [] diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Spear.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Spear.anim index 04217aea..b3d9dbe9 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Spear.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Spear.anim @@ -736,7 +736,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Sword.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Sword.anim index 03cbee01..ca5aff63 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Sword.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Sword.anim @@ -759,7 +759,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Wizard.anim b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Wizard.anim index 56917655..eb180c9e 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Wizard.anim +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Attack_Wizard.anim @@ -219,7 +219,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller deleted file mode 100644 index 9c681cf5..00000000 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller +++ /dev/null @@ -1,377 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107408652686126394} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &1102288765891452188 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Spear - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 47c1476d184e2104e9aad0e842d8788d, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102298494274214370 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Hit - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 5c5a7d72b98a4474097eb96d23c8248c, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102402041849555170 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Run - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 93bb095c037cdc447abc944226c6da07, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102409211675107338 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Axe - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: ad2038b779ab96543934637e2d47d628, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102438133890812478 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Sword - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: abbfaf75f57fb2a41a6b844237f45858, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102516295600635842 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 5f129987453525547970cd8c0181edc3, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102532011203141802 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Hammer - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: e2f33184e12e7df42acb638fae51963c, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102620876007161780 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Wizard - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 91d9b4a90b3916947a3be35ab70ca5b0, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102621097403430918 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Spell_Wizard - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: b2969fa7e974e7947ad994ed86e7712a, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102704470438655312 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Die - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 1ae1790457b697c45a712803b0630ea4, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102862101153102510 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Riple - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 46df1a2d90c2a8b47be04410d8c4c436, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102928380194445398 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Attack_Bow - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 2155bf7292742cb41a9bb31022d0eee6, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107408652686126394 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102409211675107338} - m_Position: {x: 252, y: 108, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102928380194445398} - m_Position: {x: 252, y: 156, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102862101153102510} - m_Position: {x: 252, y: 204, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102288765891452188} - m_Position: {x: 252, y: 252, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102438133890812478} - m_Position: {x: 252, y: 300, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102704470438655312} - m_Position: {x: 252, y: 444, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102298494274214370} - m_Position: {x: 252, y: 492, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102516295600635842} - m_Position: {x: 252, y: 540, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102402041849555170} - m_Position: {x: 252, y: 588, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102532011203141802} - m_Position: {x: 252, y: 636, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102621097403430918} - m_Position: {x: 252, y: 348, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102620876007161780} - m_Position: {x: 252, y: 396, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -204, y: 0, z: 0} - m_EntryPosition: {x: -132, y: 108, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102516295600635842} diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller new file mode 100644 index 00000000..0d805eb6 --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4731676915672512085 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3586171613514506735 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102409211675107338} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3309643977170816217 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-969592203464534741 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-506438485333264238 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102402041849555170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Orc_Axe_Anim + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107408652686126394} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102402041849555170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -969592203464534741} + - {fileID: -3309643977170816217} + 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: 93bb095c037cdc447abc944226c6da07, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102409211675107338 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5025030427453273199} + - {fileID: -4731676915672512085} + 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: ad2038b779ab96543934637e2d47d628, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102516295600635842 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -506438485333264238} + - {fileID: -3586171613514506735} + - {fileID: 2405055104208324610} + 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: 5f129987453525547970cd8c0181edc3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102704470438655312 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 1ae1790457b697c45a712803b0630ea4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107408652686126394 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102409211675107338} + m_Position: {x: 270, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102704470438655312} + m_Position: {x: 210, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102516295600635842} + m_Position: {x: -10, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102402041849555170} + m_Position: {x: -10, y: 600, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -204, y: 0, z: 0} + m_EntryPosition: {x: -132, y: 108, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102516295600635842} +--- !u!1101 &2405055104208324610 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5025030427453273199 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller.meta similarity index 100% rename from Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc.controller.meta rename to Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Axe_Anim.controller.meta diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller new file mode 100644 index 00000000..16f9bfce --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4731676915672512085 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3586171613514506735 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102409211675107338} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3309643977170816217 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-969592203464534741 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-506438485333264238 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102402041849555170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Orc_Sniper_Anim + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107408652686126394} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102402041849555170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -969592203464534741} + - {fileID: -3309643977170816217} + 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: 93bb095c037cdc447abc944226c6da07, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102409211675107338 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5025030427453273199} + - {fileID: -4731676915672512085} + 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: 46df1a2d90c2a8b47be04410d8c4c436, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102516295600635842 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -506438485333264238} + - {fileID: -3586171613514506735} + - {fileID: 2405055104208324610} + 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: 5f129987453525547970cd8c0181edc3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102704470438655312 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 1ae1790457b697c45a712803b0630ea4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107408652686126394 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102409211675107338} + m_Position: {x: 270, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102704470438655312} + m_Position: {x: 210, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102516295600635842} + m_Position: {x: -10, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102402041849555170} + m_Position: {x: -10, y: 600, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -204, y: 0, z: 0} + m_EntryPosition: {x: -132, y: 108, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102516295600635842} +--- !u!1101 &2405055104208324610 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5025030427453273199 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller.meta new file mode 100644 index 00000000..60322001 --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sniper_Anim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 707742545596c914f965ced4d1e44107 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller new file mode 100644 index 00000000..849e0c0e --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4731676915672512085 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3586171613514506735 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102409211675107338} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3309643977170816217 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-969592203464534741 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-506438485333264238 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102402041849555170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Orc_Spear_Anim + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107408652686126394} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102402041849555170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -969592203464534741} + - {fileID: -3309643977170816217} + 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: 93bb095c037cdc447abc944226c6da07, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102409211675107338 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5025030427453273199} + - {fileID: -4731676915672512085} + 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: 47c1476d184e2104e9aad0e842d8788d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102516295600635842 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -506438485333264238} + - {fileID: -3586171613514506735} + - {fileID: 2405055104208324610} + 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: 5f129987453525547970cd8c0181edc3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102704470438655312 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 1ae1790457b697c45a712803b0630ea4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107408652686126394 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102409211675107338} + m_Position: {x: 270, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102704470438655312} + m_Position: {x: 210, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102516295600635842} + m_Position: {x: -10, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102402041849555170} + m_Position: {x: -10, y: 600, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -204, y: 0, z: 0} + m_EntryPosition: {x: -132, y: 108, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102516295600635842} +--- !u!1101 &2405055104208324610 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5025030427453273199 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller.meta new file mode 100644 index 00000000..beca3b43 --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Spear_Anim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 036873cbd1875944b952f0b414406c6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller new file mode 100644 index 00000000..1b68977d --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4731676915672512085 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3586171613514506735 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102409211675107338} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3309643977170816217 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-969592203464534741 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-506438485333264238 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102402041849555170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Orc_Sword_Anim + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107408652686126394} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102402041849555170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -969592203464534741} + - {fileID: -3309643977170816217} + 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: 93bb095c037cdc447abc944226c6da07, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102409211675107338 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5025030427453273199} + - {fileID: -4731676915672512085} + 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: abbfaf75f57fb2a41a6b844237f45858, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102516295600635842 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -506438485333264238} + - {fileID: -3586171613514506735} + - {fileID: 2405055104208324610} + 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: 5f129987453525547970cd8c0181edc3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102704470438655312 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 1ae1790457b697c45a712803b0630ea4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107408652686126394 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102409211675107338} + m_Position: {x: 270, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102704470438655312} + m_Position: {x: 210, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102516295600635842} + m_Position: {x: -10, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102402041849555170} + m_Position: {x: -10, y: 600, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -204, y: 0, z: 0} + m_EntryPosition: {x: -132, y: 108, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102516295600635842} +--- !u!1101 &2405055104208324610 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5025030427453273199 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller.meta new file mode 100644 index 00000000..1d1b7bdc --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Sword_Anim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d1d38e78b381734fab4df6975ddb63c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller new file mode 100644 index 00000000..4f499997 --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4731676915672512085 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3586171613514506735 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102409211675107338} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3309643977170816217 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-969592203464534741 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-506438485333264238 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102402041849555170} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Orc_Wizard_Anim + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107408652686126394} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102402041849555170 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -969592203464534741} + - {fileID: -3309643977170816217} + 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: 93bb095c037cdc447abc944226c6da07, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102409211675107338 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5025030427453273199} + - {fileID: -4731676915672512085} + 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: 47c1476d184e2104e9aad0e842d8788d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102516295600635842 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -506438485333264238} + - {fileID: -3586171613514506735} + - {fileID: 2405055104208324610} + 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: 5f129987453525547970cd8c0181edc3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102704470438655312 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 1ae1790457b697c45a712803b0630ea4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107408652686126394 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102409211675107338} + m_Position: {x: 270, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102704470438655312} + m_Position: {x: 210, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102516295600635842} + m_Position: {x: -10, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102402041849555170} + m_Position: {x: -10, y: 600, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -204, y: 0, z: 0} + m_EntryPosition: {x: -132, y: 108, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102516295600635842} +--- !u!1101 &2405055104208324610 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102704470438655312} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5025030427453273199 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102516295600635842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller.meta b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller.meta new file mode 100644 index 00000000..0a099383 --- /dev/null +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc/Orc_Wizard_Anim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd2f7a12ef231114e8655a1fc04d9e4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc_Boss/Orc_boss.controller b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc_Boss/Orc_boss.controller index da8df757..bfa29b9b 100644 --- a/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc_Boss/Orc_boss.controller +++ b/Client/Assets/SimpleCharacter/Orc/2.Animation/Orc_Boss/Orc_boss.controller @@ -1,13 +1,107 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-3906791883059636001 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102112158405362016} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8125 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1824887047787566869 +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: isMove + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102437892202616108} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6590909 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-73905514083333436 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102152368699470908} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8125 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Orc_boss serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: isMove + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -21,41 +115,45 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1102002469357781200 -AnimatorState: - serializedVersion: 5 +--- !u!1101 &242411205787747755 +AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc_boss_Hit - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: ee5beb043c1213f4b8392d32d454c661, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102152368699470908} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6590909 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1102112158405362016 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc_boss_Idle + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1824887047787566869} + - {fileID: 4293829258904041689} + - {fileID: 242411205787747755} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -73,11 +171,12 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102152368699470908 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc_boss_Die + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Die m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -98,14 +197,17 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102437892202616108 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc_boss_Run + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3906791883059636001} + - {fileID: -73905514083333436} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -123,14 +225,17 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102640101897293174 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Orc_boss_Attack + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3389525175657899485} + - {fileID: 3089581576373084634} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -148,27 +253,25 @@ AnimatorState: m_TimeParameter: --- !u!1107 &1107408652686126394 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102640101897293174} - m_Position: {x: 312, y: 180, z: 0} + m_Position: {x: 580, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: 1102152368699470908} - m_Position: {x: 312, y: 228, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102002469357781200} - m_Position: {x: 312, y: 276, z: 0} + m_Position: {x: 430, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: 1102112158405362016} - m_Position: {x: 312, y: 324, z: 0} + m_Position: {x: 310, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: 1102437892202616108} - m_Position: {x: 312, y: 372, z: 0} + m_Position: {x: 310, y: 430, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -179,3 +282,75 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102112158405362016} +--- !u!1101 &3089581576373084634 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102152368699470908} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.85 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3389525175657899485 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102112158405362016} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.85 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4293829258904041689 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102640101897293174} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6590909 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1