Merge branch 'master' of http://192.168.123.2:3000/fort23/PoetryTour

# Conflicts:
#	Assets/Scenes/main.unity

Assets/Chinese Painting URP/Scenes/Demo 1/Globalmain.asset

@@ -690,7 +690,6 @@ MonoBehaviour:
   - {fileID: 6747474536048915564}
   - {fileID: 2879504635989778814}
   - {fileID: 6652186916671486246}
-  - {fileID: 4511894946249668537}
 --- !u!114 &1228254949640216709
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -829,10 +828,10 @@ MonoBehaviour:
     m_Value: {x: 0.5, y: 0.5}
   intensity:
     m_OverrideState: 1
-    m_Value: 0.41
+    m_Value: 0.339
   smoothness:
     m_OverrideState: 1
-    m_Value: 0.55
+    m_Value: 0.322
   rounded:
     m_OverrideState: 1
     m_Value: 0
@@ -851,13 +850,13 @@ MonoBehaviour:
   active: 1
   lift:
     m_OverrideState: 1
-    m_Value: {x: 0.86789286, y: 0.95576936, z: 1, w: 0}
+    m_Value: {x: 0.8948735, y: 0.9608108, z: 1, w: 0}
   gamma:
     m_OverrideState: 1
-    m_Value: {x: 0.9186948, y: 1, z: 0.9776466, w: 0}
+    m_Value: {x: 0.94373477, y: 1, z: 0.95858896, w: 0}
   gain:
     m_OverrideState: 1
-    m_Value: {x: 0.8140199, y: 0.9755188, z: 1, w: 0}
+    m_Value: {x: 0.8789721, y: 1, z: 0.98331755, w: 0}
 --- !u!114 &3900279966254787718
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -1195,25 +1194,6 @@ MonoBehaviour:
   m_ObsoleteShapeOffsetZ:
     m_OverrideState: 1
     m_Value: 0
---- !u!114 &4511894946249668537
-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: 221518ef91623a7438a71fef23660601, type: 3}
-  m_Name: WhiteBalance
-  m_EditorClassIdentifier: 
-  active: 1
-  temperature:
-    m_OverrideState: 1
-    m_Value: -20
-  tint:
-    m_OverrideState: 1
-    m_Value: 0
 --- !u!114 &5191937427316930287
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -1226,7 +1206,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
   m_Name: Bloom
   m_EditorClassIdentifier: 
-  active: 1
+  active: 0
   threshold:
     m_OverrideState: 1
     m_Value: 0.9
@@ -1270,7 +1250,7 @@ MonoBehaviour:
   active: 1
   postExposure:
     m_OverrideState: 1
-    m_Value: 1
+    m_Value: 0.95
   contrast:
     m_OverrideState: 1
     m_Value: 5

Assets/Scenes/baidicheng.unity

@@ -20,13 +20,13 @@ RenderSettings:
   m_FogDensity: 0.0008
   m_LinearFogStart: 0
   m_LinearFogEnd: 4000
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientSkyColor: {r: 1.4142135, g: 1.4142135, b: 1.4142135, 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: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.5444999, g: 0.5768378, b: 0.6603774, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: 0c0d30306f805c44ab44fb291c863280, type: 2}
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.71320754, g: 0.73506826, b: 0.7924528, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 212297607}
-  m_IndirectSpecularColor: {r: 0.44428685, g: 0.5388818, b: 0.58682275, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6438,7 +6438,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &156247193
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7279,43 +7279,6 @@ Transform:
   m_Father: {fileID: 802580076}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!84 &249579056
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!1001 &288307701
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8103,6 +8066,43 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8939627942807008, guid: e09917ff98e6cc444bb5541dd52f3f7f, type: 3}
   m_PrefabInstance: {fileID: 391890845}
   m_PrefabAsset: {fileID: 0}
+--- !u!84 &396013892
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!1 &396976006
 GameObject:
   m_ObjectHideFlags: 0
@@ -23162,8 +23162,8 @@ Camera:
   m_GameObject: {fileID: 1656411214}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -23203,7 +23203,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1656411214}
-  m_LocalRotation: {x: 0.039591577, y: -0.018465158, z: 0.0007317636, w: 0.9990451}
+  m_LocalRotation: {x: 0.03959158, y: -0.018465154, z: 0.00073176343, w: 0.9990451}
   m_LocalPosition: {x: -859.99976, y: 7594, z: -7516}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -24300,7 +24300,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 249579056}
+        m_Texture: {fileID: 396013892}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -24317,24 +24317,24 @@ Material:
     - _SpecularThreshold: 0.5
     m_Colors:
     - _BoundsBorder: {r: 610.0001, g: 9390, b: 762.5001, a: 11737.5}
