diff --git a/Assets/Enviro 3 - Sky and Weather/Profiles/HDRP/Enviro HDRP Sky and Fog Volume.asset b/Assets/Enviro 3 - Sky and Weather/Profiles/HDRP/Enviro HDRP Sky and Fog Volume.asset
index 74bf764ba..374f8463a 100644
--- a/Assets/Enviro 3 - Sky and Weather/Profiles/HDRP/Enviro HDRP Sky and Fog Volume.asset	
+++ b/Assets/Enviro 3 - Sky and Weather/Profiles/HDRP/Enviro HDRP Sky and Fog Volume.asset	
@@ -13,7 +13,6 @@ MonoBehaviour:
   m_Name: Exposure
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   mode:
     m_OverrideState: 1
     m_Value: 0
@@ -119,19 +118,15 @@ MonoBehaviour:
   adaptationSpeedDarkToLight:
     m_OverrideState: 0
     m_Value: 3
-    min: 0.001
   adaptationSpeedLightToDark:
     m_OverrideState: 0
     m_Value: 1
-    min: 0.001
   weightTextureMask:
     m_OverrideState: 0
     m_Value: {fileID: 0}
   histogramPercentages:
     m_OverrideState: 0
     m_Value: {x: 40, y: 90}
-    min: 0
-    max: 100
   histogramUseCurveRemapping:
     m_OverrideState: 0
     m_Value: 0
@@ -156,7 +151,6 @@ MonoBehaviour:
   proceduralSoftness:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
 --- !u!114 &-4333884995096911234
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -222,7 +216,6 @@ MonoBehaviour:
   - {fileID: 2642261307547123297}
   - {fileID: 3994963388396277213}
   - {fileID: 8215393669219850347}
-  - {fileID: -4333884995096911234}
   - {fileID: -4703332889699849288}
 --- !u!114 &2642261307547123297
 MonoBehaviour:
@@ -237,25 +230,21 @@ MonoBehaviour:
   m_Name: IndirectLightingController
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   indirectDiffuseLightingMultiplier:
     m_OverrideState: 1
     m_Value: 1
-    min: 0
   indirectDiffuseLightingLayers:
     m_OverrideState: 0
     m_Value: 255
   reflectionLightingMultiplier:
     m_OverrideState: 1
     m_Value: 1
-    min: 0
   reflectionLightingLayers:
     m_OverrideState: 0
     m_Value: 255
   reflectionProbeIntensityMultiplier:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
 --- !u!114 &3994963388396277213
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -269,7 +258,6 @@ MonoBehaviour:
   m_Name: Fog
   m_EditorClassIdentifier: 
   active: 0
-  m_AdvancedMode: 0
   quality:
     m_OverrideState: 0
     m_Value: 1
@@ -282,32 +270,21 @@ MonoBehaviour:
   color:
     m_OverrideState: 0
     m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   tint:
     m_OverrideState: 1
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   maxFogDistance:
     m_OverrideState: 1
     m_Value: 5000
-    min: 0
   mipFogMaxMip:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   mipFogNear:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
   mipFogFar:
     m_OverrideState: 0
     m_Value: 1000
-    min: 0
   baseHeight:
     m_OverrideState: 1
     m_Value: 0
@@ -317,67 +294,48 @@ MonoBehaviour:
   meanFreePath:
     m_OverrideState: 1
     m_Value: 38.000023
-    min: 1
   enableVolumetricFog:
     m_OverrideState: 1
     m_Value: 0
   albedo:
     m_OverrideState: 1
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 1
-    showEyeDropper: 1
   globalLightProbeDimmer:
     m_OverrideState: 1
     m_Value: 1
-    min: 0
-    max: 1
   depthExtent:
     m_OverrideState: 0
     m_Value: 64
-    min: 0.1
   denoisingMode:
     m_OverrideState: 0
     m_Value: 2
   anisotropy:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
   sliceDistributionUniformity:
     m_OverrideState: 0
     m_Value: 0.75
-    min: 0
-    max: 1
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 0
     m_Value: 0
   screenResolutionPercentage:
     m_OverrideState: 0
     m_Value: 12.5
-    min: 6.25
-    max: 50
   volumeSliceCount:
     m_OverrideState: 0
     m_Value: 64
-    min: 1
-    max: 512
   m_VolumetricFogBudget:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   m_ResolutionDepthRatio:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   directionalLightsOnly:
     m_OverrideState: 0
     m_Value: 0
-  filter:
-    m_OverrideState: 0
-    m_Value: 0
 --- !u!114 &8215393669219850347
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -391,13 +349,34 @@ MonoBehaviour:
   m_Name: VisualEnvironment
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   skyType:
     m_OverrideState: 1
     m_Value: 990
+  cloudType:
+    m_OverrideState: 0
+    m_Value: 0
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 0
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 0
+    m_Value: {x: 0, y: -6378.1, z: 0}
+  windOrientation:
+    m_OverrideState: 0
+    m_Value: 0
+  windSpeed:
+    m_OverrideState: 0
+    m_Value: 0
   fogType:
     m_OverrideState: 0
     m_Value: 0
+  m_Version: 1
diff --git a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 1.asset b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 1.asset
index 9b159007a..3560be5d0 100644
--- a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 1.asset	
+++ b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 1.asset	
@@ -13,7 +13,6 @@ MonoBehaviour:
   m_Name: Exposure
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   mode:
     m_OverrideState: 1
     m_Value: 0
@@ -119,19 +118,15 @@ MonoBehaviour:
   adaptationSpeedDarkToLight:
     m_OverrideState: 0
     m_Value: 3
-    min: 0.001
   adaptationSpeedLightToDark:
     m_OverrideState: 0
     m_Value: 1
-    min: 0.001
   weightTextureMask:
     m_OverrideState: 0
     m_Value: {fileID: 0}
   histogramPercentages:
     m_OverrideState: 0
     m_Value: {x: 40, y: 90}
-    min: 0
-    max: 100
   histogramUseCurveRemapping:
     m_OverrideState: 0
     m_Value: 0
@@ -156,7 +151,6 @@ MonoBehaviour:
   proceduralSoftness:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
 --- !u!114 &-3249981042706813740
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -273,9 +267,7 @@ MonoBehaviour:
   components:
   - {fileID: 7410085670797730347}
   - {fileID: 4152255024509356373}
-  - {fileID: -1353919533150288711}
   - {fileID: -5350473765285545990}
-  - {fileID: -3249981042706813740}
 --- !u!114 &4152255024509356373
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -289,7 +281,6 @@ MonoBehaviour:
   m_Name: Fog
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   quality:
     m_OverrideState: 0
     m_Value: 1
@@ -302,32 +293,21 @@ MonoBehaviour:
   color:
     m_OverrideState: 0
     m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   tint:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   maxFogDistance:
     m_OverrideState: 0
     m_Value: 5000
-    min: 0
   mipFogMaxMip:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   mipFogNear:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
   mipFogFar:
     m_OverrideState: 0
     m_Value: 1000
-    min: 0
   baseHeight:
     m_OverrideState: 0
     m_Value: 0
@@ -337,67 +317,48 @@ MonoBehaviour:
   meanFreePath:
     m_OverrideState: 0
     m_Value: 400
-    min: 1
   enableVolumetricFog:
     m_OverrideState: 1
     m_Value: 1
   albedo:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 1
-    showEyeDropper: 1
   globalLightProbeDimmer:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   depthExtent:
     m_OverrideState: 0
     m_Value: 64
-    min: 0.1
   denoisingMode:
     m_OverrideState: 0
     m_Value: 2
   anisotropy:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
   sliceDistributionUniformity:
     m_OverrideState: 0
     m_Value: 0.75
-    min: 0
-    max: 1
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 0
     m_Value: 0
   screenResolutionPercentage:
     m_OverrideState: 0
     m_Value: 12.5
-    min: 6.25
-    max: 50
   volumeSliceCount:
     m_OverrideState: 0
     m_Value: 64
-    min: 1
-    max: 512
   m_VolumetricFogBudget:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   m_ResolutionDepthRatio:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   directionalLightsOnly:
     m_OverrideState: 0
     m_Value: 0
-  filter:
-    m_OverrideState: 0
-    m_Value: 0
 --- !u!114 &7410085670797730347
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -411,13 +372,34 @@ MonoBehaviour:
   m_Name: VisualEnvironment
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   skyType:
     m_OverrideState: 1
     m_Value: 20382390
