Merge branch 'main' of http://www.chatgpt918.top:3000/wartheking/WaterFlush

Assets/Prefabs/UI/Thing1Title.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 47.4875, y: 0}
+  m_SizeDelta: {x: 46.24, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4342331782844457992
 CanvasRenderer:
@@ -215,7 +215,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 17
+    m_Left: 22
     m_Right: 0
     m_Top: 2
     m_Bottom: 0
@@ -264,7 +264,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 30.1, y: 0}
+  m_SizeDelta: {x: 33.3, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7861496979013839011
 CanvasRenderer:
@@ -344,7 +344,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 44.7123, y: 0}
+  m_SizeDelta: {x: 36.3, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7861496979646497233
 CanvasRenderer:

Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -6529,8 +6529,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653547392614}
   - {fileID: 9093061653291335120}
+  - {fileID: 9093061653547392614}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8106,7 +8106,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10783,8 +10783,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061655173667199}
   - {fileID: 9093061654094578440}
+  - {fileID: 9093061655173667199}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15011,7 +15011,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -15353,7 +15353,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -16780,8 +16780,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061654484229631}
   - {fileID: 9093061653995338931}
+  - {fileID: 9093061654484229631}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -22280,8 +22280,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654333608751}
   - {fileID: 9093061654922658960}
+  - {fileID: 9093061654333608751}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -25024,7 +25024,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26678,7 +26678,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27371,7 +27371,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -31216,7 +31216,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -32250,7 +32250,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -33970,7 +33970,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -34703,8 +34703,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061655340129781}
   - {fileID: 9093061654399081119}
+  - {fileID: 9093061655340129781}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -35974,7 +35974,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -43280,7 +43280,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -49740,7 +49740,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -52974,8 +52974,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654518704622}
   - {fileID: 9093061654135754304}
+  - {fileID: 9093061654518704622}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54151,7 +54151,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

Assets/Scripts/HttpHelper.cs

@@ -1570,7 +1570,7 @@ public class HttpHelper : MonoBehaviour
                 // 提取data字段的值
                 JToken dataToken = jsonObject["data"];
                 JToken codeToken = jsonObject["code"];
-                Debug.LogError(dataToken);
+                //Debug.LogError(dataToken);
                 if (codeToken.ToString() == "200")
                 {
                     //Debug.LogError(200);

Assets/Scripts/UI/Item/DeviceIconCtrl.cs

@@ -116,15 +116,19 @@ public class DeviceIconCtrl : MonoBehaviour
 
     void Update()
     {
-        currentTime += Time.deltaTime;
-        if (currentTime > 0.06f) {
-            if (targetTransForm != null)
+        if (targetTransForm != null)
+        {
+            Vector3 pos = _camera.WorldToScreenPoint(targetTransForm.position);
+            if (pos.z > 0)
+            {
+                rect.transform.position = pos;
+            }
+            else
             {
-                rect.transform.position = _camera.WorldToScreenPoint(targetTransForm.position);
+                rect.transform.position = new Vector3(10000, 10000, 0);
             }
-            currentTime = 0;
         }
-        
+
     }
     
     bool IsObjectInCameraView(Transform objectTransform, Camera camera)

Assets/Scripts/UI/Item/ObsIconCtrl.cs

@@ -46,15 +46,15 @@ public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandle
 
                 if (GlobalData.pageIndex == PageIndex.Page3)
                 {
-                    SPJKLayer._Instance.ShowObsPanel(_data);
+                    ThreeDNav.instance.ShowObsPanel(_data);
                 }
             });
         }
         
         rect.anchoredPosition = new Vector2(2000, 0);
         _camera = CameraManager.instance.mainCamera;
-        _camera.GetComponent<CameraBird>().OnCameraBeginChange += CameraBeginChange;
-        _camera.GetComponent<CameraBird>().OnCameraEndChange += CameraEndChange;
+        //_camera.GetComponent<CameraBird>().OnCameraBeginChange += CameraBeginChange;
+        //_camera.GetComponent<CameraBird>().OnCameraEndChange += CameraEndChange;
         targetTransForm =StaticLod.instance.GetStaticObj(_data.targetName).transform;
 
         
