changed chury model

2022-11-22 11:08:29 +01:00 · 2022-11-22 11:08:29 +01:00 · fbea99134e
parent 967af7c37b
commit fbea99134e
7 changed files with 322 additions and 30 deletions
--- a/Assets/Assets/00_Scenes/04_Rosetta.unity
+++ b/Assets/Assets/00_Scenes/04_Rosetta.unity
@ -15,9 +15,9 @@ RenderSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 9
  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogColor: {r: 0.8679245, g: 0.47080812, b: 0.47080812, a: 1}
  m_FogMode: 3
-  m_FogDensity: 0.01
+  m_FogDensity: 0.004
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
@ -27,7 +27,7 @@ RenderSettings:
  m_AmbientMode: 0
  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
  m_SkyboxMaterial: {fileID: 2100000, guid: 9f692d730f18040efb1d8ff802662e39, type: 2}
-  m_HaloStrength: 0.5
+  m_HaloStrength: 0.416
  m_FlareStrength: 1
  m_FlareFadeSpeed: 3
  m_HaloTexture: {fileID: 0}
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.007575536, g: 0.038132925, b: 0.07416911, a: 1}
+  m_IndirectSpecularColor: {r: 0.000937368, g: 0.0012667424, b: 0.0014870083, 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: a41d8f351ebd14453a4438f1152108bf, type: 2}
  m_LightingSettings: {fileID: 4890085278179872738, guid: 6788f93f1822a410caa94f314a987eec, type: 2}
 --- !u!196 &4
 NavMeshSettings:
@ -132,19 +132,19 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.108924985
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.12
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0.5621335
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
      propertyPath: m_LocalRotation.w
@ -180,6 +180,103 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ed5b82ca1779e4a83a86ccda3bd2c997, type: 3}
+--- !u!1 &197500098
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 197500102}
+  - component: {fileID: 197500101}
+  - component: {fileID: 197500100}
+  - component: {fileID: 197500099}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &197500099
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 197500098}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &197500100
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 197500098}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &197500101
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 197500098}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &197500102
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 197500098}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.3, y: 1.23, z: 20}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@ -255,7 +352,7 @@ Light:
  m_BounceIntensity: 1
  m_ColorTemperature: 6570
  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_BoundingSphereOverride: {x: 4.5905e-41, y: 4.194652e-29, z: 1e-45, w: 2.2645214e-26}
  m_UseBoundingSphereOverride: 0
  m_UseViewFrustumForShadowCasterCull: 1
  m_ShadowRadius: 0
@ -267,14 +364,14 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 705507993}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalRotation: {x: 0.41315413, y: 0.27698043, z: -0.17929006, w: 0.8487878}
+  m_LocalPosition: {x: -1645, y: 1412, z: 93}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+  m_LocalEulerAnglesHint: {x: 53.195, y: 32.518, z: -7.239}
 --- !u!114 &705507996
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -295,6 +392,103 @@ MonoBehaviour:
  m_ShadowLayerMask: 1
  m_LightCookieSize: {x: 1, y: 1}
  m_LightCookieOffset: {x: 0, y: 0}
