Explorar o código

优化了一下场景

wartheking hai 1 día
pai
achega
6f55c87779
Modificáronse 60 ficheiros con 392 adicións e 331 borrados
  1. 1 1
      Assets/Art/Material/Effect/BianKuangEffect1.mat
  2. 3 3
      Assets/Art/Material/Effect/BianKuangEffect2.mat
  3. 3 3
      Assets/Art/Material/QiTaJianZhu/BengZhan_TongYong.mat
  4. 3 3
      Assets/Art/Material/QiTaJianZhu/NongChang1.mat
  5. 3 3
      Assets/Art/Material/QiTaJianZhu/NongChang2.mat
  6. 3 3
      Assets/Art/Material/QiTaJianZhu/Zha_Tong.mat
  7. 3 3
      Assets/Art/Material/SheBei/SheXiangTou.mat
  8. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y2.mat
  9. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y3.mat
  10. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y4.mat
  11. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y5.mat
  12. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y6.mat
  13. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y7.mat
  14. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y2.mat
  15. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y3.mat
  16. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y4.mat
  17. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y5.mat
  18. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y6.mat
  19. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y7.mat
  20. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y2.mat
  21. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y3.mat
  22. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y4.mat
  23. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y5.mat
  24. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y6.mat
  25. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y7.mat
  26. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y2.mat
  27. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y3.mat
  28. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y4.mat
  29. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y5.mat
  30. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y6.mat
  31. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y7.mat
  32. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y2.mat
  33. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y3.mat
  34. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y4.mat
  35. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y5.mat
  36. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y6.mat
  37. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y7.mat
  38. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y2.mat
  39. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y3.mat
  40. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y4.mat
  41. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y5.mat
  42. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y6.mat
  43. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y7.mat
  44. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y2.mat
  45. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y3.mat
  46. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y4.mat
  47. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y5.mat
  48. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y6.mat
  49. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y7.mat
  50. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y2.mat
  51. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y3.mat
  52. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y4.mat
  53. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y5.mat
  54. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y6.mat
  55. 3 3
      Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y7.mat
  56. 171 132
      Assets/Scene 1.unity
  57. 11 2
      Assets/Scripts/StaticImportant.cs
  58. 35 23
      Assets/Scripts/StaticLod.cs
  59. 10 9
      Assets/WaterRangeCtrlTool.cs
  60. 2 2
      Assets/WaterRangeCtrl_UI.cs

+ 1 - 1
Assets/Art/Material/Effect/BianKuangEffect1.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BianKuangEffect1
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4

+ 3 - 3
Assets/Art/Material/Effect/BianKuangEffect2.mat

@@ -8,10 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BianKuangEffect2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _EMISSION
-  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/QiTaJianZhu/BengZhan_TongYong.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BengZhan_TongYong
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _METALLICGLOSSMAP
   - _NORMALMAP
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/QiTaJianZhu/NongChang1.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NongChang1
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _METALLICGLOSSMAP
   - _NORMALMAP
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/QiTaJianZhu/NongChang2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: NongChang2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/QiTaJianZhu/Zha_Tong.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Zha_Tong
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _METALLICGLOSSMAP
   - _NORMALMAP
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/SheBei/SheXiangTou.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SheXiangTou
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _METALLICGLOSSMAP
   - _NORMALMAP
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x0_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x0_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x1_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x1_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x2_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x2_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x3_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x3_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x4_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x4_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x5_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x5_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x6_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x6_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y2.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y3.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y3
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y4.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y4
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y5.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y5
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y6.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y6
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 3 - 3
Assets/Art/Material/TerrainV2/Mount_Rainier_x7_y7.mat

@@ -8,11 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Mount_Rainier_x7_y7
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _GLOSSYREFLECTIONS_OFF
   - _SPECULARHIGHLIGHTS_OFF
-  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 171 - 132
Assets/Scene 1.unity


+ 11 - 2
Assets/Scripts/StaticImportant.cs

@@ -41,6 +41,10 @@ public class StaticImportant : MonoBehaviour
 
     private List<GameObject> models = new List<GameObject>();
 
+    public bool important = false;
+
+    public GameObject extraParticle;
+
     private void Awake()
     {
         foucusPos = this.transform.position;
@@ -82,6 +86,7 @@ public class StaticImportant : MonoBehaviour
         onShow = true;
         for (int i = 0; i < models.Count; i++)
         {
+            //Debug.Log(models[i].name);
             models[i].SetActive(true);
         }
         CheckChangeModels();
@@ -93,6 +98,7 @@ public class StaticImportant : MonoBehaviour
         onShow = false;
         for (int i = 0; i < models.Count; i++)
         {
+            //Debug.Log(models[i].name);
             models[i].SetActive(false);
         }
     }
@@ -211,7 +217,7 @@ public class StaticImportant : MonoBehaviour
                 fader.material.DOColor(Color.clear, 1.5f).onComplete = () => { fader.gameObject.SetActive(false); };
             };
             birdCamera.target.localPosition = centerPos;
-            Debug.Log(birdCamera.target.position);
+            //Debug.Log(birdCamera.target.position);
             birdCamera.currentDistance = targetDistance;
             birdCamera.rotateXAngle = rotateXAngle;
             birdCamera.rotateYAngle = rotateYAngle;
