修修补补

Assets/ModelAniTool.cs

@@ -69,7 +69,7 @@ public class ModelAniTool : MonoBehaviour
                     int tempIndex = i;
                     targetObjs[i].transform.localPosition = oriV3[tempIndex];
                     targetObjs[i].transform.DOLocalMoveZ(8*openValues[tempIndex], speed);
-                    Debug.Log($"{targetObjs[i].name}:{openValues[tempIndex]}");
+                    //Debug.Log($"{targetObjs[i].name}:{openValues[tempIndex]}");
                 }
                 break;
             case AniType.taoKou:

Assets/Prefabs/UI/Item/3D_ObsItem.prefab

@@ -140,7 +140,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -405,6 +405,7 @@ GameObject:
   - component: {fileID: 1989918062366935913}
   - component: {fileID: 9144983617254082187}
   - component: {fileID: 1884348070531118768}
+  - component: {fileID: 2631554445738824792}
   m_Layer: 5
   m_Name: 3D_ObsItem
   m_TagString: Untagged
@@ -489,7 +490,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _data:
     name: 
-    url: 
     targetName: 
     type: 0
     targetTransform: {fileID: 0}
@@ -500,3 +500,47 @@ MonoBehaviour:
   typeText: {fileID: 7646881027709608283}
   codeText: {fileID: 5915123928582573810}
   updataTimeText: {fileID: 7156416251939125383}
+--- !u!114 &2631554445738824792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6277356545195172783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 0
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 9144983617254082187}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Prefabs/UI/SWFZ/SPJK.prefab

@@ -1811,6 +1811,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5774837649050539594}
+  - {fileID: 3147033115075484175}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1836,6 +1837,7 @@ MonoBehaviour:
   currentObsDataList: []
   countText: {fileID: 5147317439065066957}
   _obsSearchInputField: {fileID: 6744885183358372171}
+  obsPlayerPanel: {fileID: 0}
 --- !u!1 &4520921689576299114
 GameObject:
   m_ObjectHideFlags: 0
@@ -3178,3 +3180,105 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &6036100113053915545
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4461453780397662635}
+    m_Modifications:
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 804
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 432
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 31
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -38
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8941761853964081110, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+      propertyPath: m_Name
+      value: ObsPlayerPanel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+--- !u!224 &3147033115075484175 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
+  m_PrefabInstance: {fileID: 6036100113053915545}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/HttpHelper.cs