+  cloudType:
+    m_OverrideState: 0
+    m_Value: 0
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 0
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 0
+    m_Value: {x: 0, y: -6378.1, z: 0}
+  windOrientation:
+    m_OverrideState: 0
+    m_Value: 0
+  windSpeed:
+    m_OverrideState: 0
+    m_Value: 0
   fogType:
     m_OverrideState: 1
     m_Value: 0
+  m_Version: 1
diff --git a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 2.asset b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 2.asset
index a8d4a7fbb..1d1445e65 100644
--- a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 2.asset	
+++ b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile 2.asset	
@@ -13,7 +13,6 @@ MonoBehaviour:
   m_Name: Fog
   m_EditorClassIdentifier: 
   active: 0
-  m_AdvancedMode: 0
   quality:
     m_OverrideState: 0
     m_Value: 1
@@ -26,32 +25,21 @@ MonoBehaviour:
   color:
     m_OverrideState: 0
     m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   tint:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   maxFogDistance:
     m_OverrideState: 0
     m_Value: 5000
-    min: 0
   mipFogMaxMip:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   mipFogNear:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
   mipFogFar:
     m_OverrideState: 0
     m_Value: 1000
-    min: 0
   baseHeight:
     m_OverrideState: 0
     m_Value: 0
@@ -61,67 +49,48 @@ MonoBehaviour:
   meanFreePath:
     m_OverrideState: 0
     m_Value: 400
-    min: 1
   enableVolumetricFog:
     m_OverrideState: 1
     m_Value: 1
   albedo:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 1
-    showEyeDropper: 1
   globalLightProbeDimmer:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   depthExtent:
     m_OverrideState: 0
     m_Value: 64
-    min: 0.1
   denoisingMode:
     m_OverrideState: 0
     m_Value: 2
   anisotropy:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
   sliceDistributionUniformity:
     m_OverrideState: 0
     m_Value: 0.75
-    min: 0
-    max: 1
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 0
     m_Value: 0
   screenResolutionPercentage:
     m_OverrideState: 0
     m_Value: 12.5
-    min: 6.25
-    max: 50
   volumeSliceCount:
     m_OverrideState: 0
     m_Value: 64
-    min: 1
-    max: 512
   m_VolumetricFogBudget:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   m_ResolutionDepthRatio:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   directionalLightsOnly:
     m_OverrideState: 0
     m_Value: 0
-  filter:
-    m_OverrideState: 0
-    m_Value: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -138,7 +107,6 @@ MonoBehaviour:
   - {fileID: 1180714087162382705}
   - {fileID: 659824909832756443}
   - {fileID: -7271469571897195173}
-  - {fileID: 8598773281738389836}
 --- !u!114 &659824909832756443
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -152,12 +120,9 @@ MonoBehaviour:
   m_Name: PhysicallyBasedSky
   m_EditorClassIdentifier: 
   active: 0
-  m_AdvancedMode: 0
   rotation:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
-    max: 360
   skyIntensityMode:
     m_OverrideState: 0
     m_Value: 0
@@ -167,11 +132,9 @@ MonoBehaviour:
   multiplier:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
   upperHemisphereLuxValue:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
   upperHemisphereLuxColor:
     m_OverrideState: 0
     m_Value: {x: 0, y: 0, z: 0}
@@ -184,86 +147,60 @@ MonoBehaviour:
   updatePeriod:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
   includeSunInBaking:
     m_OverrideState: 0
     m_Value: 0
-  m_SkyVersion: 1
-  m_ObsoleteEarthPreset:
-    m_OverrideState: 0
-    m_Value: 1
   type:
     m_OverrideState: 0
     m_Value: 1
-  sphericalMode:
+  atmosphericScattering:
     m_OverrideState: 0
     m_Value: 1
-  seaLevel:
+  renderingMode:
     m_OverrideState: 0
     m_Value: 0
-  planetaryRadius:
+  material:
     m_OverrideState: 0
-    m_Value: 6378100
-    min: 0
-  planetCenterPosition:
-    m_OverrideState: 0
-    m_Value: {x: 0, y: -6378100, z: 0}
+    m_Value: {fileID: 0}
   airDensityR:
     m_OverrideState: 0
     m_Value: 0.04534
-    min: 0
-    max: 1
   airDensityG:
     m_OverrideState: 0
     m_Value: 0.10237241
-    min: 0
-    max: 1
   airDensityB:
     m_OverrideState: 0
     m_Value: 0.23264056
-    min: 0
-    max: 1
   airTint:
     m_OverrideState: 0
-    m_Value: {r: 0.9, g: 0.9, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 0
-    showEyeDropper: 1
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
   airMaximumAltitude:
     m_OverrideState: 0
     m_Value: 55261.973
-    min: 0
   aerosolDensity:
     m_OverrideState: 0
     m_Value: 0.01192826
-    min: 0
-    max: 1
   aerosolTint:
     m_OverrideState: 0
     m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1}
-    hdr: 0
-    showAlpha: 0
-    showEyeDropper: 1
   aerosolMaximumAltitude:
     m_OverrideState: 0
     m_Value: 8289.296
-    min: 0
   aerosolAnisotropy:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
-  numberOfBounces:
+  ozoneDensityDimmer:
     m_OverrideState: 0
-    m_Value: 8
-    min: 1
-    max: 10
+    m_Value: 1
+  ozoneMinimumAltitude:
+    m_OverrideState: 0
+    m_Value: 20000
+  ozoneLayerWidth:
+    m_OverrideState: 0
+    m_Value: 20000
   groundTint:
     m_OverrideState: 0
     m_Value: {r: 0.4, g: 0.25, b: 0.15, a: 1}
-    hdr: 0
-    showAlpha: 0
-    showEyeDropper: 0
   groundColorTexture:
     m_OverrideState: 0
     m_Value: {fileID: 0}
@@ -273,7 +210,6 @@ MonoBehaviour:
   groundEmissionMultiplier:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
   planetRotation:
     m_OverrideState: 0
     m_Value: {x: 0, y: 0, z: 0}
@@ -283,42 +219,37 @@ MonoBehaviour:
   spaceEmissionMultiplier:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
   spaceRotation:
     m_OverrideState: 0
     m_Value: {x: 0, y: 0, z: 0}
   colorSaturation:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   alphaSaturation:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   alphaMultiplier:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   horizonTint:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 0
-    showEyeDropper: 0
   zenithTint:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 0
-    showEyeDropper: 0
   horizonZenithShift:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
+  m_SkyVersion: 2
+  m_ObsoleteEarthPreset:
+    m_OverrideState: 0
+    m_Value: 1
+  planetaryRadius:
+    m_OverrideState: 0
+    m_Value: 6378100
+  planetCenterPosition:
+    m_OverrideState: 0
+    m_Value: {x: 0, y: -6378100, z: 0}
 --- !u!114 &1180714087162382705
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -332,16 +263,37 @@ MonoBehaviour:
   m_Name: VisualEnvironment
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   skyType:
     m_OverrideState: 1
     m_Value: 990
+  cloudType:
+    m_OverrideState: 0
+    m_Value: 0
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 0
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 0
+    m_Value: {x: 0, y: -6378.1, z: 0}
+  windOrientation:
+    m_OverrideState: 0
+    m_Value: 0
+  windSpeed:
+    m_OverrideState: 0
+    m_Value: 0
   fogType:
     m_OverrideState: 1
     m_Value: 0
+  m_Version: 1
 --- !u!114 &8598773281738389836
 MonoBehaviour:
   m_ObjectHideFlags: 3
diff --git a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile.asset b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile.asset
index a5fcef775..f781bfe07 100644
--- a/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile.asset	
+++ b/Assets/Enviro 3 - Sky and Weather/Sample/Scene/Sample_HDRP/Sky and Fog Settings Profile.asset	
@@ -13,16 +13,37 @@ MonoBehaviour:
   m_Name: VisualEnvironment
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   skyType:
     m_OverrideState: 1
     m_Value: 20382390
+  cloudType:
+    m_OverrideState: 0
+    m_Value: 0
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 0
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 0
+    m_Value: {x: 0, y: -6378.1, z: 0}
+  windOrientation:
+    m_OverrideState: 0
+    m_Value: 0
+  windSpeed:
+    m_OverrideState: 0
+    m_Value: 0
   fogType:
     m_OverrideState: 1
     m_Value: 0