+--- !u!1 &843597563
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 843597567}
+  - component: {fileID: 843597566}
+  - component: {fileID: 843597565}
+  - component: {fileID: 843597564}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &843597564
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 843597563}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &843597565
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 843597563}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &843597566
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 843597563}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &843597567
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 843597563}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.23, z: 10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1152965692
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -304,12 +498,16 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 269239878110707379, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: far clip plane
-      value: 1500
+      value: 12000
      objectReference: {fileID: 0}
    - target: {fileID: 269239878110707380, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_Antialiasing
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 269239878110707380, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
+      propertyPath: m_RenderShadows
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 269239878620184706, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_Name
      value: XR Origin
@ -320,7 +518,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 269239878620184709, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 269239878620184709, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_LocalPosition.x
@ -328,7 +526,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 269239878620184709, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.035
+      value: 1.23
      objectReference: {fileID: 0}
    - target: {fileID: 269239878620184709, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
      propertyPath: m_LocalPosition.z
@ -364,6 +562,95 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 20663686ae12446af8e5b6d5c7eec648, type: 3}
+--- !u!1001 &1569550380
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 48
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.27985287
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7448127
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.6057469
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.0026724287
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -24.842
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -158.332
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 96.931
+      objectReference: {fileID: 0}
+    - target: {fileID: -6680694904271970379, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -6680694904271970379, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -6680694904271970379, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -3563011121306059091, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: edc008f55770242feabb04c0fe798545, type: 2}
+    - target: {fileID: 919132149155446097, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_Name
+      value: ChuryLowRes (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5748739632706453778, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 729932a4541c045caa5a82ba094bfb44, type: 3}
 --- !u!1 &1842779338
 GameObject:
  m_ObjectHideFlags: 0
@ -406,5 +693,5 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Assets/00_Scenes/Lighting/04_Rosetta_Lighting.lighting
+++ b/Assets/Assets/00_Scenes/Lighting/04_Rosetta_Lighting.lighting
@ -8,7 +8,7 @@ LightingSettings:
  m_PrefabAsset: {fileID: 0}
  m_Name: 04_Rosetta_Lighting
  serializedVersion: 4
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
  m_EnableBakedLightmaps: 1
  m_EnableRealtimeLightmaps: 0
  m_RealtimeEnvironmentLighting: 1
@ -17,7 +17,7 @@ LightingSettings:
  m_IndirectOutputScale: 1
  m_UsingShadowmask: 1
  m_BakeBackend: 1
-  m_LightmapMaxSize: 1024
+  m_LightmapMaxSize: 4096
  m_BakeResolution: 40
  m_Padding: 2
  m_LightmapCompression: 3
--- a/Assets/Assets/01_Models/ChuryLowRes.blend
+++ b/Assets/Assets/01_Models/ChuryLowRes.blend
--- a/Assets/Assets/01_Models/Rosetta.blend
+++ b/Assets/Assets/01_Models/Rosetta.blend
--- a/Assets/Assets/02_Materials/SpaceSkybox.mat
+++ b/Assets/Assets/02_Materials/SpaceSkybox.mat
@ -78,7 +78,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _Tex:
-        m_Texture: {fileID: 8900000, guid: d1bec3a38720244288227b8c74ee1338, type: 3}
+        m_Texture: {fileID: 8900000, guid: dc25ff33afb124dfba593e09789fbdf9, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -106,7 +106,7 @@ Material:
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _EnvironmentReflections: 1
-    - _Exposure: 1
+    - _Exposure: 0.34
    - _GlossMapScale: 0
    - _Glossiness: 0
    - _GlossyReflections: 0
--- a/Assets/Assets/99_RenderScripts/New
+++ b/Assets/Assets/99_RenderScripts/New
@ -32,25 +32,25 @@ MonoBehaviour:
  m_FsrSharpness: 0.92
  m_MainLightRenderingMode: 1
  m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 2048
+  m_MainLightShadowmapResolution: 4096
  m_AdditionalLightsRenderingMode: 1
  m_AdditionalLightsPerObjectLimit: 4
  m_AdditionalLightShadowsSupported: 0
-  m_AdditionalLightsShadowmapResolution: 2048
+  m_AdditionalLightsShadowmapResolution: 4096
  m_AdditionalLightsShadowResolutionTierLow: 256
  m_AdditionalLightsShadowResolutionTierMedium: 512
  m_AdditionalLightsShadowResolutionTierHigh: 1024
  m_ReflectionProbeBlending: 0
  m_ReflectionProbeBoxProjection: 0
-  m_ShadowDistance: 2000
-  m_ShadowCascadeCount: 1
+  m_ShadowDistance: 12000
+  m_ShadowCascadeCount: 4
  m_Cascade2Split: 0.25
-  m_Cascade3Split: {x: 0.1, y: 0.3}
-  m_Cascade4Split: {x: 0.008, y: 0.08400011, z: 0.7925}
-  m_CascadeBorder: 0.757
+  m_Cascade3Split: {x: 0, y: 0.001}
+  m_Cascade4Split: {x: 0, y: 0.026083333, z: 0.11658333}
+  m_CascadeBorder: 0.5069141
  m_ShadowDepthBias: 1
-  m_ShadowNormalBias: 1
-  m_SoftShadowsSupported: 0
+  m_ShadowNormalBias: 0.98
+  m_SoftShadowsSupported: 1
  m_ConservativeEnclosingSphere: 1
  m_NumIterationsEnclosingSphere: 64
  m_AdditionalLightsCookieResolution: 2048
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -161,7 +161,12 @@ PlayerSettings:
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
+<<<<<<< HEAD
  - {fileID: 0}
+=======
+  - {fileID: 102911504429780127, guid: e006f1e7563d8404b9ee5d6fcdabceb4, type: 2}
+  - {fileID: 11400000, guid: 53647b0a2a9724adc8c66ce13d1a7ed4, type: 2}
+>>>>>>> b4c1857 (changed chury model)
  - {fileID: 0}
  metroInputSource: 0
  wsaTransparentSwapchain: 0