From 9d36d62a061da7471d73ed78a203b8939172f02d Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 23:28:56 -0500 Subject: [PATCH] Added wand and sparkle FX to Wizard's Waltz --- Assets/Resources/Games/wizardsWaltz.prefab | 462 +++++++++++++++++- .../WizardsWaltz/Animations/GirlFlower.anim | 74 +++ .../Animations/GirlFlower.anim.meta | 8 + .../Animations/GirlFlowerAnimator.controller | 72 +++ .../GirlFlowerAnimator.controller.meta | 8 + .../Games/WizardsWaltz/Animations/Magic.anim | 132 +++++ .../WizardsWaltz/Animations/Magic.anim.meta | 8 + .../Animations/MagicAnimator.controller | 72 +++ .../Animations/MagicAnimator.controller.meta | 8 + .../Animations/WandAnimator.controller | 72 +++ .../Animations/WandAnimator.controller.meta | 8 + .../WizardsWaltz/Animations/WandIdle.anim | 71 +++ .../Animations/WandIdle.anim.meta | 8 + .../WizardsWaltz/Animations/WizardMagic.anim | 147 +++++- Assets/Scripts/Games/WizardsWaltz/MagicFX.cs | 33 ++ .../Games/WizardsWaltz/MagicFX.cs.meta | 11 + Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 3 + .../Games/WizardsWaltz/WizardsWaltz.cs | 23 + 18 files changed, 1216 insertions(+), 4 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim.meta create mode 100644 Assets/Scripts/Games/WizardsWaltz/MagicFX.cs create mode 100644 Assets/Scripts/Games/WizardsWaltz/MagicFX.cs.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index 4144759b..10544d52 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -91,6 +91,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1309880749741740237} + - component: {fileID: 6740298018500695640} - component: {fileID: 2235530822151886643} m_Layer: 0 m_Name: Flower5 @@ -113,6 +114,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6740298018500695640 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824369986073677995} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &2235530822151886643 SpriteRenderer: m_ObjectHideFlags: 0 @@ -192,8 +212,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5180675038394081533} + - {fileID: 6993427650898198263} m_Father: {fileID: 7248900333300803150} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1172109260453278802 GameObject: @@ -306,7 +327,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: 3.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 8429620278342177322} m_Father: {fileID: 7248900333300803150} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -433,6 +455,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5393523326211893817} + - component: {fileID: 4211247411273968514} - component: {fileID: 3282600108638979987} m_Layer: 0 m_Name: Flower2 @@ -455,6 +478,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4211247411273968514 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2244225289080053818} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &3282600108638979987 SpriteRenderer: m_ObjectHideFlags: 0 @@ -515,6 +557,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3585927333340198492} + - component: {fileID: 3389947255201315437} - component: {fileID: 8024436598733951220} m_Layer: 0 m_Name: Flower3 @@ -537,6 +580,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3389947255201315437 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2817781706182905973} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &8024436598733951220 SpriteRenderer: m_ObjectHideFlags: 0 @@ -676,6 +738,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6858471038995154122} + - component: {fileID: 8210213039236412641} - component: {fileID: 1390796412318508355} m_Layer: 0 m_Name: Flower1 @@ -698,6 +761,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8210213039236412641 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5266103671708731011} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &1390796412318508355 SpriteRenderer: m_ObjectHideFlags: 0 @@ -749,6 +831,227 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5278380087569256045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6993427650898198263} + - component: {fileID: 4315762306294834728} + - component: {fileID: 7275759733699282619} + - component: {fileID: 8058958110164768756} + m_Layer: 0 + m_Name: MagicFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6993427650898198263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5278380087569256045} + 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: 1108624160834189978} + m_Father: {fileID: 2989642375569903027} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4315762306294834728 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5278380087569256045} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 39f83b785ae333946a675fe36007f143, 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 &7275759733699282619 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5278380087569256045} + 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: -4394865311163506109, 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.4166666, y: 1.3541666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8058958110164768756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5278380087569256045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b107d57be99ffe34ea2d14c49c15ff80, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 4315762306294834728} + spriteRenderer: {fileID: 7275759733699282619} + shimmer: {fileID: 6210899606573426352} +--- !u!1 &5680873806160498898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8429620278342177322} + - component: {fileID: 3989471717981959470} + - component: {fileID: 8027216760673948632} + m_Layer: 0 + m_Name: WandFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8429620278342177322 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680873806160498898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.351, y: -0.352, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5068490343008965940} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3989471717981959470 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680873806160498898} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 00883fa872202e849a45ffd2d0709a0e, 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 &8027216760673948632 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680873806160498898} + 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: -4802072682935432007, 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: 0.6666667, y: 0.6666667} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5785328837124315536 GameObject: m_ObjectHideFlags: 0 @@ -758,6 +1061,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4760280235451728407} + - component: {fileID: 3413606215457806306} - component: {fileID: 3302157959808029144} m_Layer: 0 m_Name: Flower6 @@ -780,6 +1084,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3413606215457806306 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5785328837124315536} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &3302157959808029144 SpriteRenderer: m_ObjectHideFlags: 0 @@ -831,6 +1154,118 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6210899606573426352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108624160834189978} + - component: {fileID: 6793929396423223475} + m_Layer: 0 + m_Name: Shimmer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1108624160834189978 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210899606573426352} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.127, y: -0.793, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6993427650898198263} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6793929396423223475 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210899606573426352} + 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: 8593872140096344179, 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.4166666, y: 1.3541666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6238007165649348560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3306196407876322261} + m_Layer: 0 + m_Name: FX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3306196407876322261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6238007165649348560} + 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: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6730866518009185534 GameObject: m_ObjectHideFlags: 0 @@ -900,6 +1335,7 @@ Transform: - {fileID: 669296839509545821} - {fileID: 7400556352280096869} - {fileID: 8217893490508314786} + - {fileID: 3306196407876322261} - {fileID: 2989642375569903027} m_Father: {fileID: 0} m_RootOrder: 0 @@ -922,6 +1358,8 @@ MonoBehaviour: girl: {fileID: 4216735310021244778} plantHolder: {fileID: 1740010938943195280} plantBase: {fileID: 3353780840221392181} + fxHolder: {fileID: 6238007165649348560} + fxBase: {fileID: 5278380087569256045} beatInterval: 4 wizardBeatOffset: 0 --- !u!1 &7509558683071972976 @@ -1058,6 +1496,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1593976179448737357} + - component: {fileID: 5840585533933896833} - component: {fileID: 8972858675252531799} m_Layer: 0 m_Name: Flower4 @@ -1080,6 +1519,25 @@ Transform: m_Father: {fileID: 7909129079744458918} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5840585533933896833 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8569180149739450563} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ac9da901814c92841a81aa3680c911da, 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 &8972858675252531799 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim new file mode 100644 index 00000000..c122ef96 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.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: GirlFlower + 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: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -9206242486865119274, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: -1724727701389049137, guid: a7ebfee08631d124d9385ba110cd71c0, 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: 8880887496617416097, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -9206242486865119274, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -1724727701389049137, 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/GirlFlower.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim.meta new file mode 100644 index 00000000..bda1c790 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlower.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67ecb1fae6524bb4fa331902189f6a61 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller new file mode 100644 index 00000000..62d16aae --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-855178079144025653 +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: 762042481424420564} + m_Position: {x: 281, y: 46, 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: 762042481424420564} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GirlFlowerAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -855178079144025653} + 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 &762042481424420564 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flower + 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: 67ecb1fae6524bb4fa331902189f6a61, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller.meta new file mode 100644 index 00000000..dc3e8297 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/GirlFlowerAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac9da901814c92841a81aa3680c911da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim new file mode 100644 index 00000000..a3b2a68d --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim @@ -0,0 +1,132 @@ +%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: Magic + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shimmer + classID: 1 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -4394865311163506109, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -6165325623540167759, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.033333335 + value: {fileID: 3955841814209212924, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.05 + value: {fileID: -6165325623540167759, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.06666667 + value: {fileID: 3955841814209212924, guid: a7ebfee08631d124d9385ba110cd71c0, 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: 3491122176 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -4394865311163506109, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -6165325623540167759, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3955841814209212924, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -6165325623540167759, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: 3955841814209212924, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.083333336 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shimmer + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0.083333336 + functionName: Kill + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim.meta new file mode 100644 index 00000000..5482d695 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Magic.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a129607f5aae4eb49b0ac18493244372 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller new file mode 100644 index 00000000..c6ba1255 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6929626609083400027 +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: a129607f5aae4eb49b0ac18493244372, 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: MagicAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8758913436755009276} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &8758913436755009276 +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: -6929626609083400027} + m_Position: {x: 303, y: 44, 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: -6929626609083400027} diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller.meta new file mode 100644 index 00000000..e192ee77 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/MagicAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39f83b785ae333946a675fe36007f143 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller new file mode 100644 index 00000000..1cc4182a --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WandAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7951864180998181940} + 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 &4336037563296518706 +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: caeaf93b62b4fcc449a8504b890b2d67, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7951864180998181940 +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: 4336037563296518706} + m_Position: {x: 280, y: 60, 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: 4336037563296518706} diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller.meta new file mode 100644 index 00000000..78b435fe --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00883fa872202e849a45ffd2d0709a0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim new file mode 100644 index 00000000..61783d8e --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim @@ -0,0 +1,71 @@ +%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: WandIdle + 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: -4802072682935432007, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - time: 0.016666668 + value: {fileID: -2406188369649778213, guid: a7ebfee08631d124d9385ba110cd71c0, 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: -4802072682935432007, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + - {fileID: -2406188369649778213, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.033333335 + 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/WandIdle.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim.meta new file mode 100644 index 00000000..51703875 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WandIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: caeaf93b62b4fcc449a8504b890b2d67 +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 95f07052..0b0426d1 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/WizardMagic.anim @@ -14,7 +14,41 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.47, y: -0.79, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: -1.28, y: -0.75, z: 0} + inSlope: {x: 0, y: 3.2000015, z: 0} + outSlope: {x: 0, y: 3.2000015, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.050000004 + value: {x: -1.351, y: -0.352, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: WandFX m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -36,6 +70,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 1403983256 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -67,7 +108,109 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.47 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -1.28 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.050000004 + value: -1.351 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: WandFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.79 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.75 + inSlope: 3.2000015 + outSlope: 3.2000015 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.050000004 + value: -0.352 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: WandFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.050000004 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: WandFX + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs new file mode 100644 index 00000000..fb38c2a9 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using RhythmHeavenMania.Util; +using System; + +namespace RhythmHeavenMania.Games.WizardsWaltz +{ + public class MagicFX : MonoBehaviour + { + public Animator animator; + public SpriteRenderer spriteRenderer; + public GameObject shimmer; + + public void Start() + { + int order = (int)Math.Round((transform.position.z - 2) * 1000); + spriteRenderer.sortingOrder = order; + shimmer.GetComponent().sortingOrder = order; + animator.Play("Magic", 0, 0); + + Rigidbody2D rb2d = gameObject.AddComponent(); + rb2d.gravityScale = 2.5f; + } + + public void Kill() + { + Destroy(shimmer); + Destroy(gameObject); + } + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs.meta b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs.meta new file mode 100644 index 00000000..4a0dc7ea --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/MagicFX.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b107d57be99ffe34ea2d14c49c15ff80 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs index 884e54c1..3e5f5543 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -10,6 +10,9 @@ namespace RhythmHeavenMania.Games.WizardsWaltz public Animator animator; public GameObject shadow; + private float newBeat = 0; + private int beats = 0; + private WizardsWaltz game; private float songPos; diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index f9ac7fa6..fc7dd49f 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -15,7 +15,10 @@ namespace RhythmHeavenMania.Games.WizardsWaltz public Girl girl; public GameObject plantHolder; public GameObject plantBase; + public GameObject fxHolder; + public GameObject fxBase; + private int timer = 0; public float beatInterval = 4f; float intervalStartBeat; bool intervalStarted; @@ -38,6 +41,26 @@ namespace RhythmHeavenMania.Games.WizardsWaltz } } + private void FixedUpdate() + { + if (timer % 8 == 0 || UnityEngine.Random.Range(0,8) == 0) + { + var songPos = Conductor.instance.songPositionInBeats; + var am = beatInterval / 2f; + var x = Mathf.Sin(Mathf.PI * songPos / am) * 6 + UnityEngine.Random.Range(-0.5f, 0.5f); + var y = Mathf.Cos(Mathf.PI * songPos / am) * 2f + UnityEngine.Random.Range(-0.5f, 0.5f); ; + var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f + UnityEngine.Random.Range(-0.2f, 0.2f); ; + + MagicFX magic = Instantiate(fxBase, fxHolder.transform).GetComponent(); + + magic.transform.position = new Vector3(x, 0.5f + y, scale * 2); + magic.transform.localScale = wizard.gameObject.transform.localScale; + magic.gameObject.SetActive(true); + } + + timer++; + } + public void SetIntervalStart(float beat, float interval = 4f) { // Don't do these things if the interval was already started.