+  m_Version: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -38,8 +59,6 @@ MonoBehaviour:
   components:
   - {fileID: -2046017808112310427}
   - {fileID: 7831316389285193311}
-  - {fileID: 5659259459564499625}
-  - {fileID: 6251740582726932953}
 --- !u!114 &5659259459564499625
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -154,7 +173,6 @@ MonoBehaviour:
   m_Name: Fog
   m_EditorClassIdentifier: 
   active: 1
-  m_AdvancedMode: 0
   quality:
     m_OverrideState: 0
     m_Value: 1
@@ -167,32 +185,21 @@ MonoBehaviour:
   color:
     m_OverrideState: 0
     m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   tint:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 1
-    showAlpha: 0
-    showEyeDropper: 1
   maxFogDistance:
     m_OverrideState: 0
     m_Value: 5000
-    min: 0
   mipFogMaxMip:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   mipFogNear:
     m_OverrideState: 0
     m_Value: 0
-    min: 0
   mipFogFar:
     m_OverrideState: 0
     m_Value: 1000
-    min: 0
   baseHeight:
     m_OverrideState: 0
     m_Value: 0
@@ -202,64 +209,45 @@ MonoBehaviour:
   meanFreePath:
     m_OverrideState: 0
     m_Value: 400
-    min: 1
   enableVolumetricFog:
     m_OverrideState: 1
     m_Value: 1
   albedo:
     m_OverrideState: 0
     m_Value: {r: 1, g: 1, b: 1, a: 1}
-    hdr: 0
-    showAlpha: 1
-    showEyeDropper: 1
   globalLightProbeDimmer:
     m_OverrideState: 0
     m_Value: 1
-    min: 0
-    max: 1
   depthExtent:
     m_OverrideState: 0
     m_Value: 64
-    min: 0.1
   denoisingMode:
     m_OverrideState: 0
     m_Value: 2
   anisotropy:
     m_OverrideState: 0
     m_Value: 0
-    min: -1
-    max: 1
   sliceDistributionUniformity:
     m_OverrideState: 0
     m_Value: 0.75
-    min: 0
-    max: 1
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 0
     m_Value: 0
   screenResolutionPercentage:
     m_OverrideState: 0
     m_Value: 12.5
-    min: 6.25
-    max: 50
   volumeSliceCount:
     m_OverrideState: 0
     m_Value: 64
-    min: 1
-    max: 512
   m_VolumetricFogBudget:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   m_ResolutionDepthRatio:
     m_OverrideState: 0
     m_Value: 0.5
-    min: 0
-    max: 1
   directionalLightsOnly:
     m_OverrideState: 0
     m_Value: 0
-  filter:
-    m_OverrideState: 0
-    m_Value: 0
diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png b/Assets/Resources/Fgui/Common/Common_atlas0.png
index 84260b314..b07a4b271 100644
Binary files a/Assets/Resources/Fgui/Common/Common_atlas0.png and b/Assets/Resources/Fgui/Common/Common_atlas0.png differ
diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png.meta b/Assets/Resources/Fgui/Common/Common_atlas0.png.meta
index f5532dd05..b48b2f776 100644
--- a/Assets/Resources/Fgui/Common/Common_atlas0.png.meta
+++ b/Assets/Resources/Fgui/Common/Common_atlas0.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -25,7 +25,7 @@ TextureImporter:
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMipmapLimit: 0
+  ignoreMipmapLimit: 1
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
diff --git a/Assets/Resources/Fgui/Common/Common_atlas0_1.png b/Assets/Resources/Fgui/Common/Common_atlas0_1.png
new file mode 100644
index 000000000..07d39edb6
Binary files /dev/null and b/Assets/Resources/Fgui/Common/Common_atlas0_1.png differ
diff --git a/Assets/Resources/Fgui/Common/Common_atlas0_1.png.meta b/Assets/Resources/Fgui/Common/Common_atlas0_1.png.meta
new file mode 100644
index 000000000..177be563a
--- /dev/null
+++ b/Assets/Resources/Fgui/Common/Common_atlas0_1.png.meta
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 0209d87e5aa63714a831db4f677c6e4a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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: 4
+    buildTarget: DefaultTexturePlatform
+    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: 4
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes
index 4e262ff4b..79eed3199 100644
Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ
diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes
index 43f56b7ee..0f0d1709e 100644
Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ
diff --git a/Assets/Resources/Fgui/Shop/Shop_fui.bytes b/Assets/Resources/Fgui/Shop/Shop_fui.bytes
index 8d246ea7a..04a1c37d5 100644
Binary files a/Assets/Resources/Fgui/Shop/Shop_fui.bytes and b/Assets/Resources/Fgui/Shop/Shop_fui.bytes differ
diff --git a/Assets/Scripts/UI/Home/Pages/HomeMainPage.Designer.cs b/Assets/Scripts/UI/Home/Pages/HomeMainPage.Designer.cs
index 77f03d174..c7706415c 100644
--- a/Assets/Scripts/UI/Home/Pages/HomeMainPage.Designer.cs
+++ b/Assets/Scripts/UI/Home/Pages/HomeMainPage.Designer.cs
@@ -13,7 +13,6 @@ namespace NBF
 
         public HomeButtonGroups OpGroup;
         public BottomMenu BottomMenu;
-        public GButton BtnTest;
 
         public override void ConstructFromXML(XML xml)
         {
@@ -21,7 +20,6 @@ namespace NBF
 
             OpGroup = (HomeButtonGroups)GetChild("OpGroup");
             BottomMenu = (BottomMenu)GetChild("BottomMenu");
-            BtnTest = (GButton)GetChild("BtnTest");
             OnInited();
             UILanguage.TrySetComponentLanguage(this);
         }
diff --git a/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs b/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs
index 7e3c80f1d..9369dc5d0 100644
--- a/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs
+++ b/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs
@@ -21,7 +21,7 @@ namespace NBF
                 }
             }
 
-            buttons.Add(BtnTest);
+            // buttons.Add(BtnTest);
 
             navigate = new ButtonNavigate(buttons);
             this.AutoListenInput();
