From 78e4ef48999caa010f184ad8d418d936a3e73d52 Mon Sep 17 00:00:00 2001 From: Benjamin Kraft Date: Tue, 2 May 2023 14:25:06 +0200 Subject: [PATCH] update unity version, start of room ui --- Assets/Materials/Background/Bricks_01_mat.mat | 5 +- Assets/Materials/Background/M_Wood2.mat | 5 +- Assets/Materials/Background/M_Wood3.mat | 5 +- Assets/Materials/DeathGate.mat | 5 +- Assets/Materials/NewBall.mat | 16 ++++ Assets/Materials/Player.mat | 16 ++++ Assets/Materials/Wormhole.mat | 16 ++++ Assets/Materials/Zone.mat | 16 ++++ Assets/RenderAssets/URP Asset.asset | 53 ++++++++++++- Assets/Scripts/Menu/RoomUI.cs | 23 ++++++ .../UnityThemes/UnityDefaultRuntimeTheme.tss | 3 +- Assets/UI/Main.uxml | 1 + Assets/UI/Room.uxml | 4 +- Assets/UI/Styles/Main/main.uss | 5 ++ Assets/UI/Styles/Main/room.uss | 7 ++ ...niversalRenderPipelineGlobalSettings.asset | 23 ++++-- Packages/manifest.json | 14 ++-- Packages/packages-lock.json | 79 ++++++++----------- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/URPProjectSettings.asset | 2 +- ProjectSettings/boot.config | 0 21 files changed, 229 insertions(+), 73 deletions(-) delete mode 100644 ProjectSettings/boot.config diff --git a/Assets/Materials/Background/Bricks_01_mat.mat b/Assets/Materials/Background/Bricks_01_mat.mat index e3860be..7e7b816 100644 --- a/Assets/Materials/Background/Bricks_01_mat.mat +++ b/Assets/Materials/Background/Bricks_01_mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Bricks_01_mat m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _GLOSSINESS_FROM_BASE_ALPHA - _NORMALMAP @@ -21,6 +23,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,4 +101,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Materials/Background/M_Wood2.mat b/Assets/Materials/Background/M_Wood2.mat index 004cd1d..091edd6 100644 --- a/Assets/Materials/Background/M_Wood2.mat +++ b/Assets/Materials/Background/M_Wood2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Wood2 m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/Background/M_Wood3.mat b/Assets/Materials/Background/M_Wood3.mat index 434d609..5a399bd 100644 --- a/Assets/Materials/Background/M_Wood3.mat +++ b/Assets/Materials/Background/M_Wood3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Wood3 m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/DeathGate.mat b/Assets/Materials/DeathGate.mat index e923adb..ca24897 100644 --- a/Assets/Materials/DeathGate.mat +++ b/Assets/Materials/DeathGate.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DeathGate m_Shader: {fileID: -6465566751694194690, guid: f7bf46226804881e5a4493c166745688, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/NewBall.mat b/Assets/Materials/NewBall.mat index af7f964..d9b971d 100644 --- a/Assets/Materials/NewBall.mat +++ b/Assets/Materials/NewBall.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: NewBall m_Shader: {fileID: -6465566751694194690, guid: 11508ba6b7a598ad3bbb1d90c2f66d3e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,3 +62,16 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!114 &6741116239379098462 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Materials/Player.mat b/Assets/Materials/Player.mat index ddc5807..55b6fde 100644 --- a/Assets/Materials/Player.mat +++ b/Assets/Materials/Player.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Player m_Shader: {fileID: -6465566751694194690, guid: 11508ba6b7a598ad3bbb1d90c2f66d3e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,3 +62,16 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!114 &6579332793168892861 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Materials/Wormhole.mat b/Assets/Materials/Wormhole.mat index 364de1d..f9c31a9 100644 --- a/Assets/Materials/Wormhole.mat +++ b/Assets/Materials/Wormhole.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5396914732546028011 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -9,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Wormhole m_Shader: {fileID: -6465566751694194690, guid: 5e68bbedda3b17858b070612ad890c40, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/Zone.mat b/Assets/Materials/Zone.mat index 504179b..0064fb6 100644 --- a/Assets/Materials/Zone.mat +++ b/Assets/Materials/Zone.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Zone m_Shader: {fileID: -6465566751694194690, guid: 40205d1d7f3ac994fb09829e5ddbad62, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -59,3 +62,16 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!114 &2434918872678741895 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/RenderAssets/URP Asset.asset b/Assets/RenderAssets/URP Asset.asset index ec51328..b06d216 100644 --- a/Assets/RenderAssets/URP Asset.asset +++ b/Assets/RenderAssets/URP Asset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP Asset m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,21 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_ProbeVolumeBlendingMemoryBudget: 128 + m_SupportProbeVolumeStreaming: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -54,13 +62,17 @@ MonoBehaviour: m_SoftShadowsSupported: 0 m_ConservativeEnclosingSphere: 1 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 0 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -70,6 +82,39 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + serializedBounds: [] + serializedHasVolumes: [] + bakingSets: [] + m_LightingScenario: + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/Scripts/Menu/RoomUI.cs b/Assets/Scripts/Menu/RoomUI.cs index e067c89..87dd9b0 100644 --- a/Assets/Scripts/Menu/RoomUI.cs +++ b/Assets/Scripts/Menu/RoomUI.cs @@ -1,4 +1,7 @@ using System; +using System.Collections.Generic; +using System.Linq; +using Global; using UnityEngine; using UnityEngine.Serialization; using UnityEngine.UIElements; @@ -7,7 +10,27 @@ namespace Menu { public class RoomUI { public VisualElement Root { get; set; } + private DropdownField difficultyField; + public void Show() { + difficultyField = Root.Q("Difficulty"); + + difficultyField.choices = Enum.GetNames(typeof(Difficulty)).ToList(); + difficultyField.index = 0; + + SliderInt slider = Root.Q("CustomWinScore"); + slider.value = 20; + slider.style.visibility = Visibility.Hidden; + + Toggle toggle = Root.Q("WinScore"); + toggle.value = false; + + void UpdateCustomWinScore() { + slider.style.visibility = toggle.value ? Visibility.Visible : Visibility.Hidden; + } + + toggle.RegisterCallback((ClickEvent _) => { UpdateCustomWinScore(); }); + UpdateCustomWinScore(); Root.style.display = DisplayStyle.Flex; } diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss index 1056e07..f23b68d 100644 --- a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss +++ b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss @@ -1 +1,2 @@ -@import url("unity-theme://default"); \ No newline at end of file +@import url("UnityDefaultRuntimeTheme.tss"); + diff --git a/Assets/UI/Main.uxml b/Assets/UI/Main.uxml index 4c32a48..538635b 100644 --- a/Assets/UI/Main.uxml +++ b/Assets/UI/Main.uxml @@ -1,6 +1,7 @@ +