diff --git a/ProjectNLD/Assets/Settings/AudioManager.asset b/ProjectNLD/Assets/Settings/AudioManager.asset index b19c8733d39..27287fec5f4 100644 --- a/ProjectNLD/Assets/Settings/AudioManager.asset +++ b/ProjectNLD/Assets/Settings/AudioManager.asset @@ -1,3 +1,19 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeedeb3243f07b61dbbe854aa08b5ef6f0b5274dd9852ad9f6129dde3e105a31 -size 413 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 0 diff --git a/ProjectNLD/Assets/Settings/CriData/Settings/CriAtomEditorSettings.asset b/ProjectNLD/Assets/Settings/CriData/Settings/CriAtomEditorSettings.asset index dc15f8c2eb5..1e6832844f2 100644 --- a/ProjectNLD/Assets/Settings/CriData/Settings/CriAtomEditorSettings.asset +++ b/ProjectNLD/Assets/Settings/CriData/Settings/CriAtomEditorSettings.asset @@ -1,3 +1,89 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b09b761589c579348981eb14de61319143d2c1f92d5063b22222eeff327fe08 -size 2376 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bdb0b816a0bf0284282bd91a06a57a05, type: 3} + m_Name: CriAtomEditorSettings + m_EditorClassIdentifier: + trySceneSettings: 0 + atomConfig: + acfFileName: + maxVirtualVoices: 32 + maxVoiceLimitGroups: 32 + maxCategories: 32 + maxAisacs: 8 + maxBusSends: 8 + maxSequenceEventsPerFrame: 2 + maxBeatSyncCallbacksPerFrame: 1 + maxCueLinkCallbacksPerFrame: 1 + standardVoicePoolConfig: + memoryVoices: 16 + streamingVoices: 8 + hcaMxVoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + outputSamplingRate: 0 + usesInGamePreview: 0 + inGamePreviewMode: 3 + switchInitializeSocket: 0 + inGamePreviewConfig: + maxPreviewObjects: 200 + communicationBufferSize: 2048 + playbackPositionUpdateInterval: 8 + serverFrequency: 60 + asrOutputChannels: 0 + useRandomSeedWithTime: 1 + categoriesPerPlayback: 4 + maxFaders: 4 + maxBuses: 8 + maxParameterBlocks: 1024 + vrMode: 1 + keepPlayingSoundOnPause: 1 + editorPcmOutputConfig: + enable: 0 + bufferLength: 4096 + pcBufferingTime: 0 + linuxOutput: 0 + linuxPulseLatencyUsec: 60000 + iosEnableSonicSync: 1 + iosBufferingTime: 50 + iosOverrideIPodMusic: 0 + androidEnableSonicSync: 1 + androidBufferingTime: 133 + androidStartBufferingTime: 100 + androidLowLatencyStandardVoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + androidUsesAndroidFastMixer: 1 + androidForceToUseAsrForDefaultPlayback: 1 + androidUsesAAudio: 0 + androidStreamType: 0 + vitaManaVoicePoolConfig: + numberOfManaDecoders: 8 + vitaAtrac9VoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + ps4Atrac9VoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + ps5PortConfig: + maxChannelPorts: 1 + maxObjectPorts: 0 + switchEnableSonicSync: 1 + switchOpusVoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + ps4Audio3dConfig: + useAudio3D: 1 + voicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + webglWebAudioVoicePoolConfig: + voices: 16 diff --git a/ProjectNLD/Assets/Settings/CriData/Settings/CriStreamingAssetsSetting.asset b/ProjectNLD/Assets/Settings/CriData/Settings/CriStreamingAssetsSetting.asset index 2a7aa0bedf3..01ffd8ba705 100644 --- a/ProjectNLD/Assets/Settings/CriData/Settings/CriStreamingAssetsSetting.asset +++ b/ProjectNLD/Assets/Settings/CriData/Settings/CriStreamingAssetsSetting.asset @@ -1,3 +1,15 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de1077b31c8588e42545c7ddad9caedbb85118d525e9c7d60bc97f64986713ea -size 451 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 2bac50d323a92024fad4d378f021a664, type: 3} + m_Name: CriStreamingAssetsSetting + m_EditorClassIdentifier: + deployFolderPath: CriStreamingData diff --git a/ProjectNLD/Assets/Settings/SampleSceneProfile.asset b/ProjectNLD/Assets/Settings/SampleSceneProfile.asset index 1a254c79ee7..37e401d5e23 100644 --- a/ProjectNLD/Assets/Settings/SampleSceneProfile.asset +++ b/ProjectNLD/Assets/Settings/SampleSceneProfile.asset @@ -1,3 +1,123 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9932bcba1b1b55c8939c72aca2b5cca21efc41847bd16208fe3e171c9cba89f -size 2803 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7893295128165547882 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + 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 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 + min: 0 +--- !u!114 &-7011558710299706105 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + 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 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: SampleSceneProfile + m_EditorClassIdentifier: + components: + - {fileID: 849379129802519247} + - {fileID: -7893295128165547882} + - {fileID: -7011558710299706105} +--- !u!114 &849379129802519247 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 1 diff --git a/ProjectNLD/Assets/Settings/URP-Balanced-Renderer.asset b/ProjectNLD/Assets/Settings/URP-Balanced-Renderer.asset index 9200d00a4ac..c38a90478f6 100644 --- a/ProjectNLD/Assets/Settings/URP-Balanced-Renderer.asset +++ b/ProjectNLD/Assets/Settings/URP-Balanced-Renderer.asset @@ -40,8 +40,6 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, - type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 @@ -90,3 +88,9 @@ MonoBehaviour: m_Active: 1 settings: renderPassEvent: 550 + QueueMin: 2000 + QueueMax: 2500 + m_UseShader: {fileID: 4800000, guid: 71bde3c64bec9944bb3ad01d1cd79379, type: 3} + layer: + serializedVersion: 2 + m_Bits: 0 diff --git a/ProjectNLD/Assets/Settings/URP-Balanced.asset b/ProjectNLD/Assets/Settings/URP-Balanced.asset index caf352af033..0d1dcb7fa70 100644 --- a/ProjectNLD/Assets/Settings/URP-Balanced.asset +++ b/ProjectNLD/Assets/Settings/URP-Balanced.asset @@ -1,3 +1,110 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ad9d7543a75d3a5f3bf4e66fbbfab530e18af9876db247de6a800e5ba123855 -size 3496 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: URP-Balanced + m_EditorClassIdentifier: + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: e634585d5c4544dd297acaee93dc2beb, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 0 + m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 + m_MSAA: 2 + m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 1024 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 2 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 1 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.1 + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 + m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 + m_AdditionalLightsCookieResolution: 512 + m_AdditionalLightsCookieFormat: 1 + 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: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 + m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 0 diff --git a/ProjectNLD/Assets/Settings/URP-HighFidelity-Renderer.asset b/ProjectNLD/Assets/Settings/URP-HighFidelity-Renderer.asset index 08654d411a4..19aa0de3018 100644 --- a/ProjectNLD/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/ProjectNLD/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -1,3 +1,98 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ac699d3752a85f8ef90b9973a66fa57fc3385d2306cc8a9d1a738fe0720fb26 -size 3650 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: URP-HighFidelity-Renderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_RendererFeatures: + - {fileID: 724921165793098398} + - {fileID: 266627032616851625} + m_RendererFeatureMap: 9e7a42a1f56f0f0aa9d8a49edf3fb303 + m_UseNativeRenderPass: 0 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 0} + 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} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} + m_AssetVersion: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 1 +--- !u!114 &266627032616851625 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 2bfd5caad43b4b7aa9cf63259567ffce, type: 3} + m_Name: DrawTireMarkRPF + m_EditorClassIdentifier: + m_Active: 1 +--- !u!114 &724921165793098398 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: ef11c69a875c51546b2263adb758074d, type: 3} + m_Name: PostOutlineRPF + m_EditorClassIdentifier: + m_Active: 1 + settings: + renderPassEvent: 550 + QueueMin: 2000 + QueueMax: 2500 + m_UseShader: {fileID: 4800000, guid: 71bde3c64bec9944bb3ad01d1cd79379, type: 3} + layer: + serializedVersion: 2 + m_Bits: 0 diff --git a/ProjectNLD/Assets/Settings/URP-HighFidelity.asset b/ProjectNLD/Assets/Settings/URP-HighFidelity.asset index 39bfce66c31..dbca59ec1ce 100644 --- a/ProjectNLD/Assets/Settings/URP-HighFidelity.asset +++ b/ProjectNLD/Assets/Settings/URP-HighFidelity.asset @@ -1,3 +1,110 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9487d11dea334cf1ba3540920585b630ee9fc323e4b063d8a8bdb6eb49dfc50 -size 3503 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: URP-HighFidelity + m_EditorClassIdentifier: + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 + m_MSAA: 2 + m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 0 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 4096 + m_AdditionalLightsRenderingMode: 0 + m_AdditionalLightsPerObjectLimit: 8 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 4096 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 + m_ShadowDistance: 200 + m_ShadowCascadeCount: 4 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.1 + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 + m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 3 + m_AdditionalLightsCookieResolution: 4096 + m_AdditionalLightsCookieFormat: 4 + 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: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 + m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 1 diff --git a/ProjectNLD/Assets/Settings/URP-Performant-Renderer.asset b/ProjectNLD/Assets/Settings/URP-Performant-Renderer.asset index 4bb207b88f8..0f6c4d5ab3a 100644 --- a/ProjectNLD/Assets/Settings/URP-Performant-Renderer.asset +++ b/ProjectNLD/Assets/Settings/URP-Performant-Renderer.asset @@ -1,3 +1,96 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60b58c53968dc3eedd7767991b30afa37f98be12d3c5b30b4a7c19d9bc08296a -size 3558 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6019593396896601206 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: ef11c69a875c51546b2263adb758074d, type: 3} + m_Name: PostOutlineRPF + m_EditorClassIdentifier: + m_Active: 1 + settings: + renderPassEvent: 550 + QueueMin: 2000 + QueueMax: 2500 + m_UseShader: {fileID: 4800000, guid: 71bde3c64bec9944bb3ad01d1cd79379, type: 3} + layer: + serializedVersion: 2 + m_Bits: 0 +--- !u!114 &-4999973429723771379 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 2bfd5caad43b4b7aa9cf63259567ffce, type: 3} + m_Name: DrawTireMarkRPF + m_EditorClassIdentifier: + m_Active: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: URP-Performant-Renderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_RendererFeatures: + - {fileID: -6019593396896601206} + - {fileID: -4999973429723771379} + m_RendererFeatureMap: 8aebb0ddb21b76ac0d4eec1aa8869cba + m_UseNativeRenderPass: 0 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 0} + 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: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 1 diff --git a/ProjectNLD/Assets/Settings/URP-Performant.asset b/ProjectNLD/Assets/Settings/URP-Performant.asset index 4645d044e02..6862c29f0f9 100644 --- a/ProjectNLD/Assets/Settings/URP-Performant.asset +++ b/ProjectNLD/Assets/Settings/URP-Performant.asset @@ -1,3 +1,110 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:640f3cebfde9462b421066683889b3387a92bf5a49e1f0d6c3ea2cce21a7cd8f -size 3499 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: URP-Performant + m_EditorClassIdentifier: + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 707360a9c581a4bd7aa53bfeb1429f71, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_SupportsHDR: 0 + 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_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 0 + m_MainLightShadowmapResolution: 1024 + m_AdditionalLightsRenderingMode: 0 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 1 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.1 + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 + m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + 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: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 16 + m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 0 + m_PrefilteringModeAdditionalLight: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 + m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 0 diff --git a/ProjectNLD/ProjectSettings/AudioManager.asset b/ProjectNLD/ProjectSettings/AudioManager.asset index df1e8090a2e..a46c11fc59e 100644 --- a/ProjectNLD/ProjectSettings/AudioManager.asset +++ b/ProjectNLD/ProjectSettings/AudioManager.asset @@ -15,6 +15,6 @@ AudioManager: m_EnableOutputSuspension: 1 m_SpatializerPlugin: m_AmbisonicDecoderPlugin: - m_DisableAudio: 0 + m_DisableAudio: 1 m_VirtualizeEffects: 1 m_RequestedDSPBufferSize: 0 diff --git a/ProjectNLD/ProjectSettings/DynamicsManager.asset b/ProjectNLD/ProjectSettings/DynamicsManager.asset index eeb271138de..2311e5b7215 100644 --- a/ProjectNLD/ProjectSettings/DynamicsManager.asset +++ b/ProjectNLD/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 diff --git a/ProjectNLD/ProjectSettings/EditorBuildSettings.asset b/ProjectNLD/ProjectSettings/EditorBuildSettings.asset index 0147887ef4b..9ff6a9281ce 100644 --- a/ProjectNLD/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectNLD/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,10 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] - m_configObjects: {} + m_Scenes: + - enabled: 1 + path: Assets/Scenes/GameLauncher.unity + guid: c1a25b9a5ca0f824fbb1ccd00b50d1c9 + m_configObjects: + com.unity.addressableassets: {fileID: 11400000, guid: 435294e30c9604136bdd53089aedb30e, + type: 2} diff --git a/ProjectNLD/ProjectSettings/EditorSettings.asset b/ProjectNLD/ProjectSettings/EditorSettings.asset index a5f77b09890..5594bfef30a 100644 --- a/ProjectNLD/ProjectSettings/EditorSettings.asset +++ b/ProjectNLD/ProjectSettings/EditorSettings.asset @@ -5,11 +5,11 @@ EditorSettings: m_ObjectHideFlags: 0 serializedVersion: 12 m_SerializationMode: 2 - m_LineEndingsForNewScripts: 1 + m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 0 + m_SpritePackerMode: 5 m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 m_Bc7TextureCompressor: 0 @@ -17,7 +17,7 @@ EditorSettings: m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp;java;cpp;c;mm;m;h + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp m_ProjectGenerationRootNamespace: m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 @@ -31,8 +31,8 @@ EditorSettings: m_AssetNamingUsesSpace: 1 m_InspectorUseIMGUIDefaultInspector: 0 m_UseLegacyProbeSampleCount: 0 - m_SerializeInlineMappingsOnOneLine: 1 - m_DisableCookiesInLightmapper: 0 + m_SerializeInlineMappingsOnOneLine: 0 + m_DisableCookiesInLightmapper: 1 m_AssetPipelineMode: 1 m_RefreshImportMode: 0 m_CacheServerMode: 0 diff --git a/ProjectNLD/ProjectSettings/GraphicsSettings.asset b/ProjectNLD/ProjectSettings/GraphicsSettings.asset index 2d513492352..5de4312294f 100644 --- a/ProjectNLD/ProjectSettings/GraphicsSettings.asset +++ b/ProjectNLD/ProjectSettings/GraphicsSettings.asset @@ -28,16 +28,15 @@ GraphicsSettings: m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 0} + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, + type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -57,11 +56,13 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 + m_LightsUseLinearIntensity: 1 + m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: {} - m_LightProbeOutsideHullStrategy: 1 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, + type: 2} + m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/ProjectNLD/ProjectSettings/InputManager.asset b/ProjectNLD/ProjectSettings/InputManager.asset index 6a65192d0db..b16147e954f 100644 --- a/ProjectNLD/ProjectSettings/InputManager.asset +++ b/ProjectNLD/ProjectSettings/InputManager.asset @@ -485,4 +485,3 @@ InputManager: type: 2 axis: 5 joyNum: 0 - m_UsePhysicalKeys: 1 diff --git a/ProjectNLD/ProjectSettings/NavMeshAreas.asset b/ProjectNLD/ProjectSettings/NavMeshAreas.asset index 2e2e36968e3..3b0b7c3d183 100644 --- a/ProjectNLD/ProjectSettings/NavMeshAreas.asset +++ b/ProjectNLD/ProjectSettings/NavMeshAreas.asset @@ -71,7 +71,7 @@ NavMeshProjectSettings: cost: 1 m_LastAgentTypeID: -887442657 m_Settings: - - serializedVersion: 3 + - serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -84,9 +84,7 @@ NavMeshProjectSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 + accuratePlacement: 0 debug: m_Flags: 0 m_SettingNames: diff --git a/ProjectNLD/ProjectSettings/PackageManagerSettings.asset b/ProjectNLD/ProjectSettings/PackageManagerSettings.asset index 6cd78343903..520ab926641 100644 --- a/ProjectNLD/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectNLD/ProjectSettings/PackageManagerSettings.asset @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -840 - m_OriginalInstanceId: -842 + m_UserModificationsInstanceId: -838 + m_OriginalInstanceId: -840 m_LoadAssets: 0 diff --git a/ProjectNLD/ProjectSettings/Physics2DSettings.asset b/ProjectNLD/ProjectSettings/Physics2DSettings.asset index b71b65c420e..062cae1547a 100644 --- a/ProjectNLD/ProjectSettings/Physics2DSettings.asset +++ b/ProjectNLD/ProjectSettings/Physics2DSettings.asset @@ -42,7 +42,7 @@ Physics2DSettings: m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1 - m_ReuseCollisionCallbacks: 1 + m_ReuseCollisionCallbacks: 0 m_AutoSyncTransforms: 0 m_GizmoOptions: 10 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/ProjectNLD/ProjectSettings/ProjectSettings.asset b/ProjectNLD/ProjectSettings/ProjectSettings.asset index 1e1a10511d5..3655866d915 100644 --- a/ProjectNLD/ProjectSettings/ProjectSettings.asset +++ b/ProjectNLD/ProjectSettings/ProjectSettings.asset @@ -4,19 +4,19 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 26 - productGUID: 08e1014d64c3a48e4bad61111c32daaa + productGUID: 537744f5c0db041fa84bbbcdd75e531b AndroidProfiler: 0 - AndroidFilterTouchesWhenObscured: 0 + AndroidFilterTouchesWhenObscured: 1 AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: ProjectNLD + companyName: PHXH + productName: ProjectA defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1} + m_SplashScreenBackgroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1} m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 @@ -40,14 +40,15 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 2800000, guid: ca3230b2da74ac54eb914aad5470018a, + type: 3} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1920 - defaultScreenHeight: 1080 + defaultScreenWidth: 1024 + defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 + m_ActiveColorSpace: 1 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -57,8 +58,8 @@ PlayerSettings: iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - allowedAutorotateToPortrait: 1 - allowedAutorotateToPortraitUpsideDown: 1 + allowedAutorotateToPortrait: 0 + allowedAutorotateToPortraitUpsideDown: 0 allowedAutorotateToLandscapeRight: 1 allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 @@ -67,7 +68,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 - androidUseSwappy: 1 + androidUseSwappy: 0 androidBlitType: 0 androidResizableWindow: 0 androidDefaultWindowWidth: 1920 @@ -77,7 +78,7 @@ PlayerSettings: androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -92,7 +93,7 @@ PlayerSettings: resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games - gpuSkinning: 0 + gpuSkinning: 1 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -129,11 +130,11 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - vulkanEnablePreTransform: 0 + vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 0.1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -153,27 +154,30 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Android: com.phxh.game.test + Standalone: com.Unity-Technologies.com.unity.template.urp-blank + iPhone: com.phxh.Try buildNumber: Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - stripEngineCode: 1 + stripEngineCode: 0 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 ForceInternetPermission: 0 - ForceSDCardPermission: 0 + ForceSDCardPermission: 1 CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 + StripUnusedMeshComponents: 1 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 @@ -234,14 +238,14 @@ PlayerSettings: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 VisionOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 0 + appleEnableAutomaticSigning: 1 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a + templatePackageId: com.unity.template.urp-blank@3.0.2 + templateDefaultScene: Assets/Scenes/SampleScene.unity useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 @@ -250,10 +254,10 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} + androidSplashScreen: {fileID: 2800000, guid: ca3230b2da74ac54eb914aad5470018a, type: 3} AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 @@ -262,7 +266,7 @@ PlayerSettings: AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 - androidUseLowAccuracyLocation: 0 + androidUseLowAccuracyLocation: 1 androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 @@ -465,11 +469,54 @@ PlayerSettings: m_Height: 36 m_Kind: 0 m_SubKind: + - m_BuildTarget: tvOS + m_Icons: + - m_Textures: [] + m_Width: 1280 + m_Height: 768 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 800 + m_Height: 480 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 400 + m_Height: 240 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 4640 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 2320 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 3840 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 1920 + m_Height: 720 + m_Kind: 1 + m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000015000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -479,15 +526,22 @@ PlayerSettings: m_TemplateCustomTags: {} mobileMTRendering: Android: 1 - VisionOS: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: [] - m_BuildTargetGroupHDRCubemapEncodingQuality: [] + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] - m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetNormalMapEncoding: + - m_BuildTarget: Android + m_Encoding: 1 + m_BuildTargetDefaultTextureCompressionFormat: + - m_BuildTarget: Android + m_Format: 3 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -623,7 +677,7 @@ PlayerSettings: switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 22 switchNativeFsCacheSize: 32 - switchIsHoldTypeHorizontal: 1 + switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 @@ -637,7 +691,7 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 - switchUseNewStyleFilepaths: 1 + switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 @@ -683,7 +737,7 @@ PlayerSettings: ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 playerPrefsMaxSize: 32768 - ps4Passcode: Soqovfo1OA5ADkUxHK25YOL7Enj3dXZn + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -721,7 +775,7 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 + blurSplashScreenBackground: 0 spritePackerPolicy: webGLMemorySize: 32 webGLExceptionSupport: 1 @@ -747,13 +801,32 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: + Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;DEBUG_LOG;DEBUG;SDK_TAPTAP_LOGIN + Standalone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;TEST_TAPTAP + Windows Store Apps: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 iPhone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 1 + Standalone: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} - managedStrippingLevel: {} + managedStrippingLevel: + Android: 1 + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 @@ -765,16 +838,16 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: ProjectNLD - metroPackageVersion: + metroPackageName: ProjectA + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: ProjectNLD + metroApplicationDescription: ProjectA wsaImages: {} - metroTileShortName: + metroTileShortName: ProjectA metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -784,7 +857,8 @@ PlayerSettings: metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, + a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} @@ -837,7 +911,7 @@ PlayerSettings: embeddedLinuxEnableGamepadInput: 1 hmiLogStartupTiming: 0 hmiCpuConfiguration: - apiCompatibilityLevel: 6 + apiCompatibilityLevel: 3 activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: @@ -850,4 +924,4 @@ PlayerSettings: hmiLoadingImage: {fileID: 0} platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 - insecureHttpOption: 0 + insecureHttpOption: 2 diff --git a/ProjectNLD/ProjectSettings/QualitySettings.asset b/ProjectNLD/ProjectSettings/QualitySettings.asset index d9f4ce222e3..7c7a7a4d66b 100644 --- a/ProjectNLD/ProjectSettings/QualitySettings.asset +++ b/ProjectNLD/ProjectSettings/QualitySettings.asset @@ -72,7 +72,7 @@ QualitySettings: globalTextureMipmapLimit: 0 textureMipmapLimitSettings: [] anisotropicTextures: 1 - antiAliasing: 2 + antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 diff --git a/ProjectNLD/ProjectSettings/TagManager.asset b/ProjectNLD/ProjectSettings/TagManager.asset index 1c92a7840ec..7f08cc85ebb 100644 --- a/ProjectNLD/ProjectSettings/TagManager.asset +++ b/ProjectNLD/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - SkillCamera layers: - Default - TransparentFX @@ -11,11 +12,11 @@ TagManager: - - Water - UI - - - - - - - - - - + - Unit + - Ground + - Skill + - TeamEdit + - MainPanel - - - @@ -41,3 +42,6 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: Editor + uniqueID: 1537621141 + locked: 0 diff --git a/ProjectNLD/ProjectSettings/TimelineSettings.asset b/ProjectNLD/ProjectSettings/TimelineSettings.asset index bec00b3aa95..cfaebd7a3ad 100644 --- a/ProjectNLD/ProjectSettings/TimelineSettings.asset +++ b/ProjectNLD/ProjectSettings/TimelineSettings.asset @@ -1,3 +1,16 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c63fbda5a79fb6a2ee33f5c664a234633dd0f9524e8669cb28dc82132047309 -size 436 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/ProjectNLD/ProjectSettings/URPProjectSettings.asset b/ProjectNLD/ProjectSettings/URPProjectSettings.asset index dfca260c9c5..cd7fd8c61bf 100644 --- a/ProjectNLD/ProjectSettings/URPProjectSettings.asset +++ b/ProjectNLD/ProjectSettings/URPProjectSettings.asset @@ -1,3 +1,15 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e9d9f824875297ef6b9315fa7a3ac7ec1b047042395404a23c368fc971a8f3e -size 410 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 7 diff --git a/ProjectNLD/ProjectSettings/UnityConnectSettings.asset b/ProjectNLD/ProjectSettings/UnityConnectSettings.asset index a27ab5f25e5..a4b74d6e8c0 100644 --- a/ProjectNLD/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectNLD/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events @@ -14,7 +14,7 @@ UnityConnectSettings: m_CNConfigUrl: https://cdp.cloud.unity.cn/config m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity.cn + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 @@ -22,7 +22,7 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_InitializeOnStartup: 1 m_PackageRequiringCoreStatsPresent: 0 diff --git a/ProjectNLD/ProjectSettings/VFXManager.asset b/ProjectNLD/ProjectSettings/VFXManager.asset index 2c7e4fb3d5e..3a95c98bec5 100644 --- a/ProjectNLD/ProjectSettings/VFXManager.asset +++ b/ProjectNLD/ProjectSettings/VFXManager.asset @@ -10,8 +10,3 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 - m_MaxScrubTime: 30 - m_CompiledVersion: 0 - m_RuntimeVersion: 0 - m_RuntimeResources: {fileID: 0} - m_BatchEmptyLifetime: 300 diff --git a/ProjectNLD/ProjectSettings/VersionControlSettings.asset b/ProjectNLD/ProjectSettings/VersionControlSettings.asset index dca288142fc..afcad6c2f7f 100644 --- a/ProjectNLD/ProjectSettings/VersionControlSettings.asset +++ b/ProjectNLD/ProjectSettings/VersionControlSettings.asset @@ -3,6 +3,6 @@ --- !u!890905787 &1 VersionControlSettings: m_ObjectHideFlags: 0 - m_Mode: Visible Meta Files + m_Mode: Perforce m_CollabEditorSettings: inProgressEnabled: 1 diff --git a/ProjectNLD/ProjectSettings/XRSettings.asset b/ProjectNLD/ProjectSettings/XRSettings.asset index bfefb859cd8..482590c196f 100644 --- a/ProjectNLD/ProjectSettings/XRSettings.asset +++ b/ProjectNLD/ProjectSettings/XRSettings.asset @@ -1,3 +1,10 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edd2beb4a2e388312b4b7da241aa51070434005d82c59363f1237dd2e567585f -size 158 +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file