diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index c5aa8fff..a801f285 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -96,6 +96,12 @@ MonoBehaviour: type: 3} dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, + type: 3} + terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, + type: 3} + terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Orange_PresetScene Lite.unity b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Orange_PresetScene Lite.unity index 5f8a27e2..a676d7d6 100644 --- a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Orange_PresetScene Lite.unity +++ b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Orange_PresetScene Lite.unity @@ -15,17 +15,17 @@ RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 m_Fog: 1 - m_FogColor: {r: 0.9490197, g: 0.5568628, b: 0.3019608, a: 1} + m_FogColor: {r: 0.4296079, g: 0.41568628, b: 0.69411767, a: 1} m_FogMode: 1 - m_FogDensity: 0.01 - m_LinearFogStart: 50 - m_LinearFogEnd: 200 + m_FogDensity: 0.001 + m_LinearFogStart: 0 + m_LinearFogEnd: 500 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.13296545, g: 0.19145328, b: 0.33962262, a: 1} + m_SubtractiveShadowColor: {r: 0.1982467, g: 0.26110268, b: 0.4245283, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: bc956c2a94277984ab315b9e44015434, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -124,6 +124,74 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &183687753 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.94 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalPosition.z + value: 36.01 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6673720464180023243, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9067588201988801210, guid: f41b93daad58cc044a5dfc2142cf7175, + type: 3} + propertyPath: m_Name + value: Stay + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f41b93daad58cc044a5dfc2142cf7175, type: 3} --- !u!1 &653260035 GameObject: m_ObjectHideFlags: 0 @@ -326,7 +394,7 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 0.8470589, g: 0.6627451, b: 0.5058824, a: 1} + m_Color: {r: 0.40988785, g: 0.5285563, b: 0.5754717, a: 1} m_Intensity: 2 m_Range: 10 m_SpotAngle: 30 @@ -427,6 +495,74 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca35da6633965f44388c40d56c83fade, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1388506127 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1191264406790193108, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_Name + value: tap + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.47 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalPosition.z + value: 36.01 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4822391907248874059, guid: db4d7224334bccc438e78f5536f92c23, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: db4d7224334bccc438e78f5536f92c23, type: 3} --- !u!1 &1687258581 GameObject: m_ObjectHideFlags: 0 @@ -671,3 +807,5 @@ SceneRoots: - {fileID: 5066472731529927416} - {fileID: 730980571} - {fileID: 706248210} + - {fileID: 183687753} + - {fileID: 1388506127} diff --git a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Scene Assets/RetrowaveSkiesLiteSceneProfile.asset b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Scene Assets/RetrowaveSkiesLiteSceneProfile.asset index c6c80ca2..3849e0f1 100644 --- a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Scene Assets/RetrowaveSkiesLiteSceneProfile.asset +++ b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Demo Scenes/Scene Assets/RetrowaveSkiesLiteSceneProfile.asset @@ -13,15 +13,18 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 + skipIterations: + m_OverrideState: 0 + m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 0.85 + m_Value: 1 intensity: m_OverrideState: 1 - m_Value: 5 + m_Value: 1 scatter: m_OverrideState: 1 - m_Value: 0.4 + m_Value: 0.5 clamp: m_OverrideState: 0 m_Value: 65472 @@ -31,9 +34,12 @@ MonoBehaviour: highQualityFiltering: m_OverrideState: 0 m_Value: 0 - skipIterations: + downscale: m_OverrideState: 0 - m_Value: 1 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -148,3 +154,27 @@ MonoBehaviour: mode: m_OverrideState: 1 m_Value: 2 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000 diff --git a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Materials/M_Grid Orange Lite.mat b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Materials/M_Grid Orange Lite.mat index 58172484..8fca4f57 100644 --- a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Materials/M_Grid Orange Lite.mat +++ b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Materials/M_Grid Orange Lite.mat @@ -65,16 +65,16 @@ Material: - _Cull: 2 - _DstBlend: 0 - _ENABLE_PARALLAX_EFFECT: 0 - - _GridRotation: 0 + - _GridRotation: 180 - _Grid_Line_X_Width: 0.9 - _Grid_Line_Y_Width: 0.9 - - _Metallic: 0.85 + - _Metallic: 1 - _Parallax_Distance: -0.3 - _Parallax_Offset: -0.3 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.74 + - _Smoothness: 0.314 - _SrcBlend: 1 - _Surface: 0 - _USETEXTUREBOOL: 1 @@ -83,9 +83,9 @@ Material: - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - - _GridColor: {r: 0.08638893, g: 0.088079184, b: 0.3018868, a: 1} - - _GridSpeed: {r: 0, g: -0.1, b: 0, a: 0} - - _GroundColor: {r: 0, g: 0, b: 0, a: 0} + - _GridColor: {r: 1.2862746, g: 1.7992157, b: 2.9960785, a: 1} + - _GridSpeed: {r: 0, g: 0, b: 0, a: 0} + - _GroundColor: {r: 0.18910624, g: 0.101103604, b: 0.3018868, a: 1} - _Parallax_Color: {r: 1.011765, g: 0, b: 1.011765, a: 1} - _Tiling: {r: 0.1, g: 0.1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Skybox Materials/Orange_Skybox.mat b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Skybox Materials/Orange_Skybox.mat index 6ea3f972..3331ace6 100644 --- a/Assets/Suggo Creations/RETROWAVE SKIES Lite/Skybox Materials/Orange_Skybox.mat +++ b/Assets/Suggo Creations/RETROWAVE SKIES Lite/Skybox Materials/Orange_Skybox.mat @@ -69,8 +69,8 @@ Material: - BOOLEAN_FF1E9D2611CF4E959316C577475EA27F: 1 - BOOLEAN_GLITCHYMOON: 1 - BOOLEAN_PREVENTSTARS: 1 - - Vector1_7d421ef4d57f45e586330be25bfb5941: 4.65 - - Vector1_a770b768a8ca40a9b814a01444e6b850: 2.6 + - Vector1_7d421ef4d57f45e586330be25bfb5941: 3.7 + - Vector1_a770b768a8ca40a9b814a01444e6b850: 1.23 - _AddPrecomputedVelocity: 0 - _AlphaCutoffEnable: 0 - _AlphaDstBlend: 0 @@ -89,11 +89,11 @@ Material: - _DstBlend: 0 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 1 - - _FogContrast: 30 + - _FogContrast: 40 - _FogHeight: 1 - - _FogPower: 1 - - _HorizonHeight: 0.43 - - _HorizonStrength: 1 + - _FogPower: 0.5 + - _HorizonHeight: 0.7 + - _HorizonStrength: 2 - _LinesMaskPower: 50 - _LinesSpeed: 1 - _LinesThickness: 0.092 @@ -103,8 +103,8 @@ Material: - _QueueOffset: 0 - _RenderQueueType: 1 - _SrcBlend: 1 - - _StarDensity: 15.3 - - _StarSize: 100 + - _StarDensity: 30 + - _StarSize: 75 - _StencilRef: 0 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 @@ -136,12 +136,12 @@ Material: - _Cubemap_Color: {r: 1, g: 1, b: 1, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _HorizonColor: {r: 0.9150943, g: 0.45614085, b: 0.31510323, a: 1} + - _HorizonColor: {r: 0.3563294, g: 0.44122353, b: 0.5647059, a: 1} - _LinesColor: {r: 0.92156863, g: 0.5540544, b: 0, a: 1} - - _SkyColor: {r: 0.054901965, g: 0.21568629, b: 0.3019608, a: 1} - - _StarColor: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0} - - _SunColorOne: {r: 0.9960785, g: 0.9686275, b: 0.7411765, a: 1} - - _SunColorTwo: {r: 1, g: 0.752211, b: 0.5424528, a: 1} + - _SkyColor: {r: 0.23777969, g: 0.21137416, b: 0.3584906, a: 1} + - _StarColor: {r: 0.6685412, g: 0.747655, b: 0.90588236, a: 1} + - _SunColorOne: {r: 0.053333327, g: 0.03878788, b: 0.08, a: 1} + - _SunColorTwo: {r: 0.02411321, g: 0.0415283, b: 0.071, a: 1} m_BuildTextureStacks: [] --- !u!114 &5814259867141563746 MonoBehaviour: diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/Decorations/Constellation.prefab.meta b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/Decorations/Constellation.prefab.meta index 998520e3..8eab2c0d 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/Decorations/Constellation.prefab.meta +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/Decorations/Constellation.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 92e2ddcb3cdd78544bef993272068d31 +guid: 8dff9fe42e1db334298a58beb53a854f PrefabImporter: externalObjects: {} userData: diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Shders/Outline ShaderGraph.shadergraph.meta b/Assets/ThemeBundles/DepartureToMultiverse/Shders/Outline ShaderGraph.shadergraph.meta index c891b2f9..4e6363f9 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Shders/Outline ShaderGraph.shadergraph.meta +++ b/Assets/ThemeBundles/DepartureToMultiverse/Shders/Outline ShaderGraph.shadergraph.meta @@ -7,4 +7,4 @@ ScriptedImporter: userData: assetBundleName: assetBundleVariant: - script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} + script: {instanceID: 0} diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index d773b0d7..3f875c51 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -24,7 +24,7 @@ MonoBehaviour: ParentPath: Virtual Acoustics\Default Work Unit guid: c285fe92ad903c468f8d4924eff8ec62 GuidInternal: - m_lastTime: -8584533763753161310 + m_lastTime: -8584415771834515569 List: [] AuxBusWwu: - PhysicalPath: Master-Mixer Hierarchy\Default Work Unit.wwu @@ -38,7 +38,7 @@ MonoBehaviour: ParentPath: Master-Mixer Hierarchy\Default Work Unit guid: 7d764240dea1e04ea7c007b75696e8ea GuidInternal: - m_lastTime: -8584473659973894495 + m_lastTime: -8584415771928857129 List: - name: Master guid: d8a41415a61d2a41a17e75ca0c2149f3 @@ -117,7 +117,7 @@ MonoBehaviour: ParentPath: SoundBanks\Default Work Unit guid: 0ab614e54e886f4dba734cd8ca5fdf07 GuidInternal: - m_lastTime: -8584532775574822350 + m_lastTime: -8584415771834541267 List: - name: ichni guid: 04d43100ee39b04e990257b5ef3e665a @@ -145,7 +145,7 @@ MonoBehaviour: ParentPath: Events\Default Work Unit guid: 7e99401298b0624fa7b30889b4682f0a GuidInternal: - m_lastTime: -8584456562175094362 + m_lastTime: -8584415771951057207 List: - name: Confirm guid: ee72ba24d8887e4e886b8f7840b2375f @@ -771,7 +771,7 @@ MonoBehaviour: ParentPath: Game Parameters\Default Work Unit guid: 6c539bbda7758047b584dae16a873cfe GuidInternal: - m_lastTime: -8584473666413108652 + m_lastTime: -8584415771951057207 List: - name: Game guid: a07fe7e6fff1394ea5520ad6753d34fd @@ -997,7 +997,7 @@ MonoBehaviour: ParentPath: States\Default Work Unit guid: 2347c39989939f41b67dff4972a12be8 GuidInternal: - m_lastTime: -8584533763752547767 + m_lastTime: -8584415771834527190 List: [] SwitchWwu: - PhysicalPath: Switches\Default Work Unit.wwu @@ -1011,7 +1011,7 @@ MonoBehaviour: ParentPath: Switches\Default Work Unit guid: bc9fac962989a54eb3be65b774f3f420 GuidInternal: - m_lastTime: -8584407006569871064 + m_lastTime: -8584376953415280157 List: - name: Chapter guid: a21f2adab3f1514d9e2a34e9fa7f4e39 @@ -1735,7 +1735,7 @@ MonoBehaviour: ParentPath: Triggers\Default Work Unit guid: 2475839e58588647914448a7d91e65c0 GuidInternal: - m_lastTime: -8584533763754003980 + m_lastTime: -8584415771834515569 List: [] ExpandedFileSystemItemIds: 0100000002000000030000000400000005000000060000000700000008000000090000000b0000000c0000000d0000000e0000000f00000010000000120000001300000014000000150000001600000017000000190000001a0000001b0000001c0000001d0000001f00000020000000210000002200000023000000260000002b0000003500000036000000380000003d0000004a000000 ExpandedWaapiItemIds: 0100000002000000030000000400000005000000060000000700000008000000090000000b0000000c0000000d0000000e0000000f00000010000000120000001300000014000000150000001600000017000000190000001a0000001b0000001c0000001d0000001e0000001f00000021000000220000002b0000003500000036000000380000003d0000004a000000c5000000c6000000c7000000c8000000e5000000e6000000e80000004e06000051060000e9c30000 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 32a9beca..750c3043 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -30,11 +30,11 @@ "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.7.3", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.burst": "1.7.3" }, "url": "https://packages.unity.com" },