diff --git a/Assets/Scenes/sr_pascal/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_pascal/ReflectionProbe-0.exr.meta index 6fd3890..253bfe1 100755 --- a/Assets/Scenes/sr_pascal/ReflectionProbe-0.exr.meta +++ b/Assets/Scenes/sr_pascal/ReflectionProbe-0.exr.meta @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 100 crunchedCompression: 0 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/sr_sfz.unity b/Assets/Scenes/sr_sfz.unity index 839b06c..3efed4c 100644 --- a/Assets/Scenes/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 3 + m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: c5b2eb5d4ceadf3dd8fc481957dfdff1, type: 2} @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.20813203, g: 0.2539528, b: 0.19699469, a: 1} + m_IndirectSpecularColor: {r: 0.14633277, g: 0.17844424, b: 0.14237845, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -432,6 +432,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 37d964cd6f6bb314bb1d5ca7f495aa2c, type: 2} + - target: {fileID: -5913779785563003073, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + propertyPath: m_TagString + value: TrackLimits + objectReference: {fileID: 0} - target: {fileID: -5844372059692666277, guid: 64b045a17d258ce37b459b444db394d4, type: 3} propertyPath: m_TagString value: Untagged @@ -440,6 +444,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: -2963534320913215714, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: -2655914762337182152, guid: 64b045a17d258ce37b459b444db394d4, type: 3} propertyPath: m_IsActive value: 0 @@ -484,9 +492,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - insertIndex: -1 - addedObject: {fileID: 745109284} - targetCorrespondingSourceObject: {fileID: -5844372059692666277, guid: 64b045a17d258ce37b459b444db394d4, type: 3} insertIndex: -1 addedObject: {fileID: 1713064437} @@ -508,7 +513,37 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5167819635043687316, guid: 64b045a17d258ce37b459b444db394d4, type: 3} insertIndex: -1 addedObject: {fileID: 1286756532} + - targetCorrespondingSourceObject: {fileID: -5913779785563003073, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + insertIndex: -1 + addedObject: {fileID: 425847539} m_SourcePrefab: {fileID: 100100000, guid: 64b045a17d258ce37b459b444db394d4, type: 3} +--- !u!1 &425847538 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5913779785563003073, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + m_PrefabInstance: {fileID: 425847537} + m_PrefabAsset: {fileID: 0} +--- !u!64 &425847539 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425847538} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2791751590836414311, guid: 64b045a17d258ce37b459b444db394d4, type: 3} --- !u!1 &580552941 GameObject: m_ObjectHideFlags: 0 @@ -752,33 +787,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &745109281 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - m_PrefabInstance: {fileID: 425847537} - m_PrefabAsset: {fileID: 0} ---- !u!64 &745109284 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 745109281} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -2115851251826702791, guid: 64b045a17d258ce37b459b444db394d4, type: 3} --- !u!114 &747507678 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7583115105922956764, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} diff --git a/Assets/Scenes/sr_sfz/00000-265549821.png.meta b/Assets/Scenes/sr_sfz/00000-265549821.png.meta index 9a00b0e..0989be1 100644 --- a/Assets/Scenes/sr_sfz/00000-265549821.png.meta +++ b/Assets/Scenes/sr_sfz/00000-265549821.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 2 + wrapV: 2 + wrapW: 2 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Scenes/sr_sfz/00017.png.meta b/Assets/Scenes/sr_sfz/00017.png.meta index f82e9c3..ba125b6 100644 --- a/Assets/Scenes/sr_sfz/00017.png.meta +++ b/Assets/Scenes/sr_sfz/00017.png.meta @@ -27,9 +27,9 @@ TextureImporter: vTOnly: 0 ignoreMipmapLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 2 cubemapConvolution: 0 - seamlessCubemap: 0 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: diff --git a/Assets/Scenes/sr_sfz/00020.png b/Assets/Scenes/sr_sfz/00020.png new file mode 100644 index 0000000..ffdbd88 Binary files /dev/null and b/Assets/Scenes/sr_sfz/00020.png differ diff --git a/Assets/Scenes/sr_sfz/00020.png.meta b/Assets/Scenes/sr_sfz/00020.png.meta new file mode 100644 index 0000000..0835ead --- /dev/null +++ b/Assets/Scenes/sr_sfz/00020.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: dadbfd71eadaf364ca6524d5a979dad9 +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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + 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: 0 + compressionQuality: 50 + 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 + 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/LightingData.asset b/Assets/Scenes/sr_sfz/LightingData.asset index d576a0d..d4c5b9c 100644 Binary files a/Assets/Scenes/sr_sfz/LightingData.asset and b/Assets/Scenes/sr_sfz/LightingData.asset differ diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr index a4127c4..c7ca616 100644 Binary files a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr and b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat new file mode 100644 index 0000000..d7f359f --- /dev/null +++ b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1675717843410783732 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpaSkyboxCube + m_Shader: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BackTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DownTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FrontTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LeftTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RightTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UpTex: + m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _Exposure: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Rotation: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat.meta b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat.meta new file mode 100644 index 0000000..64ee53b --- /dev/null +++ b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2910c04ca7c5bcc53a03f41f2ce1c9d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa.blend b/Assets/Scenes/sr_sfz/spa.blend index 110c41c..cb961fe 100644 Binary files a/Assets/Scenes/sr_sfz/spa.blend and b/Assets/Scenes/sr_sfz/spa.blend differ diff --git a/Assets/Scenes/sr_sfz/spa.blend1 b/Assets/Scenes/sr_sfz/spa.blend1 index 1bf1a0a..717811a 100644 Binary files a/Assets/Scenes/sr_sfz/spa.blend1 and b/Assets/Scenes/sr_sfz/spa.blend1 differ diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset old mode 100755 new mode 100644