@@ -26,8 +26,7 @@ public class HttpHelper : MonoBehaviour
     private async void Awake()
     {
         _Instance = this;
-        
-
+        GetSensorList();
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2 || GlobalData.pageIndex == PageIndex.Page3)
         {
@@ -37,7 +36,6 @@ public class HttpHelper : MonoBehaviour
         }
         if (GlobalData.pageIndex == PageIndex.Page1) 
         {
-            GetSensorList();
             SendBuYuan_GetSensorData();
             SendTaoKou_GetSensorData();
             

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -73,7 +73,7 @@ public class ServerAddress
     /// <summary>
     /// 获取传感器设备列表 套口&补元
     /// </summary>
-    public static string API_GetAllSensorList = "http://10.123.10.11:9080/open/sensor/list";
+    public static string API_GetAllSensorList = "http://10.123.10.11:9081/open/sensor/list";
     
     /// <summary>
     /// 补元水闸获取硬件组 最后一条数据
@@ -92,19 +92,19 @@ public class ServerAddress
 
     public static string API_TextureUploadPath = YZTServerAddress + "/upload";
 
-    public static string API_B08_dataStatis = "http://10.123.10.11:9080/open/dataStatis?projectId=";
-    public static string API_B08_inspectResult = "http://10.123.10.11:9080/open/inspectResult?projectId=";
-    public static string API_B08_projectExamine = "http://10.123.10.11:9080/open/projectExamine?projectId=";
-    public static string API_B08_event = "http://10.123.10.11:9080/open/event?projectId=";
-    public static string API_B08_questionStatis = "http://10.123.10.11:9080/open/questionStatis?projectId=";
-    public static string API_B08_inspectType = "http://10.123.10.11:9080/open/inspectType?projectId=";
+    public static string API_B08_dataStatis = "http://10.123.10.11:9081/open/dataStatis?projectId=";
+    public static string API_B08_inspectResult = "http://10.123.10.11:9081/open/inspectResult?projectId=";
+    public static string API_B08_projectExamine = "http://10.123.10.11:9081/open/projectExamine?projectId=";
+    public static string API_B08_event = "http://10.123.10.11:9081/open/event?projectId=";
+    public static string API_B08_questionStatis = "http://10.123.10.11:9081/open/questionStatis?projectId=";
+    public static string API_B08_inspectType = "http://10.123.10.11:9081/open/inspectType?projectId=";
     
     /// <summary>
     /// 获取站点水位信息(折线图和信息列表)
     /// </summary>
-    public static string API_GetWaterTrend_chart = "http://10.123.10.11:9080/open/water1?stcd=";
-    public static string API_GetWaterTrend_list = "http://10.123.10.11:9080/open/water2?stcd=";
-    public static string API_GetWaterData = "http://10.123.10.11:9080/open/water3";
+    public static string API_GetWaterTrend_chart = "http://10.123.10.11:9081/open/water1?stcd=";
+    public static string API_GetWaterTrend_list = "http://10.123.10.11:9081/open/water2?stcd=";
+    public static string API_GetWaterData = "http://10.123.10.11:9081/open/water3";
 
     //  http://111.4.141.191:9081/open/dataStatis 
     //

Assets/Scripts/UI/UIView/3D/SPJKLayer.cs

@@ -18,15 +18,24 @@ public class SPJKLayer : MonoBehaviour
     
     public InputField _obsSearchInputField;
 
-  
+    public ObsPlayerPanel obsPlayerPanel;
+
 
     async void Start()
     {
         InitObsData();
 
+        obsPlayerPanel = this.transform.Find("ObsPlayerPanel").GetComponent<ObsPlayerPanel>();
+        obsPlayerPanel.gameObject.SetActive(false);
+        
         _obsSearchInputField.onValueChanged.AddListener(SearchObsItem);
     }
 
+    private void OnDisable()
+    {
+        obsPlayerPanel.gameObject.SetActive(false);
+    }
+
     private async Task InitObsData() {
         await new WaitUntil(() =>
         {
@@ -35,16 +44,26 @@ public class SPJKLayer : MonoBehaviour
         ObsData[] obs_by = GlobalData.obsDatas_by.ToArray();
         for (int i = 0; i < obs_by.Length; i++)
         {
+            int tempIndex = i;
             SPJK_ObsItem tempItem = Instantiate(spjkItemOri, spjkItemContent).GetComponent<SPJK_ObsItem>();
-            tempItem.SetData(obs_by[i]);
+            tempItem.SetData(obs_by[tempIndex]);
             currentObsDataList.Add(tempItem);
+            tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
+            {
+                ShowObsPanel(obs_by[tempIndex]);
+            });
         }
         ObsData[] obs_tk = GlobalData.obsDatas_tk.ToArray();
         for (int i = 0; i < obs_tk.Length; i++)
         {
+            int tempIndex = i;
             SPJK_ObsItem tempItem = Instantiate(spjkItemOri, spjkItemContent).GetComponent<SPJK_ObsItem>();
-            tempItem.SetData(obs_tk[i]);
+            tempItem.SetData(obs_tk[tempIndex]);
             currentObsDataList.Add(tempItem);
+            tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
+            {
+                ShowObsPanel(obs_tk[tempIndex]);
+            });
         }
         countText.text = $"监控列表 （<color=#FFFFFF>{obs_by.Length+obs_tk.Length}</color>）";
     }
@@ -66,4 +85,11 @@ public class SPJKLayer : MonoBehaviour
             }
         }
     }
+    
+    public void ShowObsPanel(ObsData _data)
+    {
+        obsPlayerPanel.gameObject.SetActive(true);
+        obsPlayerPanel.SetObsData(_data);
+        obsPlayerPanel.SetTitle(_data.name);
+    }
 }

Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -263,7 +263,7 @@ public class BigScreenLayer : MonoBehaviour
 
         ddysButton.onClick.AddListener(() =>
         {
-            StaticLod.instance.OnFoucusStatic(-1);
+            StaticLod.instance.OnFoucusStatic("Bird0");
 
             normal.gameObject.SetActive(false);
             gk.gameObject.SetActive(false);
@@ -679,5 +679,6 @@ public class BigScreenLayer : MonoBehaviour
     {
         obsPlayerPanel.gameObject.SetActive(true);
         obsPlayerPanel.SetObsData(_data);
+        obsPlayerPanel.SetTitle(_data.name);
     }
 }

Assets/WaterRangeCtrlTool.cs

@@ -31,7 +31,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);
     }
 
@@ -59,7 +59,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
     
     public void SetRangeValue(float value)
     {
-        Debug.Log(value);
+        //Debug.Log(value);
         float rangeValue=0;
         switch (waterCurveIndex)
         {
@@ -70,7 +70,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
                 rangeValue  = waterCurve_70000.Evaluate(value);
                 break;
         }
-        Debug.Log(rangeValue);
+        //Debug.Log(rangeValue);
         waterRangeMat.SetFloat("_ClipLength",rangeValue);
     }