设备数值趋势列表修改、场景里面的图标修改

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

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1404117312858276774
 RectTransform:
   m_ObjectHideFlags: 0
@@ -115,7 +115,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: 132, y: -18}
+  m_AnchoredPosition: {x: 132, y: -31}
   m_SizeDelta: {x: 72, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3045308368642082862
@@ -177,7 +177,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4849520089292773874
 RectTransform:
   m_ObjectHideFlags: 0
@@ -348,7 +348,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: 193.6, y: -84.13}
+  m_AnchoredPosition: {x: 193.6, y: -67.05}
   m_SizeDelta: {x: 195.1963, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4660704765551993533

Assets/Prefabs/UI/Item/DeviceTrendPanel.prefab

@@ -4259,11 +4259,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2727928790325208384}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 240, y: 0}
+  m_AnchoredPosition: {x: 171.5, y: 0}
   m_SizeDelta: {x: 44, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &300271772836208936
@@ -6103,9 +6103,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5451680839596347625}
   - {fileID: 3212166926406245086}
   - {fileID: 7527676125484864229}
+  - {fileID: 5451680839596347625}
   - {fileID: 6853878541010257016}
   m_Father: {fileID: 6257576465098656461}
   m_RootOrder: 4
@@ -8620,11 +8620,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2727928790325208384}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 119, y: -0.5}
+  m_AnchoredPosition: {x: 62, y: 0}
   m_SizeDelta: {x: 48, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &555737248985582968
@@ -10360,11 +10360,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2727928790325208384}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 22, y: 0}
+  m_AnchoredPosition: {x: 254.9, y: 0}
   m_SizeDelta: {x: 24, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3964267554142725885
@@ -10408,7 +10408,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5E8F\u53F7"
+  m_Text: "\u5355\u4F4D"
 --- !u!1 &6585436724377847383
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/Item/DevicesIcon.prefab

@@ -299,7 +299,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.7372549, b: 0.11372549, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -309,7 +309,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 12
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 123

Assets/Prefabs/UI/Item/WaterTrendListItem.prefab

@@ -31,11 +31,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5238667416520758189}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 123, y: 0}
+  m_AnchoredPosition: {x: 68, y: 0}
   m_SizeDelta: {x: 98, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2772747715039418517
@@ -111,11 +111,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5238667416520758189}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 244, y: 0}
+  m_AnchoredPosition: {x: 180, y: 0}
   m_SizeDelta: {x: 30, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5648983285458463951
@@ -190,9 +190,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 86635361588439783}
   - {fileID: 4694758663055252576}
   - {fileID: 7503462985385349116}
+  - {fileID: 86635361588439783}
   - {fileID: 5220997114213742662}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -332,7 +332,7 @@ GameObject:
   - component: {fileID: 139276828443370085}
   - component: {fileID: 1109639816989179785}
   m_Layer: 5
-  m_Name: id
+  m_Name: unit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -351,12 +351,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5238667416520758189}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 22, y: 0}
-  m_SizeDelta: {x: 6, y: 17}
+  m_AnchoredPosition: {x: 270, y: 0}
+  m_SizeDelta: {x: 30, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &139276828443370085
 CanvasRenderer:
@@ -399,4 +399,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1
+  m_Text: m

Assets/Scripts/UI/Item/DeviceIconCtrl.cs

@@ -85,7 +85,7 @@ public class DeviceIconCtrl : MonoBehaviour
         nameText = this.transform.Find("Root").Find("nameText").GetComponent<Text>();
         nameText.text = $"{_data.name}";
         valueText = this.transform.Find("Root").Find("valueText").GetComponent<Text>();
-        valueText.text = $"{_data.value} <size=12><color=FFFFFF>{_data.valueType}</color></size>";
+        valueText.text = $"{_data.value:0.00} <size=12><color=FFFFFF>{_data.valueType}</color></size>";
         
         _Button.onClick.AddListener(() =>
         {

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

@@ -261,7 +261,7 @@ public class DeviceTrendPanel : MonoBehaviour
 
             tempSeries[0].data.Clear();
             tempSeries[0].data.AddRange(tempDatas);
-            StartCoroutine(CreatList(requestData));
+            StartCoroutine(CreatList(requestData,typeText));
         }
         catch (Exception e)
         {
@@ -270,7 +270,7 @@ public class DeviceTrendPanel : MonoBehaviour
         }
     }
 
-    IEnumerator CreatList(DeviceTrendRequest deviceData)
+    IEnumerator CreatList(DeviceTrendRequest deviceData,string unit)
     {
         var wait = new WaitForEndOfFrame();
         if (listObj.Count > 0)
@@ -289,7 +289,7 @@ public class DeviceTrendPanel : MonoBehaviour
         {
             float value = float.Parse(float.Parse(deviceData.data[i].r1).ToString("F2"));
             GameObject tempObj = Instantiate(listItemOri, listRoot);
-            tempObj.transform.Find("id").GetComponent<Text>().text = $"{i + 1}";
+            tempObj.transform.Find("unit").GetComponent<Text>().text = $"{unit}";
             tempObj.transform.Find("time").GetComponent<Text>().text = $"{deviceData.data[i].timeGroup}";
             tempObj.transform.Find("value").GetComponent<Text>().text = $"{value}";
             string dirStr = "-";