diff --git a/Assets/Scenes/sr_sfz/sr_sfz.meta b/Assets/Scenes/sr_sfz/sr_sfz.meta new file mode 100644 index 0000000..055935f --- /dev/null +++ b/Assets/Scenes/sr_sfz/sr_sfz.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b65c96c56dda8ff9ebdef4f4931ebcfa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/sr_sfz.unity b/Assets/Scenes/sr_sfz/sr_sfz.unity index df201d2..5d86aa7 100644 --- a/Assets/Scenes/sr_sfz/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz/sr_sfz.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.1332247, g: 0.16372603, b: 0.12614998, a: 1} + m_IndirectSpecularColor: {r: 0.20813203, g: 0.2539528, b: 0.19699469, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,8 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 0a517604f1ef27f92b90ad34f06964e9, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: a3b15a07c33f4f1f4905e3aab7e9babb, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 8f20906da7960a4c79018349bf4d8661, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: b02c454e6d6aae0f3957d7ae3a762566, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 diff --git a/Assets/Scenes/sr_sfz/LightingData.asset b/Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset similarity index 98% rename from Assets/Scenes/sr_sfz/LightingData.asset rename to Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset index 1770aa0..f62db66 100644 Binary files a/Assets/Scenes/sr_sfz/LightingData.asset and b/Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset differ diff --git a/Assets/Scenes/sr_sfz/LightingData.asset.meta b/Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset.meta similarity index 79% rename from Assets/Scenes/sr_sfz/LightingData.asset.meta rename to Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset.meta index e71076d..29ae86b 100644 --- a/Assets/Scenes/sr_sfz/LightingData.asset.meta +++ b/Assets/Scenes/sr_sfz/sr_sfz/LightingData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a517604f1ef27f92b90ad34f06964e9 +guid: 8f20906da7960a4c79018349bf4d8661 NativeFormatImporter: externalObjects: {} mainObjectFileID: 112000000 diff --git a/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr b/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr new file mode 100644 index 0000000..9194c3f --- /dev/null +++ b/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eb9f45655f134fd243b71c5b26d9a482da6f7ee24615be5c498631340e6e340 +size 149688 diff --git a/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..6484d41 --- /dev/null +++ b/Assets/Scenes/sr_sfz/sr_sfz/ReflectionProbe-0.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 63b2b9dbe47b757e7809147df7163772 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting b/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting index 4ae5863..d33d42b 100644 --- a/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting +++ b/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting @@ -9,14 +9,14 @@ LightingSettings: m_Name: sr_star_fraenkel_zermelo serializedVersion: 6 m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 1 m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 - m_BakeBackend: 1 + m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.lighting b/Assets/Scenes/sr_silverstorage/sr_silverstorage.lighting index 366f74b..232db37 100644 --- a/Assets/Scenes/sr_silverstorage/sr_silverstorage.lighting +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.lighting @@ -9,18 +9,18 @@ LightingSettings: m_Name: sr_silverstorage serializedVersion: 6 m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 1 m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 - m_BakeBackend: 1 + m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_LightmapCompression: 3 + m_LightmapCompression: 0 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta new file mode 100644 index 0000000..5f5e277 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 631f5ba61398fb62d9401e800dcf281d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity index 5fbb244..18b5444 100644 --- a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.61784047, g: 0.63485193, b: 0.64917755, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 7e8e8369f0899dc7caf8ca9ba57b2d69, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: bce38263096f35008841c37a1fed3767, type: 2} --- !u!196 &4 NavMeshSettings: @@ -611,7 +611,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8873558038744925118, guid: 474d908ae00ea2447883cf399db91645, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 126 objectReference: {fileID: 0} - target: {fileID: -8708185297467244275, guid: 474d908ae00ea2447883cf399db91645, type: 3} propertyPath: m_IsActive @@ -705,6 +705,18 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 5558786085232576308, guid: 474d908ae00ea2447883cf399db91645, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5558786085232576308, guid: 474d908ae00ea2447883cf399db91645, type: 3} + propertyPath: m_DynamicOccludee + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5558786085232576308, guid: 474d908ae00ea2447883cf399db91645, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5558786085232576308, guid: 474d908ae00ea2447883cf399db91645, type: 3} propertyPath: m_Materials.Array.data[0] value: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset new file mode 100644 index 0000000..8145b5c Binary files /dev/null and b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset differ diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta new file mode 100644 index 0000000..0546dee --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e8e8369f0899dc7caf8ca9ba57b2d69 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr new file mode 100644 index 0000000..7d05f7a --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6234b1ac26963f2924cc8356aa6259d1e4f574d4a4f4883a2401bb88ff4b637c +size 215937 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..f4d73cc --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 79b9b74182e675ec39c509ecdad52380 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ba623f8..9bee32d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,8 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1