diff --git a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs
index 6648c1bb9..37e8c9342 100644
--- a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs
+++ b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs
@@ -11,8 +11,6 @@ namespace NBF
     public partial class SettingPanel
     {
         public GObject this[string aKey] => ContentPane.GetChild(aKey);
-        [AutoFind(Name = "back")]
-        public GImage back;
         [AutoFind(Name = "Menu")]
         public CommonMenu Menu;
         [AutoFind(Name = "Introduce")]
@@ -23,6 +21,8 @@ namespace NBF
         public BottomMenu BottomMenu;
         [AutoFind(Name = "BottomLine")]
         public GImage BottomLine;
+        [AutoFind(Name = "Mask")]
+        public GLabel Mask;
         public override string[] GetDependPackages(){ return new string[] {"Common"}; }
 
 
diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
index 91d28edbc..9dd6e1383 100644
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
@@ -11,8 +11,6 @@ namespace NBF
     public partial class FishingShopPanel
     {
         public GObject this[string aKey] => ContentPane.GetChild(aKey);
-        [AutoFind(Name = "back")]
-        public GImage back;
         [AutoFind(Name = "Menu")]
         public CommonMenu Menu;
         [AutoFind(Name = "SubMenu")]
diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
index 24d6deb1f..80262e22c 100644
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -60,7 +60,19 @@ MonoBehaviour:
       - rid: 7166519162571063300
       - rid: 7166519162571063301
     m_RuntimeSettings:
-      m_List: []
+      m_List:
+      - rid: 6852985685364965378
+      - rid: 6852985685364965379
+      - rid: 6852985685364965380
+      - rid: 6852985685364965381
+      - rid: 6852985685364965384
+      - rid: 6852985685364965385
+      - rid: 6852985685364965392
+      - rid: 6852985685364965394
+      - rid: 8712630790384254976
+      - rid: 7166519162571063296
+      - rid: 7166519162571063298
+      - rid: 7166519162571063301
   m_AssetVersion: 8
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:
diff --git a/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Asset/SceneAsset.asset b/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Asset/SceneAsset.asset
index 504b2dfdf..aca60de37 100644
--- a/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Asset/SceneAsset.asset	
+++ b/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Asset/SceneAsset.asset	
@@ -62,6 +62,18 @@ MonoBehaviour:
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 1
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: -6378.1, z: 0}
   windOrientation:
     m_OverrideState: 1
     m_Value: 0
@@ -71,6 +83,7 @@ MonoBehaviour:
   fogType:
     m_OverrideState: 1
     m_Value: 0
+  m_Version: 1
 --- !u!114 &-8822522078318893831
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -124,6 +137,9 @@ MonoBehaviour:
     opacityA:
       m_OverrideState: 1
       m_Value: 0
+    altitude:
+      m_OverrideState: 0
+      m_Value: 2000
     rotation:
       m_OverrideState: 1
       m_Value: 0
@@ -162,6 +178,9 @@ MonoBehaviour:
     thickness:
       m_OverrideState: 1
       m_Value: 1
+    ambientProbeDimmer:
+      m_OverrideState: 0
+      m_Value: 1
     castShadows:
       m_OverrideState: 1
       m_Value: 0
@@ -181,6 +200,9 @@ MonoBehaviour:
     opacityA:
       m_OverrideState: 1
       m_Value: 0
+    altitude:
+      m_OverrideState: 0
+      m_Value: 2000
     rotation:
       m_OverrideState: 1
       m_Value: 0
@@ -219,6 +241,9 @@ MonoBehaviour:
     thickness:
       m_OverrideState: 1
       m_Value: 1
+    ambientProbeDimmer:
+      m_OverrideState: 0
+      m_Value: 1
     castShadows:
       m_OverrideState: 1
       m_Value: 1
@@ -238,6 +263,9 @@ MonoBehaviour:
   mode:
     m_OverrideState: 1
     m_Value: 1
+  useFullACES:
+    m_OverrideState: 0
+    m_Value: 0
   toeStrength:
     m_OverrideState: 1
     m_Value: 0
@@ -262,6 +290,33 @@ MonoBehaviour:
   lutContribution:
     m_OverrideState: 1
     m_Value: 1
+  neutralHDRRangeReductionMode:
+    m_OverrideState: 0
+    m_Value: 2
+  acesPreset:
+    m_OverrideState: 0
+    m_Value: 3
+  fallbackMode:
+    m_OverrideState: 0
+    m_Value: 1
+  hueShiftAmount:
+    m_OverrideState: 0
+    m_Value: 0
+  detectPaperWhite:
+    m_OverrideState: 0
+    m_Value: 0
+  paperWhite:
+    m_OverrideState: 0
+    m_Value: 300
+  detectBrightnessLimits:
+    m_OverrideState: 0
+    m_Value: 1
+  minNits:
+    m_OverrideState: 0
+    m_Value: 0.005
+  maxNits:
+    m_OverrideState: 0
+    m_Value: 1000
 --- !u!114 &-6437997779283869981
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -504,6 +559,9 @@ MonoBehaviour:
     m_Value:
       serializedVersion: 2
       m_Bits: 4294967295
+  specularOcclusion:
+    m_OverrideState: 0
+    m_Value: 0.5
   occluderMotionRejection:
     m_OverrideState: 0
     m_Value: 1
@@ -607,18 +665,15 @@ MonoBehaviour:
   type:
     m_OverrideState: 1
     m_Value: 2
-  sphericalMode:
-    m_OverrideState: 1
+  atmosphericScattering:
+    m_OverrideState: 0
     m_Value: 1
-  seaLevel:
-    m_OverrideState: 1
+  renderingMode:
+    m_OverrideState: 0
     m_Value: 0
-  planetaryRadius:
-    m_OverrideState: 1
-    m_Value: 6378100
-  planetCenterPosition:
-    m_OverrideState: 1
-    m_Value: {x: 0, y: -6378100, z: 0}
+  material:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
   airDensityR:
     m_OverrideState: 1
     m_Value: 0.04534
@@ -630,7 +685,7 @@ MonoBehaviour:
     m_Value: 0.23264056
   airTint:
     m_OverrideState: 1
-    m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
   airMaximumAltitude:
     m_OverrideState: 1
     m_Value: 55555
@@ -646,9 +701,15 @@ MonoBehaviour:
   aerosolAnisotropy:
     m_OverrideState: 1
     m_Value: -1
-  numberOfBounces:
-    m_OverrideState: 1
-    m_Value: 8
+  ozoneDensityDimmer:
+    m_OverrideState: 0
+    m_Value: 1
+  ozoneMinimumAltitude:
+    m_OverrideState: 0
+    m_Value: 20000
+  ozoneLayerWidth:
+    m_OverrideState: 0
+    m_Value: 20000
   groundTint:
     m_OverrideState: 1
     m_Value: {r: 0.34004435, g: 0.33775365, b: 0.4339623, a: 1}
@@ -691,10 +752,16 @@ MonoBehaviour:
   horizonZenithShift:
     m_OverrideState: 1
     m_Value: 0
-  m_SkyVersion: 1
+  m_SkyVersion: 2
   m_ObsoleteEarthPreset:
     m_OverrideState: 1
     m_Value: 1
+  planetaryRadius:
+    m_OverrideState: 1
+    m_Value: 6378100
+  planetCenterPosition:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: -6378100, z: 0}
 --- !u!114 &7525892682557262841
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -765,6 +832,9 @@ MonoBehaviour:
   sliceDistributionUniformity:
     m_OverrideState: 1
     m_Value: 0.75
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 1
     m_Value: 0
@@ -796,6 +866,7 @@ MonoBehaviour:
   m_Name: HDShadowSettings
   m_EditorClassIdentifier: 
   active: 1
+  interCascadeBorders: 1
   maxShadowDistance:
     m_OverrideState: 1
     m_Value: 30
@@ -816,16 +887,16 @@ MonoBehaviour:
     m_Value: 0.75
   cascadeShadowBorder0:
     m_OverrideState: 1
-    m_Value: 0.5066672
+    m_Value: 0.29762346
   cascadeShadowBorder1:
     m_OverrideState: 1
-    m_Value: 0.26222223
+    m_Value: 0.23866719
   cascadeShadowBorder2:
     m_OverrideState: 1
-    m_Value: 0.19777776
+    m_Value: 0.20507395
   cascadeShadowBorder3:
     m_OverrideState: 1
-    m_Value: 0.262
+    m_Value: 0.56372285
 --- !u!114 &8945511190722533045
 MonoBehaviour:
   m_ObjectHideFlags: 3
diff --git a/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Camera/Camera_Scene.asset b/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Camera/Camera_Scene.asset
index 4096e80b7..8fcb7c94f 100644
--- a/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Camera/Camera_Scene.asset	
+++ b/Assets/Versatile Grass/001 Versatile Grass HDRP/Scenes/Scene_Camera/Camera_Scene.asset	
@@ -62,6 +62,18 @@ MonoBehaviour:
   skyAmbientMode:
     m_OverrideState: 1
     m_Value: 1
+  planetRadius:
+    m_OverrideState: 1
+    m_Value: 6378.1
+  renderingSpace:
+    m_OverrideState: 0
+    m_Value: 1
+  centerMode:
+    m_OverrideState: 0
+    m_Value: 0
+  planetCenter:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: -6378.1, z: 0}
   windOrientation:
     m_OverrideState: 1
     m_Value: 0
@@ -71,6 +83,7 @@ MonoBehaviour:
   fogType:
     m_OverrideState: 1
     m_Value: 0
+  m_Version: 1
 --- !u!114 &-8822522078318893831
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -124,6 +137,9 @@ MonoBehaviour:
     opacityA:
       m_OverrideState: 1
       m_Value: 0
+    altitude:
+      m_OverrideState: 0
+      m_Value: 2000
     rotation:
       m_OverrideState: 1
       m_Value: 0
@@ -162,6 +178,9 @@ MonoBehaviour:
     thickness:
       m_OverrideState: 1
       m_Value: 1
+    ambientProbeDimmer:
+      m_OverrideState: 0
+      m_Value: 1
     castShadows:
       m_OverrideState: 1
       m_Value: 0
@@ -181,6 +200,9 @@ MonoBehaviour:
     opacityA:
       m_OverrideState: 1
       m_Value: 0
+    altitude:
+      m_OverrideState: 0
+      m_Value: 2000
     rotation:
       m_OverrideState: 1
       m_Value: 0
@@ -219,6 +241,9 @@ MonoBehaviour:
     thickness:
       m_OverrideState: 1
       m_Value: 1
+    ambientProbeDimmer:
+      m_OverrideState: 0
+      m_Value: 1
     castShadows:
       m_OverrideState: 1
       m_Value: 1
@@ -538,6 +563,9 @@ MonoBehaviour:
     m_Value:
       serializedVersion: 2
       m_Bits: 4294967295
