提交进一步修改

Assets/Prefabs/UI/Item/shuiwei_Icon.prefab

@@ -427,7 +427,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 2342.93 <size=12><color=FFFFFF>mm</color></size>
+  m_Text: 2342.93 <size=12><color=FFFFFF>m</color></size>
 --- !u!1 &8109446757646552142
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/SWHeightUnit.prefab

@@ -174,6 +174,7 @@ MonoBehaviour:
   nameText: {fileID: 8036006287103540530}
   valueText: {fileID: 5786029107628702619}
   bingObj: {fileID: 0}
+  layoutGroup: {fileID: 0}
 --- !u!1 &4092680537418251090
 GameObject:
   m_ObjectHideFlags: 0
@@ -185,7 +186,6 @@ GameObject:
   - component: {fileID: 7804796807733395106}
   - component: {fileID: 1000649346985467138}
   - component: {fileID: 7664143975356844433}
-  - component: {fileID: 4883211757490536911}
   m_Layer: 5
   m_Name: Unit
   m_TagString: Untagged
@@ -208,10 +208,10 @@ RectTransform:
   m_Father: {fileID: 4492321345001509165}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 100, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 86, y: -15.1521}
+  m_SizeDelta: {x: 12, y: 30.3042}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1000649346985467138
 CanvasRenderer:
@@ -254,21 +254,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: mm
---- !u!114 &4883211757490536911
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4092680537418251090}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_Text: m
 --- !u!1 &5156336335213794083
 GameObject:
   m_ObjectHideFlags: 0
@@ -280,7 +266,6 @@ GameObject:
   - component: {fileID: 5484191645523972304}
   - component: {fileID: 1796557245521567741}
   - component: {fileID: 5786029107628702619}
-  - component: {fileID: 6537729164295490543}
   m_Layer: 5
   m_Name: Digit
   m_TagString: Untagged
@@ -303,10 +288,10 @@ RectTransform:
   m_Father: {fileID: 4492321345001509165}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 24, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 24, y: -15.1521}
+  m_SizeDelta: {x: 62, y: 30.3042}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1796557245521567741
 CanvasRenderer:
@@ -349,21 +334,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 2222.2
---- !u!114 &6537729164295490543
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5156336335213794083}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_Text: 22.22
 --- !u!1 &6053640933039440434
 GameObject:
   m_ObjectHideFlags: 0
@@ -373,7 +344,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4492321345001509165}
-  - component: {fileID: 6598412324523501425}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -401,35 +371,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -1.4385071}
-  m_SizeDelta: {x: 100, y: 30.3042}
+  m_AnchoredPosition: {x: 0.000015258789, y: -1.4385147}
+  m_SizeDelta: {x: 112, y: 30.3042}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6598412324523501425
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6053640933039440434}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 1
-  m_ChildScaleWidth: 1
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &6970587796717354711
 GameObject:
   m_ObjectHideFlags: 0
@@ -441,7 +385,6 @@ GameObject:
   - component: {fileID: 2096676826575661560}
   - component: {fileID: 1506606434393156317}
   - component: {fileID: 50409020755191163}
-  - component: {fileID: 5581257421135851298}
   m_Layer: 5
   m_Name: SW
   m_TagString: Untagged
@@ -464,10 +407,10 @@ RectTransform:
   m_Father: {fileID: 4492321345001509165}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -15.1521}
+  m_SizeDelta: {x: 24, y: 30.3042}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1506606434393156317
 CanvasRenderer:
@@ -511,17 +454,3 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6C34\u4F4D"
---- !u!114 &5581257421135851298
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6970587796717354711}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -19464,7 +19464,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5F53\u524D\u6C34\u4F4D\n\nmm"
+  m_Text: "\u5F53\u524D\u6C34\u4F4D\n\nm"
 --- !u!1 &7402417200512600239
 GameObject:
   m_ObjectHideFlags: 0
@@ -22411,7 +22411,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 0.62 <size=14><color=#A5BBE2>mm</color></size>
+  m_Text: 0.62 <size=14><color=#A5BBE2>m</color></size>
 --- !u!1 &7641376839988656564
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/HttpHelper.cs

@@ -374,7 +374,7 @@ public class HttpHelper : MonoBehaviour
                 {
                     name = "补元上游水位",
                     targetName = "BY_ShuiWei_Up",
-                    value = tempData.datas[0].NodeValue,
+                    value = tempData.datas[0].NodeValue / 100,
                     type = shuiWeiType.BuYuanShuiWei,
                     datas = tempData.datas.ToArray()
                 });