-    - _BoundsCenter: {r: 237, g: 1430, b: 8261, a: 0}
-    - _BoundsData: {r: 0, g: -570, b: 4000, a: 0}
+    - _BoundsCenter: {r: 237, g: 697, b: 8261, a: 0}
+    - _BoundsData: {r: 0, g: -1303, b: 4000, a: 0}
     - _BoundsExtents: {r: 10000, g: 2000, b: 12500, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.575, g: 0.575, b: 0.575, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: -0.02971566, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: 0, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarSize: {r: 0, g: 0, b: 0, a: 1}
-    - _LightColor: {r: 2, g: 1.7687205, b: 1.6113207, a: 0.148}
+    - _LightColor: {r: 2, g: 1.7687205, b: 1.6113207, a: 0.29}
     - _MaxDistanceData: {r: 100000, g: 1, b: 0, a: 0}
     - _RayMarchSettings: {r: 5, g: 0.01, b: 1, a: 0.1}
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: -0.02971566, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &1819042572
 GameObject:
@@ -30753,7 +30753,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1982659326}
-  m_LocalRotation: {x: 0.039591577, y: -0.018465158, z: 0.0007317636, w: 0.9990451}
+  m_LocalRotation: {x: 0.03959158, y: -0.018465154, z: 0.00073176343, w: 0.9990451}
   m_LocalPosition: {x: -859.99976, y: 7594, z: -7516}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -50936,7 +50936,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7926472211735412197}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 237, y: 1430, z: 8261}
+  m_LocalPosition: {x: 237, y: 697, z: 8261}
   m_LocalScale: {x: 20000, y: 4000, z: 25000}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Scenes/main.unity

@@ -20,13 +20,13 @@ RenderSettings:
   m_FogDensity: 0.0008
   m_LinearFogStart: 0
   m_LinearFogEnd: 4000
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientSkyColor: {r: 1.7411011, g: 1.7411011, b: 1.7411011, 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: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.5444999, g: 0.5768378, b: 0.6603774, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: 0c0d30306f805c44ab44fb291c863280, type: 2}
+  m_AmbientIntensity: 2
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.97557855, g: 0.9770595, b: 0.9811321, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 212297607}
-  m_IndirectSpecularColor: {r: 0.44428685, g: 0.5388818, b: 0.58682275, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -443,7 +443,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!199 &27519630
 ParticleSystemRenderer:
   serializedVersion: 6
@@ -5867,7 +5867,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 156247192}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
   m_Name: 
@@ -6036,7 +6036,7 @@ Light:
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1}
+  m_Color: {r: 0.9622642, g: 0.9436585, b: 0.9386615, a: 1}
   m_Intensity: 1
   m_Range: 10
   m_SpotAngle: 30
@@ -7544,6 +7544,43 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 596725845}
   m_Mesh: {fileID: -6239872419269273756, guid: 756bd7f89005ecd4da0ffc8a3d31448f, type: 3}
+--- !u!84 &599989343
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!4 &607079618
 Transform:
   m_ObjectHideFlags: 0
@@ -15963,8 +16000,8 @@ Camera:
   m_GameObject: {fileID: 1656411214}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -16576,7 +16613,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 1934335231}
+        m_Texture: {fileID: 599989343}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -16599,18 +16636,18 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.5533019, g: 0.5533019, b: 0.5533019, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: -0.028674759, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: -0.58498317, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarSize: {r: 0, g: 0, b: 0, a: 1}
-    - _LightColor: {r: 1.7169812, g: 1.7169812, b: 1.7169812, a: 0.3}
+    - _LightColor: {r: 1.9245284, g: 1.887317, b: 1.877323, a: 0.3}
     - _MaxDistanceData: {r: 100000, g: 1, b: 0, a: 0}
     - _RayMarchSettings: {r: 5, g: 0.01, b: 1, a: 0.1}
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: -0.028674759, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: -0.58498317, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!4 &1833292951
 Transform:
@@ -16896,43 +16933,6 @@ Transform:
   m_Father: {fileID: 6933930956171087367}
   m_RootOrder: 71
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!84 &1934335231
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!4 &1960215722
 Transform:
   m_ObjectHideFlags: 0

Assets/VolumetricFog2/Demo/Presets/DistanceFogbaidicheng.asset

@@ -47,7 +47,7 @@ MonoBehaviour:
   terrainFogHeight: 25
   terrainFogMinAltitude: 0
   terrainFogMaxAltitude: 150
-  albedo: {r: 1, g: 1, b: 1, a: 0.148}
+  albedo: {r: 1, g: 1, b: 1, a: 0.29}
   enableDepthGradient: 0
   depthGradient:
     serializedVersion: 2