加入河流湖泊行政区功能，修改minimap位置

Assets/Art/Material/Effect/DiKuaiFenQu_Hu1.mat

@@ -95,7 +95,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.2783019, g: 0.59888625, b: 1, a: 0.15686275}
+    - _Color: {r: 0.23270428, g: 0.32465455, b: 1, a: 0.77254903}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

Assets/Art/Material/Effect/DiKuaiFenQu_Hu2.mat

@@ -95,7 +95,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.2783019, g: 0.59888625, b: 1, a: 0.15686275}
+    - _Color: {r: 0.23270428, g: 0.32465455, b: 1, a: 0.77254903}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

Assets/Art/Material/Effect/DiKuaiFenQu_Hu3.mat

@@ -95,7 +95,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.2783019, g: 0.59888625, b: 1, a: 0.15686275}
+    - _Color: {r: 0.23270428, g: 0.32465455, b: 1, a: 0.77254903}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

Assets/Art/Material/Effect/DiKuaiFenQu_Hu4.mat

@@ -95,7 +95,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.2783019, g: 0.59888625, b: 1, a: 0.15686275}
+    - _Color: {r: 0.23270428, g: 0.32465455, b: 1, a: 0.77254903}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

Assets/Art/Material/Effect/DiKuaiFenQu_Hu5.mat

@@ -95,7 +95,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.2783019, g: 0.59888625, b: 1, a: 0.15686275}
+    - _Color: {r: 0.23270428, g: 0.32465455, b: 1, a: 0.77254903}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

Assets/Art/Material/Effect/RiverMat.mat

@@ -0,0 +1,102 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RiverMat
+  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  m_InvalidKeywords: []
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - GRABPASS
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BlendOp: 0
+    - _BumpScale: 1
+    - _CameraFadingEnabled: 0
+    - _CameraFarFadeDistance: 2
+    - _CameraNearFadeDistance: 1
+    - _ColorMode: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DistortionBlend: 0.5
+    - _DistortionEnabled: 0
+    - _DistortionStrength: 1
+    - _DistortionStrengthScaled: 0
+    - _DstBlend: 10
+    - _EmissionEnabled: 0
+    - _FlipbookMode: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _LightingEnabled: 0
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SoftParticlesEnabled: 0
+    - _SoftParticlesFarFadeDistance: 1
+    - _SoftParticlesNearFadeDistance: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
+    - _Color: {r: 0, g: 0.99215686, b: 0.9921566, a: 0.7019608}
+    - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/Material/Effect/RiverMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97935dcc656f81b478789ccaeb8c257c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/MiniMap.prefab

@@ -176,6 +176,89 @@ Transform:
   m_Father: {fileID: 7069582396450853087}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1491714743404068865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1087523345012294259}
+  - component: {fileID: 6362083136846772692}
+  - component: {fileID: 5169517101535841154}
+  m_Layer: 0
+  m_Name: He1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1087523345012294259
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1491714743404068865}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -9.002407, y: 11.959515, z: -0.000015795229}
+  m_LocalScale: {x: 0.77000004, y: 0.77, z: 0.77}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5621129756599565973}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6362083136846772692
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1491714743404068865}
+  m_Mesh: {fileID: 6821059736296610023, guid: 38adb8661f11c9445b8a874cb5c82cdc, type: 3}
+--- !u!23 &5169517101535841154
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1491714743404068865}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &3793048173667531158
 GameObject:
   m_ObjectHideFlags: 0
@@ -274,6 +357,89 @@ MonoBehaviour:
   y_Count: 24
   ab_Name: l14
   initDone: 0
+--- !u!1 &4147678506791997976
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6398485675108881922}
+  - component: {fileID: 283056942806499023}
+  - component: {fileID: 7158765324193133414}
+  m_Layer: 0
+  m_Name: He2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6398485675108881922
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4147678506791997976}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -3.6905735, y: 10.090464, z: -0.000015795229}
+  m_LocalScale: {x: 0.77000004, y: 0.77, z: 0.77}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5621129756599565973}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &283056942806499023
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4147678506791997976}
+  m_Mesh: {fileID: 7662791622419505772, guid: 38adb8661f11c9445b8a874cb5c82cdc, type: 3}
+--- !u!23 &7158765324193133414
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4147678506791997976}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &4444992682839687692
 GameObject:
   m_ObjectHideFlags: 0
@@ -638,7 +804,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4992683391574256453, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_RootOrder
@@ -666,7 +832,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1.4653931
+      value: -0.41
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_LocalRotation.w

Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -128,6 +128,8 @@ public class YZTLayer : YZTRootLayer
 
     public RectTransform layerInfo;
     public Button layerInfoExitBtn;
+
+    public Button[] baseLayerInfoBtns;
     public Button[] layerInfoBtns;
 
     public List<int> cancelLayer = new List<int>();
@@ -143,6 +145,15 @@ public class YZTLayer : YZTRootLayer
     public List<GameObject> thing3s = new List<GameObject>();
 
     public Button clearBtn;