@@ -64,7 +64,15 @@ public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandle
     {
         if (targetTransForm != null)
         {
-            rect.transform.position = _camera.WorldToScreenPoint(targetTransForm.position);
+            Vector3 pos = _camera.WorldToScreenPoint(targetTransForm.position);
+            if (pos.z > 0) 
+            {
+                rect.transform.position = pos;
+            }
+            else
+            {
+                rect.transform.position = new Vector3(10000, 10000, 0);
+            }
         }
     }
 
@@ -84,8 +92,8 @@ public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandle
     {
         if (_camera)
         {
-            _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
-            _camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
+           // _camera.GetComponent<CameraBird>().OnCameraBeginChange -= CameraBeginChange;
+            //_camera.GetComponent<CameraBird>().OnCameraEndChange -= CameraEndChange;
         }
     }
 

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

@@ -20,7 +20,6 @@ public class SPJKLayer : MonoBehaviour
     
     public InputField _obsSearchInputField;
 
-    public ObsPlayerPanel obsPlayerPanel;
 
     public Button byBtn;
     public Button tkBtn;
@@ -46,8 +45,6 @@ public class SPJKLayer : MonoBehaviour
     {
         InitObsData();
 
-        obsPlayerPanel = this.transform.Find("ObsPlayerPanel").GetComponent<ObsPlayerPanel>();
-        obsPlayerPanel.gameObject.SetActive(false);
 
         byBtn.onClick.AddListener(() =>
         {
@@ -65,10 +62,7 @@ public class SPJKLayer : MonoBehaviour
         _obsSearchInputField.onValueChanged.AddListener(SearchObsItem);
     }
 
-    private void OnDisable()
-    {
-        obsPlayerPanel.gameObject.SetActive(false);
-    }
+
 
     private async Task InitObsData() {
         await new WaitUntil(() =>
@@ -84,7 +78,7 @@ public class SPJKLayer : MonoBehaviour
             currentObsDataList.Add(tempItem);
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
-                ShowObsPanel(obs_by[tempIndex]);
+                ThreeDNav.instance.ShowObsPanel(obs_by[tempIndex]);
             });
         }
         ObsData[] obs_tk = GlobalData.obsDatas_tk.ToArray();
@@ -96,7 +90,7 @@ public class SPJKLayer : MonoBehaviour
             currentObsDataList.Add(tempItem);
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
-                ShowObsPanel(obs_tk[tempIndex]);
+                ThreeDNav.instance.ShowObsPanel(obs_tk[tempIndex]);
             });
         }
         countText.text = $"监控列表 （<color=#FFFFFF>{obs_by.Length+obs_tk.Length}</color>）";
@@ -195,10 +189,5 @@ public class SPJKLayer : MonoBehaviour
         }
     }
     
-    public void ShowObsPanel(ObsData _data)
-    {
-        obsPlayerPanel.gameObject.SetActive(true);
-        obsPlayerPanel.SetObsData(_data);
-        obsPlayerPanel.SetTitle(_data.name);
-    }
+   
 }

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

@@ -18,6 +18,14 @@ public class ThreeDNav : MonoBehaviour
     public RectTransform znz;
 
     public GCJKLayer gCJK;
+
+    public ObsPlayerPanel obsPlayerPanel;
+
+    public static ThreeDNav instance;
+    private void Awake()
+    {
+        instance = this;
+    }
     private void Start()
     {
         CameraManager.SwitchCamera(0);
@@ -52,6 +60,7 @@ public class ThreeDNav : MonoBehaviour
                 {
                     btns[j].GetComponentInChildren<Text>().color = new Color32(137, 147, 173, 255);
                 }
+                obsPlayerPanel.gameObject.SetActive(false);
                 btns[index].GetComponentInChildren<Text>().color = Color.white;
                 Tweener tw = s_image.GetComponent<RectTransform>().DOLocalMoveX(targetPos[index].x, 0.3f);
                 tw.SetEase(Ease.OutBack);
@@ -75,6 +84,13 @@ public class ThreeDNav : MonoBehaviour
         }
     }
 
+    public void ShowObsPanel(ObsData _data)
+    {
+        obsPlayerPanel.gameObject.SetActive(true);
+        obsPlayerPanel.SetObsData(_data);
+        obsPlayerPanel.SetTitle(_data.name);
+    }
+
     private void Update()
     {
         znz.transform.rotation = Quaternion.Lerp(znz.transform.rotation, Quaternion.Euler(0, 0, CameraManager.instance.mainCamera.transform.localEulerAngles.y), Time.deltaTime * 4);