浏览代码

修改两个问题

Void_F 1 天之前
父节点
当前提交
c8de32218a

+ 6 - 5
Assets/ModelAniTool.cs

@@ -42,13 +42,14 @@ public class ModelAniTool : MonoBehaviour
         oriV3 = new Vector3[objectCount];
         for (int i = 0; i < objectCount; i++)
         {
-            targetObjs[i] = this.transform.Find(moveModelName+"(Clone)").GetChild(i).gameObject;
             switch (aniType)
             {
                 case AniType.buYuan:
+                    targetObjs[i] = this.transform.Find(moveModelName+"(Clone)").GetChild(objectCount-1-i).gameObject;
                     oriV3[i] = targetObjs[i].transform.localPosition;
                     break;
                 case AniType.taoKou:
+                    targetObjs[i] = this.transform.Find(moveModelName+"(Clone)").GetChild(i).gameObject;
                     oriV3[i] = targetObjs[i].transform.localEulerAngles;
                     break;
             }
@@ -79,7 +80,7 @@ public class ModelAniTool : MonoBehaviour
                 {
                     int tempIndex = i;
                     targetObjs[i].transform.localPosition = oriV3[tempIndex];
-                    targetObjs[i].transform.DOLocalMoveZ(8*openValues[tempIndex], speed);
+                    targetObjs[i].transform.DOLocalMoveZ(1.2f*openValues[tempIndex], speed);
                     //Debug.Log($"{targetObjs[i].name}:{openValues[tempIndex]}");
                 }
                 break;
@@ -88,7 +89,7 @@ public class ModelAniTool : MonoBehaviour
                 {
                     int tempIndex = i;
                     targetObjs[i].transform.localEulerAngles = oriV3[tempIndex];
-                    targetObjs[i].transform.DOLocalRotate(new Vector3(-45.0f,0,0) *openValues[tempIndex], speed);
+                    targetObjs[i].transform.DOLocalRotate(new Vector3(-45.0f,0,0) * (openValues[tempIndex]/5.0f), speed);
                 }
                 break;
         }
@@ -102,7 +103,7 @@ public class ModelAniTool : MonoBehaviour
                 for (int i = 0; i < targetObjs.Length; i++)
                 {
                     int tempIndex = i;
-                    targetObjs[i].transform.localPosition = oriV3[tempIndex] + new Vector3(0, 0, 8);
+                    targetObjs[i].transform.localPosition = oriV3[tempIndex] + new Vector3(0, 0, 1.2f);
                     targetObjs[i].transform.DOLocalMoveZ(0, speed);
                 }
                 break;
@@ -110,7 +111,7 @@ public class ModelAniTool : MonoBehaviour
                 for (int i = 0; i < targetObjs.Length; i++)
                 {
                     int tempIndex = i;
-                    targetObjs[i].transform.localEulerAngles = new Vector3(-45.0f,0,0)*openValues[tempIndex];
+                    targetObjs[i].transform.localEulerAngles = new Vector3(-45.0f,0,0)*(openValues[tempIndex]/5.0f);
                     targetObjs[i].transform.DOLocalRotate(Vector3.zero, speed);
                 }
                 break;

+ 8 - 8
Assets/Prefabs/UI/Item/3D_ZhaZhanItem.prefab

@@ -156,10 +156,10 @@ MonoBehaviour:
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u76D1\u63A7\u70B9\u4F4D\u540D\u79F0"
+  m_Text: "\u76D1\u63A7\u70B9\u4F4D\u540D\u79F0XXXXXXXXXX"
 --- !u!1 &3240829825969212596
 GameObject:
   m_ObjectHideFlags: 0
@@ -538,9 +538,9 @@ MonoBehaviour:
   idText: {fileID: 3584424707877181578}
   updateTimeText: {fileID: 1873568582120804413}
   _data:
-    GateNumber: 0
-    IsOpen: 0
-    CurrentFlow: 0
-    CurrentOpening: 0
-    Status: 0
-    updateTime: 
+    sensor_id: 0
+    gate_open: 0
+    opening_degree: 0
+    gate_breakdown: 0
+    record_ts: 0
+    station_name: 

+ 2 - 2
Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -3709,7 +3709,7 @@ MonoBehaviour:
     m_Show: 1
     m_CoordSystem: GridCoord
     m_SerieType: Pie
-    m_SerieName: serie0
+    m_SerieName: "\u5206\u7EA7\u8003\u8BC4"
     m_State: 0
     m_ColorBy: 0
     m_Stack: 
@@ -14992,7 +14992,7 @@ MonoBehaviour:
     m_Show: 1
     m_CoordSystem: GridCoord
     m_SerieType: Pie
-    m_SerieName: serie0
+    m_SerieName: "\u73B0\u5730\u5DE5\u7A0B\u7BA1\u7406\u68C0\u67E5"
     m_State: 0
     m_ColorBy: 0
     m_Stack: 

文件差异内容过多而无法显示
+ 1 - 98
Assets/Scene 1.unity


+ 3 - 3
Assets/Scripts/UI/UIView/3D/ZMJKLayer.cs

@@ -89,7 +89,7 @@ public class ZMJKLayer : MonoBehaviour
             int tempIndex = i;
             ZhaZhanItem tempItem = Instantiate(ZhaZhanItemOri, itemContent).GetComponent<ZhaZhanItem>();
             tempItem.SetData(GlobalData.floorGateData.buYuan[tempIndex], $"补元-{tempIndex + 1}#闸门");
-            byV3[tempIndex] = GlobalData.floorGateData.buYuan[tempIndex].opening_degree * 0.01f;
+            byV3[tempIndex] = GlobalData.floorGateData.buYuan[tempIndex].opening_degree;
             //Debug.Log($"补元闸门-{tempIndex + 1}:{byV3[tempIndex]}");
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
@@ -112,7 +112,7 @@ public class ZMJKLayer : MonoBehaviour
             int tempIndex = i;
             ZhaZhanItem tempItem = Instantiate(ZhaZhanItemOri, itemContent).GetComponent<ZhaZhanItem>();
             tempItem.SetData(GlobalData.floorGateData.taoKou[tempIndex], $"套口:{tempIndex + 1}#闸门");
-            tkV3[tempIndex] = GlobalData.floorGateData.taoKou[tempIndex].opening_degree * 0.01f;
+            tkV3[tempIndex] = GlobalData.floorGateData.taoKou[tempIndex].opening_degree;
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
                 OpenZhaMenInfoPanel(1, tempIndex, tempItem);
@@ -140,7 +140,7 @@ public class ZMJKLayer : MonoBehaviour
         showGongPanel = true;
         zhaZhanMingCheng.text = itemData._name;
         var floorGateData = type == 0 ? GlobalData.floorGateData.buYuan : GlobalData.floorGateData.taoKou;
-        zhaMenKaiDu.text = $"{floorGateData[_index].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
+        zhaMenKaiDu.text = $"{floorGateData[_index].opening_degree:0.00}<size=14><color=#A5BFE2>m</color></size>";
 
         guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
 

+ 1 - 1
Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -627,7 +627,7 @@ public class BigScreenLayer : MonoBehaviour
                 GameObject floodGateDataObj = Instantiate(floodDataPrefab);
                 floodGateDataObj.transform.SetParent(floodLists[1].transform);
                 floodGateDataObj.transform.localScale = Vector3.one;
-                floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "闸门";
+                floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "#闸门";
                 floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = taokouData[i].gate_opening ? "开启" : "关闭";
                 floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = "- m³/s";
                 floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = "m";

部分文件因为文件数量过多而无法显示