diff --git a/Assets/Artwork/city/buildings/minselhoz/minselhoz.mat b/Assets/Artwork/city/buildings/minselhoz/minselhoz.mat index 00825d1d..7e7ba10d 100644 --- a/Assets/Artwork/city/buildings/minselhoz/minselhoz.mat +++ b/Assets/Artwork/city/buildings/minselhoz/minselhoz.mat @@ -157,8 +157,8 @@ Material: - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 5 + - _EmissiveExposureWeight: 0.981 + - _EmissiveIntensity: 500 - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 @@ -239,7 +239,7 @@ Material: - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 5, g: 5, b: 5, a: 5} + - _EmissiveColor: {r: 500, g: 500, b: 500, a: 500} - _EmissiveColorLDR: {r: 1, g: 1, b: 1, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} diff --git a/Assets/Artwork/city/buildings/minselhoz/minselhoz_lambert1_Emissive.1001.png.meta b/Assets/Artwork/city/buildings/minselhoz/minselhoz_lambert1_Emissive.1001.png.meta index b1628156..ff1ec9b0 100644 --- a/Assets/Artwork/city/buildings/minselhoz/minselhoz_lambert1_Emissive.1001.png.meta +++ b/Assets/Artwork/city/buildings/minselhoz/minselhoz_lambert1_Emissive.1001.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Prefabs/Environment.prefab b/Assets/Prefabs/Environment.prefab index 15267f70..8e75b4e6 100644 --- a/Assets/Prefabs/Environment.prefab +++ b/Assets/Prefabs/Environment.prefab @@ -11835,7 +11835,6 @@ Transform: - {fileID: 8058037078516934988} - {fileID: 6411663886932445155} - {fileID: 8058037080328384143} - - {fileID: 6411663887651714916} - {fileID: 6411663887841454676} m_Father: {fileID: 6877127647316600736} m_RootOrder: 1 @@ -11886,7 +11885,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.9776257, b: 0.9009434, a: 1} - m_Intensity: 90000 + m_Intensity: 100000 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -12185,6 +12184,7 @@ Transform: - {fileID: 5213765417582927736} - {fileID: 1865814383} - {fileID: 5604336826772252284} + - {fileID: 3389969811057979465} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12823,6 +12823,101 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3129838480035785116} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3326084950379325096 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6877127647316600736} + m_Modifications: + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalScale.x + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalScale.y + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalScale.z + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalPosition.x + value: -932.9205 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalPosition.y + value: 615 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalPosition.z + value: 8162.9814 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.975025 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.22209544 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 25.664 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 750103987943443547, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + propertyPath: m_Name + value: minselhoz + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 506d7e8b531a66445a19dbee681d8568, type: 3} +--- !u!4 &3389969811057979465 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 81969926701143777, guid: 506d7e8b531a66445a19dbee681d8568, + type: 3} + m_PrefabInstance: {fileID: 3326084950379325096} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3440812670362173237 PrefabInstance: m_ObjectHideFlags: 0 @@ -13358,7 +13453,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: a43287a6ce88123478f2481c116c27fa, type: 3} propertyPath: m_RootOrder - value: 24 + value: 23 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a43287a6ce88123478f2481c116c27fa, type: 3} @@ -13443,116 +13538,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6877127647281810879} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6877127647429873807 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5213765417582927736} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_RootOrder - value: 23 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalScale.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalScale.y - value: 150 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalScale.z - value: 150 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalPosition.x - value: -373.80457 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalPosition.y - value: 132.20976 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalPosition.z - value: 1556.718 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.5811267 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.8138131 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 108.94 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_ScaleInLightmap - value: 0.001 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_StaticShadowCaster - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_Name - value: Atrium - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dfe87a56d4d1180438d47e9428bbf32f, type: 3} ---- !u!4 &6411663887651714916 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dfe87a56d4d1180438d47e9428bbf32f, - type: 3} - m_PrefabInstance: {fileID: 6877127647429873807} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6877127647665778686 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LightSettings.lighting b/Assets/Scenes/LightSettings.lighting index 6e79aca6..c79bbc6a 100644 --- a/Assets/Scenes/LightSettings.lighting +++ b/Assets/Scenes/LightSettings.lighting @@ -9,8 +9,8 @@ LightingSettings: m_Name: LightSettings serializedVersion: 4 m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 1 m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 diff --git a/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr b/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr new file mode 100644 index 00000000..4192d8e3 Binary files /dev/null and b/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr.meta b/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..8585e4fc --- /dev/null +++ b/Assets/Scenes/Monument_Debug2/ReflectionProbe-0.exr.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 89ab05521dfb65a4383630542a7e0881 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Road/Roads/materials/road 1.mat b/Assets/_Road/Roads/materials/road 1.mat index f3fd0c1d..43e20e4d 100644 --- a/Assets/_Road/Roads/materials/road 1.mat +++ b/Assets/_Road/Roads/materials/road 1.mat @@ -238,7 +238,7 @@ Material: - _MaterialID: 1 - _Metallic: 1 - _MetallicRemapMax: 1 - - _MetallicRemapMin: 0.4193781 + - _MetallicRemapMin: 0.64149815 - _Mode: 3 - _NormalMapSpace: 0 - _NormalScale: 0.3 @@ -257,8 +257,8 @@ Material: - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _Smoothness: 1 - - _SmoothnessRemapMax: 0.72885007 - - _SmoothnessRemapMin: 0.26030368 + - _SmoothnessRemapMax: 0.7457005 + - _SmoothnessRemapMin: 0.3751934 - _SmoothnessTextureChannel: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 @@ -300,9 +300,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.9, g: 0.9, b: 0.9, a: 1} + - _BaseColor: {r: 0.9925083, g: 1, b: 0.8726415, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9, g: 0.9, b: 0.9, a: 1} + - _Color: {r: 0.99250823, g: 1, b: 0.8726415, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}