Browse Source

提交水文預警沒有數據就--

lantiannb 1 week ago
parent
commit
1ebe46c7a7

+ 16 - 22
Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -3720,7 +3720,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 322, y: -140.5}
+  m_AnchoredPosition: {x: 309.5, y: -140.5}
   m_SizeDelta: {x: 70, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6219942770006898276
@@ -3758,7 +3758,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -4941,7 +4941,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 32.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &1758555593681745192
 GameObject:
   m_ObjectHideFlags: 0
@@ -8038,7 +8038,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &3003835271752930421
 GameObject:
   m_ObjectHideFlags: 0
@@ -8697,7 +8697,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2060663034614906384}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.81333333
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -9709,7 +9709,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &3678014219504541650
 GameObject:
   m_ObjectHideFlags: 0
@@ -10957,7 +10957,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &4205337505787412431
 GameObject:
   m_ObjectHideFlags: 0
@@ -14358,7 +14358,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &5342896170822683227
 GameObject:
   m_ObjectHideFlags: 0
@@ -16093,12 +16093,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   viewMode: 0
   currentDataType: 0
-  currentQuanYuYuLiangData:
-    dangQianYuLiang: 50.6
-    zuiDaYuLiang: 63.5
-    pingJunYuLiang: 32.2
-    chaoJingZhanDian: 3
-    weatherTypeStr: "\u4E2D\u96E8"
   ShuiWeiBianHuaData_TK_Month:
     name:
     - 1
@@ -18564,8 +18558,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 40, y: -31}
-  m_SizeDelta: {x: 31, y: 30}
+  m_AnchoredPosition: {x: 45, y: -31}
+  m_SizeDelta: {x: 71, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1317345481507082124
 CanvasRenderer:
@@ -22959,7 +22953,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 63.5 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &7809875836404235760
 GameObject:
   m_ObjectHideFlags: 0
@@ -24520,7 +24514,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &8394886352278913305
 GameObject:
   m_ObjectHideFlags: 0
@@ -25088,7 +25082,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 50.6 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &8585894487763902327
 GameObject:
   m_ObjectHideFlags: 0
@@ -25404,7 +25398,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E2D\u96E8"
+  m_Text: ----
 --- !u!1 &8640585047409735557
 GameObject:
   m_ObjectHideFlags: 0
@@ -25948,7 +25942,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 56.2 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
 --- !u!1 &8780719615516837624
 GameObject:
   m_ObjectHideFlags: 0
@@ -26733,7 +26727,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "3 <size=14><color=#A5BBE2>\u4E2A</color></size>"
+  m_Text: "- <size=14><color=#A5BBE2>\u4E2A</color></size>"
 --- !u!1 &8999385547966070555
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 1
Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -80,7 +80,8 @@ public class StationData:IComparable
     private Text _chaoJingZhanDianText;
     private Text _weatherTypeText;
     private Image _weatherTypeIcon;
-    [Header("全域流量数据")] public QuanYuYuLiangData currentQuanYuYuLiangData;
+
+    private QuanYuYuLiangData currentQuanYuYuLiangData = null;
 
     //站点排名
     private Text _paiMing_1_Text;

+ 12 - 5
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -234,7 +234,11 @@ public class YZTLayer : YZTRootLayer
 
     }
 
-    void InitGCGKData() {
+    async void InitGCGKData() {
+        await new WaitUntil(() =>
+        {
+            return GlobalData.gcgkContents.Count > 2;
+        });
         normalCount.text = GlobalData.gcgkContents[0].count.ToString() + "个";
         badCount.text = GlobalData.gcgkContents[1].count.ToString() + "个";
         stopCount.text = GlobalData.gcgkContents[2].count.ToString() + "个";
@@ -243,10 +247,12 @@ public class YZTLayer : YZTRootLayer
 
     async void InitJKYJData()
     {
+       // Debug.Log("111");
         await new WaitUntil(() =>
         {
             return GlobalData.byJKYJContents.total > 0 && GlobalData.tkJKYJContents.total > 0;
         });
+        //Debug.Log("222");
         for (int i = 0; i < GlobalData.byJKYJContents.items.Count; i++) {
             Thing0 thing0 = Instantiate(thing0Prefab);
             thing0.transform.SetParent(thing0Content);
@@ -254,7 +260,7 @@ public class YZTLayer : YZTRootLayer
             thing0.transform.localScale = Vector3.one;
             thing0.SetData(i.ToString(), GlobalData.byJKYJContents.items[i].name, "补元", "开启", GlobalData.byJKYJContents.items[i].onlineStatus?"正常":"故障");
         }
-
+        //Debug.Log("333");
         for (int i = 0; i < GlobalData.tkJKYJContents.items.Count; i++)
         {
             Thing0 thing0 = Instantiate(thing0Prefab);
@@ -263,7 +269,7 @@ public class YZTLayer : YZTRootLayer
             thing0.transform.localScale = Vector3.one;
             thing0.SetData((i + GlobalData.byJKYJContents.total).ToString(), GlobalData.tkJKYJContents.items[i].name, "套口", "开启", GlobalData.tkJKYJContents.items[i].onlineStatus ? "正常" : "故障");
         }
-
+       // Debug.Log("444");
         totalJKNum.text = (GlobalData.byJKYJContents.total + GlobalData.tkJKYJContents.total).ToString();
         normalJKNum.text = (GlobalData.byJKYJContents.normal + GlobalData.tkJKYJContents.normal).ToString();
         errorJKNum.text = (GlobalData.byJKYJContents.fault + GlobalData.tkJKYJContents.fault).ToString();
@@ -271,11 +277,12 @@ public class YZTLayer : YZTRootLayer
 
     async void InitSWYJData()
     {
+        //Debug.Log("555");
         await new WaitUntil(() =>
         {
             return GlobalData.TaoKouShuiWeiDataList.Count > 1;
         });
-
+        //Debug.Log("666");
         float value1 = GlobalData.TaoKouShuiWeiDataList[0].value;
         float value2 = GlobalData.TaoKouShuiWeiDataList[1].value;
         if (value1 > 1000)
@@ -287,7 +294,7 @@ public class YZTLayer : YZTRootLayer
             value2 = value2 / 100.0f;
         }
 
-
+        //Debug.Log("777");
         avgSWText.text = $"{((value1 + value2) / 2).ToString("0.00")}";
         sfSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].floodProtectionLevel}";
         jjSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].warningLevel}";