diff --git a/Assets/Resources/Sprites/Editor/GameIcons/bonOdori.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/bonOdori.png.meta index 8cc549b2d..854f302e0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/bonOdori.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/bonOdori.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -33,8 +33,8 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/bonOdori_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/bonOdori_mask.png.meta index ffa372ac1..033a0efc0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/bonOdori_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/bonOdori_mask.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -33,8 +33,8 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller index f1d8f4a60..9e3dff787 100644 --- a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller +++ b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/CPU.controller @@ -30,6 +30,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -800090046824456851} m_Position: {x: 535.5234, y: 170.3475, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7173598651105736538} + m_Position: {x: 690, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -40,6 +43,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 8528355832639613082} +--- !u!1102 &-7173598651105736538 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NeutralClapFront + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-4705747275684449524 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -72,7 +101,8 @@ AnimatorState: m_Name: ClapFront m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1781960644044065865} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -114,6 +144,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1781960644044065865 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7173598651105736538} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-800090046824456851 AnimatorState: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Player.controller b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Player.controller index fa4096e0b..790f0d55e 100644 --- a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Player.controller +++ b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Player.controller @@ -26,7 +26,10 @@ AnimatorStateMachine: m_Position: {x: 70, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: -6504830255594219854} - m_Position: {x: 302, y: 292, z: 0} + m_Position: {x: 300, y: 290, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1856292094833090732} + m_Position: {x: 530, y: 290, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -47,7 +50,8 @@ AnimatorState: m_Name: ClapFront m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3534372531958332861} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -89,6 +93,54 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3534372531958332861 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1856292094833090732} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1856292094833090732 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NeutralClapFront + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-214786828639412855 AnimatorState: serializedVersion: 6