浏览代码

提交一些很小的改动

lantiannb 2 周之前
父节点
当前提交
f268b97494

+ 12 - 1
Assets/ModelAniTool.cs

@@ -24,7 +24,18 @@ public class ModelAniTool : MonoBehaviour
     public AniType aniType;
 
     private float[] openValues;
-    
+
+
+    private void Update()
+    {
+        if (aniType == AniType.buYuan) {
+            if (GlobalData.buYuanSensorData.data.Count > 0) {
+                for (int i = 0; i < targetObjs.Length; i++) {
+                    Debug.Log(GlobalData.buYuanSensorData.data[0].opening_degree);
+                }
+            }
+        }
+    }
     public void FindObje()
     {
         targetObjs = new GameObject[objectCount];

+ 1 - 1
Assets/Prefabs/UI/Item/ZhaZhanJianKongItem.prefab

@@ -159,7 +159,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5F00\u5EA6\uFF1A\t\t<color=#FFFFFF>50</color> %"
+  m_Text: "\u5F00\u5EA6\uFF1A\t\t<color=#FFFFFF>50</color> cm"
 --- !u!1 &5163826658515464674
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 3
Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -3501,7 +3501,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
+  m_IsOn: 0
 --- !u!1 &1332602984557299964
 GameObject:
   m_ObjectHideFlags: 0
@@ -14603,6 +14603,8 @@ MonoBehaviour:
   startDateStr: 
   endDateStr: 
   currentType: 0
+  _sid: 
+  _gid: 
 --- !u!1 &4450752333740051320
 GameObject:
   m_ObjectHideFlags: 0
@@ -22341,7 +22343,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
+  m_IsOn: 0
 --- !u!1 &6689920087274219883
 GameObject:
   m_ObjectHideFlags: 0
@@ -29485,7 +29487,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
+  m_IsOn: 0
 --- !u!1 &8825350910248299912
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -2377,8 +2377,8 @@ RectTransform:
   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: 76, y: 0}
-  m_SizeDelta: {x: 56, y: 19}
+  m_AnchoredPosition: {x: 77.76896, y: 0}
+  m_SizeDelta: {x: 75.538, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7344039086190510415
 CanvasRenderer:

+ 1 - 1
Assets/Scripts/UI/Item/ZhaZhanJianKongItem.cs

@@ -22,7 +22,7 @@ public class ZhaZhanJianKongItem : MonoBehaviour
     {
         _currentData = data;
         _nameText.text = _currentData.name;
-        _openValueText.text = $"开度:\t\t<color=#FFFFFF>{(int)(_currentData.openValue*100)}</color> cm";
+        _openValueText.text = $"开度:\t<color=#FFFFFF>{(int)(_currentData.openValue*100)}</color> cm";
         string stateStr = "未知";
         switch (_currentData.state)
         {

+ 3 - 3
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -607,9 +607,9 @@ public class GCJKLayer : YZTRootLayer
         FindWeiYiTargetObje();
 
         SetObsIconActive(obsToggle.isOn);
-        SetShuiWeiIconActive(shuiWeiToggle.isOn);
-        SetShuiYaIconActive(shuiYaToggle.isOn);
-        SetWeiYiIconActive(weiYiToggle.isOn);
+        SetShuiWeiIconActive(false);
+        SetShuiYaIconActive(false);
+        SetWeiYiIconActive(false);
 
         SetGongChengLieBiaoData();