@@ -396,7 +396,7 @@ public class HttpHelper : MonoBehaviour
                 {
                     name = "补元下游水位",
                     targetName = "BY_ShuiWei_Down",
-                    value = tempData.datas[0].NodeValue,
+                    value = tempData.datas[0].NodeValue / 100,
                     type = shuiWeiType.BuYuanShuiWei,
                     datas = tempData.datas.ToArray()
                 });

Assets/Scripts/UI/Item/ShuiWeiIconCtrl.cs

@@ -23,7 +23,7 @@ public class ShuiWeiIconCtrl : MonoBehaviour
         rect.anchoredPosition = new Vector2(2000, 0);
         
         valueText = this.transform.Find("valueText").GetComponent<Text>();
-        valueText.text = $"{data.value} <size=12><color=FFFFFF>mm</color></size>";
+        valueText.text = $"{data.value} <size=12><color=FFFFFF>m</color></size>";
         histroyButton = this.transform.Find("histroyButton").GetComponent<Button>();
         histroyButton.onClick.RemoveAllListeners();
         histroyButton.onClick.AddListener(() =>

Assets/Scripts/UI/UIView/GCJK/SWHeightUnit.cs

@@ -9,6 +9,7 @@ public class SWHeightUnit : MonoBehaviour
     public Text valueText;
 
     public GameObject bingObj;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -17,11 +18,12 @@ public class SWHeightUnit : MonoBehaviour
     public void Init(double lgtd, double lttd, string na, string we)
     {
         Vector3 temp = CoordinateConverter.GeoToUGUI(lgtd, lttd);
-        this.GetComponent<RectTransform>().anchoredPosition3D = temp;
+        
         nameText.text = na;
-        valueText.text = we;
-
-
+        float value = 0.0f;
+        if(float.TryParse(we,out value))
+            valueText.text = value.ToString("0.00");
+        this.GetComponent<RectTransform>().anchoredPosition3D = temp;
     }
     // Update is called once per frame
     void Update()

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

@@ -200,7 +200,7 @@ public class StationData:IComparable
 
             float value1 = GlobalData.BuYuanShuiWeiDataList[0].value;
             float value2 = GlobalData.BuYuanShuiWeiDataList[1].value;
-            _pingJunShuiWeiText.text = $"{(value1 + value2)/2} <color=#A5BBE2>mm</color>";
+            _pingJunShuiWeiText.text = $"{(value1 + value2)/2} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].flood_protection_level} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].warning_level} m";
             _baoZhengShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].guarantee_level} m";
@@ -210,7 +210,7 @@ public class StationData:IComparable
         {
             float value1 = GlobalData.BuYuanShuiWeiDataList[0].value;
             float value2 = GlobalData.BuYuanShuiWeiDataList[1].value;
-            _pingJunShuiWeiText.text = $"{(value1 + value2) / 2} <color=#A5BBE2>mm</color>";
+            _pingJunShuiWeiText.text = $"{(value1 + value2) / 2} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].flood_protection_level} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].warning_level} m";
             _baoZhengShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].guarantee_level} m";
@@ -290,11 +290,11 @@ public class StationData:IComparable
         if (currentQuanYuYuLiangData != null)
         {
             _dangQianYuLiangText.text =
-                $"{currentQuanYuYuLiangData.dangQianYuLiang} <size=14><color=#A5BBE2>mm</color></size>";
+                $"{currentQuanYuYuLiangData.dangQianYuLiang} <size=14><color=#A5BBE2>m</color></size>";
             _zuiDaYuLiangText.text =
-                $"{currentQuanYuYuLiangData.zuiDaYuLiang} <size=14><color=#A5BBE2>mm</color></size>";
+                $"{currentQuanYuYuLiangData.zuiDaYuLiang} <size=14><color=#A5BBE2>m</color></size>";
             _pingJunYuLiangText.text =
-                $"{currentQuanYuYuLiangData.pingJunYuLiang} <size=14><color=#A5BBE2>mm</color></size>";
+                $"{currentQuanYuYuLiangData.pingJunYuLiang} <size=14><color=#A5BBE2>m</color></size>";
             _chaoJingZhanDianText.text =
                 $"{currentQuanYuYuLiangData.chaoJingZhanDian} <size=14><color=#A5BBE2>个</color></size>";