diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC')
18 files changed, 395 insertions, 186 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset index 07ea538e..416c2c91 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset @@ -10,14 +10,40 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Dash + m_Name: Air_Dash(Clone) m_EditorClassIdentifier: animationName: Air_Dash animationPath: Assets/Art/Animations/Erika/Air_Dash.anim animationEvents: [] hurtBoxes: - - type: 1 - pivot: 0 + - collider: + type: 0 + pivot: 0 + multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 + multiple: 0 frames: - frame: 0 active: 1 @@ -44,9 +70,70 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} size: {x: 1, y: 1.34, z: 0.5} hitBoxes: - - type: 0 - pivot: 1 + - collider: + type: 0 + pivot: 0 + multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 + multiple: 0 frames: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: 00000000 + m_values: + - from: 0.5 + to: 1 + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset index 4edb3d25..c355dded 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset @@ -20,25 +20,45 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 149 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} hitBoxes: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] - curve: + speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -62,3 +82,12 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: + m_values: [] + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset index 4f63709a..df5e5520 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset @@ -19,25 +19,45 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.24, z: 0.61} + size: {x: 0.61, y: 1.24, z: 1} - frame: 16 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.27, z: 0.5} + size: {x: 0.5, y: 1.27, z: 1} hitBoxes: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] - curve: + speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -61,3 +81,12 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: + m_values: [] + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index 7cc3c8c2..915c2d85 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -25,172 +25,274 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 1 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 1 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} - frame: 7 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 12 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 20 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.7, z: 0.5} + size: {x: 0.5, y: 0.7, z: 1} - frame: 22 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.75, z: 0.5} + size: {x: 0.5, y: 0.75, z: 1} - frame: 24 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} - frame: 30 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.4, z: 0.5} + size: {x: 0.5, y: 1.4, z: 1} - frame: 40 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.16, z: 0.5} + size: {x: 0.5, y: 1.16, z: 1} - frame: 41 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.78, z: 0.5} + size: {x: 0.5, y: 0.78, z: 1} - frame: 42 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.95, z: 0.5} + size: {x: 0.5, y: 0.95, z: 1} - frame: 43 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.07, z: 0.5} + size: {x: 0.5, y: 1.07, z: 1} - frame: 45 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.61, z: 0.5} + size: {x: 0.5, y: 0.61, z: 1} - frame: 53 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 82 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} hitBoxes: - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 11 active: 1 - position: {x: 0, y: 1, z: 1} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1, y: 1, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 17 active: 1 - position: {x: 0, y: 0.58, z: 1} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1, y: 0.58, z: 0} + size: {x: 0.5, y: 1, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 24 active: 1 - position: {x: 0, y: 0.71, z: 1.14} - size: {x: 1, y: 1.78, z: 0.5} + position: {x: 1.14, y: 0.71, z: 0} + size: {x: 0.5, y: 1.78, z: 1} - frame: 28 active: 1 - position: {x: 0, y: 1.37, z: 1.31} - size: {x: 1, y: 1.62, z: 0.49} + position: {x: 1.31, y: 1.37, z: 0} + size: {x: 0.49, y: 1.62, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 40 active: 1 - position: {x: 0, y: 0.61, z: 1.08} - size: {x: 1, y: 1.35, z: 0.5} + position: {x: 1.08, y: 0.61, z: 0} + size: {x: 0.5, y: 1.35, z: 1} - frame: 43 active: 1 - position: {x: 0, y: 0.52, z: 1.08} - size: {x: 1, y: 1.43, z: 0.5} + position: {x: 1.08, y: 0.52, z: 0} + size: {x: 0.5, y: 1.43, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 44 active: 1 - position: {x: 0, y: 0.52, z: 0.82} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.82, y: 0.52, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 46 active: 1 - position: {x: 0, y: 0.3, z: 0.85} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.85, y: 0.3, z: 0} + size: {x: 0.5, y: 1, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 48 active: 1 - position: {x: 0, y: 0, z: 1.13} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1.13, y: 0, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 51 active: 1 - position: {x: 0, y: 0.31, z: 0.67} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.67, y: 0.31, z: 0} + size: {x: 0.5, y: 1, z: 1} throwBoxes: [] blockBoxes: [] defendBoxes: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller index 429a9a07..294f664f 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller @@ -14,19 +14,19 @@ AnimatorController: m_DefaultFloat: 0.4 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PlaybackSpeed0 m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PlaybackSpeed1 m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Basic @@ -306,7 +306,7 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} m_Tag: - m_SpeedParameter: + m_SpeedParameter: IdleStatus m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: @@ -388,6 +388,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102214450384744764 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirDash + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102230929257620240 AnimatorState: serializedVersion: 5 @@ -678,6 +704,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102696179637896120 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102700468040696058 AnimatorState: serializedVersion: 5 @@ -821,13 +873,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102108504916990050} - m_Position: {x: 192, y: -492, z: 0} + m_Position: {x: -96, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102289505320285826} m_Position: {x: 444, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102474951772684744} - m_Position: {x: -72, y: -492, z: 0} + m_Position: {x: 168, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102064426511052762} m_Position: {x: 444, y: -600, z: 0} @@ -836,38 +888,44 @@ AnimatorStateMachine: m_Position: {x: 444, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102700468040696058} - m_Position: {x: 264, y: -816, z: 0} + m_Position: {x: 708, y: -456, z: 0} - serializedVersion: 1 m_State: {fileID: 1102403163851985622} - m_Position: {x: 264, y: -864, z: 0} + m_Position: {x: 708, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102018842156954176} - m_Position: {x: 264, y: -960, z: 0} + m_Position: {x: 708, y: -600, z: 0} - serializedVersion: 1 m_State: {fileID: 1102397782345947260} - m_Position: {x: 264, y: -912, z: 0} + m_Position: {x: 708, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102230929257620240} - m_Position: {x: 552, y: -816, z: 0} + m_Position: {x: 1236, y: -456, z: 0} - serializedVersion: 1 m_State: {fileID: 1102642339950476984} - m_Position: {x: 552, y: -864, z: 0} + m_Position: {x: 1236, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102101182547217892} - m_Position: {x: 552, y: -912, z: 0} + m_Position: {x: 1236, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102269967399741822} - m_Position: {x: 552, y: -960, z: 0} + m_Position: {x: 1236, y: -600, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102696179637896120} + m_Position: {x: -456, y: -792, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102214450384744764} + m_Position: {x: 972, y: -600, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -408, y: -888, z: 0} - m_EntryPosition: {x: 216, y: -420, z: 0} + m_EntryPosition: {x: -408, y: -840, z: 0} m_ExitPosition: {x: -408, y: -924, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102108504916990050} + m_DefaultState: {fileID: 1102696179637896120} --- !u!1107 &1107669995669758872 AnimatorStateMachine: serializedVersion: 5 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/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/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta index 1d22d5d2..be6badd6 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e777b7b5be18d4e4092e116011158c68 +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: |