diff options
Diffstat (limited to 'Assets/Bundle/Unit')
32 files changed, 125 insertions, 1358 deletions
diff --git a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller b/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller deleted file mode 100644 index 5ef5e972..00000000 --- a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller +++ /dev/null @@ -1,43 +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: Monster_AnimatorController - serializedVersion: 5 - m_AnimatorParameters: [] - 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} ---- !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: [] - 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/Monster_AnimatorController.controller.meta b/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller.meta deleted file mode 100644 index 1ce47b32..00000000 --- a/Assets/Bundle/Unit/AnimatorController/Monster_AnimatorController.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0b81909d05ebb964db0b68025b06b43a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller deleted file mode 100644 index f6f73b77..00000000 --- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller +++ /dev/null @@ -1,646 +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: 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 deleted file mode 100644 index f555d2c2..00000000 --- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController 1.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e2d366cf87c3f574bad579686d5b5d21 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller deleted file mode 100644 index 97d8f1bf..00000000 --- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller +++ /dev/null @@ -1,484 +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: PC_AnimatorController - 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_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 &1101037676296870908 -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.046343505 - m_TransitionOffset: 0 - m_ExitTime: 0.9439586 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 3 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 0 ---- !u!1101 &1101144256514140790 -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.07083995 - m_TransitionOffset: 0 - m_ExitTime: 0.92931783 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 4 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 0 ---- !u!1101 &1101301825364227868 -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.08333343 - m_TransitionOffset: 0 - m_ExitTime: 0.91026247 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 3 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 0 ---- !u!1101 &1101523671407522470 -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.054671824 - m_TransitionOffset: 0 - m_ExitTime: 0.9453282 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 3 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 0 ---- !u!1101 &1101604052918910436 -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.051469862 - m_TransitionOffset: 0 - m_ExitTime: 0.94853014 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 3 - m_OrderedInterruption: 0 - m_CanTransitionToSelf: 0 ---- !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: [] - 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: [] - 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: [] - 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: [] - 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: [] - 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: 576, y: -432, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102758058710279394} - m_Position: {x: 636, y: -312, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102099224573621780} - m_Position: {x: 420, y: -504, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102474951772684744} - m_Position: {x: 384, y: -312, 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: -60, y: -276, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102530119364819120} - m_Position: {x: 48, y: -384, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: 1101301825364227868} - - {fileID: 1101604052918910436} - - {fileID: 1101523671407522470} - - {fileID: 1101144256514140790} - - {fileID: 1101037676296870908} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 312, y: -384, 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.controller.meta b/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller.meta deleted file mode 100644 index 2a7c8f3f..00000000 --- a/Assets/Bundle/Unit/AnimatorController/PC_AnimatorController.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cc85b30273da8ce4eb42ec6ff4c98074 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta deleted file mode 100644 index 142f5872..00000000 --- a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6ad7401709700f34db2b795830937d76 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/Assets/Bundle/Unit/NPC.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ced034d375cdfa488814663ea17a79b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset index ad5d4207..0a2d8ca8 100644 --- a/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset +++ b/Assets/Bundle/Unit/PC/Erika/ActionData/ErikaActionData.asset @@ -13,12 +13,37 @@ MonoBehaviour: m_Name: ErikaActionData m_EditorClassIdentifier: actions: - m_keys: 00000000020000000600000004000000050000000100000007000000 + m_keys: + - Idle + - Move + - Landing + - LandingGround + - Jump + - AirAttack0 + - AirAttack1 + - AirAttack2 + - AirAttack3 + - AirAttack4 + - AttackToAir + - AirDash + - Attack0 + - Attack1 + - Attack2 + - Attack3 m_values: - - {fileID: 7400000, guid: 6a53e3ed6230d2742939796aef1e214c, type: 2} + - {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + - {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} + - {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} + - {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} - {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2} - - {fileID: 7400000, guid: 21f8513f0b3b0b945b76bbf95e6adc3e, type: 2} - - {fileID: 7400000, guid: a7f4564d08baf0342bd790dda3aa1540, type: 2} - - {fileID: 7400000, guid: ac5153c0b622f6041984ea8c2155fa8a, type: 2} - - {fileID: 7400000, guid: b3b491ff9a4b4204fb54105483e9458f, type: 2} - - {fileID: 7400000, guid: f6b472b469a84bd4fb06b3b99d3c08b7, type: 2} + - {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2} + - {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} + - {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} + - {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} + - {fileID: 7400000, guid: 6543c9aee7b3f7b4d80c8f87fdf3c837, type: 2} + - {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2} + - {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + - {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2} + - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim index 0d5beaa3..c27f27ad 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim +++ b/Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim @@ -31177,7 +31177,7 @@ AnimationClip: m_AdditiveReferencePoseTime: 0 m_StartTime: 0 m_StopTime: 2 - m_OrientationOffsetY: 0 + m_OrientationOffsetY: -19.7 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset index 9ac4cfb7..a49dbcb1 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -53,3 +56,6 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset index 34f21520..c91f8013 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset @@ -22,6 +22,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -54,6 +60,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -138,3 +150,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.07 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset index 1009b6af..7fdac624 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset @@ -53,8 +53,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.45 + - from: 0.54 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.08 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset index 0f718029..9cf4efee 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset @@ -22,6 +22,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -62,6 +68,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -98,27 +110,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] - overrideRootMotion: 1 + overrideRootMotion: 0 rootMotionOverrideData: - positions: - - position: {x: 0, y: 0, z: 0} - frame: 0 - - position: {x: 0.79, y: 0.14, z: 0} - frame: 3 - - position: {x: 1.41, y: 0.24, z: 0} - frame: 6 - - position: {x: 2.44, y: 0.28, z: 0} - frame: 9 - - position: {x: 3.41, y: 0.25, z: 0} - frame: 12 - - position: {x: 3.83, y: 0.29, z: 0} - frame: 18 - - position: {x: 4.01, y: 0.26, z: 0} - frame: 28 - - position: {x: 4.09, y: 0.27, z: 0} - frame: 42 - - position: {x: 4.37, y: 0.14, z: 0} - frame: 45 + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -181,8 +175,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.69 + - from: 0.55 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.05 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset index 694b3f64..27a674b8 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -55,3 +58,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.03 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index b372229a..a0695940 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Take 001(Clone) + m_Name: Take 001 m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim @@ -28,6 +28,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -116,6 +122,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -155,6 +167,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -194,6 +212,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -233,6 +257,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -272,6 +302,12 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta deleted file mode 100644 index 1d22d5d2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 8c41a6b2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 11148d17..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d712421d808a43438a43d8a5d34effe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/AnimatorController.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta index 5854bffd..b3286831 100644 --- a/Assets/Bundle/Unit/AnimatorController.meta +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bccf23fd118cb34e8464423a307e16d +guid: b5a895c20fc15c748a20b8f214dd24b5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 922befa8a94692845b88500a23229d7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta index ca7266b0..be6badd6 100644 --- a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 +guid: 2c46a5a23283c7d428ae8bb13663ab6a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4ed2c938..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 43a52cd1..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 85d58a8c..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index dd867045..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index dc530723..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index b28b6f04..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index eeca0d3b..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 7f91da28..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index affd6eed..00000000 --- a/Assets/Bundle/Unit/Prop.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dafc173db1ebeab4c80641cc3d4fa528 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: |