+  specularOcclusion:
+    m_OverrideState: 0
+    m_Value: 0.5
   occluderMotionRejection:
     m_OverrideState: 0
     m_Value: 1
@@ -654,6 +682,15 @@ MonoBehaviour:
   m_PhysicallyBased:
     m_OverrideState: 1
     m_Value: 1
+  m_AdaptiveSamplingWeight:
+    m_OverrideState: 0
+    m_Value: 0.75
+  m_LimitManualRangeNearBlur:
+    m_OverrideState: 0
+    m_Value: 0
+  coCStabilization:
+    m_OverrideState: 0
+    m_Value: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -728,18 +765,15 @@ MonoBehaviour:
   type:
     m_OverrideState: 1
     m_Value: 2
-  sphericalMode:
-    m_OverrideState: 1
+  atmosphericScattering:
+    m_OverrideState: 0
     m_Value: 1
-  seaLevel:
-    m_OverrideState: 1
+  renderingMode:
+    m_OverrideState: 0
     m_Value: 0
-  planetaryRadius:
-    m_OverrideState: 1
-    m_Value: 6378100
-  planetCenterPosition:
-    m_OverrideState: 1
-    m_Value: {x: 0, y: -6378100, z: 0}
+  material:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
   airDensityR:
     m_OverrideState: 1
     m_Value: 0.04534
@@ -751,7 +785,7 @@ MonoBehaviour:
     m_Value: 0.23264056
   airTint:
     m_OverrideState: 1
-    m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
   airMaximumAltitude:
     m_OverrideState: 1
     m_Value: 55555
@@ -767,9 +801,15 @@ MonoBehaviour:
   aerosolAnisotropy:
     m_OverrideState: 1
     m_Value: -1
-  numberOfBounces:
-    m_OverrideState: 1
-    m_Value: 8
+  ozoneDensityDimmer:
+    m_OverrideState: 0
+    m_Value: 1
+  ozoneMinimumAltitude:
+    m_OverrideState: 0
+    m_Value: 20000
+  ozoneLayerWidth:
+    m_OverrideState: 0
+    m_Value: 20000
   groundTint:
     m_OverrideState: 1
     m_Value: {r: 0.34004435, g: 0.33775365, b: 0.4339623, a: 1}
@@ -812,10 +852,16 @@ MonoBehaviour:
   horizonZenithShift:
     m_OverrideState: 1
     m_Value: 0
-  m_SkyVersion: 1
+  m_SkyVersion: 2
   m_ObsoleteEarthPreset:
     m_OverrideState: 1
     m_Value: 1
+  planetaryRadius:
+    m_OverrideState: 1
+    m_Value: 6378100
+  planetCenterPosition:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: -6378100, z: 0}
 --- !u!114 &7525892682557262841
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -886,6 +932,9 @@ MonoBehaviour:
   sliceDistributionUniformity:
     m_OverrideState: 1
     m_Value: 0.75
+  multipleScatteringIntensity:
+    m_OverrideState: 0
+    m_Value: 0
   m_FogControlMode:
     m_OverrideState: 1
     m_Value: 0
@@ -917,6 +966,7 @@ MonoBehaviour:
   m_Name: HDShadowSettings
   m_EditorClassIdentifier: 
   active: 1
+  interCascadeBorders: 1
   maxShadowDistance:
     m_OverrideState: 1
     m_Value: 30
@@ -937,16 +987,16 @@ MonoBehaviour:
     m_Value: 0.75
   cascadeShadowBorder0:
     m_OverrideState: 1
-    m_Value: 0.3273333
+    m_Value: 0.1798374
   cascadeShadowBorder1:
     m_OverrideState: 1
-    m_Value: 0.26222223
+    m_Value: 0.46980196
   cascadeShadowBorder2:
     m_OverrideState: 1
-    m_Value: 0.19777776
+    m_Value: 0.30240977
   cascadeShadowBorder3:
     m_OverrideState: 1
-    m_Value: 0.262
+    m_Value: 0.56372285
 --- !u!114 &8304972671645653218
 MonoBehaviour:
   m_ObjectHideFlags: 3
diff --git a/FGUIProject/assets/Common/Com/Back/Back1.xml b/FGUIProject/assets/Common/Com/Back/Back1.xml
new file mode 100644
index 000000000..138d74a6a
--- /dev/null
+++ b/FGUIProject/assets/Common/Com/Back/Back1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1920,1080" extention="Label">
+  <displayList>
+    <loader id="n36_gii7" name="icon" xy="0,0" size="1920,1080" url="ui://6hgkvlau8hy8lb" align="center" vAlign="middle"/>
+    <image id="n37_gii7" name="back" src="kryob" fileName="Images/Square.png" xy="0,0" size="1920,1080" alpha="0.9" color="#041c26">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml
index 3a16ac532..fde87fcb2 100644
--- a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml
+++ b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml
@@ -2,7 +2,7 @@
 <component size="32,32" pivot="0.5,0.5" extention="Button">
   <controller name="show" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n11_r03u" name="icon" xy="0,0" size="32,32" url="ui://6hgkvlau9mf1jr" align="center" vAlign="middle" autoSize="true"/>
+    <loader id="n11_r03u" name="icon" xy="0,0" size="32,32" url="ui://6hgkvlau9mf1jr" align="center" vAlign="middle" autoSize="true" color="#8bf3ff"/>
   </displayList>
   <Button downEffect="scale" downEffectValue=".95"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml b/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml
index 7ab931411..f5134e4c1 100644
--- a/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml
+++ b/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml
@@ -2,9 +2,9 @@
 <component size="85,32" pivot="0.5,0.5" extention="Button">
   <controller name="show" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n9_r03u" name="icon" xy="0,0" size="32,32" url="ui://6hgkvlau9mf1jv" align="center" vAlign="middle" autoSize="true"/>
-    <text id="n10_r03u" name="title" xy="38,0" size="47,32" font="ui://6hgkvlaugkm7x" fontSize="22" color="#ffffff" text="继续"/>
+    <loader id="n9_r03u" name="icon" xy="0,0" size="32,32" url="ui://6hgkvlau9mf1jv" align="center" vAlign="middle" autoSize="true" color="#8bf3ff"/>
+    <text id="n10_r03u" name="title" xy="38,0" size="47,32" font="ui://6hgkvlaugkm7w" fontSize="22" color="#8bf3ff" text="继续"/>
   </displayList>
-  <Button downEffect="scale" downEffectValue="0.95"/>
+  <Button downEffect="scale" downEffectValue=".95"/>
   <relation target="n10_r03u" sidePair="rightext-right"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Common/Com/Menu/ButtonSubIconTab.xml b/FGUIProject/assets/Common/Com/Menu/ButtonSubIconTab.xml
index 33e70c817..dc6f17bcb 100644
--- a/FGUIProject/assets/Common/Com/Menu/ButtonSubIconTab.xml
+++ b/FGUIProject/assets/Common/Com/Menu/ButtonSubIconTab.xml
@@ -2,17 +2,17 @@
 <component size="100,40" extention="Button">
   <controller name="button" pages="2,up,3,down" selected="1"/>
   <displayList>
-    <text id="n3_fcfg" name="title" xy="43,3" size="45,30" font="ui://6hgkvlaugkm7v" fontSize="21" color="#ffffff" align="center" vAlign="middle" text="标题">
-      <gearColor controller="button" pages="2,3" values="#cccccc,#000000|#ffffff,#000000"/>
+    <text id="n3_fcfg" name="title" xy="43,3" size="45,30" font="ui://6hgkvlaugkm7v" fontSize="21" color="#8bf3ff" align="center" vAlign="middle" text="标题">
+      <gearColor controller="button" pages="2,3" values="#d8fbff,#000000|#8bf3ff,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="37,38" size="22,2">
+    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="37,38" size="22,2" color="#8bf3ff">
       <gearDisplay controller="button" pages="3,5"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <loader id="n5_nmzb" name="icon" xy="12,3" size="30,30" url="ui://6hgkvlau9mf1je" align="center" vAlign="middle" fill="scale">
+    <loader id="n5_nmzb" name="icon" xy="12,3" size="30,30" url="ui://6hgkvlau9mf1je" align="center" vAlign="middle" fill="scale" color="#8bf3ff">
       <gearLook controller="button" default="1,0,0,1"/>