@@ -265,7 +271,10 @@ public class StaticImportant : MonoBehaviour
         {
             Debug.LogError($"{model_ab_Name}下载失败:{www.error}");
         }
-
+        if (extraParticle != null) { 
+            models.Add(extraParticle);
+        }
+        Hide();
         www.Dispose();
     }
 }

+ 35 - 23
Assets/Scripts/StaticLod.cs

@@ -30,9 +30,13 @@ public class StaticLod : MonoBehaviour
             StaticImportant si = this.transform.GetChild(i).GetComponent<StaticImportant>();
             if (si != null)
             {
-                staticImportants.Add(si);
+                if (si.important)
+                {
+                    staticImportants.Add(si);
+                    //si.Hide();
+                }
                 staticImportantsDic.Add(si.gameObject.name, si);
-                si.Hide();
+                
             }
         }
 
@@ -72,40 +76,48 @@ public class StaticLod : MonoBehaviour
     void Update()
     {
         interVal -= Time.deltaTime;
-        if (lodAvalible)
+        if (CameraManager.instance.mainCamera.enabled)
         {
-            if (interVal < 0.0f)
+            if (lodAvalible)
             {
-                interVal = 0.8f;
-                for (int i = 0; i < staticImportants.Count; i++)
+                if (interVal < 0.0f)
                 {
-                    if (Vector3.Distance(CameraManager.instance.mainCamera.transform.position, staticImportants[i].foucusPos) < 3200)
+                    interVal = 0.8f;
+                    for (int i = 0; i < staticImportants.Count; i++)
                     {
-                        staticImportants[i].Show();
+                        if (Vector3.Distance(CameraManager.instance.mainCamera.transform.position, staticImportants[i].foucusPos) < 3200)
+                        {
+                            staticImportants[i].Show();
+                        }
+                        else
+                        {
+                            staticImportants[i].Hide();
+                        }
                     }
-                    else
-                    {
-                        staticImportants[i].Hide();
-                    }
-                }
 
-                if (hetiGaoLiang != null) {
-                    if (CameraManager.instance.mainCamera.transform.position.y > 3000)
+                    if (hetiGaoLiang != null)
                     {
-                        hetiGaoLiang.gameObject.SetActive(true);
-                    }
-                    else{
-                        hetiGaoLiang.gameObject.SetActive(false);
+                        if (CameraManager.instance.mainCamera.transform.position.y > 3000)
+                        {
+                            hetiGaoLiang.gameObject.SetActive(true);
+                        }
+                        else
+                        {
+                            hetiGaoLiang.gameObject.SetActive(false);
 
+                        }
                     }
                 }
+
             }
-        }
-        else {
-            for (int i = 0; i < staticImportants.Count; i++)
+            else
             {
-                staticImportants[i].Show();
+                for (int i = 0; i < staticImportants.Count; i++)
+                {
+                    staticImportants[i].Show();
+                }
             }
         }
+        
     }
 }

+ 10 - 9
Assets/WaterRangeCtrlTool.cs

@@ -32,7 +32,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
             //FxObjects[i].SetActive(true);
         }
         waterRangeMat = this.transform.Find("NeiHe_FenQu").GetComponent<MeshRenderer>().material;
-        hemian = this.transform.Find("HeMianTrans"); 
+        hemian = this.transform.Find("HeMianTrans");
         ChangeWaterCurve(0);
     }
 
@@ -51,28 +51,29 @@ public class WaterRangeCtrlTool : MonoBehaviour
     public void HideFx()
     {
         waterRangeMat.SetFloat("_ClipLength", 1);
-        hemian.transform.localPosition = Vector3.zero;
+        if (hemian != null)
+            hemian.transform.localPosition = Vector3.zero;
         for (int i = 0; i < FxObjects.Length; i++)
         {
             FxObjects[i].SetActive(false);
         }
     }
-    
+
     public void SetRangeValue(float value)
     {
         //Debug.Log(value);
-        float rangeValue=0;
+        float rangeValue = 0;
         switch (waterCurveIndex)
         {
-            case 0 :
-                rangeValue  = waterCurve_65000.Evaluate(value);
+            case 0:
+                rangeValue = waterCurve_65000.Evaluate(value);
                 break;
-            case 1 :
-                rangeValue  = waterCurve_70000.Evaluate(value);
+            case 1:
+                rangeValue = waterCurve_70000.Evaluate(value);
                 break;
         }
         //Debug.Log(rangeValue);
-        waterRangeMat.SetFloat("_ClipLength",rangeValue);
+        waterRangeMat.SetFloat("_ClipLength", rangeValue);
         onCtrlChange?.Invoke(rangeValue);
     }
 

+ 2 - 2
Assets/WaterRangeCtrl_UI.cs

@@ -73,12 +73,12 @@ public class WaterRangeCtrl_UI : MonoBehaviour
         WaterRangeCtrlTool._Instance.ChangeWaterCurve(0);
         rangeSlider.value = 0;
         WaterRangeCtrlTool._Instance.ShowFx(true);
-        StaticLod.instance.lodAvalible = false;
+        //StaticLod.instance.lodAvalible = false;
     }
 
     private void OnDisable()
     {
-        StaticLod.instance.lodAvalible = true;
+        //StaticLod.instance.lodAvalible = true;
         WaterRangeCtrlTool._Instance.HideFx();
     }
 }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio