From 53879de099a26d2bc23c3a93aee0ace92e21347e Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 26 Jun 2022 00:27:23 -0400 Subject: [PATCH] Move stray somen file to its folder --- .../RhythmSomen/Animations/Sweat.controller | 123 +++++++++++------- .../Animations/Sweat.controller.meta | 2 +- .../Animations/TestSweat.controller} | 91 +++++-------- .../Animations/TestSweat.controller.meta} | 2 +- 4 files changed, 109 insertions(+), 109 deletions(-) rename Assets/Resources/{Games/Sweat.controller => Sprites/Games/RhythmSomen/Animations/TestSweat.controller} (60%) rename Assets/Resources/{Games/Sweat.controller.meta => Sprites/Games/RhythmSomen/Animations/TestSweat.controller.meta} (79%) diff --git a/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller index 59f96c6a..a3aaf43d 100644 --- a/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller +++ b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller @@ -1,57 +1,13 @@ %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: Sweat - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 7746455235394996756} - 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 &7746455235394996756 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 8020205864861736811} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8020205864861736811} ---- !u!1102 &8020205864861736811 +--- !u!1102 &-6697072708767678652 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: teststs + m_Name: BlobSweating m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -64,9 +20,82 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 8ef3150a73054154e86f00c94273349b, type: 2} + m_Motion: {fileID: 7400000, guid: 49dbc1758c8095040b83b37106b417e2, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-19641165761514187 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlobNothing + 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: d547354621aa67644bfe852277f517fa, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sweat + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4794652093112339212} + 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 &4794652093112339212 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6697072708767678652} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -19641165761514187} + m_Position: {x: 235, y: 65, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -19641165761514187} diff --git a/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller.meta b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller.meta index 6084569c..4d1ae7a1 100644 --- a/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller.meta +++ b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25a71f038b410b6488f7350f85de852c +guid: f383738438c8c364a99ba374f24c2b05 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Resources/Games/Sweat.controller b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller similarity index 60% rename from Assets/Resources/Games/Sweat.controller rename to Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller index a3aaf43d..4324b317 100644 --- a/Assets/Resources/Games/Sweat.controller +++ b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller @@ -1,70 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-6697072708767678652 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BlobSweating - 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: 49dbc1758c8095040b83b37106b417e2, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-19641165761514187 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BlobNothing - 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: d547354621aa67644bfe852277f517fa, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Sweat + m_Name: TestSweat serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 4794652093112339212} + m_StateMachine: {fileID: 7746455235394996756} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -74,7 +22,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1107 &4794652093112339212 +--- !u!1107 &7746455235394996756 AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -84,11 +32,8 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -6697072708767678652} + m_State: {fileID: 8020205864861736811} m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: -19641165761514187} - m_Position: {x: 235, y: 65, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -98,4 +43,30 @@ AnimatorStateMachine: 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: -19641165761514187} + m_DefaultState: {fileID: 8020205864861736811} +--- !u!1102 &8020205864861736811 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: teststs + 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: 8ef3150a73054154e86f00c94273349b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Games/Sweat.controller.meta b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller.meta similarity index 79% rename from Assets/Resources/Games/Sweat.controller.meta rename to Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller.meta index 4d1ae7a1..6084569c 100644 --- a/Assets/Resources/Games/Sweat.controller.meta +++ b/Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f383738438c8c364a99ba374f24c2b05 +guid: 25a71f038b410b6488f7350f85de852c NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000