diff options
author | chai <215380520@qq.com> | 2022-11-18 14:24:37 +0800 |
---|---|---|
committer | chai <215380520@qq.com> | 2022-11-18 14:24:37 +0800 |
commit | 1393efb0c1d8189f538ddc9e2af317c982002ac2 (patch) | |
tree | 751919efdbc0cbbd4d67f802412cffdc8b09d53a | |
parent | 95732f7fb714cf32eaf0dbed66e424a92759df17 (diff) |
* animator controller
132 files changed, 179 insertions, 4057 deletions
diff --git a/Documents/_TODO.xlsx b/Documents/_TODO.xlsx Binary files differindex ecd6fd98..55e9a45d 100644 --- a/Documents/_TODO.xlsx +++ b/Documents/_TODO.xlsx diff --git a/Documents/动画/动画筛选.xlsx b/Documents/动画/动画筛选.xlsx Binary files differindex c7ca3929..421d1991 100644 --- a/Documents/动画/动画筛选.xlsx +++ b/Documents/动画/动画筛选.xlsx diff --git a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index 8d40d0d4..ec2485ed 100644 --- a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity +++ b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity @@ -297,7 +297,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152403860} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 78d3bc54e34721e468d0541fb5c0c839, type: 3} m_Name: @@ -311,7 +311,7 @@ MonoBehaviour: m_GameObject: {fileID: 152403860} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0524ad309fb60ba4cae5f63a6f5c1bb3, type: 3} + m_Script: {fileID: 11500000, guid: 938b513e88c7a944da3258ba5bcf699e, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &203878585 diff --git a/Erika/Assets/Bundle/Unit/OverrideClips.meta b/Erika/Assets/Bundle/Unit/Animation.meta index 53d02995..56e8f7f5 100644 --- a/Erika/Assets/Bundle/Unit/OverrideClips.meta +++ b/Erika/Assets/Bundle/Unit/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 529993974dcd0504ba33326c5f987ed3 +guid: c5dedbbeaf18a774792e781b8250d70a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController.meta b/Erika/Assets/Bundle/Unit/Animation/AnimatorController.meta index aa3e5e85..f2d310d8 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController.meta +++ b/Erika/Assets/Bundle/Unit/Animation/AnimatorController.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4c803c5fb4c1854da004dc0ea55dffb +guid: 8070e072285a4e047a9c1189b821c828 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller b/Erika/Assets/Bundle/Unit/Animation/AnimatorController/Erika_AnimatorController.controller index 70d30ccc..70d30ccc 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller +++ b/Erika/Assets/Bundle/Unit/Animation/AnimatorController/Erika_AnimatorController.controller diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller.meta b/Erika/Assets/Bundle/Unit/Animation/AnimatorController/Erika_AnimatorController.controller.meta index 3eca5138..3eca5138 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller.meta +++ b/Erika/Assets/Bundle/Unit/Animation/AnimatorController/Erika_AnimatorController.controller.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips.meta index b3286831..1437750e 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5a895c20fc15c748a20b8f214dd24b5 +guid: 88fa9da75283c29489556e41f4221ed1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/AirDash.anim index 2cbd6d95..2cbd6d95 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/AirDash.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/AirDash.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/AirDash.anim.meta index 0a343cf1..0a343cf1 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/AirDash.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/AirDash.anim.meta diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Attack.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack.anim index 6ba719df..6ba719df 100644 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Attack.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack.anim.meta index f3425bfe..f3425bfe 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack0.anim index e434d878..e434d878 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack0.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack0.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack0.anim.meta index 45e166b9..45e166b9 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack0.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack0.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack1.anim index 74debe7a..74debe7a 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack1.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack1.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack1.anim.meta index 213c0999..213c0999 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack1.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack1.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack2.anim index 2f1910a5..2f1910a5 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack2.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack2.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack2.anim.meta index 434ac14f..434ac14f 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack2.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack2.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack3.anim index 5aad0009..5aad0009 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack3.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack3.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack3.anim.meta index 4749cd78..4749cd78 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack3.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack3.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack4.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack4.anim index b20dd679..b20dd679 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack4.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack4.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack4.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack4.anim.meta index 4fa80c83..4fa80c83 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack4.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack4.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack5.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack5.anim index b8bc3031..b8bc3031 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack5.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack5.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack5.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack5.anim.meta index da020c69..da020c69 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack5.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Attack5.anim.meta diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Idle.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Idle.anim index c89c1003..c89c1003 100644 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Idle.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Idle.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Idle.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Idle.anim.meta index 15670efc..15670efc 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Idle.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Idle.anim.meta diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Jump.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Jump.anim index 79cb6fb9..79cb6fb9 100644 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Jump.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Jump.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Jump.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Jump.anim.meta index 5578c03a..5578c03a 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Jump.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Jump.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Landing.anim index bb4169c4..bb4169c4 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Landing.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Landing.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Landing.anim.meta index cfec0f06..cfec0f06 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Landing.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Landing.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/LandingGround.anim index f47fb06d..f47fb06d 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/LandingGround.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/LandingGround.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/LandingGround.anim.meta index bbde8f46..bbde8f46 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/LandingGround.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/LandingGround.anim.meta diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Move.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Move.anim index 9126daa9..9126daa9 100644 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Move.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Move.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Move.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Move.anim.meta index 7371591c..7371591c 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Move.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Move.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase0.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase0.anim index 135e1eeb..135e1eeb 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase0.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase0.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase0.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase0.anim.meta index 97ddc787..97ddc787 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase0.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase0.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase1.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase1.anim index 8e272a6a..8e272a6a 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase1.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase1.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase1.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase1.anim.meta index 784bf6dd..784bf6dd 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase1.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase1.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase2.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase2.anim index 2f71688f..2f71688f 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase2.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase2.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase2.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase2.anim.meta index a5bb4390..a5bb4390 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase2.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase2.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase3.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase3.anim index 63702876..63702876 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase3.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase3.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase3.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase3.anim.meta index ec0f0a5b..ec0f0a5b 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase3.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase3.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase4.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase4.anim index 2da87662..2da87662 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase4.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase4.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase4.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase4.anim.meta index bf5c0ffc..bf5c0ffc 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase4.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase4.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase5.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase5.anim index 701e4e25..701e4e25 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase5.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase5.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase5.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase5.anim.meta index 41ad7066..41ad7066 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase5.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase5.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase6.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase6.anim index 95c8f965..95c8f965 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase6.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase6.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase6.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase6.anim.meta index 755f3ff5..755f3ff5 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase6.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase6.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase7.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase7.anim index 18932af1..18932af1 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase7.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase7.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase7.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase7.anim.meta index d954aec0..d954aec0 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase7.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase7.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase8.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase8.anim index 1241d9cd..1241d9cd 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase8.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase8.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase8.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase8.anim.meta index 7ba4245c..7ba4245c 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase8.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase8.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase9.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase9.anim index 0f7741b4..0f7741b4 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase9.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase9.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase9.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase9.anim.meta index e4fc5423..e4fc5423 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Phase9.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/Phase9.anim.meta diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/QTE.anim b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/QTE.anim index 41d9494b..41d9494b 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/QTE.anim +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/QTE.anim diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/QTE.anim.meta b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/QTE.anim.meta index 69b1ecaf..69b1ecaf 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/QTE.anim.meta +++ b/Erika/Assets/Bundle/Unit/Animation/EmptyClips/QTE.anim.meta diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Attack.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Attack.anim.meta deleted file mode 100644 index f5c109e2..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Attack.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 602750927a3a2884584fd8824a96685f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim b/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim deleted file mode 100644 index 863149ab..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Empty - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim.meta deleted file mode 100644 index fc1f57ab..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Empty.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f21fa572000c76b43962f6f606834d02 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim b/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim deleted file mode 100644 index 040dfecc..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Hit - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim.meta deleted file mode 100644 index 1ee374ee..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Hit.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 89d09a17e1563a8408eea19dfede6b96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Idle.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Idle.anim.meta deleted file mode 100644 index 5ba794df..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Idle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e89ea1854d98c8438e8b2e70b121359 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Jump.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Jump.anim.meta deleted file mode 100644 index 8b1fb05c..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Jump.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c81f2b54cf596794e89eeeef68d1d2c2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Move.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Move.anim.meta deleted file mode 100644 index de51d51a..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Move.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 17add94a09ebacd48bafd5e74eab053c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim b/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim deleted file mode 100644 index b28b91e6..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Rise - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim.meta deleted file mode 100644 index 58a5e9d4..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Rise.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aed97c7f7249ffd4ea19dae5d904e5c1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim b/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim deleted file mode 100644 index 09368cf6..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Stinger - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim.meta deleted file mode 100644 index abd5a61b..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Stinger.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a299acef9ab3af44d8a11eaad43d4993 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim b/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim deleted file mode 100644 index 1ef6fc54..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Turn - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim.meta b/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim.meta deleted file mode 100644 index 5b1d3e80..00000000 --- a/Erika/Assets/Bundle/Unit/OverrideClips/Turn.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ac19955e7bd4ac446a29571a278bc6a7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset index aeeeaca9..4058f0e3 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset +++ b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset @@ -128,6 +128,7 @@ MonoBehaviour: isAttack: 0 disableTimeCurve: 0 defaultPlaySpeed: 0.1 + disableHurtBox: 0 --- !u!114 &114095509392824086 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller deleted file mode 100644 index 7d0c542c..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller +++ /dev/null @@ -1,1024 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Erika_AnimatorControllerCrossFade - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: IdleStatus - m_Type: 1 - m_DefaultFloat: 0.4 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: PlaybackSpeed0 - m_Type: 1 - m_DefaultFloat: 1 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: PlaybackSpeed1 - m_Type: 1 - m_DefaultFloat: 1 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Basic - m_StateMachine: {fileID: 1107100304230058010} - 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} - - serializedVersion: 5 - m_Name: Attack - m_StateMachine: {fileID: 1107681041014594778} - 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} - - serializedVersion: 5 - m_Name: UpperBody - m_StateMachine: {fileID: 1107669995669758872} - m_Mask: {fileID: 31900000, guid: d5a10d76582efb742a48170e6fcec7ca, type: 2} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!206 &206480665046382184 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} - m_Threshold: 0.40057373 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Height - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 6a53e3ed6230d2742939796aef1e214c, type: 2} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Height - m_Mirror: 0 - m_BlendParameter: IdleStatus - m_BlendParameterY: Height - m_MinThreshold: 0.40057373 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 0 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!206 &206677301753582214 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} - m_Threshold: 0.09453471 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: IdleStatus - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: b3b491ff9a4b4204fb54105483e9458f, type: 2} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: IdleStatus - m_Mirror: 0 - m_BlendParameter: IdleStatus - m_BlendParameterY: IdleStatus - m_MinThreshold: 0.09453471 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 0 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!1101 &1101002184460743296 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102297523170354260} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101459780614957350 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102966563713409750} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101490274029905172 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102128302872726618} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101493541400856974 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102528537118139770} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101839656961236588 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102959491876525966} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101950743644363386 -AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102385235525877490} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1102018842156954176 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack0 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 47193788a5f8b264ea6cecc0f40565fd, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102064426511052762 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Landing - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 12d218bc2d437724596bf621977ef2b1, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102101182547217892 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack1 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9f98de732e61882409d9a3456b87be18, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102108504916990050 -AnimatorState: - serializedVersion: 5 - 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: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 699f02cd5bde7474c87c46a702af08af, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102128302872726618 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack3 - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102214450384744764 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirDash - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 27718441c96a4114ebb01ccc168d623d, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102230929257620240 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack2 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9dd4ab0963a41b34b82a519bb7cced5b, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102269967399741822 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack0 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 2e5d802bfba7db747af88bfe578a602b, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102289505320285826 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Jump - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: a3d6b748582c79b4aaa28b16395f2152, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102297523170354260 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101490274029905172} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102299012691714534 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101493541400856974} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102385235525877490 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101839656961236588} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102397782345947260 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack1 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 46fdb4c35c347b04ca9c107a10f50e90, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102403163851985622 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack2 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ce137d29e7943ad4081d2ab6c4bad77c, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102474951772684744 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Move - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 78c6ded2841535449b1e3f362cbd2a87, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102528537118139770 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101002184460743296} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102559519921444194 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack4 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 5c91a24c28d8248438c7b28ce88cdaa9, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102642339950476984 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack3 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 3aa5c8eea43356142af2368559af17b1, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102653220258956662 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AttackToAir - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 09e1d1b1eaa33064299f7a72a18410dd, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102696179637896120 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Empty - 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: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102700468040696058 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack3 - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 3cc70e950f9a2e84f82c182e9d3f268d, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102857213712746212 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LandingGround - 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: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 05b364e0ea3f6b44ca336a2abf51ba67, type: 2} - m_Tag: IgnoreY - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102959491876525966 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101459780614957350} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102966563713409750 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack3 - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102996721486872664 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101950743644363386} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107100304230058010 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Basic - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102108504916990050} - m_Position: {x: -96, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102289505320285826} - m_Position: {x: 444, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102474951772684744} - m_Position: {x: 168, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102064426511052762} - m_Position: {x: 444, y: -600, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102857213712746212} - m_Position: {x: 444, y: -552, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102700468040696058} - m_Position: {x: 708, y: -456, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102403163851985622} - m_Position: {x: 708, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102018842156954176} - m_Position: {x: 708, y: -600, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102397782345947260} - m_Position: {x: 708, y: -552, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102230929257620240} - m_Position: {x: 1236, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102642339950476984} - m_Position: {x: 1236, y: -456, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102101182547217892} - m_Position: {x: 1236, y: -552, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102269967399741822} - m_Position: {x: 1236, y: -600, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102696179637896120} - m_Position: {x: -456, y: -792, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102214450384744764} - m_Position: {x: 972, y: -600, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102653220258956662} - m_Position: {x: 708, y: -336, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102559519921444194} - m_Position: {x: 708, y: -408, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -408, y: -888, z: 0} - m_EntryPosition: {x: -408, y: -840, z: 0} - m_ExitPosition: {x: -408, y: -924, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102696179637896120} ---- !u!1107 &1107669995669758872 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UpperBody - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} ---- !u!1107 &1107681041014594778 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller.meta b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller.meta deleted file mode 100644 index fd510290..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dbcf42e4fb8a6ad4488eb7d2941acc31 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller deleted file mode 100644 index e60df01c..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller +++ /dev/null @@ -1,1306 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Erika_AnimatorControllerTransition - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: ToIdle - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToMove - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToJump - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToRise - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToStinger - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToAttack - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToHit - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToTurn - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: IsOnGround - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: IdleStatus - m_Type: 1 - m_DefaultFloat: 0.4 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToAirAttack - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: PlaybackSpeed0 - m_Type: 1 - m_DefaultFloat: 1 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: PlaybackSpeed1 - m_Type: 1 - m_DefaultFloat: 1 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ToLanding - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Basic - m_StateMachine: {fileID: 1107100304230058010} - 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} - - serializedVersion: 5 - m_Name: Attack - m_StateMachine: {fileID: 1107681041014594778} - 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} - - serializedVersion: 5 - m_Name: UpperBody - m_StateMachine: {fileID: 1107669995669758872} - m_Mask: {fileID: 31900000, guid: d5a10d76582efb742a48170e6fcec7ca, type: 2} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!206 &206480665046382184 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} - m_Threshold: 0.40057373 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Height - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 6a53e3ed6230d2742939796aef1e214c, type: 2} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Height - m_Mirror: 0 - m_BlendParameter: IdleStatus - m_BlendParameterY: Height - m_MinThreshold: 0.40057373 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 0 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!206 &206677301753582214 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} - m_Threshold: 0.09453471 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: IdleStatus - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: b3b491ff9a4b4204fb54105483e9458f, type: 2} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: IdleStatus - m_Mirror: 0 - m_BlendParameter: IdleStatus - m_BlendParameterY: IdleStatus - m_MinThreshold: 0.09453471 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 0 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!1101 &1101063182358135150 -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: ToAirAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102715618218775434} - 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 &1101076526550250692 -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: ToLanding - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102857213712746212} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8369565 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101091503501639136 -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: ToAirAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102808011359794334} - 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 &1101201493442508346 -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: ToJump - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102289505320285826} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.09467596 - m_TransitionOffset: 0 - m_ExitTime: 0.90532404 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101217549972238732 -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: ToAirAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102278397408076722} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8636364 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101277273196438664 -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: ToAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 1107316004126161660} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.5588236 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101347427831014856 -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: ToLanding - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102064426511052762} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8333334 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101367417141206914 -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: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101386849265002562 -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: 1102351066419642334} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101413950958904708 -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: ToLanding - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102064426511052762} - 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 &1101422729616207682 -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: 1102459082635296446} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101430511541102454 -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: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101476570206594454 -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: ToIdle - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.13441938 - m_TransitionOffset: 0 - m_ExitTime: 0.7576849 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101483071843572362 -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: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101494853469579572 -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: ToMove - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102474951772684744} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.12073946 - m_TransitionOffset: 0 - m_ExitTime: 0.97719324 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101502987317117046 -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: ToLanding - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102064426511052762} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9013158 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101573921585606128 -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: ToIdle - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.1370371 - m_TransitionOffset: 0 - m_ExitTime: 0.9900462 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101577544753639196 -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: ToJump - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102289505320285826} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.5588236 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101581784590335586 -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: ToLanding - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102064426511052762} - 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 &1101599082201015084 -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: ToAirAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 1107282701554374512} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.11406255 - m_TransitionOffset: 0 - m_ExitTime: 0.84021574 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101715084332155032 -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: ToIdle - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7761194 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101874907451195540 -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: ToAttack - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 1107316004126161660} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9444444 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101932912538589558 -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: 1102426791575653434} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101992818995835738 -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: 1102108504916990050} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1102064426511052762 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Landing - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101076526550250692} - 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: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102108504916990050 -AnimatorState: - serializedVersion: 5 - 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: 1101494853469579572} - - {fileID: 1101201493442508346} - - {fileID: 1101874907451195540} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 206480665046382184} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102278397408076722 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack3 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101502987317117046} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 49bee39a341b8a04f954ff83d44eea6e, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102289505320285826 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Jump - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101573921585606128} - - {fileID: 1101599082201015084} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102351066419642334 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack3 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101992818995835738} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102355989716950608 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Empty - 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: f21fa572000c76b43962f6f606834d02, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102426791575653434 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101386849265002562} - - {fileID: 1101430511541102454} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102459082635296446 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101932912538589558} - - {fileID: 1101483071843572362} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102474951772684744 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Move - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101476570206594454} - - {fileID: 1101277273196438664} - - {fileID: 1101577544753639196} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: PlaybackSpeed0 ---- !u!1102 &1102530993245071752 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101422729616207682} - - {fileID: 1101367417141206914} - 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: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102715618218775434 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101217549972238732} - - {fileID: 1101413950958904708} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 49bee39a341b8a04f954ff83d44eea6e, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102728060828446312 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101091503501639136} - - {fileID: 1101347427831014856} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102808011359794334 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101063182358135150} - - {fileID: 1101581784590335586} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 1 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 49bee39a341b8a04f954ff83d44eea6e, type: 2} - m_Tag: - m_SpeedParameter: PlaybackSpeed0 - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102857213712746212 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LandingGround - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101715084332155032} - 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: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107100304230058010 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Basic - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102108504916990050} - m_Position: {x: 192, y: -492, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102289505320285826} - m_Position: {x: 276, y: -732, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102474951772684744} - m_Position: {x: -12, y: -732, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102355989716950608} - m_Position: {x: -336, y: -336, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102064426511052762} - m_Position: {x: 540, y: -492, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102857213712746212} - m_Position: {x: 540, y: -420, z: 0} - m_ChildStateMachines: - - serializedVersion: 1 - m_StateMachine: {fileID: 1107282701554374512} - m_Position: {x: 540, y: -684, z: 0} - - serializedVersion: 1 - m_StateMachine: {fileID: 1107316004126161660} - m_Position: {x: -192, y: -648, z: 0} - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: - - first: {fileID: 1107316004126161660} - second: [] - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -456, y: -564, z: 0} - m_EntryPosition: {x: 192, y: -408, z: 0} - m_ExitPosition: {x: -348, y: -756, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102108504916990050} ---- !u!1107 &1107282701554374512 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102728060828446312} - m_Position: {x: 300, y: 12, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102808011359794334} - m_Position: {x: 300, y: 84, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102715618218775434} - m_Position: {x: 300, y: 156, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102278397408076722} - m_Position: {x: 300, y: 228, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 48, y: 24, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 588, y: 156, z: 0} - m_ParentStateMachinePosition: {x: 564, y: 24, z: 0} - m_DefaultState: {fileID: 1102728060828446312} ---- !u!1107 &1107316004126161660 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102530993245071752} - m_Position: {x: 351.03894, y: -60.45456, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102459082635296446} - m_Position: {x: 348, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102426791575653434} - m_Position: {x: 348, y: 60, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102351066419642334} - m_Position: {x: 348, y: 120, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 660, y: 84, z: 0} - m_ParentStateMachinePosition: {x: 636, y: 12, z: 0} - m_DefaultState: {fileID: 1102530993245071752} ---- !u!1107 &1107669995669758872 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UpperBody - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} ---- !u!1107 &1107681041014594778 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller.meta b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller.meta deleted file mode 100644 index 1334b72e..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerTransition.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fe6160e21621de4ba4b24805b4aa6b4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController deleted file mode 100644 index 160043b6..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!221 &22100000 -AnimatorOverrideController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Erika_OverrideController - m_Controller: {fileID: 9100000, guid: dbcf42e4fb8a6ad4488eb7d2941acc31, type: 2} - m_Clips: - - m_OriginalClip: {fileID: 7400000, guid: 699f02cd5bde7474c87c46a702af08af, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 78c6ded2841535449b1e3f362cbd2a87, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 12d218bc2d437724596bf621977ef2b1, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 05b364e0ea3f6b44ca336a2abf51ba67, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: a3d6b748582c79b4aaa28b16395f2152, type: 2} - m_OverrideClip: {fileID: 7400000, guid: e40d4e05553066545b4d61f5f92a528a, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 47193788a5f8b264ea6cecc0f40565fd, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 46fdb4c35c347b04ca9c107a10f50e90, type: 2} - m_OverrideClip: {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: ce137d29e7943ad4081d2ab6c4bad77c, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 3cc70e950f9a2e84f82c182e9d3f268d, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 5c91a24c28d8248438c7b28ce88cdaa9, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 6543c9aee7b3f7b4d80c8f87fdf3c837, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 09e1d1b1eaa33064299f7a72a18410dd, type: 2} - m_OverrideClip: {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 27718441c96a4114ebb01ccc168d623d, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 2e5d802bfba7db747af88bfe578a602b, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 9f98de732e61882409d9a3456b87be18, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 9dd4ab0963a41b34b82a519bb7cced5b, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} - - m_OriginalClip: {fileID: 7400000, guid: 3aa5c8eea43356142af2368559af17b1, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta b/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta deleted file mode 100644 index facde7f6..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05a3a5adfcdba2247a71c5e335295e45 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 22100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim deleted file mode 100644 index 7010af54..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack0 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim.meta deleted file mode 100644 index 810dd5b4..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack0.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 47193788a5f8b264ea6cecc0f40565fd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim deleted file mode 100644 index 01bf4833..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack1 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim.meta deleted file mode 100644 index 4e5c881f..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack1.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 46fdb4c35c347b04ca9c107a10f50e90 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim deleted file mode 100644 index b66b2357..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack2 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim.meta deleted file mode 100644 index 08b7cfa7..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack2.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce137d29e7943ad4081d2ab6c4bad77c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim deleted file mode 100644 index 356f916d..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack3 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim.meta deleted file mode 100644 index 34213b16..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack3.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3cc70e950f9a2e84f82c182e9d3f268d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim deleted file mode 100644 index 8f952fec..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirAttack4 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim.meta deleted file mode 100644 index 17683e3b..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirAttack4.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c91a24c28d8248438c7b28ce88cdaa9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim.meta deleted file mode 100644 index e2cf3478..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AirDash.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 27718441c96a4114ebb01ccc168d623d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim.meta deleted file mode 100644 index ea7f3d19..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack0.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2e5d802bfba7db747af88bfe578a602b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim.meta deleted file mode 100644 index 59b914fc..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack1.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9f98de732e61882409d9a3456b87be18 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim.meta deleted file mode 100644 index 2b91ac59..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack2.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9dd4ab0963a41b34b82a519bb7cced5b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim.meta deleted file mode 100644 index 3f551c37..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Attack3.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3aa5c8eea43356142af2368559af17b1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim deleted file mode 100644 index 47d3ad18..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AttackToAir - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim.meta deleted file mode 100644 index 41a53c73..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/AttackToAir.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09e1d1b1eaa33064299f7a72a18410dd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim deleted file mode 100644 index c89c1003..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim.meta deleted file mode 100644 index 61915493..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Idle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 699f02cd5bde7474c87c46a702af08af -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim deleted file mode 100644 index 79cb6fb9..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Jump - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim.meta deleted file mode 100644 index 72aa409b..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Jump.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a3d6b748582c79b4aaa28b16395f2152 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim.meta deleted file mode 100644 index 3d6af889..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Landing.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 12d218bc2d437724596bf621977ef2b1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim.meta deleted file mode 100644 index 264759a6..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/LandingGround.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05b364e0ea3f6b44ca336a2abf51ba67 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim deleted file mode 100644 index 9126daa9..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Move - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim.meta deleted file mode 100644 index 2593fd56..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/Move.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 78c6ded2841535449b1e3f362cbd2a87 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New.meta b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New.meta deleted file mode 100644 index eff1c3df..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 54a62ea08988a394bbedd92da7ea7d48 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/AirDash.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/AirDash.anim deleted file mode 100644 index 2cbd6d95..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/AirDash.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AirDash - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack.anim deleted file mode 100644 index 6ba719df..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack0.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack0.anim deleted file mode 100644 index e434d878..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack0.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack0 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack1.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack1.anim deleted file mode 100644 index 74debe7a..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack1.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack1 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack2.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack2.anim deleted file mode 100644 index 2f1910a5..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack2.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack2 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack3.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack3.anim deleted file mode 100644 index 5aad0009..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Attack3.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack3 - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Idle.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Idle.anim deleted file mode 100644 index c89c1003..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Idle.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Jump.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Jump.anim deleted file mode 100644 index 79cb6fb9..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Jump.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Jump - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Landing.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Landing.anim deleted file mode 100644 index bb4169c4..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Landing.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Landing - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/LandingGround.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/LandingGround.anim deleted file mode 100644 index f47fb06d..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/LandingGround.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LandingGround - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Move.anim b/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Move.anim deleted file mode 100644 index 9126daa9..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/PlaceholderClip/New/Move.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Move - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Erika/Assets/Scripts/Input/DeviceBase.cs b/Erika/Assets/Scripts/Input/DeviceBase.cs new file mode 100644 index 00000000..aac5e1ea --- /dev/null +++ b/Erika/Assets/Scripts/Input/DeviceBase.cs @@ -0,0 +1,13 @@ + +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public class DeviceBase : MonoBehaviour +{ + protected virtual void Update() + { + } + +} diff --git a/Erika/Assets/Scripts/Input/InputKeyboardMouse.cs.meta b/Erika/Assets/Scripts/Input/DeviceBase.cs.meta index 3ccc10f4..a3d4baeb 100644 --- a/Erika/Assets/Scripts/Input/InputKeyboardMouse.cs.meta +++ b/Erika/Assets/Scripts/Input/DeviceBase.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0524ad309fb60ba4cae5f63a6f5c1bb3 +guid: 9a5dc4eeb7a362544b4fecbccb3d7903 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Erika/Assets/Scripts/Input/DeviceKeyboardMouse.cs b/Erika/Assets/Scripts/Input/DeviceKeyboardMouse.cs new file mode 100644 index 00000000..71a0172b --- /dev/null +++ b/Erika/Assets/Scripts/Input/DeviceKeyboardMouse.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 鼠标键盘输入,不应该涉及角色逻辑 +/// </summary> +public sealed class DeviceKeyboardMouse : DeviceBase +{ + protected override void Update() + { + ProcessKey(); + ProcessMouse(); + } + + // 键盘 + private void ProcessKey() + { + float horizontal = Input.GetAxisRaw("Horizontal"); + + EUnitDirection dir = EUnitDirection.None; + if (horizontal == 1) + dir = EUnitDirection.Right; + else if (horizontal == -1) + dir = EUnitDirection.Left; + + InputManager.Instance.InputTurn(dir); + InputManager.Instance.InputMove(dir); + + if (Input.GetKeyDown("j")) + { + InputManager.Instance.InputSkill(1); + } + if (Input.GetKeyDown("k")) + { + InputManager.Instance.InputSkill(2); + } + } + + // 鼠标 + private void ProcessMouse() + { + } + +} diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController_States.cs.meta b/Erika/Assets/Scripts/Input/DeviceKeyboardMouse.cs.meta index f1ccd46a..98a91a7c 100644 --- a/Erika/Assets/Scripts/Unit/Controller/PCController_States.cs.meta +++ b/Erika/Assets/Scripts/Input/DeviceKeyboardMouse.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fafb158c8bb0c4340a63c4cb743706de +guid: 938b513e88c7a944da3258ba5bcf699e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Erika/Assets/Scripts/Input/InputKeyboardMouse.cs b/Erika/Assets/Scripts/Input/InputKeyboardMouse.cs deleted file mode 100644 index 3a457103..00000000 --- a/Erika/Assets/Scripts/Input/InputKeyboardMouse.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 鼠标键盘输入 -/// </summary> -public class InputKeyboardMouse : MonoBehaviour -{ - void Update() - { - float horizontal = Input.GetAxisRaw("Horizontal"); - bool bMove = horizontal != 0; - - if (bMove) - { - EUnitDirection dir = horizontal == 1 ? EUnitDirection.Right : EUnitDirection.Left; - InputManager.Instance.InputTurn(dir); - } - - if (bMove && PCController.instance.unitStatemachine.IsInState(EUnitState.Idle)) - { - EUnitDirection dir = horizontal == 1 ? EUnitDirection.Right : EUnitDirection.Left; - InputManager.Instance.InputMove(dir); - } - else if(!bMove) - { - if(PCController.instance.unitStatemachine.IsInState(EUnitState.Move)) - { - PCController.instance.unitStatemachine.ChangeState(EUnitState.Idle); - } - } - - if (Input.GetKeyDown("j")) - { - InputManager.Instance.InputSkill(1); - } - if (Input.GetKeyDown("k")) - { - InputManager.Instance.InputSkill(2); - } - } -} diff --git a/Erika/Assets/Scripts/Input/InputManager.cs b/Erika/Assets/Scripts/Input/InputManager.cs index 32b24809..ac6790db 100644 --- a/Erika/Assets/Scripts/Input/InputManager.cs +++ b/Erika/Assets/Scripts/Input/InputManager.cs @@ -3,27 +3,45 @@ using System.Collections.Generic; using UnityEngine;
/// <summary>
-/// 只处理逻辑,不涉及输入。逻辑和输入分离
+/// 只处理逻辑,不涉及输入。逻辑和输入分离。主要调用角色的command,不应该判断角色状态机,command具体能不能生效,由command内部控制。
/// </summary>
public class InputManager : SingletonMB<InputManager>
{
+ private EUnitDirection m_InputDir;
+
+ public bool CanInputMoveStop()
+ {
+ return m_InputDir == EUnitDirection.None;
+ }
+
+ #region 处理输入
public void InputTurn(EUnitDirection dir)
{
- PCController.instance.CommandTurn(dir);
+ if(dir != EUnitDirection.None)
+ {
+ UnitManager.Instance.pc.CommandTurn(dir);
+ }
}
public void InputMove(EUnitDirection dir)
{
- PCController.instance.CommandMove(dir);
+ m_InputDir = dir;
+
+ if (dir != EUnitDirection.None)
+ {
+ UnitManager.Instance.pc.CommandMove(dir);
+ }
}
public void InputSkill(int comboId)
{
- PCController.instance.CommandCombo(comboId);
+ UnitManager.Instance.pc.CommandCombo(comboId);
}
public void InputDodge()
{
}
+ #endregion
+
}
diff --git a/Erika/Assets/Scripts/Managers/UnitManager.cs b/Erika/Assets/Scripts/Managers/UnitManager.cs index 53d25762..db28c27e 100644 --- a/Erika/Assets/Scripts/Managers/UnitManager.cs +++ b/Erika/Assets/Scripts/Managers/UnitManager.cs @@ -4,6 +4,7 @@ using UnityEngine; public class UnitManager : Singleton<UnitManager>
{
+ // 玩家角色
public PCController pc { get; private set; }
public List<MonsterController> monsters { get; private set; }
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs index c372c452..27a51f74 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs @@ -31,6 +31,10 @@ namespace UnitStates.Common public override void OnUpdate() { + if(!m_Owner.unitStatemachine.IsMoving()) + { + ChangeState(EUnitState.Idle); + } } } } diff --git a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStateBase.cs b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStateBase.cs index 472a8850..da5a900f 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStateBase.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStateBase.cs @@ -30,6 +30,11 @@ public abstract class UnitStateBase m_Motion = owner.unitMotion; } + protected void ChangeState(EUnitState state) + { + fsm.ChangeState(state); + } + public abstract void OnEnter(IStateParam param); public abstract void OnExit(); public abstract void OnUpdate(); diff --git a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStatemachine.cs b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStatemachine.cs index 8c3351a2..c97d0390 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStatemachine.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/UnitStatemachine.cs @@ -195,6 +195,48 @@ public sealed class UnitStatemachine : UnitComponent return m_CurrentState == EUnitState.HitAir; } + public bool IsMove() + { + return m_CurrentState == EUnitState.Move; + } + + public bool IsMoveAble() + { + if (IsInState(EUnitState.Skill)) + return false; + + return true; + } + + // 是否正在移动中 + public bool IsMoving() + { + if (IsMove()) + { + if(owner.type == UnitController.UnitType.PC) + { + if(InputManager.Instance.CanInputMoveStop()) + return false; + + return true; + } + } + return false; + } + + #endregion + + #region 状态切换 + + + public void EnterMove() + { + if (IsInState(EUnitState.Move)) + return; + + ChangeState(EUnitState.Move); + } + #endregion } diff --git a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs index cffc08f0..225f46d3 100644 --- a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs @@ -61,7 +61,7 @@ public class MonsterController : UnitController public virtual bool IsFacePC()
{
- PCController pc = PCController.instance;
+ PCController pc = UnitManager.Instance.pc;
float pcX = pc.transform.position.x;
float x = transform.position.x;
bool isface = pcX > x && isTowardRight || pcX <= x && !isTowardRight;
@@ -73,7 +73,7 @@ public class MonsterController : UnitController {
if (IsFacePC())
return;
- PCController pc = PCController.instance;
+ PCController pc = UnitManager.Instance.pc;
float pcX = pc.transform.position.x;
float x = transform.position.x;
if (pcX > x)
@@ -88,7 +88,7 @@ public class MonsterController : UnitController public virtual void FaceToFacePC()
{
- PCController pc = PCController.instance;
+ PCController pc = UnitManager.Instance.pc;
transform.rotation = Quaternion.Euler(0, 180, 0) * pc.transform.rotation;
}
diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController.cs b/Erika/Assets/Scripts/Unit/Controller/PCController.cs index ddce9e02..cddf8540 100644 --- a/Erika/Assets/Scripts/Unit/Controller/PCController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/PCController.cs @@ -6,19 +6,12 @@ using UnityEngine; [DisallowMultipleComponent]
public sealed partial class PCController : UnitController
{
- public static PCController instance;
-
// Unit的三种效果
public UnitAfterImage unitAfterImage;
public UnitImageEffect unitImageEffect;
public override UnitType type { get { return UnitType.PC; } }
- private void Awake()
- {
- instance = this;
- }
-
protected override void Initialize(UnitProfile profile)
{
base.Initialize(profile);
diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController_Commands.cs b/Erika/Assets/Scripts/Unit/Controller/PCController_Commands.cs index 25f60a56..63550002 100644 --- a/Erika/Assets/Scripts/Unit/Controller/PCController_Commands.cs +++ b/Erika/Assets/Scripts/Unit/Controller/PCController_Commands.cs @@ -21,10 +21,10 @@ public sealed partial class PCController : UnitController public void CommandMove(EUnitDirection dir) { - if (!IsMoveAble()) + if (!unitStatemachine.IsMoveAble()) return; - EnterMove(); + unitStatemachine.EnterMove(); } public void CommandIdle() diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController_States.cs b/Erika/Assets/Scripts/Unit/Controller/PCController_States.cs deleted file mode 100644 index f011e6db..00000000 --- a/Erika/Assets/Scripts/Unit/Controller/PCController_States.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 操作状态机 - -public sealed partial class PCController : UnitController -{ - - private bool IsMoveAble() - { - return true; - } - - #region 操作statemachine - - void EnterMove() - { - if (fsm.IsInState(EUnitState.Move)) - return; - - fsm.ChangeState(EUnitState.Move); - } - - #endregion - -} diff --git a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs index 49d0aa79..3b2822a7 100644 --- a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs @@ -11,8 +11,9 @@ using UnityEngine; public enum EUnitDirection
{
- Right = 0, // 默认朝右
- Left = 1, // 左
+ None = 0,
+ Right = 1, // 默认朝右
+ Left = 2, // 左
}
/// <summary>
diff --git a/Erika/Assets/Scripts/Unit/UnitProfile.cs b/Erika/Assets/Scripts/Unit/UnitProfile.cs index 66e007ff..15efb71f 100644 --- a/Erika/Assets/Scripts/Unit/UnitProfile.cs +++ b/Erika/Assets/Scripts/Unit/UnitProfile.cs @@ -20,9 +20,6 @@ public class UnitProfile : ScriptableObject //public UnitActionData actionData; - [Tooltip("角色所有动作")] - public UnitMotionData motionData; - public string unitFolder; public GameObject unitControllerPrefab; @@ -31,8 +28,10 @@ public class UnitProfile : ScriptableObject public RuntimeAnimatorController animController; - [Header("技能相关")] - [Space(5)] + [Header("角色所有动作"), Space(5)] + public UnitMotionData motionData; + + [Header("角色所有技能"), Space(5)] [Tooltip("技能")] public List<SkillData> skills; diff --git a/Erika/Assets/Scripts/Utils/EventCenter.cs b/Erika/Assets/Scripts/Utils/EventCenter.cs index ee16ebf3..ce173087 100644 --- a/Erika/Assets/Scripts/Utils/EventCenter.cs +++ b/Erika/Assets/Scripts/Utils/EventCenter.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class EventCenter : Singleton<EventCenter> +public class MessageCenter : Singleton<MessageCenter> { public delegate void EventHandler(params object [] param); diff --git a/Erika/Assets/Tools/ActionTool/ActionTool Settings.asset b/Erika/Assets/Tools/ActionTool/ActionTool Settings.asset index 7136409c..fdfd96c8 100644 --- a/Erika/Assets/Tools/ActionTool/ActionTool Settings.asset +++ b/Erika/Assets/Tools/ActionTool/ActionTool Settings.asset @@ -42,33 +42,35 @@ MonoBehaviour: - EventMesh_VisibilityInMainCamera - EventUnit_SetPosition - EventUnit_BulletTime + - EventUnit_SetInAir eventColors: - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0.5343158, g: 0.3037113, b: 0.8584906, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0.6037736, g: 0.3275187, b: 0.5568827, a: 1} + - {r: 0.73344606, g: 0.7735849, b: 0.7672242, a: 1} + - {r: 0.73344606, g: 0.7735849, b: 0.7672242, a: 1} + - {r: 0.73344606, g: 0.7735849, b: 0.7672242, a: 1} + - {r: 0.73344606, g: 0.7735849, b: 0.7672242, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.9716981, g: 0.6941154, b: 0.27959237, a: 1} + - {r: 0.9716981, g: 0.6941154, b: 0.27959237, a: 1} + - {r: 1, g: 0.9987363, b: 0.33333337, a: 1} + - {r: 1, g: 0.9987363, b: 0.33333337, a: 1} - {r: 0.9528302, g: 0.013483422, b: 0.013483422, a: 1} - {r: 1, g: 0, b: 0.9345741, a: 1} + - {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0.3773585, g: 0.21537913, b: 0.21537913, a: 1} - - {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} - {r: 0.34390378, g: 0.7924528, b: 0.09344961, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 0.5801887, g: 0.6100278, b: 1, a: 1} + - {r: 1, g: 0.4764151, b: 0.50778645, a: 1} + - {r: 1, g: 0.4764151, b: 0.50778645, a: 1} + - {r: 1, g: 0.4764151, b: 0.50778645, a: 1} |