+
+
+    public RectTransform[] regionLayerInfo;
+    public RectTransform[] riverLayerInfo;
+    public RectTransform[] lakeLayerInfo;
+
+    public GameObject[] regionLayerObj;
+    public GameObject[] riverLayerObj;
+    public GameObject[] lakeLayerObj;
     // Start is called before the first frame update
     async void Awake()
     {
@@ -346,7 +357,43 @@ public class YZTLayer : YZTRootLayer
         {
             layerInfo.gameObject.SetActive(false);
         });
-        
+
+
+        baseLayerInfoBtns[0].onClick.AddListener(() =>
+        {
+            bool active = baseLayerInfoBtns[0].GetComponent<CanvasGroup>().alpha > 0.5f;
+            baseLayerInfoBtns[0].GetComponent<CanvasGroup>().alpha = active ? 0.5f : 1.0f;
+            bool newActive = !active;
+            for (int i = 0; i < regionLayerObj.Length; i++) {
+                regionLayerObj[i].gameObject.SetActive(newActive);
+                regionLayerInfo[i].gameObject.SetActive(newActive);
+            }
+        });
+        baseLayerInfoBtns[0].GetComponent<CanvasGroup>().alpha = 0.5f;
+        baseLayerInfoBtns[1].onClick.AddListener(() =>
+        {
+            bool active = baseLayerInfoBtns[1].GetComponent<CanvasGroup>().alpha > 0.5f;
+            baseLayerInfoBtns[1].GetComponent<CanvasGroup>().alpha = active ? 0.5f : 1.0f;
+            bool newActive = !active;
+            for (int i = 0; i < riverLayerObj.Length; i++)
+            {
+                riverLayerObj[i].gameObject.SetActive(newActive);
+                riverLayerInfo[i].gameObject.SetActive(newActive);
+            }
+        });
+        baseLayerInfoBtns[1].GetComponent<CanvasGroup>().alpha = 0.5f;
+        baseLayerInfoBtns[2].onClick.AddListener(() =>
+        {
+            bool active = baseLayerInfoBtns[2].GetComponent<CanvasGroup>().alpha > 0.5f;
+            baseLayerInfoBtns[2].GetComponent<CanvasGroup>().alpha = active ? 0.5f : 1.0f;
+            bool newActive = !active;
+            for (int i = 0; i < lakeLayerObj.Length; i++)
+            {
+                lakeLayerObj[i].gameObject.SetActive(newActive);
+                lakeLayerInfo[i].gameObject.SetActive(newActive);
+            }
+        });
+        baseLayerInfoBtns[2].GetComponent<CanvasGroup>().alpha = 0.5f;
     }
 
     void RunTimeLayerClick(int temp) {
@@ -493,7 +540,7 @@ public class YZTLayer : YZTRootLayer
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
         for (int i = 0; i < GlobalData.hotPointDatas.Count; i++)
         {
-            
+
             HotPointData temp = GlobalData.hotPointDatas[i];
             Vector3 tempLocalPosition = CoordinateConverter.GeoToUGUISmall(temp.longitude, temp.latitude);
             //bool have = false;
@@ -510,7 +557,7 @@ public class YZTLayer : YZTRootLayer
             //            have = true;
             //            runtimePointLib[j].Refresh(hotPointSprite[8]);
             //            runtimePointLib[j].layerIDs.Add((int)temp.type);
-                        
+
             //            break;
             //        }
             //    }
@@ -522,7 +569,7 @@ public class YZTLayer : YZTRootLayer
             RuntimePoint newPoint = Instantiate(pointPrefab, Vector3.zero, Quaternion.identity);
             int tempI = i;
             newPoint.GetComponent<RectTransform>().SetParent(pointParent);
-            newPoint.InitPoint(hotPointSprite[(int)(temp.type)], temp.name_pri, temp.name);;
+            newPoint.InitPoint(hotPointSprite[(int)(temp.type)], temp.name_pri, temp.name); ;
             newPoint.layerIDs.Add((int)(temp.type));
             newPoint.bingObj = Instantiate(runtimePointObj).gameObject;
             newPoint.bingObj.transform.SetParent(shaPan.transform.GetChild(6));
@@ -544,6 +591,8 @@ public class YZTLayer : YZTRootLayer
         RunTimeLayerClick(4);
         RunTimeLayerClick(5);
 
+
+        
     }
 
     int FindIndexByLayerUnitName(string name) {
@@ -701,4 +750,28 @@ public class YZTLayer : YZTRootLayer
             }
         }
     }
+
+    private void LateUpdate()
+    {
+        for (int i = 0; i < regionLayerInfo.Length; i++) 
+        {
+            if (regionLayerInfo[i].gameObject.activeSelf) {
+                regionLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(regionLayerObj[i].transform.position);
+            }
+        }
+        for (int i = 0; i < riverLayerInfo.Length; i++)
+        {
+            if (riverLayerInfo[i].gameObject.activeSelf)
+            {
+                riverLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(riverLayerObj[i].transform.position);
+            }
+        }
+        for (int i = 0; i < lakeLayerInfo.Length; i++)
+        {
+            if (lakeLayerInfo[i].gameObject.activeSelf)
+            {
+                lakeLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(lakeLayerObj[i].transform.position);
+            }
+        }
+    }
 }