-      <gearColor controller="button" pages="2,3" values="#cccccc|#ffffff"/>
+      <gearColor controller="button" pages="2,3" values="#d8fbff|#8bf3ff"/>
       <relation target="n3_fcfg" sidePair="middle-middle,left-left"/>
     </loader>
   </displayList>
diff --git a/FGUIProject/assets/Common/Com/Menu/ButtonSubTab.xml b/FGUIProject/assets/Common/Com/Menu/ButtonSubTab.xml
index 268ff0cbe..7fb82b170 100644
--- a/FGUIProject/assets/Common/Com/Menu/ButtonSubTab.xml
+++ b/FGUIProject/assets/Common/Com/Menu/ButtonSubTab.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="75,40" extention="Button">
-  <controller name="button" pages="2,up,3,down" selected="1"/>
+  <controller name="button" pages="2,up,3,down" selected="0"/>
   <displayList>
-    <text id="n3_fcfg" name="title" xy="15,3" size="45,30" font="ui://6hgkvlaugkm7v" fontSize="21" color="#ffffff" align="center" vAlign="middle" text="标题">
-      <gearColor controller="button" pages="2,3" values="#cccccc,#000000|#ffffff,#000000"/>
+    <text id="n3_fcfg" name="title" xy="15,3" size="45,30" font="ui://6hgkvlaugkm7v" fontSize="21" color="#d8fbff" align="center" vAlign="middle" text="标题">
+      <gearColor controller="button" pages="2,3" values="#d8fbff,#000000|#8bf3ff,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="25,38" size="22,2">
+    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="25,38" size="22,2" color="#8bf3ff">
       <gearDisplay controller="button" pages="3,5"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
diff --git a/FGUIProject/assets/Common/Com/Menu/ButtonTab.xml b/FGUIProject/assets/Common/Com/Menu/ButtonTab.xml
index b9be43d66..51edcd113 100644
--- a/FGUIProject/assets/Common/Com/Menu/ButtonTab.xml
+++ b/FGUIProject/assets/Common/Com/Menu/ButtonTab.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="83,54" extention="Button">
-  <controller name="button" pages="2,up,3,down" selected="1"/>
+  <controller name="button" pages="2,up,3,down" selected="0"/>
   <displayList>
-    <text id="n3_fcfg" name="title" xy="15,0" size="53,35" font="ui://6hgkvlaugkm7v" fontSize="25" color="#ffffff" align="center" vAlign="middle" text="标题">
-      <gearColor controller="button" pages="2,3" values="#cbcbcb,#000000|#ffffff,#000000"/>
+    <text id="n3_fcfg" name="title" xy="15,0" size="53,35" font="ui://6hgkvlaugkm7v" fontSize="25" color="#d8fbff" align="center" vAlign="middle" text="标题">
+      <gearColor controller="button" pages="2,3" values="#d8fbff,#000000|#8bf3ff,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="20,52" size="40,2">
+    <image id="n4_fcfg" name="n4" src="kryob" fileName="Images/Square.png" xy="20,52" size="40,2" color="#8bf3ff">
       <gearDisplay controller="button" pages="3,5"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
diff --git a/FGUIProject/assets/Shop/images/Background.png b/FGUIProject/assets/Common/Images/Back/Background.png
similarity index 100%
rename from FGUIProject/assets/Shop/images/Background.png
rename to FGUIProject/assets/Common/Images/Back/Background.png
diff --git a/FGUIProject/assets/Common/Images/button/GlowBtn.png b/FGUIProject/assets/Common/Images/button/GlowBtn.png
new file mode 100644
index 000000000..3a572bbc8
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/GlowBtn.png differ
diff --git a/FGUIProject/assets/Common/Images/button/GlowBtnDisabled.png b/FGUIProject/assets/Common/Images/button/GlowBtnDisabled.png
new file mode 100644
index 000000000..3ab71e9b6
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/GlowBtnDisabled.png differ
diff --git a/FGUIProject/assets/Common/Images/button/GlowBtnHighlighted.png b/FGUIProject/assets/Common/Images/button/GlowBtnHighlighted.png
new file mode 100644
index 000000000..a05696fe9
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/GlowBtnHighlighted.png differ
diff --git a/FGUIProject/assets/Common/Images/button/GlowBtnOver.png b/FGUIProject/assets/Common/Images/button/GlowBtnOver.png
new file mode 100644
index 000000000..ad3dfe72b
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/GlowBtnOver.png differ
diff --git a/FGUIProject/assets/Common/Images/button/RadioBg.png b/FGUIProject/assets/Common/Images/button/RadioBg.png
new file mode 100644
index 000000000..7515b970e
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/RadioBg.png differ
diff --git a/FGUIProject/assets/Common/Images/button/RadioCheck.png b/FGUIProject/assets/Common/Images/button/RadioCheck.png
new file mode 100644
index 000000000..07936e686
Binary files /dev/null and b/FGUIProject/assets/Common/Images/button/RadioCheck.png differ
diff --git a/FGUIProject/assets/Common/Images/button/button_square_2.png b/FGUIProject/assets/Common/Images/button/other/button_square_2.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_2.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_2.png
diff --git a/FGUIProject/assets/Common/Images/button/button_square_3.png b/FGUIProject/assets/Common/Images/button/other/button_square_3.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_3.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_3.png
diff --git a/FGUIProject/assets/Common/Images/button/button_square_4.png b/FGUIProject/assets/Common/Images/button/other/button_square_4.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_4.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_4.png
diff --git a/FGUIProject/assets/Common/Images/button/button_square_5.png b/FGUIProject/assets/Common/Images/button/other/button_square_5.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_5.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_5.png
diff --git a/FGUIProject/assets/Common/Images/button/button_square_6.png b/FGUIProject/assets/Common/Images/button/other/button_square_6.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_6.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_6.png
diff --git a/FGUIProject/assets/Common/Images/button/button_square_7.png b/FGUIProject/assets/Common/Images/button/other/button_square_7.png
similarity index 100%
rename from FGUIProject/assets/Common/Images/button/button_square_7.png
rename to FGUIProject/assets/Common/Images/button/other/button_square_7.png
diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml
index ed71c6012..4cc3d5149 100644
--- a/FGUIProject/assets/Common/package.xml
+++ b/FGUIProject/assets/Common/package.xml
@@ -89,12 +89,12 @@
     <component id="fcfgga" name="BtnIcon.xml" path="/Com/Buttons/" exported="true"/>
     <component id="fcfggb" name="BtnClose.xml" path="/Com/Buttons/" exported="true"/>
     <component id="fcfggj" name="BtnIcon2.xml" path="/Com/Buttons/" exported="true"/>
-    <image id="fcfggk" name="button_square_2.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="7,10,113,109"/>
-    <image id="fcfggl" name="button_square_3.png" path="/Images/button/" exported="true"/>
-    <image id="fcfggm" name="button_square_4.png" path="/Images/button/" exported="true"/>
-    <image id="fcfggn" name="button_square_5.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="9,9,102,108"/>
-    <image id="fcfggo" name="button_square_6.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="20,18,94,92"/>
-    <image id="fcfggp" name="button_square_7.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="25,23,79,85"/>
+    <image id="fcfggk" name="button_square_2.png" path="/Images/button/other/" exported="true" scale="9grid" scale9grid="7,10,113,109"/>
+    <image id="fcfggl" name="button_square_3.png" path="/Images/button/other/" exported="true"/>
+    <image id="fcfggm" name="button_square_4.png" path="/Images/button/other/" exported="true"/>
+    <image id="fcfggn" name="button_square_5.png" path="/Images/button/other/" exported="true" scale="9grid" scale9grid="9,9,102,108"/>
+    <image id="fcfggo" name="button_square_6.png" path="/Images/button/other/" exported="true" scale="9grid" scale9grid="20,18,94,92"/>
+    <image id="fcfggp" name="button_square_7.png" path="/Images/button/other/" exported="true" scale="9grid" scale9grid="25,23,79,85"/>
     <component id="fcfggq" name="CurrencyGroup.xml" path="/Com/Tags/" exported="true"/>
     <image id="fcfg9" name="20250521000344_1.jpg" path="/效果图/"/>
     <component id="fcfggr" name="CommonMenu.xml" path="/Com/Menu/" exported="true"/>
@@ -194,6 +194,14 @@
     <component id="lvqll7" name="CommonContainer.xml" path="/Com/" exported="true"/>
     <component id="lvqll8" name="CommonTopPanel.xml" path="/Panel/" exported="true"/>
     <component id="lvqll9" name="MarqueeTag.xml" path="/Com/" exported="true"/>
