diff --git a/Assets/Scenes/DemoSettings.lighting b/Assets/Scenes/DemoSettings.lighting new file mode 100644 index 0000000..4954698 --- /dev/null +++ b/Assets/Scenes/DemoSettings.lighting @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DemoSettings + serializedVersion: 6 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 2 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/Scenes/DemoSettings.lighting.meta b/Assets/Scenes/DemoSettings.lighting.meta new file mode 100644 index 0000000..3ba999c --- /dev/null +++ b/Assets/Scenes/DemoSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dc0abbeffb809e4295be3457a591f45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Stage_Single.unity b/Assets/Scenes/Stage_Single.unity index 54c0316..c8632da 100644 --- a/Assets/Scenes/Stage_Single.unity +++ b/Assets/Scenes/Stage_Single.unity @@ -11835,6 +11835,55 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2058148465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2058148467} + - component: {fileID: 2058148466} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2058148466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058148465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: a6560a915ef98420e9faacc1c7438823, type: 2} +--- !u!4 &2058148467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058148465} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.4308887, y: -2.4374752, z: 18.10704} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2063431241 PrefabInstance: m_ObjectHideFlags: 0 @@ -12569,3 +12618,4 @@ SceneRoots: - {fileID: 2039856058} - {fileID: 1251357597} - {fileID: 514824634} + - {fileID: 2058148467} diff --git a/Assets/Scripts/Stage/Controller/SpawnController.cs b/Assets/Scripts/Stage/Controller/SpawnController.cs index 9ffbb38..6c725c6 100644 --- a/Assets/Scripts/Stage/Controller/SpawnController.cs +++ b/Assets/Scripts/Stage/Controller/SpawnController.cs @@ -56,8 +56,6 @@ public class SpawnController : MonoBehaviour _curPropCount++; } } - - yield break; } public void OnSpawnedProp(GameObject obj) diff --git a/Assets/Settings/Quality.meta b/Assets/Settings/Quality.meta new file mode 100644 index 0000000..99311be --- /dev/null +++ b/Assets/Settings/Quality.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ebac8f0bdb938d4797f3bab0ab1852d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Balanced_PipelineAsset.asset b/Assets/Settings/Quality/Balanced_PipelineAsset.asset similarity index 95% rename from Assets/Settings/Balanced_PipelineAsset.asset rename to Assets/Settings/Quality/Balanced_PipelineAsset.asset index b6565d3..61be06c 100644 --- a/Assets/Settings/Balanced_PipelineAsset.asset +++ b/Assets/Settings/Quality/Balanced_PipelineAsset.asset @@ -80,8 +80,8 @@ MonoBehaviour: m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 m_Textures: - blueNoise64LTex: {fileID: 0} - bayerMatrixTex: {fileID: 0} + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 1 m_PrefilteringModeAdditionalLight: 4 m_PrefilteringModeAdditionalLightShadows: 1 diff --git a/Assets/Settings/Balanced_PipelineAsset.asset.meta b/Assets/Settings/Quality/Balanced_PipelineAsset.asset.meta similarity index 100% rename from Assets/Settings/Balanced_PipelineAsset.asset.meta rename to Assets/Settings/Quality/Balanced_PipelineAsset.asset.meta diff --git a/Assets/Settings/Balanced_PipelineAsset_ForwardRenderer.asset b/Assets/Settings/Quality/Balanced_PipelineAsset_ForwardRenderer.asset similarity index 100% rename from Assets/Settings/Balanced_PipelineAsset_ForwardRenderer.asset rename to Assets/Settings/Quality/Balanced_PipelineAsset_ForwardRenderer.asset diff --git a/Assets/Settings/Balanced_PipelineAsset_ForwardRenderer.asset.meta b/Assets/Settings/Quality/Balanced_PipelineAsset_ForwardRenderer.asset.meta similarity index 100% rename from Assets/Settings/Balanced_PipelineAsset_ForwardRenderer.asset.meta rename to Assets/Settings/Quality/Balanced_PipelineAsset_ForwardRenderer.asset.meta diff --git a/Assets/Settings/High Fidelity_PipelineAsset.asset b/Assets/Settings/Quality/High Fidelity_PipelineAsset.asset similarity index 100% rename from Assets/Settings/High Fidelity_PipelineAsset.asset rename to Assets/Settings/Quality/High Fidelity_PipelineAsset.asset diff --git a/Assets/Settings/High Fidelity_PipelineAsset.asset.meta b/Assets/Settings/Quality/High Fidelity_PipelineAsset.asset.meta similarity index 100% rename from Assets/Settings/High Fidelity_PipelineAsset.asset.meta rename to Assets/Settings/Quality/High Fidelity_PipelineAsset.asset.meta diff --git a/Assets/Settings/High Fidelity_PipelineAsset_ForwardRenderer.asset b/Assets/Settings/Quality/High Fidelity_PipelineAsset_ForwardRenderer.asset similarity index 100% rename from Assets/Settings/High Fidelity_PipelineAsset_ForwardRenderer.asset rename to Assets/Settings/Quality/High Fidelity_PipelineAsset_ForwardRenderer.asset diff --git a/Assets/Settings/High Fidelity_PipelineAsset_ForwardRenderer.asset.meta b/Assets/Settings/Quality/High Fidelity_PipelineAsset_ForwardRenderer.asset.meta similarity index 100% rename from Assets/Settings/High Fidelity_PipelineAsset_ForwardRenderer.asset.meta rename to Assets/Settings/Quality/High Fidelity_PipelineAsset_ForwardRenderer.asset.meta diff --git a/Assets/Settings/Performant_PipelineAsset.asset b/Assets/Settings/Quality/Performant_PipelineAsset.asset similarity index 100% rename from Assets/Settings/Performant_PipelineAsset.asset rename to Assets/Settings/Quality/Performant_PipelineAsset.asset diff --git a/Assets/Settings/Performant_PipelineAsset.asset.meta b/Assets/Settings/Quality/Performant_PipelineAsset.asset.meta similarity index 100% rename from Assets/Settings/Performant_PipelineAsset.asset.meta rename to Assets/Settings/Quality/Performant_PipelineAsset.asset.meta diff --git a/Assets/Settings/Performant_PipelineAsset_ForwardRenderer.asset b/Assets/Settings/Quality/Performant_PipelineAsset_ForwardRenderer.asset similarity index 100% rename from Assets/Settings/Performant_PipelineAsset_ForwardRenderer.asset rename to Assets/Settings/Quality/Performant_PipelineAsset_ForwardRenderer.asset diff --git a/Assets/Settings/Performant_PipelineAsset_ForwardRenderer.asset.meta b/Assets/Settings/Quality/Performant_PipelineAsset_ForwardRenderer.asset.meta similarity index 100% rename from Assets/Settings/Performant_PipelineAsset_ForwardRenderer.asset.meta rename to Assets/Settings/Quality/Performant_PipelineAsset_ForwardRenderer.asset.meta diff --git a/Assets/Settings/URP.meta b/Assets/Settings/URP.meta new file mode 100644 index 0000000..257ef19 --- /dev/null +++ b/Assets/Settings/URP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d150694d0c3a4f740a386dd74486241b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/URP-Balanced-Renderer.asset b/Assets/Settings/URP/URP-Balanced-Renderer.asset similarity index 100% rename from Assets/Settings/URP-Balanced-Renderer.asset rename to Assets/Settings/URP/URP-Balanced-Renderer.asset diff --git a/Assets/Settings/URP-Balanced-Renderer.asset.meta b/Assets/Settings/URP/URP-Balanced-Renderer.asset.meta similarity index 100% rename from Assets/Settings/URP-Balanced-Renderer.asset.meta rename to Assets/Settings/URP/URP-Balanced-Renderer.asset.meta diff --git a/Assets/Settings/URP-Balanced.asset b/Assets/Settings/URP/URP-Balanced.asset similarity index 100% rename from Assets/Settings/URP-Balanced.asset rename to Assets/Settings/URP/URP-Balanced.asset diff --git a/Assets/Settings/URP-Balanced.asset.meta b/Assets/Settings/URP/URP-Balanced.asset.meta similarity index 100% rename from Assets/Settings/URP-Balanced.asset.meta rename to Assets/Settings/URP/URP-Balanced.asset.meta diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP/URP-HighFidelity-Renderer.asset similarity index 100% rename from Assets/Settings/URP-HighFidelity-Renderer.asset rename to Assets/Settings/URP/URP-HighFidelity-Renderer.asset diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset.meta b/Assets/Settings/URP/URP-HighFidelity-Renderer.asset.meta similarity index 100% rename from Assets/Settings/URP-HighFidelity-Renderer.asset.meta rename to Assets/Settings/URP/URP-HighFidelity-Renderer.asset.meta diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP/URP-HighFidelity.asset similarity index 100% rename from Assets/Settings/URP-HighFidelity.asset rename to Assets/Settings/URP/URP-HighFidelity.asset diff --git a/Assets/Settings/URP-HighFidelity.asset.meta b/Assets/Settings/URP/URP-HighFidelity.asset.meta similarity index 100% rename from Assets/Settings/URP-HighFidelity.asset.meta rename to Assets/Settings/URP/URP-HighFidelity.asset.meta diff --git a/Assets/Settings/URP-Performant-Renderer.asset b/Assets/Settings/URP/URP-Performant-Renderer.asset similarity index 100% rename from Assets/Settings/URP-Performant-Renderer.asset rename to Assets/Settings/URP/URP-Performant-Renderer.asset diff --git a/Assets/Settings/URP-Performant-Renderer.asset.meta b/Assets/Settings/URP/URP-Performant-Renderer.asset.meta similarity index 100% rename from Assets/Settings/URP-Performant-Renderer.asset.meta rename to Assets/Settings/URP/URP-Performant-Renderer.asset.meta diff --git a/Assets/Settings/URP-Performant.asset b/Assets/Settings/URP/URP-Performant.asset similarity index 100% rename from Assets/Settings/URP-Performant.asset rename to Assets/Settings/URP/URP-Performant.asset diff --git a/Assets/Settings/URP-Performant.asset.meta b/Assets/Settings/URP/URP-Performant.asset.meta similarity index 100% rename from Assets/Settings/URP-Performant.asset.meta rename to Assets/Settings/URP/URP-Performant.asset.meta diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset similarity index 100% rename from Assets/UniversalRenderPipelineGlobalSettings.asset rename to Assets/Settings/UniversalRenderPipelineGlobalSettings.asset diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta similarity index 100% rename from Assets/UniversalRenderPipelineGlobalSettings.asset.meta rename to Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta diff --git a/Assets/Settings/Volume.meta b/Assets/Settings/Volume.meta new file mode 100644 index 0000000..40ac094 --- /dev/null +++ b/Assets/Settings/Volume.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0de47e1c59afe4e4b965d4364946ef7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/Volume/StageSceneProfile.asset similarity index 80% rename from Assets/Settings/SampleSceneProfile.asset rename to Assets/Settings/Volume/StageSceneProfile.asset index 37e401d..ad14fa7 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/Volume/StageSceneProfile.asset @@ -13,45 +13,40 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 - threshold: - m_OverrideState: 1 - m_Value: 1 - min: 0 - intensity: - m_OverrideState: 1 - m_Value: 1 - min: 0 - scatter: - m_OverrideState: 0 - m_Value: 0.7 - min: 0 - max: 1 - clamp: - m_OverrideState: 0 - m_Value: 65472 - min: 0 - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - highQualityFiltering: - m_OverrideState: 0 - m_Value: 0 skipIterations: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 16 + threshold: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 1 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} + dimension: 1 dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 --- !u!114 &-7011558710299706105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -65,26 +60,18 @@ MonoBehaviour: m_Name: Vignette m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 color: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 center: m_OverrideState: 0 m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 m_Value: 0.25 - min: 0 - max: 1 smoothness: m_OverrideState: 1 m_Value: 0.4 - min: 0.01 - max: 1 rounded: m_OverrideState: 0 m_Value: 0 @@ -98,7 +85,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: SampleSceneProfile + m_Name: StageSceneProfile m_EditorClassIdentifier: components: - {fileID: 849379129802519247} @@ -117,7 +104,30 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 1 + 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/Settings/SampleSceneProfile.asset.meta b/Assets/Settings/Volume/StageSceneProfile.asset.meta similarity index 100% rename from Assets/Settings/SampleSceneProfile.asset.meta rename to Assets/Settings/Volume/StageSceneProfile.asset.meta