提交提交

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -4392,8 +4392,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: 114, y: -21}
-  m_SizeDelta: {x: 108, y: 24}
+  m_AnchoredPosition: {x: 171.72778, y: -21}
+  m_SizeDelta: {x: 223.4557, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2098951715089284182
 CanvasRenderer:
@@ -4430,7 +4430,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -8105,7 +8105,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:
@@ -15073,6 +15073,7 @@ MonoBehaviour:
   zdpmObjs: []
   swSY: {fileID: 4333192775402009780}
   swXY: {fileID: 8083458041895868810}
+  title: {fileID: 0}
 --- !u!1 &6148527700689888400
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -137,6 +137,7 @@ public class SWYJLayer : YZTRootLayer
     public ShuiWeiCtrl swSY;
     public ShuiWeiCtrl swXY;
 
+    public Text title;
     private void Awake()
     {
         Init();
@@ -190,7 +191,6 @@ public class SWYJLayer : YZTRootLayer
             {
                 xtValue = GlobalData.qXZDatas[i].dropSum6;
             }
-
             total24Value += GlobalData.qXZDatas[i].dropSum6;
             max24Value = MathF.Max(max24Value, GlobalData.qXZDatas[i].dropSum6);
         }
@@ -203,11 +203,11 @@ public class SWYJLayer : YZTRootLayer
 
         for (int i = 0; i < GlobalData.qXZDatas1h.Count; i++)
         {
-            total1Value += GlobalData.qXZDatas[i].dropSum6;
-            max1Value = MathF.Max(max24Value, GlobalData.qXZDatas[i].dropSum6);
+            total1Value += GlobalData.qXZDatas1h[i].dropSum6;
+            max1Value = MathF.Max(max1Value, GlobalData.qXZDatas1h[i].dropSum6);
         }
 
-        avg1Value = total24Value / GlobalData.qXZDatas.Count;
+        avg1Value = total1Value / GlobalData.qXZDatas.Count;
 
 
         _dangQianYuLiangText.text =
@@ -251,6 +251,7 @@ public class SWYJLayer : YZTRootLayer
 
         if (currentDataType == shuiWeiYuJingDataType.BuYuan)
         {
+            title.text = "监测数据" + "(补元)";
             int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
             int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
             float value1 = GlobalData.swDatas[index1].upz ?? 0;
@@ -273,6 +274,7 @@ public class SWYJLayer : YZTRootLayer
         }
         else
         {
+            title.text = "监测数据" + "(套口)";
             int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
             int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
             float value1 = GlobalData.swDatas[index1].upz ?? 0;