diff --git a/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png b/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png index 1526c30f9..e46853c16 100644 Binary files a/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png and b/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png differ diff --git a/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png.meta b/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png.meta index 5f9ca2afc..5ee22e4a7 100644 --- a/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png.meta +++ b/Assets/Bundled/Games/ForkLifter/Sprites/GameSprites.png.meta @@ -1016,7 +1016,7 @@ TextureImporter: width: 1046 height: 1105 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: [] @@ -1028,6 +1028,48 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: remixgradient_white + rect: + serializedVersion: 2 + x: 400 + y: 0 + width: 284 + height: 3132 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa81068caa3154243858f87971fa0317 + internalID: 832280233 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: gamegradient_white + rect: + serializedVersion: 2 + x: 730 + y: 1962 + width: 284 + height: 1170 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eeaff545ba46c1d4abef4d4cab6ffd67 + internalID: 724391037 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -1063,6 +1105,7 @@ TextureImporter: fork_swipe_2: 7602230395459695148 forkstab_effect: -2535895568687023267 gamegradient: 1074703595 + gamegradient_white: 724391037 hand_shadow1: 7562980635367501552 hand_shadow2: -1164378328580708214 hitfx_1: 8176908352783466543 @@ -1070,6 +1113,7 @@ TextureImporter: pea_1: 5792877419163235472 pea_2: 5655859219183449053 remixgradient: -1788309548 + remixgradient_white: 832280233 shadow: -4362852279230612367 thumb_1: 8729287508403444602 thumb_2: -4214774725070190255 diff --git a/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png new file mode 100644 index 000000000..eff6bc989 Binary files /dev/null and b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png differ diff --git a/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta new file mode 100644 index 000000000..128864701 --- /dev/null +++ b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a2f1c9bf71140de439400b11fb21a452 +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: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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 + 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: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundled/Games/ForkLifter/forkLifter.prefab b/Assets/Bundled/Games/ForkLifter/forkLifter.prefab index eb798dcd6..06ae7d9fa 100644 --- a/Assets/Bundled/Games/ForkLifter/forkLifter.prefab +++ b/Assets/Bundled/Games/ForkLifter/forkLifter.prefab @@ -1,5 +1,90 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &511084115378861470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4262991889637897244} + - component: {fileID: 3815662089378679793} + m_Layer: 0 + m_Name: GradientGame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4262991889637897244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511084115378861470} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.116, y: -0.137, z: 0} + m_LocalScale: {x: 73.37161, y: 0.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6245877187403316826} + m_Father: {fileID: 4708225563451011159} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3815662089378679793 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511084115378861470} + 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: -120 + m_Sprite: {fileID: 724391037, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} + m_Color: {r: 0.8784314, g: 0.8784314, b: 0.8784314, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6213974, y: 2.5599823} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &853955153253986647 GameObject: m_ObjectHideFlags: 0 @@ -25,12 +110,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 853955153253986647} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.16016705, y: -7.2698, z: 0} - m_LocalScale: {x: 45.859734, y: 14.285204, z: 1} + m_LocalPosition: {x: -0.1657, y: -6.5473, z: 0} + m_LocalScale: {x: 45.859734, y: 15.737885, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4708225563451011159} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5384656832768884501 SpriteRenderer: @@ -82,7 +167,90 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 + m_SpriteSortPoint: 0 +--- !u!1 &1851482483429768071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2044032102570365434} + - component: {fileID: 25252789972273288} + m_Layer: 0 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2044032102570365434 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851482483429768071} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 4.0091, z: 0} + m_LocalScale: {x: 0.32029378, y: 6.07085, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5813499711561122399} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &25252789972273288 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851482483429768071} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 10758, 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: 3 + 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_MaskAlphaCutoff: 0 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 --- !u!1 &2014175700125331933 GameObject: @@ -222,6 +390,341 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &2967239537453427772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3364435688717018617} + - component: {fileID: 2913838242315372367} + m_Layer: 0 + m_Name: GradientRemix + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3364435688717018617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2967239537453427772} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.17437, y: -1.968, z: 0} + m_LocalScale: {x: 73.37125, y: 0.775, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7998923749298894519} + m_Father: {fileID: 4708225563451011159} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2913838242315372367 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2967239537453427772} + 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: -120 + m_Sprite: {fileID: 832280233, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} + m_Color: {r: 0.8784314, g: 0.8784314, b: 0.8784314, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6213974, y: 6.8528757} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3712279545747313142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7998923749298894519} + - component: {fileID: 6630718814063568532} + m_Layer: 0 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7998923749298894519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712279545747313142} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 12.343356, z: 0} + m_LocalScale: {x: 0.62911147, y: 18.64542, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3364435688717018617} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &6630718814063568532 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3712279545747313142} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 10758, 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: 3 + 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_MaskAlphaCutoff: 0 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4869991683186103480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5293462326195838894} + - component: {fileID: 9139662544458649119} + m_Layer: 0 + m_Name: megamixfloor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5293462326195838894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4869991683186103480} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2.05, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4708225563451011159} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9139662544458649119 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4869991683186103480} + 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: -121 + m_Sprite: {fileID: 21300000, guid: a2f1c9bf71140de439400b11fb21a452, type: 3} + m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 40.96, y: 20.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 2 + m_SpriteSortPoint: 0 +--- !u!1 &5022393659405576401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6245877187403316826} + - component: {fileID: 7282066931782051994} + m_Layer: 0 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6245877187403316826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022393659405576401} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 13.5565, z: 0} + m_LocalScale: {x: 0.6406305, y: 25.25095, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4262991889637897244} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &7282066931782051994 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022393659405576401} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 10758, 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: 3 + 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_MaskAlphaCutoff: 0 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 --- !u!1 &5627216916712843283 GameObject: m_ObjectHideFlags: 0 @@ -253,7 +756,10 @@ Transform: - {fileID: 5813499711658895220} - {fileID: 4291166107880106781} - {fileID: 4236074751736965253} + - {fileID: 4262991889637897244} + - {fileID: 3364435688717018617} - {fileID: 5813499711561122399} + - {fileID: 5293462326195838894} - {fileID: 8954726529296470591} m_Father: {fileID: 5813499711186931250} m_RootOrder: 0 @@ -646,7 +1152,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1191,22 +1697,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - scheduledInputs: [] ForkLifterHand: {fileID: 5813499711174113249} handAnim: {fileID: 5813499711174113250} flickedObject: {fileID: 5813499710694194086} peaPreview: {fileID: 5813499711025093251} bg: {fileID: 5813499711658895221} - gradientMaterial: {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2} Gradients: - - {fileID: 9176978866574094514} - - {fileID: 92558363803441739} + - {fileID: 3815662089378679793} + - {fileID: 2913838242315372367} - {fileID: 5813499711561122392} gradientFiller: {fileID: 5384656832768884501} + mmLines: {fileID: 9139662544458649119} viewerCircle: {fileID: 5813499710761815889} viewerCircleBg: {fileID: 4810061997930658618} playerShadow: {fileID: 5813499712485673336} handShadow: {fileID: 5813499711762093784} + forkEffects: + - {fileID: 5813499712464370658} + - {fileID: 5813499711623072827} + - {fileID: 5813499710843775433} peaSprites: - {fileID: 5792877419163235472, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} - {fileID: 6815597139681551923, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} @@ -1633,7 +2142,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.1944444, y: 4.3055553} + m_Size: {x: 1.1944445, y: 4.3055553} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1667,9 +2176,10 @@ Transform: m_LocalPosition: {x: -0.18896, y: -2.0479, z: 0} m_LocalScale: {x: 146.75307, y: 2.495626, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2044032102570365434} m_Father: {fileID: 4708225563451011159} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5813499711561122392 SpriteRenderer: @@ -1717,7 +2227,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.33333334, y: 2.3333333} + m_Size: {x: 0.3106987, y: 2.3324282} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1801,7 +2311,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 2.8611112, y: 3.1944444} + m_Size: {x: 1.3055556, y: 1.3055556} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1859,7 +2369,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2053,7 +2563,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.6388888, y: 2.5277777} + m_Size: {x: 1.4166666, y: 2.5277777} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2252,7 +2762,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.1944444, y: 0.9722222} + m_Size: {x: 1.1944445, y: 0.9722222} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2336,7 +2846,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.1944444, y: 3.3055556} + m_Size: {x: 1.1944445, y: 3.3055556} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2425,7 +2935,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2535,7 +3045,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 5.9722223, y: 1.6388888} + m_Size: {x: 5.9722223, y: 1.638889} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2637,7 +3147,7 @@ GameObject: - component: {fileID: 4236074751736965253} - component: {fileID: 92558363803441739} m_Layer: 0 - m_Name: GradientRemix + m_Name: GradientRemix_OldRemove m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2721,12 +3231,12 @@ GameObject: - component: {fileID: 4291166107880106781} - component: {fileID: 9176978866574094514} m_Layer: 0 - m_Name: GradientGame + m_Name: GradientGame_OldRemove m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4291166107880106781 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 170592833..6ef63b629 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -11,7 +11,20 @@ namespace HeavenStudio.Games.Loaders using static Minigames; public static class RvlForkLoader { - public static Minigame AddGame(EventCaller eventCaller) { + public static Minigame AddGame(EventCaller eventCaller) + { + RiqEntity flGradientUpdater(string datamodel, RiqEntity e) + { + if (datamodel == "forkLifter/colorGrad" && e.version == 0) + { + e.CreateProperty("type", 2); + e["type"] = 2; // setting it in create property doesn't work for some reason? lol + e.version = 1; + return e; + } + return null; + } + RiqBeatmap.OnUpdateEntity += flGradientUpdater; return new Minigame("forkLifter", "Fork Lifter", "f1f1f1", false, false, new List() { @@ -66,23 +79,34 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("colorGrad", "Gradient Appearance") { - function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.BackgroundColorGrad(e.beat, e.length, e["type"], e["toggle"], e["start"], e["end"], e["startBG"], e["endBG"], e["ease"]); }, + function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.BackgroundColorGrad(e.beat, e.length, + e["type"], e["toggleVC"], e["toggleLines"], + e["start"], e["end"], + e["startBG"], e["endBG"], + e["startLines"], e["endLines"], + e["ease"]); }, resizable = true, parameters = new List() { new Param("type", ForkLifter.GradientType.Game, "Gradient Type", "Set the type of gradient.", new List() { - new Param.CollapseParam((x, _) => (int)x != (int)ForkLifter.GradientType.Classic, new string[] { "startBG", "endBG" }) + new Param.CollapseParam((x, _) => (int)x != (int)ForkLifter.GradientType.Classic, new string[] { "startBG", "endBG", "toggleLines" }) }), - new Param("toggle", false, "Viewcircle Uses Gradient Color", "If toggled, the viewcircle's background will use the gradient color."), + new Param("toggleVC", false, "Viewcircle Uses Gradient Color", "If toggled, the viewcircle's background will use the gradient top color. Otherwise, it will use the background color."), + new Param("toggleLines", false, "Megamix Lines", "If toggled, the lines from Megamix will be enabled.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "startLines", "endLines" }), + }), - new Param("start", new Color(224/255f, 224/255f, 224/255f), "Gradient Start", "Set the color at the start of the event."), - new Param("end", new Color(224/255f, 224/255f, 224/255f), "Gradient End", "Set the color at the end of the event."), + new Param("start", new Color(224/255f, 224/255f, 224/255f), "Gradient Top Start", "Set the color at the start of the event."), + new Param("end", new Color(224/255f, 224/255f, 224/255f), "Gradient Top End", "Set the color at the end of the event."), + new Param("startBG", Color.white, "Gradient Bottom Start", "Set the color at the start of the event."), + new Param("endBG", Color.white, "Gradient Bottom End", "Set the color at the end of the event."), - new Param("startBG", Color.white, "Gradient BG Start", "Set the color at the start of the event."), - new Param("endBG", Color.white, "Gradient BG End", "Set the color at the end of the event."), + new Param("startLines", new Color(243/255f, 243/255f, 243/255f), "Lines Start", "Set the color at the start of the event."), + new Param("endLines", new Color(243/255f, 243/255f, 243/255f), "Lines End", "Set the color at the end of the event."), new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") }, @@ -132,15 +156,16 @@ namespace HeavenStudio.Games public SpriteRenderer peaPreview; [SerializeField] SpriteRenderer bg; - public Material gradientMaterial; + //public Material gradientMaterial; public SpriteRenderer[] Gradients; [SerializeField] SpriteRenderer gradientFiller; + [SerializeField] SpriteRenderer mmLines; [SerializeField] SpriteRenderer viewerCircle; [SerializeField] SpriteRenderer viewerCircleBg; [SerializeField] SpriteRenderer playerShadow; [SerializeField] SpriteRenderer handShadow; - //public SpriteRenderer[] forkEffects; + public SpriteRenderer[] forkEffects; public Sprite[] peaSprites; public Sprite[] peaHitSprites; @@ -148,9 +173,6 @@ namespace HeavenStudio.Games private void Awake() { instance = this; - //gradientMaterial.SetColor("_ColorAlpha", new Color(224/255f, 224/255f, 224/255f)); - //gradientMaterial.SetColor("_ColorBravo", Color.white); - //gradientMaterial.SetColor("_ColorDelta", Color.white); } private void Update() @@ -176,7 +198,7 @@ namespace HeavenStudio.Games var lastColorGrad = actionsBefore.FindLast(e => e.datamodel == "forkLifter/colorGrad"); if (lastColorGrad != null) { - BackgroundColorGrad(lastColorGrad.beat, lastColorGrad.length, lastColorGrad["type"], lastColorGrad["toggle"], lastColorGrad["start"], lastColorGrad["end"], lastColorGrad["startBG"], lastColorGrad["endBG"], lastColorGrad["ease"]); + BackgroundColorGrad(lastColorGrad.beat, lastColorGrad.length, lastColorGrad["type"], lastColorGrad["toggleVC"], lastColorGrad["toggleLines"], lastColorGrad["start"], lastColorGrad["end"], lastColorGrad["startBG"], lastColorGrad["endBG"], lastColorGrad["startLines"], lastColorGrad["endLines"], lastColorGrad["ease"]); } var tempFlicks = actions.FindAll(e => e.datamodel == "forkLifter/flick"); @@ -212,6 +234,7 @@ namespace HeavenStudio.Games private ColorEase bgColorEase = new(Color.white); private ColorEase gradColorEase = new(new Color(224/255f, 224/255f, 224/255f)); + private ColorEase linesColorEase = new(new Color (243/255f, 243/255f, 243/255f)); private ColorEase gradBgEase = new(Color.white); private bool vCircleToggle = false; @@ -221,24 +244,36 @@ namespace HeavenStudio.Games bg.color = viewerCircle.color = bgColorEase.GetColor(); + mmLines.color = linesColorEase.GetColor(); + + for (int i = 0; i < Gradients.Length; i++) + { + Gradients[i].color = gradColorEase.GetColor(); + } + + if (Gradients[2].gameObject.activeSelf) { - Gradients[2].color = - gradientFiller.color = + gradientFiller.color = playerShadow.color = gradColorEase.GetColor(); - gradientMaterial.SetColor("_ColorDelta", gradColorEase.GetColor()); + for (int i = 0; i < forkEffects.Length; i++) + { + forkEffects[i].color = gradColorEase.GetColor(); + } } else { - playerShadow.color = - gradientFiller.color = gradBgEase.GetColor(); + gradientFiller.color = + playerShadow.color = gradBgEase.GetColor(); - gradientMaterial.SetColor("_ColorAlpha", gradColorEase.GetColor()); - gradientMaterial.SetColor("_ColorBravo", bgColorEase.GetColor()); - gradientMaterial.SetColor("_ColorDelta", gradBgEase.GetColor()); + for (int i = 0; i < forkEffects.Length; i++) + { + forkEffects[i].color = gradBgEase.GetColor(); + } } + if (vCircleToggle) { viewerCircleBg.color = @@ -257,16 +292,22 @@ namespace HeavenStudio.Games bgColorEase = new ColorEase(beat, length, startColor, endColor, ease); } - public void BackgroundColorGrad(double beat, float length, int gradType, bool vCircle, Color startColor, Color endColor, Color startBottom, Color endBottom, int ease) + public void BackgroundColorGrad(double beat, float length, int gradType, bool vCircle, bool lines, Color startColor, Color endColor, Color startBottom, Color endBottom, Color startLines, Color endLines, int ease) { gradColorEase = new ColorEase(beat, length, startColor, endColor, ease); gradBgEase = new ColorEase(beat, length, startBottom, endBottom, ease); + linesColorEase = new ColorEase(beat, length, startLines, endLines, ease); for (int i = 0; i < Gradients.Length; i++) { Gradients[i].gameObject.SetActive(gradType == (i)); } + if (lines && gradType != 2) + { + mmLines.gameObject.SetActive(true); + } + vCircleToggle = (vCircle); } @@ -286,7 +327,7 @@ namespace HeavenStudio.Games { allEventsBeforeBeatGrad.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case var lastEventGrad = allEventsBeforeBeatGrad[^1]; - BackgroundColorGrad(lastEventGrad.beat, lastEventGrad.length, lastEventGrad["type"], lastEventGrad["toggle"], lastEventGrad["start"], lastEventGrad["end"], lastEventGrad["startBG"], lastEventGrad["endBG"], lastEventGrad["ease"]); + BackgroundColorGrad(lastEventGrad.beat, lastEventGrad.length, lastEventGrad["type"], lastEventGrad["toggleVC"], lastEventGrad["toggleLines"], lastEventGrad["start"], lastEventGrad["end"], lastEventGrad["startBG"], lastEventGrad["endBG"], lastEventGrad["startLines"], lastEventGrad["endLines"], lastEventGrad["ease"]); } } }