From 2786cdca4c77526a528539136d0c402671e5ca11 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 18:33:22 -0500 Subject: [PATCH 1/5] Began adding Wizard's Waltz --- Assets/Resources/Games/wizardsWaltz.prefab | 197 ++++ .../Resources/Games/wizardsWaltz.prefab.meta | 7 + .../Resources/Sprites/Games/WizardsWaltz.meta | 8 + .../WizardsWaltz/wizardswaltz_main.png.meta | 1020 +++++++++++++++++ .../WizardsWaltz/wizardwaltz_bg.png.meta | 108 ++ Assets/Scripts/Games/WizardsWaltz.meta | 8 + .../Games/WizardsWaltz/WizardsWaltz.cs | 23 + .../Games/WizardsWaltz/WizardsWaltz.cs.meta | 11 + 8 files changed, 1382 insertions(+) create mode 100644 Assets/Resources/Games/wizardsWaltz.prefab create mode 100644 Assets/Resources/Games/wizardsWaltz.prefab.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta create mode 100644 Assets/Scripts/Games/WizardsWaltz.meta create mode 100644 Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs create mode 100644 Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab new file mode 100644 index 00000000..fe834fc5 --- /dev/null +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -0,0 +1,197 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7248900333300803145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7248900333300803150} + - component: {fileID: 7248900333300803151} + m_Layer: 0 + m_Name: wizardsWaltz + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7248900333300803150 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248900333300803145} + 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: 8701843541313247389} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7248900333300803151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248900333300803145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7c69b76f8c0a85489aa15813dfef687, type: 3} + m_Name: + m_EditorClassIdentifier: + EligibleHits: [] + firstEnable: 0 + LightBulbColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0.007843138, g: 0.8117647, b: 1, a: 1} + - {r: 233, g: 233, b: 0, a: 1} + - {r: 0, g: 0, b: 0, a: 0} + BackgroundColors: + - {r: 0.9411765, g: 0.9137255, b: 0.4392157, a: 1} + - {r: 0.99607843, g: 0.60784316, b: 0.98039216, a: 1} + - {r: 0.42745098, g: 0.6666667, b: 0.8784314, a: 1} + - {r: 1, g: 0.09411766, b: 0, a: 1} + - {r: 1, g: 0.58431375, b: 0.3137255, a: 1} + - {r: 0.9607844, g: 0.7725491, b: 0.78823537, a: 1} + - {r: 0, g: 0, b: 0, a: 0} + ShadowColors: + - {r: 0.84313726, g: 0.52156866, b: 0.23137255, a: 1} + - {r: 0.88235295, g: 0.41960785, b: 0.5294118, a: 1} + - {r: 0.3137255, g: 0.31764707, b: 0.40784317, a: 1} + - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.454902, g: 0.19607845, b: 0.121568635, a: 1} + - {r: 0.654902, g: 0.4156863, b: 0.45882356, a: 1} + Pot: {fileID: 0} + Bomb: {fileID: 0} + KarateJoe: {fileID: 0} + EligibleCombos: [] + ObjectSprites: + - {fileID: 8050164209934277894, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 5443719295599431979, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -4108414130637688947, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -3530312539838775474, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 8671423413994339737, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -6341196331951941137, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 6243727673011286339, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -8767211005568948338, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + BarrelSprites: + - {fileID: 6524922379630696755, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 1156572009758090512, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -7998309181045564909, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -7906004722935515527, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 5805539206011318834, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + CookingPotSprites: + - {fileID: 6243727673011286339, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 561377664857987667, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + OtherSprites: + - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + BGSprites: + - Sprites: + - {fileID: 21300000, guid: 72431c7c58f54e848bcb7527635bb72b, type: 3} + - {fileID: 21300000, guid: f05694d1ff974fe4387e487d025edede, type: 3} + - Sprites: + - {fileID: 21300000, guid: 02bb4d7e097a4524db553cfabcdbcf10, type: 3} + - {fileID: 21300000, guid: c19e325e2bac3e44d9464debd23372c5, type: 3} + BGSprite: {fileID: 0} + BGFXSprite: {fileID: 7037067448840752386} + BGType: 0 + BGFXType: 0 + BGColor: {r: 0.94117653, g: 0.91372555, b: 0.43921572, a: 1} + Shadow: 0 + ShadowColor: {r: 0, g: 0, b: 0, a: 0} + potHitEffect: {fileID: 0} + comboRef: {fileID: 0} + HIT3Ref: {fileID: 0} + Numbers: + - {fileID: -6652173421999817615, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 1726704843289908573, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: 8853733407125453983, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + - {fileID: -715771857855404744, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} +--- !u!1 &8963803634876878173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8701843541313247389} + - component: {fileID: 7037067448840752386} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8701843541313247389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8963803634876878173} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7037067448840752386 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8963803634876878173} + 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: -299 + m_Sprite: {fileID: 21300000, guid: 8efef001b979ac0469c4648bbac086c4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.84, y: 1.6} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Games/wizardsWaltz.prefab.meta b/Assets/Resources/Games/wizardsWaltz.prefab.meta new file mode 100644 index 00000000..f2706b8d --- /dev/null +++ b/Assets/Resources/Games/wizardsWaltz.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: febb1dd952e61934cab790ba362b1c0b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz.meta b/Assets/Resources/Sprites/Games/WizardsWaltz.meta new file mode 100644 index 00000000..3a136341 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a81cc2f4a09277489a58d0beaf0b995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta new file mode 100644 index 00000000..3aa75251 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta @@ -0,0 +1,1020 @@ +fileFormatVersion: 2 +guid: affa77f4c5206f444a79fbd5d03c0aa4 +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 + - first: + 213: -9206242486865119274 + second: wizardswaltz_magic_fx_0 + - first: + 213: -1724727701389049137 + second: wizardswaltz_bubble_fx_0 + - first: + 213: -364512971116804208 + second: wizardswaltz_bubble_fx_1 + - first: + 213: 3704906013091560217 + second: wizardswaltz_sparkle_fx_ + - first: + 213: 2615604564187904341 + second: wizardswaltz_sparkle_fx_2 + - first: + 213: 5008211631437172949 + second: wizardswaltz_sparkle_fx_0 + - first: + 213: 5772900555431232981 + second: wizardswaltz_girl_0 + - first: + 213: -4304133006063306856 + second: wizardswaltz_girl_1 + - first: + 213: 2853135921585969209 + second: wizardswaltz_girl_2 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: wizardswaltz_a_button + rect: + serializedVersion: 2 + x: 105 + y: 281 + width: 14 + height: 14 + 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_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: 0 + pivot: {x: 0.5, y: 0.5} + 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.25925925, 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: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_magic_fx_0 + rect: + serializedVersion: 2 + x: 32 + y: 176 + width: 16 + height: 15 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6d7bb462c3bdc3080800000000000000 + internalID: -9206242486865119274 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_bubble_fx_0 + rect: + serializedVersion: 2 + x: 169 + y: 185 + 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: fc20e682b498018e0800000000000000 + internalID: -1724727701389049137 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_bubble_fx_1 + rect: + serializedVersion: 2 + x: 154 + y: 186 + width: 4 + height: 4 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0978f80526df0faf0800000000000000 + internalID: -364512971116804208 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_ + rect: + serializedVersion: 2 + x: 117 + y: 181 + width: 10 + height: 6 + alignment: 9 + pivot: {x: 0.3, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 91bf784b3687a6330800000000000000 + internalID: 3704906013091560217 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_2 + rect: + serializedVersion: 2 + x: 99 + y: 180 + width: 12 + height: 9 + alignment: 9 + pivot: {x: 0.4166667, y: 0.44444445} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5597f493e7e7c4420800000000000000 + internalID: 2615604564187904341 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_sparkle_fx_0 + rect: + serializedVersion: 2 + x: 53 + y: 182 + width: 9 + height: 5 + alignment: 9 + pivot: {x: 0.33333334, y: 0.4} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5d0dac3b1fdb08540800000000000000 + internalID: 5008211631437172949 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_happy + rect: + serializedVersion: 2 + x: 48 + y: 247 + width: 24 + 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: 8660fd8bbd3ff5b00800000000000000 + internalID: 819641782229730920 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_0 + rect: + serializedVersion: 2 + x: 24 + y: 247 + width: 24 + 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: 5d5422218767d1050800000000000000 + internalID: 5772900555431232981 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_1 + rect: + serializedVersion: 2 + x: 72 + y: 247 + width: 24 + 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: 897ff83d5d5a444c0800000000000000 + internalID: -4304133006063306856 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wizardswaltz_girl_2 + rect: + serializedVersion: 2 + x: 96 + y: 247 + width: 24 + 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: 938d90e0100689720800000000000000 + internalID: 2853135921585969209 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta new file mode 100644 index 00000000..88f88c99 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardwaltz_bg.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8efef001b979ac0469c4648bbac086c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz.meta b/Assets/Scripts/Games/WizardsWaltz.meta new file mode 100644 index 00000000..ebbb8672 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9218a00714b3e4a4c9a0868a33e17c2f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs new file mode 100644 index 00000000..9b8100ba --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.WizardWaltz +{ + public class WizardsWaltz : Minigame + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs.meta b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs.meta new file mode 100644 index 00000000..60fc4d4d --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f2919d01c742294387031de86ef710b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From edece5218af50bf5da639480d6ddbd083b2a533f Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 19:15:56 -0500 Subject: [PATCH 2/5] He rotate --- Assets/Resources/Games/wizardsWaltz.prefab | 170 ++++++++++-------- Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 30 ++++ .../Scripts/Games/WizardsWaltz/Wizard.cs.meta | 11 ++ .../Games/WizardsWaltz/WizardsWaltz.cs | 12 +- .../EventSelector/EventParameterManager.cs | 2 +- .../EventSelector/GridGameSelector.cs | 2 +- Assets/Scripts/Minigames.cs | 5 + 7 files changed, 159 insertions(+), 73 deletions(-) create mode 100644 Assets/Scripts/Games/WizardsWaltz/Wizard.cs create mode 100644 Assets/Scripts/Games/WizardsWaltz/Wizard.cs.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index fe834fc5..dc7b4f16 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1194608921018870769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5068490343008965940} + - component: {fileID: 7265463465499129635} + - component: {fileID: 9147818320159898070} + m_Layer: 0 + m_Name: Wizard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5068490343008965940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7265463465499129635 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194608921018870769} + 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: 6626715444242248344, 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 &9147818320159898070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194608921018870769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d323f90f8c1dd54da6d53d21013cf5c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7248900333300803145 GameObject: m_ObjectHideFlags: 0 @@ -9,7 +104,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7248900333300803150} - - component: {fileID: 7248900333300803151} + - component: {fileID: 4376227386272826112} m_Layer: 0 m_Name: wizardsWaltz m_TagString: Untagged @@ -29,10 +124,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8701843541313247389} + - {fileID: 5068490343008965940} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7248900333300803151 +--- !u!114 &4376227386272826112 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,78 +137,12 @@ MonoBehaviour: m_GameObject: {fileID: 7248900333300803145} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7c69b76f8c0a85489aa15813dfef687, type: 3} + m_Script: {fileID: 11500000, guid: 8f2919d01c742294387031de86ef710b, type: 3} m_Name: m_EditorClassIdentifier: EligibleHits: [] firstEnable: 0 - LightBulbColors: - - {r: 0, g: 0, b: 0, a: 0} - - {r: 0.007843138, g: 0.8117647, b: 1, a: 1} - - {r: 233, g: 233, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 0} - BackgroundColors: - - {r: 0.9411765, g: 0.9137255, b: 0.4392157, a: 1} - - {r: 0.99607843, g: 0.60784316, b: 0.98039216, a: 1} - - {r: 0.42745098, g: 0.6666667, b: 0.8784314, a: 1} - - {r: 1, g: 0.09411766, b: 0, a: 1} - - {r: 1, g: 0.58431375, b: 0.3137255, a: 1} - - {r: 0.9607844, g: 0.7725491, b: 0.78823537, a: 1} - - {r: 0, g: 0, b: 0, a: 0} - ShadowColors: - - {r: 0.84313726, g: 0.52156866, b: 0.23137255, a: 1} - - {r: 0.88235295, g: 0.41960785, b: 0.5294118, a: 1} - - {r: 0.3137255, g: 0.31764707, b: 0.40784317, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0.454902, g: 0.19607845, b: 0.121568635, a: 1} - - {r: 0.654902, g: 0.4156863, b: 0.45882356, a: 1} - Pot: {fileID: 0} - Bomb: {fileID: 0} - KarateJoe: {fileID: 0} - EligibleCombos: [] - ObjectSprites: - - {fileID: 8050164209934277894, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 5443719295599431979, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -4108414130637688947, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -3530312539838775474, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 8671423413994339737, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -6341196331951941137, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 6243727673011286339, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -8767211005568948338, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - BarrelSprites: - - {fileID: 6524922379630696755, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 1156572009758090512, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -7998309181045564909, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -7906004722935515527, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 5805539206011318834, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - CookingPotSprites: - - {fileID: 6243727673011286339, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 561377664857987667, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - OtherSprites: - - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - BGSprites: - - Sprites: - - {fileID: 21300000, guid: 72431c7c58f54e848bcb7527635bb72b, type: 3} - - {fileID: 21300000, guid: f05694d1ff974fe4387e487d025edede, type: 3} - - Sprites: - - {fileID: 21300000, guid: 02bb4d7e097a4524db553cfabcdbcf10, type: 3} - - {fileID: 21300000, guid: c19e325e2bac3e44d9464debd23372c5, type: 3} - BGSprite: {fileID: 0} - BGFXSprite: {fileID: 7037067448840752386} - BGType: 0 - BGFXType: 0 - BGColor: {r: 0.94117653, g: 0.91372555, b: 0.43921572, a: 1} - Shadow: 0 - ShadowColor: {r: 0, g: 0, b: 0, a: 0} - potHitEffect: {fileID: 0} - comboRef: {fileID: 0} - HIT3Ref: {fileID: 0} - Numbers: - - {fileID: -6652173421999817615, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 1726704843289908573, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 8853733407125453983, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: -715771857855404744, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + wizard: {fileID: 9147818320159898070} --- !u!1 &8963803634876878173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs new file mode 100644 index 00000000..84865025 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.WizardsWaltz +{ + public class Wizard : MonoBehaviour + { + + private float songPos; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + songPos = Conductor.instance.songPositionInBeats; + var x = Mathf.Sin(Mathf.PI * songPos / 2) * 6; + var y = 2 + Mathf.Cos(Mathf.PI * songPos / 2) * 1.5f; + var scale = 1 - Mathf.Cos(Mathf.PI * songPos / 2) * 0.25f; + transform.position = new Vector3(x, y, 0); + transform.localScale = new Vector3(scale, scale, 1); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs.meta b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs.meta new file mode 100644 index 00000000..69c9096a --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d323f90f8c1dd54da6d53d21013cf5c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index 9b8100ba..11671959 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -4,10 +4,20 @@ using UnityEngine; using RhythmHeavenMania.Util; -namespace RhythmHeavenMania.Games.WizardWaltz +namespace RhythmHeavenMania.Games.WizardsWaltz { public class WizardsWaltz : Minigame { + + public Wizard wizard; + + public static WizardsWaltz instance; + + private void Awake() + { + instance = this; + } + // Start is called before the first frame update void Start() { diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs index 40c2cc92..27afe83c 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs @@ -56,7 +56,7 @@ namespace RhythmHeavenMania.Editor eventSelector.SetActive(true); DestroyParams(); - Editor.instance.SetGameEventTitle($"Select game event for {gridGameSelector.SelectedMinigame}"); + Editor.instance.SetGameEventTitle($"Select game event for {gridGameSelector.SelectedMinigame.Replace("\n", "")}"); } public void StartParams(Beatmap.Entity entity) diff --git a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs index 0138c515..42cbb140 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs @@ -105,7 +105,7 @@ namespace RhythmHeavenMania.Editor currentEventIndex = 0; UpdateIndex(0, false); - Editor.instance.SetGameEventTitle($"Select game event for {gameName}"); + Editor.instance.SetGameEventTitle($"Select game event for {gameName.Replace("\n", "")}"); } private void AddEvents() diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 9ac7b0e4..38c1da50 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -16,6 +16,7 @@ using RhythmHeavenMania.Games.RhythmRally; using RhythmHeavenMania.Games.BuiltToScaleDS; using RhythmHeavenMania.Games.TapTrial; using RhythmHeavenMania.Games.CropStomp; +using RhythmHeavenMania.Games.WizardsWaltz; namespace RhythmHeavenMania { @@ -367,6 +368,10 @@ namespace RhythmHeavenMania new GameAction("veggies", delegate { }, 4f, true), new GameAction("mole", delegate { }, 2f, false), }), + new Minigame("wizardsWaltz", "Wizard's Waltz \n(Mahou Tsukai)", "FFEF9C", false, false, new List() + { + // new GameAction("plant flower", delegate { }, 2f, false), + }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() { }), From b0f74c9f01cd0ceb565d44137d9613c68783ca75 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 22:30:08 -0500 Subject: [PATCH 3/5] Wizard's Waltz is feature complete Just missing 90% of the visual assets --- Assets/Resources/Games/wizardsWaltz.prefab | 311 ++++++++++++++++++ Assets/Resources/Sfx/games/wizardsWaltz.meta | 8 + .../Sfx/games/wizardsWaltz/grow.ogg.meta | 22 ++ .../Sfx/games/wizardsWaltz/plant.ogg.meta | 22 ++ .../Animations/Hairs/HairHolder.controller | 2 +- .../Games/WizardsWaltz/Animations.meta | 8 + .../Games/WizardsWaltz/Animations/Appear.anim | 83 +++++ .../WizardsWaltz/Animations/Appear.anim.meta | 8 + .../Games/WizardsWaltz/Animations/Eat.anim | 90 +++++ .../WizardsWaltz/Animations/Eat.anim.meta | 8 + .../WizardsWaltz/Animations/EatLoop.anim | 74 +++++ .../WizardsWaltz/Animations/EatLoop.anim.meta | 8 + .../Games/WizardsWaltz/Animations/Hit.anim | 92 ++++++ .../WizardsWaltz/Animations/Hit.anim.meta | 8 + .../Animations/PlantAnimator.controller | 159 +++++++++ .../Animations/PlantAnimator.controller.meta | 8 + .../WizardsWaltz/wizardswaltz_main.png.meta | 6 +- Assets/Scenes/Editor.unity | 6 +- Assets/Scripts/Games/WizardsWaltz/Plant.cs | 91 +++++ .../Scripts/Games/WizardsWaltz/Plant.cs.meta | 11 + Assets/Scripts/Games/WizardsWaltz/Wizard.cs | 45 ++- .../Games/WizardsWaltz/WizardsWaltz.cs | 59 +++- Assets/Scripts/Minigames.cs | 3 +- 23 files changed, 1109 insertions(+), 23 deletions(-) create mode 100644 Assets/Resources/Sfx/games/wizardsWaltz.meta create mode 100644 Assets/Resources/Sfx/games/wizardsWaltz/grow.ogg.meta create mode 100644 Assets/Resources/Sfx/games/wizardsWaltz/plant.ogg.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller.meta create mode 100644 Assets/Scripts/Games/WizardsWaltz/Plant.cs create mode 100644 Assets/Scripts/Games/WizardsWaltz/Plant.cs.meta diff --git a/Assets/Resources/Games/wizardsWaltz.prefab b/Assets/Resources/Games/wizardsWaltz.prefab index dc7b4f16..1369c166 100644 --- a/Assets/Resources/Games/wizardsWaltz.prefab +++ b/Assets/Resources/Games/wizardsWaltz.prefab @@ -1,5 +1,200 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &495079121991323623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8145183858976180822} + - component: {fileID: 6977509582872707701} + m_Layer: 0 + m_Name: SpriteHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8145183858976180822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495079121991323623} + 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: 5180675038394081533} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6977509582872707701 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495079121991323623} + 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: 4636117524539756526, 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2989642375569903027} + m_Layer: 0 + m_Name: Prefabs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2989642375569903027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 883613100522307325} + 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: 5180675038394081533} + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1172109260453278802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 669296839509545821} + - component: {fileID: 4750861237420523156} + m_Layer: 0 + m_Name: WizardShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &669296839509545821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172109260453278802} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6, y: -2.5, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4750861237420523156 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172109260453278802} + 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: -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 &1194608921018870769 GameObject: m_ObjectHideFlags: 0 @@ -95,6 +290,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d323f90f8c1dd54da6d53d21013cf5c, type: 3} m_Name: m_EditorClassIdentifier: + shadow: {fileID: 1172109260453278802} +--- !u!1 &1740010938943195280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8217893490508314786} + m_Layer: 0 + m_Name: Plants + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8217893490508314786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740010938943195280} + 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: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3353780840221392181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5180675038394081533} + - component: {fileID: 1956085913247994144} + - component: {fileID: 4115963594268370484} + m_Layer: 0 + m_Name: Plant + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5180675038394081533 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3353780840221392181} + 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: 8145183858976180822} + m_Father: {fileID: 2989642375569903027} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1956085913247994144 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3353780840221392181} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 453398630ec0cea43afc5dd7338ca249, 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!114 &4115963594268370484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3353780840221392181} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b62617c2e80c5e2488da3c603bc21022, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + eligibleHitsList: [] + aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 + animator: {fileID: 1956085913247994144} + createBeat: 0 --- !u!1 &7248900333300803145 GameObject: m_ObjectHideFlags: 0 @@ -125,6 +429,9 @@ Transform: m_Children: - {fileID: 8701843541313247389} - {fileID: 5068490343008965940} + - {fileID: 669296839509545821} + - {fileID: 8217893490508314786} + - {fileID: 2989642375569903027} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -143,6 +450,10 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 wizard: {fileID: 9147818320159898070} + plantHolder: {fileID: 1740010938943195280} + plantBase: {fileID: 3353780840221392181} + beatInterval: 4 + wizardBeatOffset: 0 --- !u!1 &8963803634876878173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sfx/games/wizardsWaltz.meta b/Assets/Resources/Sfx/games/wizardsWaltz.meta new file mode 100644 index 00000000..8467aad6 --- /dev/null +++ b/Assets/Resources/Sfx/games/wizardsWaltz.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba811f35279b31948a8f713a5da267e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/wizardsWaltz/grow.ogg.meta b/Assets/Resources/Sfx/games/wizardsWaltz/grow.ogg.meta new file mode 100644 index 00000000..8b9ea799 --- /dev/null +++ b/Assets/Resources/Sfx/games/wizardsWaltz/grow.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 47cbd468afddf1540ab561e66d3f64b9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/wizardsWaltz/plant.ogg.meta b/Assets/Resources/Sfx/games/wizardsWaltz/plant.ogg.meta new file mode 100644 index 00000000..86afb4d1 --- /dev/null +++ b/Assets/Resources/Sfx/games/wizardsWaltz/plant.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d7002a01686627a48b45afee706eb8f0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller index 6002d1e1..de1ed21f 100644 --- a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller @@ -137,7 +137,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 8081536976595334241} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 210, y: -10, z: 0} - serializedVersion: 1 m_State: {fileID: 3716456221662251481} m_Position: {x: 235, y: 65, z: 0} diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations.meta new file mode 100644 index 00000000..b3d52fef --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c69e1b2a1a87e54cb388807fb61949f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim new file mode 100644 index 00000000..981dbe64 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim @@ -0,0 +1,83 @@ +%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: Appear + 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: -7368868625357890572, guid: affa77f4c5206f444a79fbd5d03c0aa4, 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} + 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: -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} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.18333334 + 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/Appear.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim.meta new file mode 100644 index 00000000..3ea23d08 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Appear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 419d3c4586a72324694e9fa8a2663074 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim new file mode 100644 index 00000000..087509b3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim @@ -0,0 +1,90 @@ +%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: Eat + 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: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.033333335 + value: {fileID: -5472345213390817180, guid: affa77f4c5206f444a79fbd5d03c0aa4, 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} + 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: -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} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.2 + 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: + - time: 0.2 + functionName: EatLoop + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta new file mode 100644 index 00000000..25ae5d49 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Eat.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93acfc02cdfa9ac469655d8ddf7cfdb8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim new file mode 100644 index 00000000..ef23c5a2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.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: EatLoop + 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: -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} + 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: -7426945613399875653, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 854124440379713626, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - {fileID: 854124440379713626, 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/EatLoop.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim.meta new file mode 100644 index 00000000..8105cbec --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/EatLoop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e30bfa73f66bd444dbdfab4d16c9e32c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim new file mode 100644 index 00000000..9ef48fd4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim @@ -0,0 +1,92 @@ +%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: Hit + 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: -4540014695617444453, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.033333335 + value: {fileID: -7118984775159605532, guid: affa77f4c5206f444a79fbd5d03c0aa4, type: 3} + - time: 0.06666667 + value: {fileID: 8880887496617416097, guid: affa77f4c5206f444a79fbd5d03c0aa4, 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} + 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: -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} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.28333336 + 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/Hit.anim.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim.meta new file mode 100644 index 00000000..c644055c --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/Hit.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f021f0cc0f7f2694bb680dba31fde663 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller new file mode 100644 index 00000000..545d6bee --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8735285583408772827 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Eat + m_Speed: 0.5 + 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: 93acfc02cdfa9ac469655d8ddf7cfdb8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3731834624934684321 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hit + m_Speed: 0.5 + 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: f021f0cc0f7f2694bb680dba31fde663, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1911281047350913601 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Appear + m_Speed: 0.5 + 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: 419d3c4586a72324694e9fa8a2663074, 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: PlantAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3333581725375681455} + 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 &3333581725375681455 +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: -1911281047350913601} + m_Position: {x: 230, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3731834624934684321} + m_Position: {x: 260, y: 90, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8735285583408772827} + m_Position: {x: 220, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4439301530716439655} + m_Position: {x: 190, y: 250, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -10, y: -30, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 470, y: 220, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1911281047350913601} +--- !u!1102 &4439301530716439655 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EatLoop + m_Speed: 0.5 + 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: e30bfa73f66bd444dbdfab4d16c9e32c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller.meta new file mode 100644 index 00000000..ac2d0e55 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/Animations/PlantAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 453398630ec0cea43afc5dd7338ca249 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta index 3aa75251..c143b66b 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta @@ -569,8 +569,8 @@ TextureImporter: y: 89 width: 16 height: 15 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.5, y: 0.20000002} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -633,7 +633,7 @@ TextureImporter: width: 29 height: 45 alignment: 9 - pivot: {x: 0.25925925, y: 0.06666667} + pivot: {x: 0.31034482, y: 0.06666667} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 278908a7..bb8ab11c 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -18739,9 +18739,9 @@ RectTransform: m_Father: {fileID: 1671351975} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -25.34875} m_SizeDelta: {x: 224, y: 50.6975} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1906769994 diff --git a/Assets/Scripts/Games/WizardsWaltz/Plant.cs b/Assets/Scripts/Games/WizardsWaltz/Plant.cs new file mode 100644 index 00000000..c42a7f8d --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Plant.cs @@ -0,0 +1,91 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; + +namespace RhythmHeavenMania.Games.WizardsWaltz +{ + public class Plant : PlayerActionObject + { + public Animator animator; + public float createBeat; + + private WizardsWaltz game; + private bool hit = false; + private bool passed = false; + + private void Awake() + { + game = WizardsWaltz.instance; + } + + private void Start() + { + animator.Play("Appear", 0, 0); + } + + private void Update() + { + if (!passed && Conductor.instance.songPositionInBeats > createBeat + game.beatInterval) + { + StartCoroutine(FadeOut()); + passed = true; + } + + if (hit) return; + + float stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.beatInterval, 1f); + StateCheck(stateBeat); + + if (PlayerInput.Pressed(true)) + { + if (state.perfect) + { + Ace(); + } else if (state.notPerfect()) + { + Miss(); + } + } + + } + + public void Bloom() + { + animator.Play("Hit", 0, 0); + } + + public void Eat() + { + animator.Play("Eat", 0, 0); + } + + public void EatLoop() + { + animator.Play("EatLoop", 0, 0); + } + + public void Ace() + { + game.wizard.Magic(this, true); + hit = true; + } + + public void Miss() + { + game.wizard.Magic(this, false); + hit = true; + } + + public override void OnAce() + { + Ace(); + } + + public IEnumerator FadeOut() + { + yield return new WaitForSeconds(Conductor.instance.secPerBeat * game.beatInterval / 2f); + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/Plant.cs.meta b/Assets/Scripts/Games/WizardsWaltz/Plant.cs.meta new file mode 100644 index 00000000..f4621d05 --- /dev/null +++ b/Assets/Scripts/Games/WizardsWaltz/Plant.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b62617c2e80c5e2488da3c603bc21022 +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 84865025..8ad64706 100644 --- a/Assets/Scripts/Games/WizardsWaltz/Wizard.cs +++ b/Assets/Scripts/Games/WizardsWaltz/Wizard.cs @@ -7,24 +7,51 @@ namespace RhythmHeavenMania.Games.WizardsWaltz { public class Wizard : MonoBehaviour { + public GameObject shadow; + private WizardsWaltz game; private float songPos; - // Start is called before the first frame update - void Start() + private void Awake() { - + game = WizardsWaltz.instance; } - // Update is called once per frame void Update() { songPos = Conductor.instance.songPositionInBeats; - var x = Mathf.Sin(Mathf.PI * songPos / 2) * 6; - var y = 2 + Mathf.Cos(Mathf.PI * songPos / 2) * 1.5f; - var scale = 1 - Mathf.Cos(Mathf.PI * songPos / 2) * 0.25f; - transform.position = new Vector3(x, y, 0); - transform.localScale = new Vector3(scale, scale, 1); + 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; + + transform.position = new Vector3(x, 2 + y, -scale); + shadow.transform.position = new Vector3(x, -2.5f + y, -scale + 0.1f); + + var xscale = scale; + if (y > 0) xscale *= -1; + transform.localScale = new Vector3(xscale, scale, 1); + shadow.transform.localScale = new Vector3(scale, scale, 1); } + + public void Magic(Plant plant, bool hit) + { + if(plant == null) + { + // TODO: Play empty A press sound + return; + } + if (hit) + { + Jukebox.PlayOneShotGame("wizardsWaltz/grow"); + plant.Bloom(); + } + else + { + Jukebox.PlayOneShot("miss"); + plant.Eat(); + } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index 11671959..1893f7f6 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -1,6 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using System; +using Starpelly; using RhythmHeavenMania.Util; @@ -8,8 +10,17 @@ namespace RhythmHeavenMania.Games.WizardsWaltz { public class WizardsWaltz : Minigame { - + [Header("References")] public Wizard wizard; + public GameObject plantHolder; + public GameObject plantBase; + + public float beatInterval = 4f; + float intervalStartBeat; + bool intervalStarted; + public float wizardBeatOffset = 0f; + + [NonSerialized] public int plantsLeft = 0; public static WizardsWaltz instance; @@ -18,16 +29,52 @@ namespace RhythmHeavenMania.Games.WizardsWaltz instance = this; } - // Start is called before the first frame update - void Start() + private void Update() { - + if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused && intervalStarted) + { + intervalStarted = false; + } } - // Update is called once per frame - void Update() + public void SetIntervalStart(float beat, float interval = 4f) { + // Don't do these things if the interval was already started. + if (!intervalStarted) + { + plantsLeft = 0; + intervalStarted = true; + } + intervalStartBeat = beat; + beatInterval = interval; } + + public void SpawnFlower(float beat) + { + // If interval hasn't started, assume this is the first hair of the interval. + if (!intervalStarted) + SetIntervalStart(beat, beatInterval); + + Jukebox.PlayOneShotGame("wizardsWaltz/plant", beat); + Plant plant = Instantiate(plantBase, plantHolder.transform).GetComponent(); + + 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 xscale = scale; + if (y > -2.5f) xscale *= -1; + + plant.transform.localPosition = new Vector3(x, y, -scale); + plant.transform.localScale = new Vector3(xscale, scale, 1); + + plant.gameObject.SetActive(true); + + plant.createBeat = beat; + plantsLeft++; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 38c1da50..4eb16a83 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -370,7 +370,8 @@ namespace RhythmHeavenMania }), new Minigame("wizardsWaltz", "Wizard's Waltz \n(Mahou Tsukai)", "FFEF9C", false, false, new List() { - // new GameAction("plant flower", delegate { }, 2f, false), + new GameAction("start interval", delegate { WizardsWaltz.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 4f, true), + new GameAction("plant flower", delegate { WizardsWaltz.instance.SpawnFlower(eventCaller.currentEntity.beat); }, 0.5f, false), }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() { From 6958b7bbb72f898970409f78e31e0e8ba8ef26fc Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 22:36:11 -0500 Subject: [PATCH 4/5] Added game icon for Wizard's Waltz --- .../Editor/GameIcons/wizardsWaltz.png.meta | 108 ++++++++++++++++++ .../WizardsWaltz/wizardswaltz_main.png.meta | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta new file mode 100644 index 00000000..9be19808 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: f534e26a3ef74ff4fa8433f4467c0259 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta index c143b66b..a6ac87da 100644 --- a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta +++ b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png.meta @@ -182,7 +182,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -194,7 +194,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 From 3547010af0d4b12ac457d685843f6adbe6c1cf33 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Thu, 3 Mar 2022 22:43:11 -0500 Subject: [PATCH 5/5] Shortened "plant flower" in Wizard's Waltz --- Assets/Scripts/Minigames.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 4eb16a83..1f973204 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -371,7 +371,7 @@ namespace RhythmHeavenMania new Minigame("wizardsWaltz", "Wizard's Waltz \n(Mahou Tsukai)", "FFEF9C", false, false, new List() { new GameAction("start interval", delegate { WizardsWaltz.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 4f, true), - new GameAction("plant flower", delegate { WizardsWaltz.instance.SpawnFlower(eventCaller.currentEntity.beat); }, 0.5f, false), + new GameAction("plant", delegate { WizardsWaltz.instance.SpawnFlower(eventCaller.currentEntity.beat); }, 0.5f, false), }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() {