+    <component id="8hy8la" name="Back1.xml" path="/Com/Back/" exported="true"/>
+    <image id="8hy8lb" name="Background.png" path="/Images/Back/"/>
+    <image id="8hy8lc" name="GlowBtn.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="46,26,57,56"/>
+    <image id="8hy8ld" name="GlowBtnDisabled.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="46,27,57,55"/>
+    <image id="8hy8le" name="GlowBtnOver.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="45,26,58,57"/>
+    <image id="8hy8lf" name="GlowBtnHighlighted.png" path="/Images/button/" exported="true" scale="9grid" scale9grid="46,37,57,45"/>
+    <image id="8hy8lg" name="RadioBg.png" path="/Images/button/" exported="true"/>
+    <image id="8hy8lh" name="RadioCheck.png" path="/Images/button/" exported="true"/>
   </resources>
   <publish name="" path="../Assets/Resources/Fgui/Common" packageCount="2" genCode="true"/>
 </packageDescription>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/Home/BtnHomeMap.xml b/FGUIProject/assets/Main/Com/Home/BtnHomeMap.xml
index 11367326f..1aef769eb 100644
--- a/FGUIProject/assets/Main/Com/Home/BtnHomeMap.xml
+++ b/FGUIProject/assets/Main/Com/Home/BtnHomeMap.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="732,370" extention="Button">
-  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="2"/>
+  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
   <displayList>
     <loader id="n21_lvql" name="icon" xy="0,0" size="732,370" url="ui://6hgkvlaudheveh" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n22_lvql" name="n22" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="732,370" alpha="0.9" color="#4297be">
-      <gearDisplay controller="button" pages="3,4,5"/>
-      <gearLook controller="button" pages="4" values="0.9,0,0,0" default="1,0,0,0"/>
-      <gearColor controller="button" pages="2,4" values="#34a7de|#4297be" default="#4297be"/>
+    <loader id="n24_8hy8" name="n24" xy="-43,-23" size="818,456" url="ui://6hgkvlau8hy8lc" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
+      <gearIcon controller="button" pages="2,4" values="ui://6hgkvlau8hy8lc|ui://6hgkvlau8hy8le" default="ui://6hgkvlau8hy8lf"/>
       <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    </loader>
     <component id="n23_lvql" name="Weather" src="tmu81h" fileName="Com/WeatherInfo.xml" pkg="6hgkvlau" xy="4,4"/>
+    <image id="n25_8hy8" name="n25" src="8hy8lf" fileName="Images/button/GlowBtnHighlighted.png" pkg="6hgkvlau" xy="214,301"/>
   </displayList>
   <Button mode="Radio"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml b/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml
index 0f2efaa31..5ee61abd9 100644
--- a/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml
+++ b/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="410,242" extention="Button">
-  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="2"/>
+  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="3"/>
   <displayList>
-    <graph id="n33_lvql" name="back" xy="0,0" size="410,242" type="rect" lineSize="0" lineColor="#ff4297be" fillColor="#cc0e0f11">
+    <image id="n37_gii7" name="n37" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="410,241" alpha="0.2" color="#5c748b"/>
+    <loader id="n36_lvql" name="n36" xy="-42,-22" size="494,326" url="ui://6hgkvlau8hy8lf" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
+      <gearIcon controller="button" pages="2,4" values="ui://6hgkvlau8hy8lc|ui://6hgkvlau8hy8le" default="ui://6hgkvlau8hy8lf"/>
       <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <image id="n36_lvql" name="n36" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="410,242" alpha="0.9" color="#4297be">
-      <gearDisplay controller="button" pages="3,4,5"/>
-      <gearLook controller="button" pages="4" values="0.9,0,0,0" default="1,0,0,0"/>
-      <gearColor controller="button" pages="4" values="#4297be" default="#34a7de"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" text="title"/>
+    </loader>
+    <text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#d8fbff" align="center" vAlign="middle" text="title"/>
   </displayList>
   <Button mode="Radio"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/Home/BtnHomeSmall.xml b/FGUIProject/assets/Main/Com/Home/BtnHomeSmall.xml
index 8f8b0ae29..4196ca4d8 100644
--- a/FGUIProject/assets/Main/Com/Home/BtnHomeSmall.xml
+++ b/FGUIProject/assets/Main/Com/Home/BtnHomeSmall.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="356,112" pivot="0.5,0.5" extention="Button">
-  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="2"/>
+  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="3"/>
   <displayList>
-    <image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="356,112" alpha="0.8" color="#0e0f11"/>
-    <image id="n38_lvql" name="n38" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="356,112" alpha="0.9" color="#4297be">
-      <gearDisplay controller="button" pages="3,4,5"/>
-      <gearLook controller="button" pages="4" values="0.9,0,0,0" default="1,0,0,0"/>
-      <gearColor controller="button" pages="4" values="#4297be" default="#34a7de"/>
-    </image>
-    <loader id="n33_lvql" name="icon" xy="253,11" size="90,90" alpha="0.7" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale"/>
-    <text id="n34_lvql" name="title" xy="16,17" size="217,73" alpha="0.7" fontSize="25" color="#ffffff" vAlign="middle" autoSize="none" text="设置"/>
+    <image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="356,112" alpha="0.2" color="#5c748b"/>
+    <loader id="n38_lvql" name="n38" xy="-42,-22" size="440,196" url="ui://6hgkvlau8hy8lf" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
+      <gearIcon controller="button" pages="2,3,4,5" values="ui://6hgkvlau8hy8lc|ui://6hgkvlau8hy8lf|ui://6hgkvlau8hy8le|ui://6hgkvlau8hy8lf"/>
+    </loader>
+    <loader id="n33_lvql" name="icon" xy="253,11" size="90,90" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale" color="#d8fbff"/>
+    <text id="n34_lvql" name="title" xy="16,17" size="217,73" fontSize="25" color="#d8fbff" vAlign="middle" autoSize="none" text="设置"/>
   </displayList>
   <Button mode="Radio"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/Home/Pages/HomeMainPage.xml b/FGUIProject/assets/Main/Com/Home/Pages/HomeMainPage.xml
index ff2a3772b..c43c2a576 100644
--- a/FGUIProject/assets/Main/Com/Home/Pages/HomeMainPage.xml
+++ b/FGUIProject/assets/Main/Com/Home/Pages/HomeMainPage.xml
@@ -7,6 +7,5 @@
     <component id="n1_lvql" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,992">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n2_wp6f" name="BtnTest" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="1467,810"/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/HomePanel.xml b/FGUIProject/assets/Main/HomePanel.xml
index b5e5b97ee..a3489bb54 100644
--- a/FGUIProject/assets/Main/HomePanel.xml
+++ b/FGUIProject/assets/Main/HomePanel.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1920,1080" designImage="ui://hxr7rc7pnmzbd" designImageAlpha="0">
   <displayList>
-    <graph id="n17_nmzb" name="n17" xy="0,0" size="1920,1080" type="rect" lineSize="0" fillColor="#ff182128">
+    <component id="n33_gii7" name="n33" src="8hy8la" fileName="Com/Back/Back1.xml" pkg="6hgkvlau" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <image id="n30_nmzb" name="n30" src="nmzbl6" fileName="Images/bluenoise64/LDR_LLL1_0.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" alpha="0.2">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    </component>
     <component id="n32_lvql" name="Pages" src="lvqll7" fileName="Com/CommonContainer.xml" pkg="6hgkvlau" xy="0,0" size="1920,1080">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
diff --git a/FGUIProject/assets/Main/SettingPanel.xml b/FGUIProject/assets/Main/SettingPanel.xml
index ab990ce65..8b0846eb0 100644
--- a/FGUIProject/assets/Main/SettingPanel.xml
+++ b/FGUIProject/assets/Main/SettingPanel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1920,1080" extention="Label" designImage="ui://hxr7rc7pe9z82" designImageAlpha="30">
   <displayList>
-    <image id="n1_e9z8" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" color="#182128">
+    <component id="n14_gii7" name="n14" src="8hy8la" fileName="Com/Back/Back1.xml" pkg="6hgkvlau" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    </component>
     <component id="n0_e9z8" name="Menu" src="fcfggr" fileName="Com/Menu/CommonMenu.xml" pkg="6hgkvlau" xy="0,0">
       <relation target="" sidePair="width-width,center-center,top-top"/>
     </component>
