diff --git a/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png new file mode 100644 index 000000000..6083fbbf6 Binary files /dev/null and b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png differ diff --git a/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta new file mode 100644 index 000000000..3fe01ef15 --- /dev/null +++ b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 66a4fb1c822a07345a8adeca76f50859 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 2040, 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 + cookieLightType: 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 + - serializedVersion: 3 + buildTarget: Server + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundled/Games/Fireworks/Sprites/city.png b/Assets/Bundled/Games/Fireworks/Sprites/city.png index 97a045b9e..50bff2847 100644 Binary files a/Assets/Bundled/Games/Fireworks/Sprites/city.png and b/Assets/Bundled/Games/Fireworks/Sprites/city.png differ diff --git a/Assets/Bundled/Games/Fireworks/Sprites/city.png.meta b/Assets/Bundled/Games/Fireworks/Sprites/city.png.meta index 066fa7289..b29703977 100644 --- a/Assets/Bundled/Games/Fireworks/Sprites/city.png.meta +++ b/Assets/Bundled/Games/Fireworks/Sprites/city.png.meta @@ -59,7 +59,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -131,27 +131,6 @@ TextureImporter: spriteSheet: serializedVersion: 2 sprites: - - serializedVersion: 2 - name: city_0 - rect: - serializedVersion: 2 - x: 3181 - y: 1964 - width: 179 - height: 2004 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 480fe1d878d1409e0800000000000000 - internalID: -1656166294940094332 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: city_1 rect: @@ -173,27 +152,6 @@ TextureImporter: indices: edges: [] weights: [] - - serializedVersion: 2 - name: city_2 - rect: - serializedVersion: 2 - x: 77 - y: 1908 - width: 3069 - height: 276 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2fda41bfc93429470800000000000000 - internalID: 8399850596505791986 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: city_3 rect: @@ -224,7 +182,7 @@ TextureImporter: width: 1907 height: 1856 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -236,6 +194,48 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: city_5 + rect: + serializedVersion: 2 + x: 77 + y: 1924 + width: 3069 + height: 260 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 250} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 765a75cb1a0a62e4d8638a3ba46b422a + internalID: -1414428263 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: city_2 + rect: + serializedVersion: 2 + x: 105 + y: 1924 + width: 2834 + height: 260 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 250} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 92dcadc3ac15e0145b83ec46a4deb5c7 + internalID: 8399850596505791986 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -252,6 +252,7 @@ TextureImporter: city_2: 8399850596505791986 city_3: -3980211991217024205 city_4: -4113892033949338959 + city_5: -1414428263 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Bundled/Games/Fireworks/fireworks.prefab b/Assets/Bundled/Games/Fireworks/fireworks.prefab index c0397eeda..06954886d 100644 --- a/Assets/Bundled/Games/Fireworks/fireworks.prefab +++ b/Assets/Bundled/Games/Fireworks/fireworks.prefab @@ -25,11 +25,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171474737575621237} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.002, y: 0.0049039996, z: 0} - m_LocalScale: {x: 0.011518534, y: 0.011518534, z: 0.21019222} + m_LocalPosition: {x: -95.83849, y: 17.909262, z: 16.27828} + m_LocalScale: {x: 0.5759267, y: 0.5759267, z: 0.21019222} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5813499711658895220} - m_RootOrder: 2 + m_Father: {fileID: 4762364942322048598} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8468730928825350006 SpriteRenderer: @@ -42,6 +43,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -109,6 +111,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} m_RootOrder: 4 @@ -124,6 +127,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -191,6 +195,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.0968592, y: -6.3948936, z: 0.00032305717} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7124394477294642002} m_RootOrder: 0 @@ -237,6 +242,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -6.48, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5200199067119660498} - {fileID: 8558492605798639434} @@ -244,6 +250,90 @@ Transform: m_Father: {fileID: 5813499711186931250} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2591736519592438108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8171375328388491944} + - component: {fileID: 2341992166764747826} + m_Layer: 0 + m_Name: City + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8171375328388491944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2591736519592438108} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -96.526794, y: -46.52659, z: 16.27828} + m_LocalScale: {x: 0.62924993, y: 0.6293265, z: 0.22968118} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4762364942322048598} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2341992166764747826 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2591736519592438108} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: -100 + m_Sprite: {fileID: 8399850596505791986, guid: 68bf694a5844f554ab51f1e9ce2e8a02, type: 3} + m_Color: {r: 0, g: 0.03137255, b: 0.1254902, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 141.70032, y: 192.72717} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3025163259343331284 GameObject: m_ObjectHideFlags: 0 @@ -270,10 +360,95 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.84, y: -5.281, z: -5.149107} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3694913927940001559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8110471333012071110} + - component: {fileID: 5272343107655608154} + m_Layer: 0 + m_Name: Gradient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8110471333012071110 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3694913927940001559} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -95.77979, y: 77.71207, z: 16.27828} + m_LocalScale: {x: 1, y: 0.1314, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4762364942322048598} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5272343107655608154 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3694913927940001559} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: -200 + m_Sprite: {fileID: 21300000, guid: 66a4fb1c822a07345a8adeca76f50859, type: 3} + m_Color: {r: 0, g: 0.03137255, b: 0.1254902, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 250.00003, y: 991.12946} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3811424113264410502 GameObject: m_ObjectHideFlags: 0 @@ -301,6 +476,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.1202, y: 0.0094, z: 0} m_LocalScale: {x: 0.012033556, y: 0.012033556, z: 0.21959044} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6385302848168911078} m_RootOrder: 0 @@ -316,6 +492,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -382,6 +559,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3834466572031141912} m_RootOrder: 2 @@ -412,6 +590,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.04, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3834466572031141912} m_RootOrder: 0 @@ -443,6 +622,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.34261814, y: 1.2302552, z: -2.8538387} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2069956319690697148} - {fileID: 4502375672747896293} @@ -495,6 +675,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5.04, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3834466572031141912} m_RootOrder: 1 @@ -526,6 +707,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.092, y: 0.0068, z: 0} m_LocalScale: {x: 0.012033556, y: 0.012033556, z: 0.21959044} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6385302848168911078} m_RootOrder: 1 @@ -541,6 +723,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -608,12 +791,14 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5813499711658895220} - {fileID: 3834466572031141912} - {fileID: 7124394477294642002} - {fileID: 1467648090879296825} - {fileID: 6940767383293912137} + - {fileID: 4762364942322048598} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -630,9 +815,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - EligibleHits: [] - scheduledInputs: [] - firstEnable: 0 spawnLeft: {fileID: 5200199067119660498} spawnRight: {fileID: 8558492605798639434} spawnMiddle: {fileID: 6035009452925457847} @@ -641,6 +823,9 @@ MonoBehaviour: bomb: {fileID: 7261189633897651690, guid: ee8233cab321ff84c9f139d288111d95, type: 3} bombCurve: {fileID: 8938167690036452110} flashWhite: {fileID: 4842625358731046380} + gradientTop: {fileID: 5272343107655608154} + gradientBottom: {fileID: 6645841643578104492} + city: {fileID: 2341992166764747826} faces: {fileID: 6451929997686234885} stars: {fileID: 1171474737575621237} --- !u!1 &5813499711658895222 @@ -668,13 +853,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5813499711658895222} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.1587, y: -0.1652, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 50, z: 1} + m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7390385555347021158} - {fileID: 6194428826657868395} - {fileID: 534086842147196264} - - {fileID: 2217084986388416459} - - {fileID: 6385302848168911078} m_Father: {fileID: 5813499711186931250} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -689,6 +874,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -719,7 +905,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -1000 m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -740,12 +926,12 @@ GameObject: - component: {fileID: 534086842147196264} - component: {fileID: 6610291745070879787} m_Layer: 0 - m_Name: City + m_Name: City_Old m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &534086842147196264 Transform: m_ObjectHideFlags: 0 @@ -755,10 +941,11 @@ Transform: m_GameObject: {fileID: 5869995283611955847} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00042600004, y: -0.08829599, z: 0} - m_LocalScale: {x: 0.012586528, y: 0.012586528, z: 0.22968118} + m_LocalScale: {x: 0.0125865275, y: 0.012586529, z: 0.22968118} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711658895220} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6610291745070879787 SpriteRenderer: @@ -771,6 +958,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -805,12 +993,132 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 6.72, y: 4.52} + m_Size: {x: 28.36, y: 2.6} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6182355443420124252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6013699270570279750} + - component: {fileID: 6645841643578104492} + m_Layer: 0 + m_Name: Sky + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6013699270570279750 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6182355443420124252} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -95.77979, y: -44.67074, z: 16.27828} + m_LocalScale: {x: 250, y: 125, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4762364942322048598} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6645841643578104492 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6182355443420124252} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: -210 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0.2, b: 0.46666667, 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 &6272330987550237685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4762364942322048598} + m_Layer: 0 + m_Name: agasgagag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4762364942322048598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272330987550237685} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 95.77979, y: -17.829262, z: -16.27828} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8110471333012071110} + - {fileID: 8171375328388491944} + - {fileID: 6013699270570279750} + - {fileID: 2217084986388416459} + - {fileID: 6385302848168911078} + m_Father: {fileID: 5813499711186931250} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6451929997686234885 GameObject: m_ObjectHideFlags: 0 @@ -834,14 +1142,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6451929997686234885} - 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -95.93849, y: 17.664062, z: 16.27828} + m_LocalScale: {x: 50, y: 50, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 235249916234133676} - {fileID: 2266949119702849154} - m_Father: {fileID: 5813499711658895220} - m_RootOrder: 3 + m_Father: {fileID: 4762364942322048598} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6653436984196068176 GameObject: @@ -870,6 +1179,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.3622792, y: -0.6290142, z: 0.00032305717} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7124394477294642002} m_RootOrder: 1 @@ -890,6 +1200,90 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -0.9015206, y: 0.8997858, z: -0} rightHandleLocalPosition: {x: 0.9015206, y: -0.8997858, z: 0} +--- !u!1 &6930847513310121931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7390385555347021158} + - component: {fileID: 2962882487995762323} + m_Layer: 0 + m_Name: Cityold + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7390385555347021158 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930847513310121931} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0036000002, y: -1.2871169, z: 0} + m_LocalScale: {x: 0.057482235, y: 0.01258653, z: 0.22968118} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5813499711658895220} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2962882487995762323 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930847513310121931} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: -100 + m_Sprite: {fileID: -1414428263, guid: 68bf694a5844f554ab51f1e9ce2e8a02, type: 3} + m_Color: {r: 0, g: 0.03137255, b: 0.1254902, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 6.72, y: 192.72717} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8262151026341675557 GameObject: m_ObjectHideFlags: 0 @@ -906,7 +1300,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6194428826657868395 Transform: m_ObjectHideFlags: 0 @@ -916,10 +1310,11 @@ Transform: m_GameObject: {fileID: 8262151026341675557} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.007, z: 0} - m_LocalScale: {x: 0.21198754, y: 0.011052757, z: 0.011052757} + m_LocalScale: {x: 0.21198751, y: 0.011052757, z: 0.011052757} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711658895220} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9045103493732349067 SpriteRenderer: @@ -932,6 +1327,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -969,6 +1365,6 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/Assets/Scripts/Games/Fireworks/Fireworks.cs b/Assets/Scripts/Games/Fireworks/Fireworks.cs index 7b70bdca2..0bce40024 100644 --- a/Assets/Scripts/Games/Fireworks/Fireworks.cs +++ b/Assets/Scripts/Games/Fireworks/Fireworks.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using UnityEngine; using NaughtyBezierCurves; using DG.Tweening; +using Jukebox; namespace HeavenStudio.Games.Loaders { @@ -11,6 +12,30 @@ namespace HeavenStudio.Games.Loaders public static class AgbFireworkLoader { public static Minigame AddGame(EventCaller eventCaller) { + + RiqEntity fwBGUpdater(string datamodel, RiqEntity e) + { + if (datamodel == "fireworks/altBG") + { + e.CreateProperty("stars", (!e["toggle"])); + e.CreateProperty("faces", (e["toggle"])); + e.CreateProperty("startTop", new Color(0f, 8/255f, 32/255f)); + e.CreateProperty("endTop", new Color(0f, 8/255f, 32/255f)); + e.CreateProperty("startBot", new Color(0f, 51/255f, 119/255f)); + e.CreateProperty("endBot", new Color(0f, 51/255f, 119/255f)); + e.CreateProperty("startCity", new Color(0f, 8/255f, 32/255f)); + e.CreateProperty("endCity", new Color(0f, 8/255f, 32/255f)); + e.CreateProperty("ease", 0); + + e.dynamicData.Remove("toggle"); + + e.datamodel = "fireworks/changeBG"; + return e; + } + return null; + } + RiqBeatmap.OnUpdateEntity += fwBGUpdater; + return new Minigame("fireworks", "Fireworks \n(Hanabi)", "000820", false, false, new List() { new GameAction("firework", "Firework") @@ -58,13 +83,35 @@ namespace HeavenStudio.Games.Loaders new Param("count", Fireworks.CountInType.CountOne, "Type", "Set the number to be said.") } }, - new GameAction("altBG", "Background Appearance") + new GameAction("changeBG", "Background Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + Fireworks.instance.BackgroundColor(e.beat, e.length, e["stars"], e["faces"], e["startTop"], e["endTop"], e["startBot"], e["endBot"], e["startCity"], e["endCity"], e["ease"]); + }, + resizable = true, + parameters = new List() + { + new Param("stars", true, "Stars", "Toggle if the stars should appear."), + new Param("faces", false, "Remix 5", "Toggle if the faces from Remix 5 (GBA) should appear."), + new Param("startTop", new Color(0f, 8/255f, 32/255f), "Gradient Top Start", "Set the color at the start of the event."), + new Param("endTop", new Color(0f, 8/255f, 32/255f), "Gradient Top End", "Set the color at the end of the event."), + new Param("startBot", new Color(0f, 51/255f, 119/255f), "Gradient Bottom Start", "Set the color at the start of the event."), + new Param("endBot", new Color(0f, 51/255f, 119/255f), "Gradient Bottom End", "Set the color at the end of the event."), + new Param("startCity", new Color(0f, 8/255f, 32/255f), "City Start", "Set the color at the start of the event."), + new Param("endCity", new Color(0f, 8/255f, 32/255f), "City End", "Set the color at the end of the event."), + new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") + } + }, + + new GameAction("altBG", "Background Appearance (OLD)") { function = delegate {var e = eventCaller.currentEntity; Fireworks.instance.ChangeBackgroundAppearance(e["toggle"]); }, defaultLength = 0.5f, + hidden = true, parameters = new List() { - new Param("toggle", true, "Remix 5", "Togle if the background from Remix 5 (GBA) should appear.") + new Param("toggle", true, "Remix 5", "Toggle fi ze bckgrond frum realix 5 (GFA) shool aper. (You should never see this.)") } } }, @@ -122,11 +169,18 @@ namespace HeavenStudio.Games [SerializeField] FireworksBomb bomb; [SerializeField] BezierCurve3D bombCurve; [SerializeField] SpriteRenderer flashWhite; + [SerializeField] SpriteRenderer gradientTop; + [SerializeField] SpriteRenderer gradientBottom; + [SerializeField] SpriteRenderer city; [SerializeField] GameObject faces; [SerializeField] GameObject stars; [Header("Properties")] Tween flashTween; public static List queuedFireworks = new List(); + + private ColorEase topColorEase = new(new Color(0f, 8/255f, 32/255f)); + private ColorEase botColorEase = new(new Color(0f, 51/255f, 119/255f)); + private ColorEase cityColorEase = new(new Color(0f, 8/255f, 32/255f)); public static Fireworks instance; @@ -143,6 +197,11 @@ namespace HeavenStudio.Games { instance = this; } + + public override void OnPlay(double beat) + { + PersistColor(beat); + } void Update() { @@ -159,12 +218,14 @@ namespace HeavenStudio.Games queuedFireworks.Clear(); } } + + BackgroundColorUpdate(); } public void ChangeBackgroundAppearance(bool doIt) { - faces.SetActive(doIt); - stars.SetActive(!doIt); + //faces.SetActive(doIt); + //stars.SetActive(!doIt); } public static void CountIn(double beat, int count) @@ -314,6 +375,39 @@ namespace HeavenStudio.Games { ChangeFlashColor(start, 0f); ChangeFlashColor(end, beats); + } + + private void BackgroundColorUpdate() + { + gradientTop.color = topColorEase.GetColor(); + gradientBottom.color = botColorEase.GetColor(); + city.color = cityColorEase.GetColor(); + } + + public void BackgroundColor(double beat, float length, bool dostars, bool dormx5, Color topStart, Color topEnd, Color botStart, Color botEnd, Color cityStart, Color cityEnd, int ease) + { + topColorEase = new ColorEase(beat, length, topStart, topEnd, ease); + botColorEase = new ColorEase(beat, length, botStart, botEnd, ease); + cityColorEase = new ColorEase(beat, length, cityStart, cityEnd, ease); + + faces.SetActive(dormx5); + stars.SetActive(dostars); + } + + private void PersistColor(double beat) + { + var allEventsBeforeBeat = EventCaller.GetAllInGameManagerList("fireworks", new string[] { "changeBG" }).FindAll(x => x.beat < beat); + if (allEventsBeforeBeat.Count > 0) + { + allEventsBeforeBeat.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case + var lastEvent = allEventsBeforeBeat[^1]; + BackgroundColor(lastEvent.beat, lastEvent.length, lastEvent["stars"], lastEvent["faces"], lastEvent["startTop"], lastEvent["endTop"], lastEvent["startBot"], lastEvent["endBot"], lastEvent["startCity"], lastEvent["endCity"], lastEvent["ease"]); + } + } + + public override void OnGameSwitch(double beat) + { + PersistColor(beat); } } }