diff options
71 files changed, 1637 insertions, 254 deletions
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta deleted file mode 100644 index 640ede12..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 32ad36f78e7f23f46a0ce64fce991723 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta deleted file mode 100644 index 4d017390..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 93031cff7ea5a314ca110920f817635f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta deleted file mode 100644 index 0d171fe4..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 69c2852d26b47fa44a688db1349ae258 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta index 4627f5df..b76e98a5 100644 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta +++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d467e546efed7054c934b1a97a116c5c +guid: 20381b3eecfbfe34a9d9222868969d29 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta index ab214036..41200932 100644 --- a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta +++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 063d53dfefca4e3429f5788835b0b4ea +guid: abff7cb61c760094f8ab9437379e0f2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta index 20eca756..fa9e76cd 100644 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta +++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f14f2cbed5e00a40a3fa94241cf6c27 +guid: e38cb65072bb4a64cbe162792de9bec2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Bundle/Material.meta index ee2ffc5f..85215e86 100644 --- a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta +++ b/Assets/Bundle/Material.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b82ae836c84f36049bdbdb08743b98e0 +guid: 8641bb4d4eee8b1419a1c8316ff9aee5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Bundle/Projectile.meta index e0cb5de8..b01252f1 100644 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta +++ b/Assets/Bundle/Projectile.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c219c63d9953ba84b8cbe80444bdbf22 +guid: 370f39b2edf043241a00acd3f6844aa6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta new file mode 100644 index 00000000..92ded933 --- /dev/null +++ b/Assets/Bundle/Shader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a8ba4f43d9a7b24d855cadccb986b60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta new file mode 100644 index 00000000..0914914c --- /dev/null +++ b/Assets/Bundle/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4392471259b05a74a82a4bc72b510eb1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller new file mode 100644 index 00000000..f6f73b77 --- /dev/null +++ b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller @@ -0,0 +1,646 @@ +%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: PC_AnimatorController 1 + 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: Blend + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + 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 Layer + 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} +--- !u!1101 &1101005051643187040 +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: 0} + m_DstState: {fileID: 1102099224573621780} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.15586424 + m_TransitionOffset: 0 + m_ExitTime: 0.84413576 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101070554495638954 +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.07171363 + m_TransitionOffset: 0.046414375 + m_ExitTime: 0.89665186 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101150190650443198 +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.1229167 + m_TransitionOffset: 0 + m_ExitTime: 0.8770833 + 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 &1101243288826134708 +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.1276235 + m_TransitionOffset: 0 + m_ExitTime: 0.8723765 + m_HasExitTime: 0 + 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.1323303 + m_TransitionOffset: 0 + m_ExitTime: 0.8676697 + m_HasExitTime: 0 + 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.1229167 + m_TransitionOffset: 0 + m_ExitTime: 0.8770833 + 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 &1101709092166622032 +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: 0} + m_DstState: {fileID: 1102099224573621780} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.15115744 + m_TransitionOffset: 0 + m_ExitTime: 0.84884256 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101946621754155960 +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.07114208 + m_TransitionOffset: 0.34830385 + m_ExitTime: 0.8206018 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101984677742375892 +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: ToTurn + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102530119364819120} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.09938282 + m_TransitionOffset: 0 + m_ExitTime: 0.9006172 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102099224573621780 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101946621754155960} + - {fileID: 1101070554495638954} + 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: 602750927a3a2884584fd8824a96685f, 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: 1101984677742375892} + - {fileID: 1101494853469579572} + - {fileID: 1101709092166622032} + - {fileID: 1101201493442508346} + 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: 9e89ea1854d98c8438e8b2e70b121359, type: 2} + m_Tag: + m_SpeedParameter: + 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} + 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: c81f2b54cf596794e89eeeef68d1d2c2, type: 2} + 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: 1101005051643187040} + - {fileID: 1101476570206594454} + 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: 17add94a09ebacd48bafd5e74eab053c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102530119364819120 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Turn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101243288826134708} + - {fileID: 1101150190650443198} + 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: ac19955e7bd4ac446a29571a278bc6a7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102758058710279394 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hit + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 89d09a17e1563a8408eea19dfede6b96, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102817678999412688 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Singer + 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: a299acef9ab3af44d8a11eaad43d4993, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102936270698915478 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Rise + 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: aed97c7f7249ffd4ea19dae5d904e5c1, 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: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102108504916990050} + m_Position: {x: 120, y: -480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102289505320285826} + m_Position: {x: 420, y: -588, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102758058710279394} + m_Position: {x: -144, y: -492, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102099224573621780} + m_Position: {x: 420, y: -480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102474951772684744} + m_Position: {x: 324, y: -324, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102936270698915478} + m_Position: {x: 132, y: -168, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102817678999412688} + m_Position: {x: -108, y: -216, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102530119364819120} + m_Position: {x: 48, y: -324, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -12, y: -576, z: 0} + m_EntryPosition: {x: 204, y: -636, z: 0} + m_ExitPosition: {x: -48, y: -684, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102108504916990050} +--- !u!1107 &1107681041014594778 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack Layer + 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/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta new file mode 100644 index 00000000..f555d2c2 --- /dev/null +++ b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2d366cf87c3f574bad579686d5b5d21 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/BodyMask.meta b/Assets/Bundle/Unit/BodyMask.meta new file mode 100644 index 00000000..ab4388e4 --- /dev/null +++ b/Assets/Bundle/Unit/BodyMask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2154c3e2f6425474cad8a1e77db4cd26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/BodyMask/LowerMask.mask b/Assets/Bundle/Unit/BodyMask/LowerMask.mask new file mode 100644 index 00000000..534fdf60 --- /dev/null +++ b/Assets/Bundle/Unit/BodyMask/LowerMask.mask @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!319 &31900000 +AvatarMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LowerMask + m_Mask: 00000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000000 + m_Elements: [] diff --git a/Assets/Bundle/Unit/BodyMask/LowerMask.mask.meta b/Assets/Bundle/Unit/BodyMask/LowerMask.mask.meta new file mode 100644 index 00000000..055e41a9 --- /dev/null +++ b/Assets/Bundle/Unit/BodyMask/LowerMask.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5a10d76582efb742a48170e6fcec7ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 31900000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/BodyMask/UppperMask.mask b/Assets/Bundle/Unit/BodyMask/UppperMask.mask new file mode 100644 index 00000000..0846d4f7 --- /dev/null +++ b/Assets/Bundle/Unit/BodyMask/UppperMask.mask @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!319 &31900000 +AvatarMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UppperMask + m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000000000000000000 + m_Elements: [] diff --git a/Assets/Bundle/Unit/BodyMask/UppperMask.mask.meta b/Assets/Bundle/Unit/BodyMask/UppperMask.mask.meta new file mode 100644 index 00000000..026a5fe1 --- /dev/null +++ b/Assets/Bundle/Unit/BodyMask/UppperMask.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ba862dcf2d6a7446bde67504d9f4998 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 31900000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster.meta b/Assets/Bundle/Unit/Monster.meta new file mode 100644 index 00000000..51d19a1d --- /dev/null +++ b/Assets/Bundle/Unit/Monster.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98c6b7d15b8909e4b911c42ea72b9930 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta new file mode 100644 index 00000000..eeea13e1 --- /dev/null +++ b/Assets/Bundle/Unit/NPC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ced034d375cdfa488814663ea17a79b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController.meta b/Assets/Bundle/Unit/PC/Erika/AnimatorController.meta new file mode 100644 index 00000000..aa3e5e85 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4c803c5fb4c1854da004dc0ea55dffb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller new file mode 100644 index 00000000..a8fd68de --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller @@ -0,0 +1,677 @@ +%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_AnimatorController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: ToIdle + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToMove + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToJump + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToRise + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToStinger + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToAttack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToHit + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToTurn + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Blend + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + 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 Layer + 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: LowerJumpLayer + 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!1101 &1101005051643187040 +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: 0} + m_DstState: {fileID: 1102099224573621780} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.15586424 + m_TransitionOffset: 0 + m_ExitTime: 0.84413576 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101070554495638954 +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.098537505 + m_TransitionOffset: 0 + m_ExitTime: 0.86788446 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101150190650443198 +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.1229167 + m_TransitionOffset: 0 + m_ExitTime: 0.8770833 + 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 &1101243288826134708 +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.1276235 + m_TransitionOffset: 0 + m_ExitTime: 0.8723765 + m_HasExitTime: 0 + 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.1323303 + m_TransitionOffset: 0 + m_ExitTime: 0.8676697 + m_HasExitTime: 0 + 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.1229167 + m_TransitionOffset: 0 + m_ExitTime: 0.8770833 + 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 &1101709092166622032 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: ToAttack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102099224573621780} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.11836755 + m_TransitionOffset: 0.5 + m_ExitTime: 0.8641487 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101946621754155960 +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.07114208 + m_TransitionOffset: 0.34830385 + m_ExitTime: 0.8206018 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101984677742375892 +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: ToTurn + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102530119364819120} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.09938282 + m_TransitionOffset: 0 + m_ExitTime: 0.9006172 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102099224573621780 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101946621754155960} + - {fileID: 1101070554495638954} + 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: a7f4564d08baf0342bd790dda3aa1540, 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: 1101984677742375892} + - {fileID: 1101494853469579572} + - {fileID: 1101709092166622032} + - {fileID: 1101201493442508346} + 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: 47136a68d9037954f9e68bdb85424b2e, type: 2} + m_Tag: + m_SpeedParameter: + 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} + 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: 80b0945bbe9b94f468cc20801c050baf, type: 2} + 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: 1101005051643187040} + - {fileID: 1101476570206594454} + 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: b3b491ff9a4b4204fb54105483e9458f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102530119364819120 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Turn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101243288826134708} + - {fileID: 1101150190650443198} + 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: f6b472b469a84bd4fb06b3b99d3c08b7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102758058710279394 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hit + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 89d09a17e1563a8408eea19dfede6b96, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102817678999412688 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Singer + 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: a299acef9ab3af44d8a11eaad43d4993, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102936270698915478 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Rise + 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: aed97c7f7249ffd4ea19dae5d904e5c1, 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: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102108504916990050} + m_Position: {x: 120, y: -480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102289505320285826} + m_Position: {x: 420, y: -588, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102758058710279394} + m_Position: {x: -144, y: -492, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102099224573621780} + m_Position: {x: 420, y: -480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102474951772684744} + m_Position: {x: 324, y: -324, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102936270698915478} + m_Position: {x: 132, y: -168, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102817678999412688} + m_Position: {x: -108, y: -216, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102530119364819120} + m_Position: {x: 48, y: -324, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -12, y: -576, z: 0} + m_EntryPosition: {x: 204, y: -636, z: 0} + m_ExitPosition: {x: -48, y: -684, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102108504916990050} +--- !u!1107 &1107669995669758872 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LowerJumpLayer + 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 Layer + 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/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller.meta b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller.meta new file mode 100644 index 00000000..1334b72e --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fe6160e21621de4ba4b24805b4aa6b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta new file mode 100644 index 00000000..1d22d5d2 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e777b7b5be18d4e4092e116011158c68 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta new file mode 100644 index 00000000..8c41a6b2 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dc1b71affc68b54594096a1b96a5c00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta new file mode 100644 index 00000000..11148d17 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d712421d808a43438a43d8a5d34effe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta new file mode 100644 index 00000000..7d4b13eb --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 922befa8a94692845b88500a23229d7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons.meta b/Assets/Bundle/Unit/PC/Erika/Weapons.meta new file mode 100644 index 00000000..98272dda --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 915d00b9283fe78498460cad2b626acb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta new file mode 100644 index 00000000..f5434a00 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07c3b2bf6cb8cc2498422bbb105cbad8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta new file mode 100644 index 00000000..4ed2c938 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 827d77abe87680a47ae2d71a9e953a18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta new file mode 100644 index 00000000..43a52cd1 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a2b72fbb41383047ac45e6c22ea9663 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta new file mode 100644 index 00000000..85d58a8c --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b0838fb0603964e99904eefe81ad7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta new file mode 100644 index 00000000..dd867045 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c8a678ea9e801f439a1003d04f33cf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta new file mode 100644 index 00000000..dc530723 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebf636c7cf7b1934b885298ce1f5f42e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta new file mode 100644 index 00000000..b28b6f04 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2022e8298d3a8624992143eb57c0f8ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta new file mode 100644 index 00000000..eeca0d3b --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6aa859c834c51f498ef0b3c3b83a0f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta new file mode 100644 index 00000000..7f91da28 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df69962f5b01e444a8bea87e31c7d0a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta new file mode 100644 index 00000000..affd6eed --- /dev/null +++ b/Assets/Bundle/Unit/Prop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dafc173db1ebeab4c80641cc3d4fa528 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta new file mode 100644 index 00000000..48dd5af5 --- /dev/null +++ b/Assets/Data/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e712aac7b9add047ab7a8691dd1a17a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta new file mode 100644 index 00000000..10bf1fb1 --- /dev/null +++ b/Assets/Data/AnimationData/Erika.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02289cc4b0fe1c34988c293ff6dbca02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta new file mode 100644 index 00000000..57b03e09 --- /dev/null +++ b/Assets/Data/RootMotionData/Erika.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c4e05f9eb0abc949a472e82070dfef1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta new file mode 100644 index 00000000..d0809213 --- /dev/null +++ b/Assets/Data/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bdb120d934aa114ab2f20e111a3c4d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity index ce665d9d..56ff419a 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Scenes/Demo/AnimationEditScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -353,7 +353,7 @@ MonoBehaviour: type: 3} unitPrefab: {fileID: 8398550124946730917, guid: 7ad9bdd473f2e5f49a7ec144e5b5c999, type: 3} - animController: {fileID: 9100000, guid: cc85b30273da8ce4eb42ec6ff4c98074, type: 2} + animController: {fileID: 9100000, guid: 8fe6160e21621de4ba4b24805b4aa6b4, type: 2} unitFolder: Assets/Bundle/Unit/PC/Erika/ unit: {fileID: 8398550124946730917, guid: 7ad9bdd473f2e5f49a7ec144e5b5c999, type: 3} unitController: {fileID: 5422729882032160352, guid: 3006b392f87405b44bd878da2c6a54ec, diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta new file mode 100644 index 00000000..bb96602e --- /dev/null +++ b/Assets/Scripts/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f299520ed9fcf4a45858ad4ef5a8d5d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta new file mode 100644 index 00000000..eb7a8716 --- /dev/null +++ b/Assets/Scripts/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaee2d0f48cff9b40baf0686a8105600 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Test 1/TestErika.cs b/Assets/Scripts/Test 1/TestErika.cs index c76f09e0..96fcec25 100644 --- a/Assets/Scripts/Test 1/TestErika.cs +++ b/Assets/Scripts/Test 1/TestErika.cs @@ -46,10 +46,10 @@ public class TestErika : MonoBehaviour animCtr.name = unitPrefab.name + " Override Controller"; animator.runtimeAnimatorController = animCtr; - foreach(var action in actionData.actions) - { - animCtr[action.Key.ToString()] = action.Value; - } + //foreach(var action in actionData.actions) + //{ + // animCtr[action.Key.ToString()] = action.Value; + //} unitCtr.unitState.ChangeState(UnitState.EUnitState.Idle, new UnitState.IdleParam()); diff --git a/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs b/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs index 28ab8177..3f5d20d4 100644 --- a/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs +++ b/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs @@ -16,7 +16,9 @@ public class WaitForActionReachEnd : IEnumerator public bool MoveNext() { - float normalTime = m_UnitAnimation.stateInfo.normalizedTime; + var stateInfo = m_UnitAnimation.stateInfo; + float normalTime = stateInfo.normalizedTime; + LogHelper.Log(stateInfo.loop.ToString()); return normalTime < 1f; } diff --git a/Assets/Scripts/Unit/Component/UnitAnimation.cs b/Assets/Scripts/Unit/Component/UnitAnimation.cs index 7ebd780c..de3d4cce 100644 --- a/Assets/Scripts/Unit/Component/UnitAnimation.cs +++ b/Assets/Scripts/Unit/Component/UnitAnimation.cs @@ -2,38 +2,11 @@ using System.Collections.Generic;
using UnityEngine;
-// 播放动画，执行帧事件
+// 控制动画播放，执行帧事件
[DisallowMultipleComponent]
public class UnitAnimation : UnitComponent
{
- // animator trigger值，切换动画
- public enum ETrigger
- {
- Nein = 0,
-
- ToIdle ,
- ToMove ,
- ToSpawn ,
-
- ToDie ,
- ToHitAir ,
- ToHitAirAir,
-
- ToHitKnockDown,
-
- ToJump,
- ToWalk,
-
- ToAttack,
-
- ToRise,
-
- ToStinger,
-
- ToTurn,
- }
-
- // animator状态
+ // 动画
public enum EAnimState
{
Idle,
@@ -46,15 +19,11 @@ public class UnitAnimation : UnitComponent Turn,
}
- public Dictionary<EAnimState, ETrigger> triggers = new Dictionary<EAnimState, ETrigger>() {
- { EAnimState.Idle, ETrigger.ToIdle},
- { EAnimState.Move, ETrigger.ToMove},
- { EAnimState.Jump, ETrigger.ToJump},
- { EAnimState.Attack, ETrigger.ToAttack},
- { EAnimState.Rise, ETrigger.ToRise},
- { EAnimState.Stinger, ETrigger.ToStinger},
- { EAnimState.Turn , ETrigger.ToTurn},
- };
+ public enum ELayer
+ {
+ Basic = 0,
+ Attack = 1,
+ }
public Animator animator { get { return m_Animator; } }
private Animator m_Animator;
@@ -89,12 +58,15 @@ public class UnitAnimation : UnitComponent }
}
+ public string GetTrigger(EAnimState state)
+ {
+ return "To" + state.ToString();
+ }
+
public void Play(EAnimState state)
{
m_CurState = state;
- ETrigger trigger = triggers[state];
- string toAnim = trigger.ToString();
- m_Animator.SetTrigger(toAnim);
+ m_Animator.SetTrigger(GetTrigger(state));
m_Animator.speed = 0;
m_PlaybackTime = 0;
m_Owner.unitRootMotion.Reset();
diff --git a/Assets/Scripts/Unit/Component/UnitState.cs b/Assets/Scripts/Unit/Component/UnitState.cs index 500096d3..587c2f33 100644 --- a/Assets/Scripts/Unit/Component/UnitState.cs +++ b/Assets/Scripts/Unit/Component/UnitState.cs @@ -1,4 +1,6 @@ -using System.Collections;
+using System;
+using System.Reflection;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -34,7 +36,6 @@ public class UnitState : UnitComponent public EUnitState CurrentState { get { return m_State; } }
private delegate void ExitStateHandler(EUnitState nextState);
- private delegate void EnterStateHandler(EUnitState prevState);
private Dictionary<EUnitState, ExitStateHandler> m_ExitStateHandlerDic = new Dictionary<EUnitState, ExitStateHandler>();
@@ -71,10 +72,6 @@ public class UnitState : UnitComponent void InitState()
{
- m_ExitStateHandlerDic.Add(EUnitState.Idle, OnIdleExit);
- m_ExitStateHandlerDic.Add(EUnitState.Move, OnMoveExit);
- m_ExitStateHandlerDic.Add(EUnitState.Skill, OnSkillExit);
- m_ExitStateHandlerDic.Add(EUnitState.Jump, OnJumpExit);
}
public void ChangeState<T>(EUnitState nextState, T param = default, bool bForce = false)
@@ -87,11 +84,17 @@ public class UnitState : UnitComponent StopAllCoroutines();
EUnitState prevState = m_State;
- if (m_ExitStateHandlerDic.ContainsKey(m_State))
- {
- m_ExitStateHandlerDic[m_State](nextState);
- }
- m_State = nextState;
+ string methodFunc = "On" + m_State.ToString() + "Exit";
+ MethodInfo exitMethod = GetType().GetMethod(methodFunc, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(EUnitState) }, null);
+ if(exitMethod != null)
+ {
+ exitMethod.Invoke(this, new object[] { nextState });
+ }
+ else
+ {
+ LogHelper.LogError("缺少 " + methodFunc);
+ }
+ m_State = nextState;
StartCoroutine(m_State.ToString(), param);
}
@@ -113,7 +116,7 @@ public class UnitState : UnitComponent void OnIdleExit(EUnitState nextState)
{
-
+ LogHelper.Log(nextState.ToString());
}
#endregion
diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs index c39e82f4..8cea1331 100644 --- a/Assets/Scripts/Unit/Controller/UnitController.cs +++ b/Assets/Scripts/Unit/Controller/UnitController.cs @@ -18,7 +18,7 @@ public class UnitController : MonoBehaviour public GameObject unitObj; // 角色模型
- public bool isTowardRight
+ public bool isTowardRight
{
get
{
diff --git a/Assets/Scripts/Unit/RootMotion/Editor/RootMotionEditor.cs b/Assets/Scripts/Unit/RootMotion/Editor/RootMotionEditor.cs index f2a31bba..9bcb8b84 100644 --- a/Assets/Scripts/Unit/RootMotion/Editor/RootMotionEditor.cs +++ b/Assets/Scripts/Unit/RootMotion/Editor/RootMotionEditor.cs @@ -249,9 +249,6 @@ public class RootMotionEditor : EditorWindow m_Animator.Update(kDeltaTime);
m_Animator.speed = 0;
- //m_Transform.rotation *= m_Animator.deltaRotation;
- //m_Transform.position += m_Animator.deltaPosition;
-
sampleTime += kDeltaTime;
if(sampleTime >= sampleDuration)
{
diff --git a/Assets/Scripts/Unit/UnitRootMotion.cs b/Assets/Scripts/Unit/UnitRootMotion.cs index 18e0093f..542b08fd 100644 --- a/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Assets/Scripts/Unit/UnitRootMotion.cs @@ -70,7 +70,7 @@ public class UnitRootMotion : UnitComponent public void UpdateRootMotion()
{
Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition;
- dest.x = 0;
+ dest.x = 0; //限制x轴始终在x=0
m_Owner.transform.position += dest;
}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta deleted file mode 100644 index fc69e121..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b4092aee1925294286c91c8b2f0246b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta deleted file mode 100644 index 16dceda0..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f677b222bd908a4eb6e8b6f446f0c95 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta deleted file mode 100644 index 3feeaa0c..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f65f99730f449cd42b5428ed33579276 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta deleted file mode 100644 index d2cc8de3..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d1d19a8d9a9258489a54453cbd409bf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta deleted file mode 100644 index 60091bee..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5fa002e3b21354f4b847ab441877ecda -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta deleted file mode 100644 index c50ca514..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9c840958f8546c4e9667f0757d8557a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta deleted file mode 100644 index 35b83bfb..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e705a58e98ec1a409129eb57fa15477 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta deleted file mode 100644 index 88f9f501..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c77d30703ebcc5c4bbb57517b133b0f4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta deleted file mode 100644 index 4d33dc86..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 142685877fe50f64caba63abfda167a7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta deleted file mode 100644 index 293c8b38..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/User.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0aa5379d96b0e14795df45a380643fb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta deleted file mode 100644 index a5ee5a64..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c9d2f06234e7e643b2118057d8e0673 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta deleted file mode 100644 index 3fdad1c4..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6fcf51a07e84ca941a62046a0b693a19 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta deleted file mode 100644 index 94757653..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta deleted file mode 100644 index d2c0b7b4..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: edc7fbbe770e693488770a7aaeae2aa6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta deleted file mode 100644 index 069be515..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ed975ceb335a144c93320e22ae1780a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta deleted file mode 100644 index 7ea21e4b..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a3babbb69c72f8419243020c0dfb70b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta deleted file mode 100644 index f2a1c8a6..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd6738b410016744eaf6e182174c0b2b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta deleted file mode 100644 index 50e68eff..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f32bd65977ebf9049bd5e40e18d1556c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta deleted file mode 100644 index 68664862..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 151a76ee3bec1ae449cd56f31d474de5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta deleted file mode 100644 index aab2c856..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3ae8613087e217249a69059295113b1c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: |