@@ -34,6 +34,6 @@
     <image id="n12_e9z8" name="BottomLine" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="57,974" size="898,4" alpha="0.2" color="#5c748b">
       <relation target="n10_e9z8" sidePair="bottom-bottom,rightext-right,leftext-left"/>
     </image>
-    <component id="n13_j6rn" name="Mask" src="j6rn18" fileName="Com/SettingMask.xml" xy="0,0"/>
+    <component id="n13_j6rn" name="Mask" src="j6rn18" fileName="Com/SettingMask.xml" xy="0,0" visible="false"/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/Com/ShopGearItem.xml b/FGUIProject/assets/Shop/Com/ShopGearItem.xml
index e60848286..e50c074cf 100644
--- a/FGUIProject/assets/Shop/Com/ShopGearItem.xml
+++ b/FGUIProject/assets/Shop/Com/ShopGearItem.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="350,300" extention="Button">
-  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="2"/>
+  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="3"/>
   <displayList>
-    <image id="n10_r03u" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="350,300" alpha="0.1" color="#8bf3ff">
-      <gearLook controller="button" pages="2,3,4,5" values="0.2,0,0,0|0.2,0,0,0|0.1,0,0,0|0.2,0,0,0" default="0.55,0,0,0"/>
-      <gearColor controller="button" pages="3,4,5" values="#8bf3ff|#8bf3ff|#8bf3ff" default="#5c748b"/>
+    <image id="n10_r03u" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="350,300" alpha="0.15" color="#8bf3ff">
+      <gearLook controller="button" pages="2,3,4,5" values="0.2,0,0,0|0.15,0,0,0|0.15,0,0,0|0.15,0,0,0" default="0.55,0,0,0"/>
+      <gearColor controller="button" pages="2,3,4,5,6,7" values="#5c748b|#8bf3ff|#8bf3ff|#8bf3ff|#6fa8c0|#6fa8c0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n12_r03u" name="ba" src="r03uif" fileName="Images/Panels/RarityBg.png" pkg="6hgkvlau" xy="0,0" size="194,300" color="#ff6c00"/>
+    <image id="n12_r03u" name="ba" src="r03uif" fileName="Images/Panels/RarityBg.png" pkg="6hgkvlau" xy="0,0" size="194,300" alpha="0.6" color="#ff6c00"/>
     <text id="n7_oome" name="title" xy="18,7" size="323,32" alpha="0.7" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="Title"/>
     <loader id="n13_r03u" name="n13" xy="50,55" size="250,190" url="ui://6hgkvlaur03uiy" align="center" vAlign="middle" fill="scale"/>
     <text id="n15_r03u" name="n15" xy="237,246" size="57,29" alpha="0.7" fontSize="20" color="#d8fbff" align="right" text="50.99"/>
diff --git a/FGUIProject/assets/Shop/FishingShopPanel.xml b/FGUIProject/assets/Shop/FishingShopPanel.xml
index 58ca73b8a..af351119e 100644
--- a/FGUIProject/assets/Shop/FishingShopPanel.xml
+++ b/FGUIProject/assets/Shop/FishingShopPanel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1920,1080" designImage="ui://146ra2lqr03ue" designImageAlpha="0">
   <displayList>
-    <image id="n2_fcfg" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" alpha="0.8" color="#031018">
+    <component id="n36_gii7" name="n36" src="8hy8la" fileName="Com/Back/Back1.xml" pkg="6hgkvlau" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    </component>
     <component id="n3_fcfg" name="Menu" src="fcfggr" fileName="Com/Menu/CommonMenu.xml" pkg="6hgkvlau" xy="0,0" controller="showType,1">
       <relation target="" sidePair="width-width,center-center,top-top"/>
     </component>
diff --git a/FGUIProject/assets/Shop/package.xml b/FGUIProject/assets/Shop/package.xml
index 3acbdfa1f..8a1866cd1 100644
--- a/FGUIProject/assets/Shop/package.xml
+++ b/FGUIProject/assets/Shop/package.xml
@@ -26,7 +26,6 @@
     <image id="r03uo" name="20250521222232_1.jpg" path="/x效果图/"/>
     <image id="r03up" name="20250521222522_1.jpg" path="/x效果图/"/>
     <image id="r03uq" name="20250521222909_1.jpg" path="/x效果图/"/>
-    <image id="9lmcv" name="Background.png" path="/images/" atlas="alone"/>
   </resources>
   <publish name="" path="../Assets/Resources/Fgui/Shop" packageCount="2" genCode="true"/>
 </packageDescription>
\ No newline at end of file
diff --git a/FGUIProject/settings/Common.json b/FGUIProject/settings/Common.json
index d8238c366..c5dc61e9d 100644
--- a/FGUIProject/settings/Common.json
+++ b/FGUIProject/settings/Common.json
@@ -5,14 +5,9 @@
   "fontAdjustment": false,
   "colorScheme": [
     "白色字 #FFFFFF",
-    "常规字 #CBCBCB",
-    "暗色字 #7A7D89",
-    "蓝色框背景 #34A7DE",
-    "暗蓝色框背景 #4297BE",
-    "亮黄色背景 #FAC604",
-    "普通灰框背景 #5D7074",
-    "灰文字条 #646B75",
-    "默认边框 #1E5068",
+    "常规色 #D8FBFF",
+    "选中色 #8BF3FF",
+    "背景框 #5C748B",
     "品质-蓝色 #008AFF",
     "品质-绿色 #44EDBF",
     "品质-紫色 #7E00FF",
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 5d5c27983..89ea06b61 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -5,7 +5,6 @@
     "com.unity.collab-proxy": "2.8.2",
     "com.unity.ide.rider": "3.0.36",
     "com.unity.ide.visualstudio": "2.0.23",
-    "com.unity.ide.vscode": "1.2.4",
     "com.unity.inputsystem": "1.14.0",
     "com.unity.multiplayer.center": "1.0.0",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 9ba75c0a6..177bb8798 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -267,13 +267,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.4",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.inputsystem": {
       "version": "1.14.0",
       "depth": 0,
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 661fb2716..eb2201660 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,35 +9,35 @@ EditorUserSettings:
       value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5b000052510d5b0a5b565a2344770b444e4e1d7c79797f622b7b1c35b3e2606a
-      flags: 0
-    RecentlyUsedSceneGuid-1:
-      value: 5309000306505b0d0b565f20427a5e44104e1d2c2a7f7467287c4d64b0b66469
-      flags: 0
-    RecentlyUsedSceneGuid-2:
       value: 5303020755510a0f5e085c2744775a40454e1a2f282b72632f284d61e1e5673d
       flags: 0
-    RecentlyUsedSceneGuid-3:
+    RecentlyUsedSceneGuid-1:
       value: 52530c5601535f020f565a2043770d1612154d2f747975692c7b4e66b5e3303b
       flags: 0
-    RecentlyUsedSceneGuid-4:
+    RecentlyUsedSceneGuid-2:
       value: 0154065050055b0a5f585a7740705d444f4f4879747f7e3174704d66e3b5636f
       flags: 0
-    RecentlyUsedSceneGuid-5:
+    RecentlyUsedSceneGuid-3:
       value: 065006565505590b0b0f5e7240730f4046154a7a7c7876607f2b4f63b2b06468
       flags: 0
-    RecentlyUsedSceneGuid-6:
+    RecentlyUsedSceneGuid-4:
       value: 025002565403500e5b5b55724321064445161a7b7b7c22367a7e4467b4b76160
       flags: 0
-    RecentlyUsedSceneGuid-7:
+    RecentlyUsedSceneGuid-5:
       value: 5002040357510f020f0a54261227084414161e7a7f7b76332c7b4532e3b66769
       flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-6:
       value: 57085255030d5d0e540c0e7340750f44174f4a2c2a7d70357b2c4b62bbb9353d
       flags: 0
-    RecentlyUsedSceneGuid-9:
+    RecentlyUsedSceneGuid-7:
       value: 5107035303565c0d5b5b592416760d4417164a7c2e2b2067747b4830b2b8653d
       flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 5a04505e56055903545e5b2347700844124f1b2b797c73327d2a4f63b4e5306c
+      flags: 0
+    RecentlyUsedSceneGuid-9:
+      value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
+      flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9afeffa9ffff8e85dd8390e2969e8899daa7
       flags: 0