diff --git a/Assets/Scenes/BossRoom/DungeonEntrance.unity b/Assets/Scenes/BossRoom/DungeonEntrance.unity index 4bd41a1..bc73239 100644 --- a/Assets/Scenes/BossRoom/DungeonEntrance.unity +++ b/Assets/Scenes/BossRoom/DungeonEntrance.unity @@ -135,6 +135,8 @@ GameObject: - component: {fileID: 240007732} - component: {fileID: 240007731} - component: {fileID: 240007730} + - component: {fileID: 240007734} + - component: {fileID: 240007733} m_Layer: 12 m_Name: P (6) m_TagString: Untagged @@ -228,6 +230,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 240007728} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &240007733 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240007728} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &240007734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240007728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &286165426 GameObject: m_ObjectHideFlags: 0 @@ -237,6 +272,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 286165427} + - component: {fileID: 286165428} m_Layer: 0 m_Name: Platforms m_TagString: Untagged @@ -266,6 +302,18 @@ Transform: - {fileID: 997499840} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &286165428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286165426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9e826abe81bf7a4b88597fe93add614, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &676920371 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +326,8 @@ GameObject: - component: {fileID: 676920375} - component: {fileID: 676920374} - component: {fileID: 676920373} + - component: {fileID: 676920377} + - component: {fileID: 676920376} m_Layer: 12 m_Name: P (2) m_TagString: Untagged @@ -371,6 +421,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676920371} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &676920376 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676920371} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &676920377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676920371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &849256358 GameObject: m_ObjectHideFlags: 0 @@ -383,6 +466,8 @@ GameObject: - component: {fileID: 849256362} - component: {fileID: 849256361} - component: {fileID: 849256360} + - component: {fileID: 849256364} + - component: {fileID: 849256363} m_Layer: 12 m_Name: P (4) m_TagString: Untagged @@ -476,6 +561,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 849256358} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &849256363 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 849256358} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &849256364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 849256358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &949745746 GameObject: m_ObjectHideFlags: 0 @@ -606,6 +724,8 @@ GameObject: - component: {fileID: 997499843} - component: {fileID: 997499842} - component: {fileID: 997499841} + - component: {fileID: 997499845} + - component: {fileID: 997499844} m_Layer: 12 m_Name: P (7) m_TagString: Untagged @@ -699,6 +819,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 997499839} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &997499844 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997499839} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &997499845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997499839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1146060681 GameObject: m_ObjectHideFlags: 0 @@ -711,6 +864,8 @@ GameObject: - component: {fileID: 1146060685} - component: {fileID: 1146060684} - component: {fileID: 1146060683} + - component: {fileID: 1146060687} + - component: {fileID: 1146060686} m_Layer: 12 m_Name: P (1) m_TagString: Untagged @@ -804,6 +959,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146060681} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &1146060686 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146060681} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &1146060687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146060681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1415641637 GameObject: m_ObjectHideFlags: 0 @@ -922,6 +1110,8 @@ GameObject: - component: {fileID: 1463337826} - component: {fileID: 1463337825} - component: {fileID: 1463337824} + - component: {fileID: 1463337828} + - component: {fileID: 1463337827} m_Layer: 12 m_Name: P (3) m_TagString: Untagged @@ -1015,6 +1205,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1463337822} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &1463337827 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463337822} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &1463337828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463337822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1620155724 GameObject: m_ObjectHideFlags: 0 @@ -1027,6 +1250,8 @@ GameObject: - component: {fileID: 1620155728} - component: {fileID: 1620155727} - component: {fileID: 1620155726} + - component: {fileID: 1620155730} + - component: {fileID: 1620155729} m_Layer: 12 m_Name: P (5) m_TagString: Untagged @@ -1120,6 +1345,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620155724} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &1620155729 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620155724} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.08, z: 1} + m_Center: {x: 0, y: 0.54, z: 0} +--- !u!114 &1620155730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620155724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbadb65558c0b1a48b58b765317ed874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2085312385 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low_Renderer.asset b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low_Renderer.asset index fb353db..a02f8ce 100644 --- a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low_Renderer.asset +++ b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low_Renderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -26,18 +27,21 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - m_AssetVersion: 1 + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 - m_Bits: 20479 + m_Bits: 24575 m_TransparentLayerMask: serializedVersion: 2 - m_Bits: 4095 + m_Bits: 8191 m_DefaultStencilState: overrideStencilState: 0 stencilReference: 0 @@ -48,7 +52,6 @@ MonoBehaviour: m_ShadowTransparentReceive: 0 m_RenderingMode: 0 m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 3561af1..a02467c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,9 +13,6 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -41,7 +38,7 @@ GraphicsSettings: - {fileID: 20000000, guid: 89fadfec677a94a42b43ea4b0cd6a083, type: 2} m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 1845ac556a2570a4c806f2a1371e8a69, type: 2} + m_CustomRenderPipeline: {fileID: 11400000, guid: 88868b38916fb8540852bd4aaef47910, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -101,6 +98,7 @@ GraphicsSettings: m_LightmapStripping: 1 m_FogStripping: 1 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 0 m_LightmapKeepDynamicPlain: 0 @@ -117,3 +115,6 @@ GraphicsSettings: m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: e708feb5fa7cc4fcbac48839ecb72daf, type: 2} + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0