From ca48e238928993fb7305dda4f94a2fdd2bbe6f00 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 23:08:55 -0500 Subject: [PATCH 1/3] Added animations to the Wizard in Wizard's Waltz --- Assets/Resources/Games/wizardsWaltz.prefab | 21 ++++ .../{Appear.anim => PlantAppear.anim} | 2 +- ...Appear.anim.meta => PlantAppear.anim.meta} | 0 .../Animations/{Eat.anim => PlantEat.anim} | 2 +- .../{Eat.anim.meta => PlantEat.anim.meta} | 0 .../{EatLoop.anim => PlantEatLoop.anim} | 2 +- ...tLoop.anim.meta => PlantEatLoop.anim.meta} | 0 .../Animations/{Hit.anim => PlantHit.anim} | 2 +- .../{Hit.anim.meta => PlantHit.anim.meta} | 0 .../Animations/WizardAnimator.controller | 101 ++++++++++++++++++ .../Animations/WizardAnimator.controller.meta | 8 ++ .../WizardsWaltz/Animations/WizardIdle.anim | 68 ++++++++++++ .../Animations/WizardIdle.anim.meta | 8 ++ .../WizardsWaltz/Animations/WizardMagic.anim | 77 +++++++++++++ .../Animations/WizardMagic.anim.meta | 8 ++ Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 11 ++ 16 files changed, 306 insertions(+), 4 deletions(-) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Appear.anim => PlantAppear.anim} (99%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Appear.anim.meta => PlantAppear.anim.meta} (100%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Eat.anim => PlantEat.anim} (99%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Eat.anim.meta => PlantEat.anim.meta} (100%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{EatLoop.anim => PlantEatLoop.anim} (98%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{EatLoop.anim.meta => PlantEatLoop.anim.meta} (100%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Hit.anim => PlantHit.anim} (99%) rename Assets/Resources/Sprites/Games/WizardsWaltz/Animations/{Hit.anim.meta => PlantHit.anim.meta} (100%) create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index 1369c166..7d8147d7 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -204,6 +204,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5068490343008965940} + - component: {fileID: 6016131923214625071} - component: {fileID: 7265463465499129635} - component: {fileID: 9147818320159898070} m_Layer: 0 @@ -227,6 +228,25 @@ Transform: m_Father: {fileID: 7248900333300803150} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6016131923214625071 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194608921018870769} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 58de0406eb0b927408d884b8508a24c6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!212 &7265463465499129635 SpriteRenderer: m_ObjectHideFlags: 0 @@ -290,6 +310,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d323f90f8c1dd54da6d53d21013cf5c, type: 3} m_Name: m_EditorClassIdentifier: + animator: {fileID: 6016131923214625071} shadow: {fileID: 1172109260453278802} --- !u!1 &1740010938943195280 GameObject: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim similarity index 99% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim index 981dbe64..8d5a837d 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Appear + m_Name: PlantAppear serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim.meta rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim.meta diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim similarity index 99% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim index 087509b3..17ef5ac9 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Eat + m_Name: PlantEat serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim.meta diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim similarity index 98% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim index ef23c5a2..835f1cda 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: EatLoop + m_Name: PlantEatLoop serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim.meta rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim.meta diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim similarity index 99% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim index 9ef48fd4..c22a1089 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Hit + m_Name: PlantHit serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim.meta rename to Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim.meta diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller new file mode 100644 index 00000000..98d0eab4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4718869513436913057 +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: 8515424114401048048} + m_Position: {x: 300, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6278702679387289231} + m_Position: {x: 290, y: 160, 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: 8515424114401048048} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WizardAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4718869513436913057} + 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!1102 &6278702679387289231 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Magic + m_Speed: 0.25 + 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: 93734c9b385564b4faedd93baa9d3252, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8515424114401048048 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0.25 + 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: 233ca8cec63c3f8478bd4925bf18ea67, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller.meta new file mode 100644 index 00000000..1671d6a1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58de0406eb0b927408d884b8508a24c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim new file mode 100644 index 00000000..361e2d29 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WizardIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim.meta new file mode 100644 index 00000000..3f83b144 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 233ca8cec63c3f8478bd4925bf18ea67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim new file mode 100644 index 00000000..e002d168 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WizardMagic + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -5319955813400714423, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.016666668 + value: {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.033333335 + value: {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.05 + value: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -5319955813400714423, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim.meta new file mode 100644 index 00000000..e0559d48 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93734c9b385564b4faedd93baa9d3252 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs index 8ad64706..72e93863 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -7,6 +7,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz { public class Wizard : MonoBehaviour { + public Animator animator; public GameObject shadow; private WizardsWaltz game; @@ -34,8 +35,18 @@ namespace RhythmHeavenMania.Games.WizardsWaltz shadow.transform.localScale = new Vector3(scale, scale, 1); } + private void LateUpdate() + { + if (PlayerInput.Pressed(true)) + { + animator.Play("Magic", 0, 0); + } + } + public void Magic(Plant plant, bool hit) { + animator.Play("Magic", 0, 0); + if(plant == null) { // TODO: Play empty A press sound From c028882d5b1ed415a14044b2847f674d7e5c4940 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 00:16:38 -0500 Subject: [PATCH 2/3] Added the girl to Wizard's Waltz --- Assets/Resources/Games/wizardsWaltz.prefab | 748 +++++++++++++++++- .../Animations/GirlAnimator.controller | 130 +++ .../Animations/GirlAnimator.controller.meta | 8 + .../WizardsWaltz/Animations/GirlHappy.anim | 68 ++ .../Animations/GirlHappy.anim.meta | 8 + .../WizardsWaltz/Animations/GirlIdle.anim | 77 ++ .../Animations/GirlIdle.anim.meta | 8 + .../WizardsWaltz/Animations/GirlSad.anim | 68 ++ .../WizardsWaltz/Animations/GirlSad.anim.meta | 8 + .../WizardsWaltz/Animations/WizardMagic.anim | 6 +- Assets/Scripts/Games/WizardsWaltz/Girl.cs | 36 + .../Scripts/Games/WizardsWaltz/Girl.cs.meta | 11 + Assets/Scripts/Games/WizardsWaltz/Plant.cs | 2 + Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 10 +- .../Games/WizardsWaltz/WizardsWaltz.cs | 9 +- 15 files changed, 1181 insertions(+), 16 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim.meta create mode 100644 Assets/Scripts/Games/WizardsWaltz/Girl.cs create mode 100644 Assets/Scripts/Games/WizardsWaltz/Girl.cs.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index 7d8147d7..1704a357 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -82,6 +82,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &824369986073677995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309880749741740237} + - component: {fileID: 2235530822151886643} + m_Layer: 0 + m_Name: Flower5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1309880749741740237 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824369986073677995} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.566, y: 0.407, z: -0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2235530822151886643 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824369986073677995} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &883613100522307325 GameObject: m_ObjectHideFlags: 0 @@ -111,7 +193,7 @@ Transform: m_Children: - {fileID: 5180675038394081533} m_Father: {fileID: 7248900333300803150} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1172109260453278802 GameObject: @@ -222,7 +304,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194608921018870769} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6, y: 2, z: 0} + m_LocalPosition: {x: -6, y: 3.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7248900333300803150} @@ -286,7 +368,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -340,8 +422,172 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7248900333300803150} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2244225289080053818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5393523326211893817} + - component: {fileID: 3282600108638979987} + m_Layer: 0 + m_Name: Flower2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5393523326211893817 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2244225289080053818} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.31, y: 0.595, z: -0.02} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3282600108638979987 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2244225289080053818} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2817781706182905973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3585927333340198492} + - component: {fileID: 8024436598733951220} + m_Layer: 0 + m_Name: Flower3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3585927333340198492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2817781706182905973} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.315, y: 0.595, z: -0.02} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8024436598733951220 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2817781706182905973} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3353780840221392181 GameObject: m_ObjectHideFlags: 0 @@ -419,7 +665,208 @@ MonoBehaviour: isEligible: 0 triggersAutoplay: 1 animator: {fileID: 1956085913247994144} + spriteRenderer: {fileID: 6977509582872707701} createBeat: 0 +--- !u!1 &5266103671708731011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6858471038995154122} + - component: {fileID: 1390796412318508355} + m_Layer: 0 + m_Name: Flower1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6858471038995154122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5266103671708731011} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.715, z: -0.03} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1390796412318508355 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5266103671708731011} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5785328837124315536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4760280235451728407} + - component: {fileID: 3302157959808029144} + m_Layer: 0 + m_Name: Flower6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4760280235451728407 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5785328837124315536} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.347, z: -0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3302157959808029144 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5785328837124315536} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6730866518009185534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7909129079744458918} + m_Layer: 0 + m_Name: Flowers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7909129079744458918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730866518009185534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6858471038995154122} + - {fileID: 5393523326211893817} + - {fileID: 3585927333340198492} + - {fileID: 1593976179448737357} + - {fileID: 1309880749741740237} + - {fileID: 4760280235451728407} + m_Father: {fileID: 7400556352280096869} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7248900333300803145 GameObject: m_ObjectHideFlags: 0 @@ -451,6 +898,7 @@ Transform: - {fileID: 8701843541313247389} - {fileID: 5068490343008965940} - {fileID: 669296839509545821} + - {fileID: 7400556352280096869} - {fileID: 8217893490508314786} - {fileID: 2989642375569903027} m_Father: {fileID: 0} @@ -471,10 +919,300 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 wizard: {fileID: 9147818320159898070} + girl: {fileID: 4216735310021244778} plantHolder: {fileID: 1740010938943195280} plantBase: {fileID: 3353780840221392181} beatInterval: 4 wizardBeatOffset: 0 +--- !u!1 &7509558683071972976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7400556352280096869} + - component: {fileID: 3995188655524054386} + - component: {fileID: 7577900123824664603} + - component: {fileID: 4216735310021244778} + m_Layer: 0 + m_Name: Girl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7400556352280096869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509558683071972976} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2.76, z: 3.57} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6267059327452545344} + - {fileID: 7909129079744458918} + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3995188655524054386 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509558683071972976} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 679d32a6cc945c5408c387aefe8a3919, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &7577900123824664603 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509558683071972976} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.875, y: 1.6875} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4216735310021244778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7509558683071972976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e25ab9ffcdb4c945ace0b7c8db5bd9a, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 3995188655524054386} + flowers: + - {fileID: 5266103671708731011} + - {fileID: 2244225289080053818} + - {fileID: 2817781706182905973} + - {fileID: 8569180149739450563} + - {fileID: 824369986073677995} + - {fileID: 5785328837124315536} +--- !u!1 &8569180149739450563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1593976179448737357} + - component: {fileID: 8972858675252531799} + m_Layer: 0 + m_Name: Flower4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1593976179448737357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8569180149739450563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.56, y: 0.407, z: -0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7909129079744458918} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8972858675252531799 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8569180149739450563} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8680683686592817947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6267059327452545344} + - component: {fileID: 4644692373945095292} + m_Layer: 0 + m_Name: GirlShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6267059327452545344 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8680683686592817947} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.55, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7400556352280096869} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4644692373945095292 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8680683686592817947} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: -2010975486192916732, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Color: {r: 1, g: 0.48467705, b: 0, a: 0.33333334} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8963803634876878173 GameObject: m_ObjectHideFlags: 0 @@ -545,7 +1283,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -299 + m_SortingOrder: -32768 m_Sprite: {fileID: 21300000, guid: 8efef001b979ac0469c4648bbac086c4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller new file mode 100644 index 00000000..a7f0cbdb --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9065830773253602795 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Happy + m_Speed: 0.25 + 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: 569ca959d62126945a973132c49c2403, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-2919265077717523514 +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: 8515814537945417518} + m_Position: {x: 280, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9065830773253602795} + m_Position: {x: 300, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: -806955783819117671} + m_Position: {x: 330, y: 150, 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: 8515814537945417518} +--- !u!1102 &-806955783819117671 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sad + m_Speed: 0.25 + 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: 67267e1d34deadc4b8300bf2fdbbbf45, 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: GirlAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2919265077717523514} + 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!1102 &8515814537945417518 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0.25 + 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: b773fc4d9fe115d4d800dcb6a50649d2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller.meta new file mode 100644 index 00000000..d2f2c64d --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 679d32a6cc945c5408c387aefe8a3919 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim new file mode 100644 index 00000000..3747e718 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GirlHappy + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 819641782229730920, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 819641782229730920, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim.meta new file mode 100644 index 00000000..1807e57d --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 569ca959d62126945a973132c49c2403 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim new file mode 100644 index 00000000..36a506e3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GirlIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -4304133006063306856, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.016666668 + value: {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.033333335 + value: {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.05 + value: {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -4304133006063306856, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim.meta new file mode 100644 index 00000000..b6bcf949 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b773fc4d9fe115d4d800dcb6a50649d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim new file mode 100644 index 00000000..c80e037a --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GirlSad + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4064990237623416981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4064990237623416981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim.meta new file mode 100644 index 00000000..6fb463c9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67267e1d34deadc4b8300bf2fdbbbf45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim index e002d168..2956c568 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim @@ -24,9 +24,9 @@ AnimationClip: - time: 0.016666668 value: {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - time: 0.033333335 - value: {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.05 value: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.05 + value: {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} attribute: m_Sprite path: classID: 212 @@ -48,8 +48,8 @@ AnimationClip: pptrCurveMapping: - {fileID: -5319955813400714423, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Scripts/Games/WizardsWaltz/Girl.cs b/Assets/Scripts/Games/WizardsWaltz/Girl.cs new file mode 100644 index 00000000..7d95aea9 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Girl.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RhythmHeavenMania.Games.WizardsWaltz +{ + public class Girl : MonoBehaviour + { + + public Animator animator; + + public GameObject[] flowers; + private int flowerCount = 0; + + public void Happy() + { + animator.Play("Happy", 0, 0); + SetFlowers(1); + } + + public void Sad() + { + animator.Play("Sad", 0, 0); + SetFlowers(-1); + } + + public void SetFlowers(int add = 0) + { + flowerCount = Mathf.Clamp(flowerCount + add, 0, flowers.Length); + for (int i = 0; i < flowers.Length; i++) + { + flowers[i].SetActive(i < flowerCount); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/Girl.cs.meta b/Assets/Scripts/Games/WizardsWaltz/Girl.cs.meta new file mode 100644 index 00000000..24ca1d94 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Girl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e25ab9ffcdb4c945ace0b7c8db5bd9a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz/Plant.cs b/Assets/Scripts/Games/WizardsWaltz/Plant.cs index c42a7f8d..98cc8903 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Plant.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Plant.cs @@ -8,6 +8,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz public class Plant : PlayerActionObject { public Animator animator; + public SpriteRenderer spriteRenderer; public float createBeat; private WizardsWaltz game; @@ -21,6 +22,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz private void Start() { + spriteRenderer.sortingOrder = (int)Math.Round((transform.position.z - 2) * 1000); animator.Play("Appear", 0, 0); } diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs index 72e93863..3a0e3e20 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -23,11 +23,11 @@ namespace RhythmHeavenMania.Games.WizardsWaltz songPos = Conductor.instance.songPositionInBeats; var am = game.beatInterval / 2f; var x = Mathf.Sin(Mathf.PI * songPos / am) * 6; - var y = Mathf.Cos(Mathf.PI * songPos / am) * 1.5f; - var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.25f; + var y = Mathf.Cos(Mathf.PI * songPos / am) * 2f; + var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f; - transform.position = new Vector3(x, 2 + y, -scale); - shadow.transform.position = new Vector3(x, -2.5f + y, -scale + 0.1f); + transform.position = new Vector3(x, 1f + y, scale * 2); + shadow.transform.position = new Vector3(x, -3.5f + y, scale * 2 + 0.1f); var xscale = scale; if (y > 0) xscale *= -1; @@ -56,11 +56,13 @@ namespace RhythmHeavenMania.Games.WizardsWaltz { Jukebox.PlayOneShotGame("wizardsWaltz/grow"); plant.Bloom(); + game.girl.Happy(); } else { Jukebox.PlayOneShot("miss"); plant.Eat(); + game.girl.Sad(); } } diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index 1893f7f6..f9ac7fa6 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -12,6 +12,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz { [Header("References")] public Wizard wizard; + public Girl girl; public GameObject plantHolder; public GameObject plantBase; @@ -62,12 +63,12 @@ namespace RhythmHeavenMania.Games.WizardsWaltz var songPos = Conductor.instance.songPositionInBeats; var am = (beatInterval / 2f); var x = Mathf.Sin(Mathf.PI * songPos / am) * 6; - var y = -2.5f + Mathf.Cos(Mathf.PI * songPos / am) * 1.5f; - var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.25f; + var y = -3.5f + Mathf.Cos(Mathf.PI * songPos / am) * 2f; + var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f; var xscale = scale; - if (y > -2.5f) xscale *= -1; + if (y > -3.5f) xscale *= -1; - plant.transform.localPosition = new Vector3(x, y, -scale); + plant.transform.localPosition = new Vector3(x, y, scale * 2); plant.transform.localScale = new Vector3(xscale, scale, 1); plant.gameObject.SetActive(true); From 502678f6b4edd299aa4915b3d921f3f0e4d4d56f Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 01:37:33 -0500 Subject: [PATCH 3/3] Added a new placeholder spritesheet for Wizard's Waltz --- Assets/Resources/Games/wizardsWaltz.prefab | 50 +- .../WizardsWaltz/Animations/GirlHappy.anim | 14 +- .../WizardsWaltz/Animations/GirlIdle.anim | 21 +- .../WizardsWaltz/Animations/GirlSad.anim | 14 +- .../Animations/PlantAnimator.controller | 66 +- .../WizardsWaltz/Animations/PlantAppear.anim | 34 +- .../WizardsWaltz/Animations/PlantEat.anim | 34 +- .../WizardsWaltz/Animations/PlantEatLoop.anim | 15 +- .../WizardsWaltz/Animations/PlantHit.anim | 54 +- .../Animations/PlantIdleFlower.anim | 74 + .../Animations/PlantIdleFlower.anim.meta | 8 + .../Animations/PlantIdlePlant.anim | 74 + .../Animations/PlantIdlePlant.anim.meta | 8 + .../WizardsWaltz/Animations/WizardIdle.anim | 12 +- .../WizardsWaltz/Animations/WizardMagic.anim | 26 +- ...z_bg.png.meta => wizardswaltz_bg.png.meta} | 0 .../WizardsWaltz/wizardswaltz_main.png.meta | 1810 ++++++++++------- Assets/Scripts/Games/WizardsWaltz/Plant.cs | 10 + Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 5 + 19 files changed, 1475 insertions(+), 854 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim.meta rename Assets/Resources/Sprites/Games/WizardsWaltz/{wizardwaltz_bg.png.meta => wizardswaltz_bg.png.meta} (100%) diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index 1704a357..4144759b 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -71,12 +71,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 4636117524539756526, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: -4854311998328955154, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.5416667, y: 0.5416667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -153,12 +153,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -266,12 +266,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -2010975486192916732, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - m_Color: {r: 1, g: 0.48467705, b: 0, a: 0.33333334} + m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.33333334} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 2, y: 1.125} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -369,12 +369,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: -3279310061726753367, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.875, y: 1.6875} + m_Size: {x: 2.5, y: 2.3125} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -495,12 +495,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -577,12 +577,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -738,12 +738,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -774,7 +774,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5785328837124315536} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.347, z: -0.01} + m_LocalPosition: {x: 0, y: -0.11, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7909129079744458918} @@ -820,12 +820,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1018,12 +1018,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 6626715444242248344, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.875, y: 1.6875} + m_Size: {x: 2.125, y: 1.875} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1120,12 +1120,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -5443044849284068091, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + m_Sprite: {fileID: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.7291667, y: 0.7291667} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1202,12 +1202,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -1 - m_Sprite: {fileID: -2010975486192916732, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - m_Color: {r: 1, g: 0.48467705, b: 0, a: 0.33333334} + m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_Color: {r: 0.90588236, g: 0.90588236, b: 0.90588236, a: 0.33333334} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 2, y: 1.125} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim index 3747e718..239f122b 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlHappy.anim @@ -20,7 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 819641782229730920, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 5008211631437172949, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 3575822998323175305, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: -5443044849284068091, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: classID: 212 @@ -40,18 +44,20 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 819641782229730920, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 5008211631437172949, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3575822998323175305, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -5443044849284068091, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim index 36a506e3..bd5bb576 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlIdle.anim @@ -20,13 +20,15 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -4304133006063306856, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -5319955813400714423, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.016666668 - value: {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 5772900555431232981, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.033333335 - value: {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 6626715444242248344, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.05 - value: {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 3255871077347632709, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.06666667 + value: {fileID: -5456092200958371718, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: classID: 212 @@ -46,16 +48,17 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -4304133006063306856, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 5772900555431232981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 2853135921585969209, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -5319955813400714423, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 5772900555431232981, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 6626715444242248344, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3255871077347632709, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -5456092200958371718, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim index c80e037a..8d93cbb9 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlSad.anim @@ -20,7 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 4064990237623416981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -7695811203869559049, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 4064990237623416981, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: 819641782229730920, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: classID: 212 @@ -40,18 +44,20 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 4064990237623416981, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -7695811203869559049, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 4064990237623416981, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 819641782229730920, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller index 545d6bee..37007b59 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8804350398867193427 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleFlower + m_Speed: 0.25 + 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: 6828641b7980b8941b050fd82376c0f4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-8735285583408772827 AnimatorState: serializedVersion: 6 @@ -8,7 +34,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Eat - m_Speed: 0.5 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -34,7 +60,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Hit - m_Speed: 0.5 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -52,6 +78,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3377413050634874265 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdlePlant + m_Speed: 0.25 + 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: 006ebbec2187eab468cbb18d55481dea, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-1911281047350913601 AnimatorState: serializedVersion: 6 @@ -60,7 +112,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Appear - m_Speed: 0.5 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -121,6 +173,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 4439301530716439655} m_Position: {x: 190, y: 250, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8804350398867193427} + m_Position: {x: 180, y: 320, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3377413050634874265} + m_Position: {x: 150, y: 380, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -139,7 +197,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: EatLoop - m_Speed: 0.5 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim index 8d5a837d..30d5b495 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAppear.anim @@ -20,17 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -7368868625357890572, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -4854311998328955154, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 8066796853834154409, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.033333335 - value: {fileID: 6550520003927709678, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.06666667 - value: {fileID: -7031960681128103596, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.1 - value: {fileID: 4636117524539756526, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.13333334 - value: {fileID: -7031960681128103596, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.16666667 - value: {fileID: 4636117524539756526, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 7729953531453421503, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: SpriteHolder classID: 212 @@ -50,18 +44,15 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -7368868625357890572, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 6550520003927709678, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -7031960681128103596, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 4636117524539756526, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -7031960681128103596, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 4636117524539756526, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -4854311998328955154, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 8066796853834154409, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 7729953531453421503, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.18333334 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -80,4 +71,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.05 + functionName: IdlePlant + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim index 17ef5ac9..bd000e5c 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEat.anim @@ -20,17 +20,17 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -4802072682935432007, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 2768467047179132677, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 5426991987252364490, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.033333335 - value: {fileID: -5472345213390817180, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 666750511962025834, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.05 + value: {fileID: 1392867603839226096, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.06666667 - value: {fileID: -4394865311163506109, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.1 - value: {fileID: -6165325623540167759, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.13333334 - value: {fileID: 3955841814209212924, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.16666667 - value: {fileID: -2406188369649778213, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -7031960681128103596, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.083333336 + value: {fileID: 6550520003927709678, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: SpriteHolder classID: 212 @@ -50,18 +50,18 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -4802072682935432007, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -5472345213390817180, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -4394865311163506109, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -6165325623540167759, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 3955841814209212924, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -2406188369649778213, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 2768467047179132677, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 5426991987252364490, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 666750511962025834, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 1392867603839226096, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -7031960681128103596, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 6550520003927709678, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.2 + m_StopTime: 0.1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -81,7 +81,7 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.2 + - time: 0.1 functionName: EatLoop data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim index 835f1cda..2d033618 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantEatLoop.anim @@ -20,11 +20,9 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -7426945613399875653, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.033333335 - value: {fileID: 854124440379713626, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.05 - value: {fileID: 854124440379713626, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 4636117524539756526, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -5472345213390817180, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: SpriteHolder classID: 212 @@ -44,15 +42,14 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -7426945613399875653, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 854124440379713626, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 854124440379713626, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 4636117524539756526, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -5472345213390817180, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.033333335 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim index c22a1089..1424f81e 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantHit.anim @@ -20,23 +20,21 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -4540014695617444453, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -6194013596605697057, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 3142048427395896837, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.033333335 - value: {fileID: -7118984775159605532, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -7118984775159605532, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.05 + value: {fileID: -4540014695617444453, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.06666667 - value: {fileID: 8880887496617416097, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -2010975486192916732, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.083333336 + value: {fileID: -6209033008860534819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.1 - value: {fileID: -6209033008860534819, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.13333334 - value: {fileID: 4424706533675870473, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.16666667 - value: {fileID: 2768467047179132677, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.2 - value: {fileID: 5426991987252364490, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.23333333 - value: {fileID: 2768467047179132677, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.26666668 - value: {fileID: 5426991987252364490, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 4424706533675870473, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.11666667 + value: {fileID: -6209033008860534819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: SpriteHolder classID: 212 @@ -56,21 +54,20 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -4540014695617444453, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -7118984775159605532, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 8880887496617416097, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -6209033008860534819, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 4424706533675870473, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 2768467047179132677, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 5426991987252364490, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 2768467047179132677, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 5426991987252364490, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -6194013596605697057, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3142048427395896837, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -7118984775159605532, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -4540014695617444453, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -2010975486192916732, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -6209033008860534819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 4424706533675870473, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -6209033008860534819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.28333336 + m_StopTime: 0.13333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -89,4 +86,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.13333334 + functionName: IdleFlower + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim new file mode 100644 index 00000000..1d279510 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlantIdleFlower + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4424706533675870473, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: 4409530632218293027, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: 7280046038182557274, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + attribute: m_Sprite + path: SpriteHolder + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1564233274 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4424706533675870473, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 4409530632218293027, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 7280046038182557274, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim.meta new file mode 100644 index 00000000..9fcd26fe --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdleFlower.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6828641b7980b8941b050fd82376c0f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim new file mode 100644 index 00000000..a5297279 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlantIdlePlant + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 8764532528569279819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -8900571466064961714, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: -1906513165463875469, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + attribute: m_Sprite + path: SpriteHolder + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1564233274 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 8764532528569279819, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -8900571466064961714, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -1906513165463875469, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim.meta new file mode 100644 index 00000000..92b361f8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantIdlePlant.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 006ebbec2187eab468cbb18d55481dea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim index 361e2d29..bbc1d4e5 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardIdle.anim @@ -20,7 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -3279310061726753367, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -642391819221963816, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: 3627136268286775080, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: classID: 212 @@ -40,13 +44,15 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -3279310061726753367, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -642391819221963816, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3627136268286775080, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim index 2956c568..95f07052 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim @@ -20,13 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -5319955813400714423, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -7368868625357890572, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.016666668 - value: {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: -4304133006063306856, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} - time: 0.033333335 - value: {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - time: 0.05 - value: {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + value: {fileID: 2853135921585969209, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} attribute: m_Sprite path: classID: 212 @@ -46,16 +44,15 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -5319955813400714423, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: -5456092200958371718, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 6626715444242248344, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} - - {fileID: 3255871077347632709, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: -7368868625357890572, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -4304133006063306856, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 2853135921585969209, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,4 +71,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.05 + functionName: Idle + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_bg.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta rename to Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_bg.png.meta diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta index a6ac87da..1eb8fae1 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta @@ -1,121 +1,166 @@ fileFormatVersion: 2 -guid: affa77f4c5206f444a79fbd5d03c0aa4 +guid: a7ebfee08631d124d9385ba110cd71c0 TextureImporter: internalIDToNameTable: - - first: - 213: 3575822998323175305 - second: wizardswaltz_a_button - - first: - 213: -5443044849284068091 - second: wizardswaltz_girl_flower - - first: - 213: -7695811203869559049 - second: wizardswaltz_girl_evil_flower - - first: - 213: 4064990237623416981 - second: wizardswaltz_girl_sad - - first: - 213: 819641782229730920 - second: wizardswaltz_girl_happy - - first: - 213: 6626715444242248344 - second: wizardswaltz_wizard - - first: - 213: 3255871077347632709 - second: wizardswaltz_wizard_turn_2 - - first: - 213: -5456092200958371718 - second: wizardswaltz_wizard_turn_1 - - first: - 213: -5319955813400714423 - second: wizardswaltz_wizard_turn_0 - - first: - 213: -7118984775159605532 - second: wizardswaltz_flower_grow_1 - - first: - 213: -4540014695617444453 - second: wizardswaltz_flower_grow_0 - - first: - 213: -2010975486192916732 - second: wizardswaltz_shadow - - first: - 213: -6209033008860534819 - second: wizardswaltz_flower_grow_3 - - first: - 213: 4424706533675870473 - second: wizardswaltz_flower_grow_4 - - first: - 213: 2768467047179132677 - second: wizardswaltz_flower_grow_5 - - first: - 213: 5426991987252364490 - second: wizardswaltz_flower_grow_6 - - first: - 213: -7031960681128103596 - second: wizardswaltz_flower_sprout_2 - - first: - 213: 6550520003927709678 - second: wizardswaltz_flower_sprout_1 - - first: - 213: 4636117524539756526 - second: wizardswaltz_flower_sprout_3 - - first: - 213: -5472345213390817180 - second: wizardswaltz_miss_1 - - first: - 213: -4802072682935432007 - second: wizardswaltz_miss_0 - - first: - 213: -4394865311163506109 - second: wizardswaltz_miss_2 - - first: - 213: -6165325623540167759 - second: wizardswaltz_miss_3 - - first: - 213: 3955841814209212924 - second: wizardswaltz_miss_4 - - first: - 213: -2406188369649778213 - second: wizardswaltz_miss_5 - - first: - 213: -7426945613399875653 - second: wizardswaltz_miss_6 - - first: - 213: -4182025397602586209 - second: wizardswaltz_miss_6 - - first: - 213: -7368868625357890572 - second: wizardswaltz_flower_sprout_0 - first: 213: 8880887496617416097 - second: wizardswaltz_flower_grow_2 + second: wizardswaltz_small_flower_0 - first: 213: -9206242486865119274 - second: wizardswaltz_magic_fx_0 + second: wizardswaltz_small_flower_1 - first: 213: -1724727701389049137 - second: wizardswaltz_bubble_fx_0 + second: wizardswaltz_small_flower_2 - first: 213: -364512971116804208 - second: wizardswaltz_bubble_fx_1 + second: wizardswaltz_evil_flower_0 - first: 213: 3704906013091560217 - second: wizardswaltz_sparkle_fx_ + second: wizardswaltz_evil_flower_1 - first: 213: 2615604564187904341 - second: wizardswaltz_sparkle_fx_2 + second: wizardswaltz_evil_flower_2 - first: 213: 5008211631437172949 - second: wizardswaltz_sparkle_fx_0 + second: wizardswaltz_girl_happy_0 - first: - 213: 5772900555431232981 + 213: 3575822998323175305 + second: wizardswaltz_girl_happy_1 + - first: + 213: -5443044849284068091 + second: wizardswaltz_girl_happy_2 + - first: + 213: -7695811203869559049 + second: wizardswaltz_girl_sad_0 + - first: + 213: 4064990237623416981 + second: wizardswaltz_girl_sad_1 + - first: + 213: 819641782229730920 + second: wizardswaltz_girl_sad_2 + - first: + 213: 6626715444242248344 second: wizardswaltz_girl_0 - first: - 213: -4304133006063306856 + 213: 3255871077347632709 second: wizardswaltz_girl_1 - first: - 213: 2853135921585969209 + 213: -5456092200958371718 second: wizardswaltz_girl_2 + - first: + 213: -5319955813400714423 + second: wizardswaltz_girl_bop_0 + - first: + 213: 5772900555431232981 + second: wizardswaltz_girl_bop_1 + - first: + 213: -7368868625357890572 + second: wizardswaltz_wizard_turn_0 + - first: + 213: -4304133006063306856 + second: wizardswaltz_wizard_turn_1 + - first: + 213: 2853135921585969209 + second: wizardswaltz_wizard_turn_2 + - first: + 213: -3279310061726753367 + second: wizardswaltz_wizard_0 + - first: + 213: -642391819221963816 + second: wizardswaltz_wizard_1 + - first: + 213: 3627136268286775080 + second: wizardswaltz_wizard_2 + - first: + 213: -4983146447318673554 + second: wizardswaltz_shadow + - first: + 213: -4854311998328955154 + second: wizardswaltz_plant_grow_0 + - first: + 213: 8066796853834154409 + second: wizardswaltz_plant_grow_1 + - first: + 213: 7729953531453421503 + second: wizardswaltz_plant_grow_2 + - first: + 213: 8764532528569279819 + second: wizardswaltz_plant_0 + - first: + 213: -8900571466064961714 + second: wizardswaltz_plant_1 + - first: + 213: -1906513165463875469 + second: wizardswaltz_plant_2 + - first: + 213: -6194013596605697057 + second: wizardswaltz_flower_grow_0 + - first: + 213: 3142048427395896837 + second: wizardswaltz_flower_grow_1 + - first: + 213: -7118984775159605532 + second: wizardswaltz_flower_grow_2 + - first: + 213: -4540014695617444453 + second: wizardswaltz_flower_grow_3 + - first: + 213: -2010975486192916732 + second: wizardswaltz_flower_grow_4 + - first: + 213: -6209033008860534819 + second: wizardswaltz_flower_grow_5 + - first: + 213: 4424706533675870473 + second: wizardswaltz_flower_0 + - first: + 213: 4409530632218293027 + second: wizardswaltz_flower_1 + - first: + 213: 7280046038182557274 + second: wizardswaltz_flower_2 + - first: + 213: 2768467047179132677 + second: wizardswaltz_miss_0 + - first: + 213: 5426991987252364490 + second: wizardswaltz_miss_1 + - first: + 213: 666750511962025834 + second: wizardswaltz_miss_2 + - first: + 213: 1392867603839226096 + second: wizardswaltz_miss_3 + - first: + 213: -7031960681128103596 + second: wizardswaltz_miss_4 + - first: + 213: 6550520003927709678 + second: wizardswaltz_miss_5 + - first: + 213: 4636117524539756526 + second: wizardswaltz_chew_0 + - first: + 213: -5472345213390817180 + second: wizardswaltz_chew_1 + - first: + 213: -4802072682935432007 + second: wizardswaltz_wand_fx_0 + - first: + 213: 8593872140096344179 + second: wizardswaltz_sparkle_fx_0 + - first: + 213: -4394865311163506109 + second: wizardswaltz_sparkle_fx_1 + - first: + 213: -6165325623540167759 + second: wizardswaltz_sparkle_fx_2 + - first: + 213: 3955841814209212924 + second: wizardswaltz_sparkle_fx_3 + - first: + 213: -2406188369649778213 + second: wizardswaltz_wand_fx_1 externalObjects: {} serializedVersion: 11 mipmaps: @@ -160,7 +205,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 16 + spritePixelsToUnits: 48 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -179,7 +224,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -191,7 +236,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -205,13 +250,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: wizardswaltz_a_button + name: wizardswaltz_small_flower_0 rect: serializedVersion: 2 - x: 105 - y: 281 - width: 14 - height: 14 + x: 688 + y: 988 + width: 35 + height: 35 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -219,573 +264,6 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 98f99ba4210ef9130800000000000000 - internalID: 3575822998323175305 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_girl_flower - rect: - serializedVersion: 2 - x: 120 - y: 273 - width: 7 - height: 5 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 50d47ed4c8b6674b0800000000000000 - internalID: -5443044849284068091 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_girl_evil_flower - rect: - serializedVersion: 2 - x: 129 - y: 273 - width: 6 - height: 6 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 7f632e6fb7cf23590800000000000000 - internalID: -7695811203869559049 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_girl_sad - rect: - serializedVersion: 2 - x: 2 - y: 247 - width: 20 - height: 20 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 59879f8751fb96830800000000000000 - internalID: 4064990237623416981 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_wizard - rect: - serializedVersion: 2 - x: 1 - y: 212 - width: 30 - height: 27 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 89277a13692d6fb50800000000000000 - internalID: 6626715444242248344 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_wizard_turn_2 - rect: - serializedVersion: 2 - x: 33 - y: 212 - width: 30 - height: 26 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 54626c79e7d2f2d20800000000000000 - internalID: 3255871077347632709 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_wizard_turn_1 - rect: - serializedVersion: 2 - x: 66 - y: 210 - width: 29 - height: 29 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a78d8140d011844b0800000000000000 - internalID: -5456092200958371718 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_wizard_turn_0 - rect: - serializedVersion: 2 - x: 100 - y: 209 - width: 27 - height: 30 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 943e971cf58bb26b0800000000000000 - internalID: -5319955813400714423 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_1 - rect: - serializedVersion: 2 - x: 2 - y: 105 - width: 28 - height: 56 - alignment: 9 - pivot: {x: 0.5, y: 0.125} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 4e69233a019443d90800000000000000 - internalID: -7118984775159605532 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_0 - rect: - serializedVersion: 2 - x: 32 - y: 105 - width: 32 - height: 59 - alignment: 9 - pivot: {x: 0.5, y: 0.118644066} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: b954ba830b0aef0c0800000000000000 - internalID: -4540014695617444453 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_shadow - rect: - serializedVersion: 2 - x: 213 - y: 160 - width: 22 - height: 8 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 407e37d23749714e0800000000000000 - internalID: -2010975486192916732 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_3 - rect: - serializedVersion: 2 - x: 96 - y: 106 - width: 23 - height: 48 - alignment: 9 - pivot: {x: 0.5217391, y: 0.10416667} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: dd76134106515d9a0800000000000000 - internalID: -6209033008860534819 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_4 - rect: - serializedVersion: 2 - x: 120 - y: 106 - width: 26 - height: 45 - alignment: 9 - pivot: {x: 0.5, y: 0.11111111} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 909a9173627b76d30800000000000000 - internalID: 4424706533675870473 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_5 - rect: - serializedVersion: 2 - x: 186 - y: 107 - width: 20 - height: 25 - alignment: 9 - pivot: {x: 0.5, y: 0.12} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 50f9c778c129b6620800000000000000 - internalID: 2768467047179132677 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_6 - rect: - serializedVersion: 2 - x: 210 - y: 107 - width: 20 - height: 26 - alignment: 9 - pivot: {x: 0.5, y: 0.11538462} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ac4811f757c805b40800000000000000 - internalID: 5426991987252364490 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_sprout_2 - rect: - serializedVersion: 2 - x: 2 - y: 89 - width: 12 - height: 15 - alignment: 9 - pivot: {x: 0.5, y: 0.20000002} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 45178d67405796e90800000000000000 - internalID: -7031960681128103596 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_sprout_1 - rect: - serializedVersion: 2 - x: 19 - y: 90 - width: 10 - height: 9 - alignment: 9 - pivot: {x: 0.5, y: 0.22222222} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ee79338cc3f18ea50800000000000000 - internalID: 6550520003927709678 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_sprout_3 - rect: - serializedVersion: 2 - x: 32 - y: 89 - width: 16 - height: 15 - alignment: 9 - pivot: {x: 0.5, y: 0.20000002} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: eefc72b435cc65040800000000000000 - internalID: 4636117524539756526 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_1 - rect: - serializedVersion: 2 - x: 2 - y: 33 - width: 27 - height: 44 - alignment: 9 - pivot: {x: 0.25925925, y: 0.06818182} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 468f78ba5035e04b0800000000000000 - internalID: -5472345213390817180 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_0 - rect: - serializedVersion: 2 - x: 34 - y: 33 - width: 27 - height: 39 - alignment: 9 - pivot: {x: 0.25925925, y: 0.07692308} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9bcc60c565c9b5db0800000000000000 - internalID: -4802072682935432007 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_2 - rect: - serializedVersion: 2 - x: 64 - y: 33 - width: 29 - height: 45 - alignment: 9 - pivot: {x: 0.31034482, y: 0.06666667} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 342a964d84d4203c0800000000000000 - internalID: -4394865311163506109 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_3 - rect: - serializedVersion: 2 - x: 101 - y: 33 - width: 27 - height: 37 - alignment: 9 - pivot: {x: 0.25925925, y: 0.081081085} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1bb464cb20d507aa0800000000000000 - internalID: -6165325623540167759 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_4 - rect: - serializedVersion: 2 - x: 133 - y: 33 - width: 27 - height: 31 - alignment: 9 - pivot: {x: 0.25925925, y: 0.09677419} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: cf1b39bcb29f5e630800000000000000 - internalID: 3955841814209212924 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_5 - rect: - serializedVersion: 2 - x: 161 - y: 33 - width: 29 - height: 34 - alignment: 9 - pivot: {x: 0.27586207, y: 0.09677419} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bd149542d608b9ed0800000000000000 - internalID: -2406188369649778213 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_7 - rect: - serializedVersion: 2 - x: 196 - y: 33 - width: 28 - height: 44 - alignment: 9 - pivot: {x: 0.2857143, y: 0.06818182} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bbf972370503ee890800000000000000 - internalID: -7426945613399875653 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_miss_6 - rect: - serializedVersion: 2 - x: 229 - y: 33 - width: 27 - height: 44 - alignment: 9 - pivot: {x: 0.25925925, y: 0.06818182} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f917c36ee0676f5c0800000000000000 - internalID: -4182025397602586209 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_sprout_0 - rect: - serializedVersion: 2 - x: 139 - y: 275 - width: 2 - height: 2 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 4fb9505f6058cb990800000000000000 - internalID: -7368868625357890572 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: wizardswaltz_flower_grow_2 - rect: - serializedVersion: 2 - x: 64 - y: 105 - width: 26 - height: 59 - alignment: 9 - pivot: {x: 0.5, y: 0.10169491} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] spriteID: 1a5d61e00204f3b70800000000000000 internalID: 8880887496617416097 vertices: [] @@ -793,13 +271,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_magic_fx_0 + name: wizardswaltz_small_flower_1 rect: serializedVersion: 2 - x: 32 - y: 176 - width: 16 - height: 15 + x: 688 + y: 951 + width: 35 + height: 35 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -814,13 +292,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_bubble_fx_0 + name: wizardswaltz_small_flower_2 rect: serializedVersion: 2 - x: 169 - y: 185 - width: 6 - height: 6 + x: 688 + y: 914 + width: 35 + height: 35 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -835,13 +313,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_bubble_fx_1 + name: wizardswaltz_evil_flower_0 rect: serializedVersion: 2 - x: 154 - y: 186 - width: 4 - height: 4 + x: 685 + y: 874 + width: 38 + height: 38 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -856,15 +334,15 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_sparkle_fx_ + name: wizardswaltz_evil_flower_1 rect: serializedVersion: 2 - x: 117 - y: 181 - width: 10 - height: 6 - alignment: 9 - pivot: {x: 0.3, y: 0.5} + x: 685 + y: 834 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -877,15 +355,15 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_sparkle_fx_2 + name: wizardswaltz_evil_flower_2 rect: serializedVersion: 2 - x: 99 - y: 180 - width: 12 - height: 9 - alignment: 9 - pivot: {x: 0.4166667, y: 0.44444445} + x: 685 + y: 794 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -898,15 +376,15 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_sparkle_fx_0 + name: wizardswaltz_girl_happy_0 rect: serializedVersion: 2 - x: 53 - y: 182 - width: 9 - height: 5 - alignment: 9 - pivot: {x: 0.33333334, y: 0.4} + x: 817 + y: 933 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -919,13 +397,97 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_girl_happy + name: wizardswaltz_girl_happy_1 rect: serializedVersion: 2 - x: 48 - y: 247 - width: 24 - height: 20 + x: 817 + y: 841 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 98f99ba4210ef9130800000000000000 + internalID: 3575822998323175305 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_happy_2 + rect: + serializedVersion: 2 + x: 817 + y: 749 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 50d47ed4c8b6674b0800000000000000 + internalID: -5443044849284068091 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_sad_0 + rect: + serializedVersion: 2 + x: 725 + y: 933 + width: 90 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7f632e6fb7cf23590800000000000000 + internalID: -7695811203869559049 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_sad_1 + rect: + serializedVersion: 2 + x: 725 + y: 841 + width: 90 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 59879f8751fb96830800000000000000 + internalID: 4064990237623416981 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_sad_2 + rect: + serializedVersion: 2 + x: 725 + y: 749 + width: 90 + height: 90 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -943,10 +505,94 @@ TextureImporter: name: wizardswaltz_girl_0 rect: serializedVersion: 2 - x: 24 - y: 247 - width: 24 - height: 20 + x: 921 + y: 933 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 89277a13692d6fb50800000000000000 + internalID: 6626715444242248344 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_1 + rect: + serializedVersion: 2 + x: 921 + y: 841 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 54626c79e7d2f2d20800000000000000 + internalID: 3255871077347632709 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_2 + rect: + serializedVersion: 2 + x: 921 + y: 749 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a78d8140d011844b0800000000000000 + internalID: -5456092200958371718 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_bop_0 + rect: + serializedVersion: 2 + x: 921 + y: 565 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 943e971cf58bb26b0800000000000000 + internalID: -5319955813400714423 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_bop_1 + rect: + serializedVersion: 2 + x: 921 + y: 657 + width: 102 + height: 90 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -961,13 +607,34 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_girl_1 + name: wizardswaltz_wizard_turn_0 rect: serializedVersion: 2 - x: 72 - y: 247 - width: 24 - height: 20 + x: 364 + y: 903 + width: 111 + height: 120 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4fb9505f6058cb990800000000000000 + internalID: -7368868625357890572 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_wizard_turn_1 + rect: + serializedVersion: 2 + x: 245 + y: 906 + width: 117 + height: 117 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -982,13 +649,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: wizardswaltz_girl_2 + name: wizardswaltz_wizard_turn_2 rect: serializedVersion: 2 - x: 96 - y: 247 - width: 24 - height: 20 + x: 123 + y: 915 + width: 119 + height: 108 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1002,6 +669,699 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: wizardswaltz_wizard_0 + rect: + serializedVersion: 2 + x: 1 + y: 912 + width: 120 + height: 111 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ad99669fdc8d72d0800000000000000 + internalID: -3279310061726753367 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_wizard_1 + rect: + serializedVersion: 2 + x: 1 + y: 799 + width: 120 + height: 111 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8db68a04b04c517f0800000000000000 + internalID: -642391819221963816 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_wizard_2 + rect: + serializedVersion: 2 + x: 1 + y: 686 + width: 120 + height: 111 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 82f4b27f73d265230800000000000000 + internalID: 3627136268286775080 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_shadow + rect: + serializedVersion: 2 + x: 477 + y: 969 + width: 96 + height: 54 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e6712df35be48dab0800000000000000 + internalID: -4983146447318673554 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_grow_0 + rect: + serializedVersion: 2 + x: 371 + y: 351 + width: 26 + height: 26 + alignment: 9 + pivot: {x: 0.5, y: 0.3846154} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eee9faee4f402acb0800000000000000 + internalID: -4854311998328955154 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_grow_1 + rect: + serializedVersion: 2 + x: 1 + y: 377 + width: 60 + height: 57 + alignment: 9 + pivot: {x: 0.5, y: 0.36842105} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9a10604bff403ff60800000000000000 + internalID: 8066796853834154409 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_grow_2 + rect: + serializedVersion: 2 + x: 63 + y: 377 + width: 66 + height: 75 + alignment: 9 + pivot: {x: 0.5, y: 0.32} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fb7be8428cf464b60800000000000000 + internalID: 7729953531453421503 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_0 + rect: + serializedVersion: 2 + x: 131 + y: 377 + width: 78 + height: 75 + alignment: 9 + pivot: {x: 0.5, y: 0.32} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b456ab3f5efd1a970800000000000000 + internalID: 8764532528569279819 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_1 + rect: + serializedVersion: 2 + x: 211 + y: 377 + width: 78 + height: 75 + alignment: 9 + pivot: {x: 0.5, y: 0.32} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e4f583ba861da7480800000000000000 + internalID: -8900571466064961714 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_plant_2 + rect: + serializedVersion: 2 + x: 291 + y: 377 + width: 78 + height: 75 + alignment: 9 + pivot: {x: 0.5, y: 0.32} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3709bec8064ba85e0800000000000000 + internalID: -1906513165463875469 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_0 + rect: + serializedVersion: 2 + x: 1 + y: 1 + width: 114 + height: 198 + alignment: 9 + pivot: {x: 0.5, y: 0.18181819} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fd3b06083717a0aa0800000000000000 + internalID: -6194013596605697057 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_1 + rect: + serializedVersion: 2 + x: 117 + y: 1 + width: 126 + height: 207 + alignment: 9 + pivot: {x: 0.5, y: 0.17391305} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 506d10eb56cca9b20800000000000000 + internalID: 3142048427395896837 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_2 + rect: + serializedVersion: 2 + x: 245 + y: 1 + width: 108 + height: 198 + alignment: 9 + pivot: {x: 0.5, y: 0.16666667} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4e69233a019443d90800000000000000 + internalID: -7118984775159605532 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_3 + rect: + serializedVersion: 2 + x: 355 + y: 1 + width: 99 + height: 174 + alignment: 9 + pivot: {x: 0.5151515, y: 0.1724138} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b954ba830b0aef0c0800000000000000 + internalID: -4540014695617444453 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_4 + rect: + serializedVersion: 2 + x: 456 + y: 1 + width: 109 + height: 165 + alignment: 9 + pivot: {x: 0.49541283, y: 0.18181817} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 407e37d23749714e0800000000000000 + internalID: -2010975486192916732 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_grow_5 + rect: + serializedVersion: 2 + x: 567 + y: 1 + width: 90 + height: 105 + alignment: 9 + pivot: {x: 0.5, y: 0.22857144} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dd76134106515d9a0800000000000000 + internalID: -6209033008860534819 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_0 + rect: + serializedVersion: 2 + x: 659 + y: 1 + width: 90 + height: 108 + alignment: 9 + pivot: {x: 0.5, y: 0.22222222} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 909a9173627b76d30800000000000000 + internalID: 4424706533675870473 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_1 + rect: + serializedVersion: 2 + x: 751 + y: 1 + width: 90 + height: 108 + alignment: 9 + pivot: {x: 0.5, y: 0.22222222} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 323339f4fbcc13d30800000000000000 + internalID: 4409530632218293027 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_flower_2 + rect: + serializedVersion: 2 + x: 843 + y: 1 + width: 90 + height: 108 + alignment: 9 + pivot: {x: 0.5, y: 0.22222222} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a567c56ec4be70560800000000000000 + internalID: 7280046038182557274 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_0 + rect: + serializedVersion: 2 + x: 114 + y: 210 + width: 111 + height: 147 + alignment: 9 + pivot: {x: 0.32432434, y: 0.1632653} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 50f9c778c129b6620800000000000000 + internalID: 2768467047179132677 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_1 + rect: + serializedVersion: 2 + x: 1 + y: 210 + width: 111 + height: 162 + alignment: 9 + pivot: {x: 0.32432434, y: 0.14814815} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ac4811f757c805b40800000000000000 + internalID: 5426991987252364490 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_2 + rect: + serializedVersion: 2 + x: 227 + y: 210 + width: 117 + height: 165 + alignment: 9 + pivot: {x: 0.35897437, y: 0.14545454} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a6f6e4bde06c04900800000000000000 + internalID: 666750511962025834 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_3 + rect: + serializedVersion: 2 + x: 346 + y: 210 + width: 109 + height: 139 + alignment: 9 + pivot: {x: 0.3211009, y: 0.16546763} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0f09cf9b4b5745310800000000000000 + internalID: 1392867603839226096 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_4 + rect: + serializedVersion: 2 + x: 457 + y: 210 + width: 111 + height: 123 + alignment: 9 + pivot: {x: 0.32432434, y: 0.19512194} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 45178d67405796e90800000000000000 + internalID: -7031960681128103596 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_miss_5 + rect: + serializedVersion: 2 + x: 570 + y: 111 + width: 117 + height: 132 + alignment: 9 + pivot: {x: 0.33333334, y: 0.18181819} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ee79338cc3f18ea50800000000000000 + internalID: 6550520003927709678 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_chew_0 + rect: + serializedVersion: 2 + x: 689 + y: 111 + width: 114 + height: 162 + alignment: 9 + pivot: {x: 0.34210527, y: 0.14814815} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eefc72b435cc65040800000000000000 + internalID: 4636117524539756526 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_chew_1 + rect: + serializedVersion: 2 + x: 805 + y: 111 + width: 111 + height: 162 + alignment: 9 + pivot: {x: 0.32432434, y: 0.14814815} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 468f78ba5035e04b0800000000000000 + internalID: -5472345213390817180 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_wand_fx_0 + rect: + serializedVersion: 2 + x: 230 + y: 454 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9bcc60c565c9b5db0800000000000000 + internalID: -4802072682935432007 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_0 + rect: + serializedVersion: 2 + x: 1 + y: 454 + width: 68 + height: 65 + alignment: 9 + pivot: {x: 0.27941176, y: 0.2923077} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 370919bdd21934770800000000000000 + internalID: 8593872140096344179 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_1 + rect: + serializedVersion: 2 + x: 71 + y: 454 + width: 56 + height: 47 + alignment: 9 + pivot: {x: 0.39285716, y: 0.46808508} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 342a964d84d4203c0800000000000000 + internalID: -4394865311163506109 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_2 + rect: + serializedVersion: 2 + x: 178 + y: 454 + width: 50 + height: 38 + alignment: 9 + pivot: {x: 0.32, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1bb464cb20d507aa0800000000000000 + internalID: -6165325623540167759 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_3 + rect: + serializedVersion: 2 + x: 129 + y: 454 + width: 47 + height: 35 + alignment: 9 + pivot: {x: 0.34042552, y: 0.45714286} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cf1b39bcb29f5e630800000000000000 + internalID: 3955841814209212924 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_wand_fx_1 + rect: + serializedVersion: 2 + x: 264 + y: 454 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd149542d608b9ed0800000000000000 + internalID: -2406188369649778213 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scripts/Games/WizardsWaltz/Plant.cs b/Assets/Scripts/Games/WizardsWaltz/Plant.cs index 98cc8903..18bd92ca 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Plant.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Plant.cs @@ -57,6 +57,16 @@ namespace RhythmHeavenMania.Games.WizardsWaltz animator.Play("Hit", 0, 0); } + public void IdlePlant() + { + animator.Play("IdlePlant", 0, 0); + } + + public void IdleFlower() + { + animator.Play("IdleFlower", 0, 0); + } + public void Eat() { animator.Play("Eat", 0, 0); diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs index 3a0e3e20..884e54c1 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -43,6 +43,11 @@ namespace RhythmHeavenMania.Games.WizardsWaltz } } + public void Idle() + { + animator.Play("Idle", 0, 0); + } + public void Magic(Plant plant, bool hit) { animator.Play("Magic", 0, 0);