Browse Source

一张图工程监控增加闸门开度对应模型

Void_F 1 week ago
parent
commit
aa167e907f

+ 1 - 1
Assets/ModelAniTool.cs

@@ -42,7 +42,7 @@ public class ModelAniTool : MonoBehaviour
         oriV3 = new Vector3[objectCount];
         for (int i = 0; i < objectCount; i++)
         {
-            targetObjs[i] = this.transform.Find(moveModelName+"(Clone)").GetChild(objectCount-1-i).gameObject;
+            targetObjs[i] = this.transform.Find(moveModelName+"(Clone)").GetChild(i).gameObject;
             switch (aniType)
             {
                 case AniType.buYuan:

+ 24 - 23
Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -1699,11 +1699,11 @@ RectTransform:
   m_Father: {fileID: 3668128195560513651}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -180, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180, y: -109.87065}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &5831016098952413980
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2073,7 +2073,7 @@ RectTransform:
   m_GameObject: {fileID: 826545313689957992}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5543015315167477308}
@@ -6758,11 +6758,11 @@ RectTransform:
   m_Father: {fileID: 7856272371583142643}
   m_RootOrder: 0
   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: 2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &8796178352796693657
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6798,7 +6798,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -6832,7 +6832,7 @@ RectTransform:
   m_GameObject: {fileID: 2221345441337441995}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6124796066701829661}
@@ -7423,7 +7423,7 @@ RectTransform:
   m_GameObject: {fileID: 2371514757001672398}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8029854753834037583}
@@ -11813,7 +11813,7 @@ RectTransform:
   m_GameObject: {fileID: 4035913960901041498}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2799870328450663158}
@@ -20347,6 +20347,7 @@ MonoBehaviour:
   buyuanBtn: {fileID: 1830753044289672754}
   taokouBtn: {fileID: 2739425641835766322}
   _DeviceTrendPanel: {fileID: 8052288892106676708}
+  currentSelectItem: {fileID: 0}
 --- !u!1 &6106077596436368013
 GameObject:
   m_ObjectHideFlags: 0
@@ -20374,7 +20375,7 @@ RectTransform:
   m_GameObject: {fileID: 6106077596436368013}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3896955839239604782}
@@ -21166,11 +21167,11 @@ RectTransform:
   m_Father: {fileID: 6383010074233340880}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &6852606498084772042
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -21206,7 +21207,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 5
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -29681,11 +29682,11 @@ RectTransform:
   m_Father: {fileID: 3668128195560513651}
   m_RootOrder: 0
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180, y: -109.87065}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &2621748943136160823
 CanvasRenderer:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 2 - 99
Assets/Scene 1.unity


+ 7 - 0
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -669,6 +669,13 @@ public class GCJKLayer : YZTRootLayer
                 currentZhaZhanJianKongItems.Add(tempItem);
             }
         }
+
+        float[] modelAniValues = new float[datas.Count];
+        for (int i = 0; i < modelAniValues.Length; i++)
+        {
+            modelAniValues[i] = datas[i].openValue;
+        }
+        ActionInstance._Instance.ModelAni_On?.Invoke( currentDataType == 0 ? AniType.buYuan : AniType.taoKou,modelAniValues);
     }
 
     public void SetShuiWenJianCeData(ShuiWenJianCeData data)

Some files were not shown because too many files changed in this diff