Ver código fonte

3D防洪跳转

Void_F 8 meses atrás
pai
commit
f6e9ef92d7

+ 18 - 18
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -2132,8 +2132,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653291335120}
   - {fileID: 9093061653547392614}
   - {fileID: 9093061653547392614}
+  - {fileID: 9093061653291335120}
   m_Father: {fileID: 9093061653547399692}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3709,7 +3709,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -6386,8 +6386,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061654094578440}
   - {fileID: 9093061655173667199}
   - {fileID: 9093061655173667199}
+  - {fileID: 9093061654094578440}
   m_Father: {fileID: 9093061653547399692}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10593,7 +10593,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061654502916386}
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -12362,8 +12362,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061653995338931}
   - {fileID: 9093061654484229631}
   - {fileID: 9093061654484229631}
+  - {fileID: 9093061653995338931}
   m_Father: {fileID: 9093061654363556753}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -17862,8 +17862,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654922658960}
   - {fileID: 9093061654333608751}
   - {fileID: 9093061654333608751}
+  - {fileID: 9093061654922658960}
   m_Father: {fileID: 9093061654363556753}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -20606,7 +20606,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -22260,7 +22260,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -22953,7 +22953,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26798,7 +26798,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061653234529556}
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -27830,7 +27830,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -29550,7 +29550,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061653476887218}
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -30283,8 +30283,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061654399081119}
   - {fileID: 9093061655340129781}
   - {fileID: 9093061655340129781}
+  - {fileID: 9093061654399081119}
   m_Father: {fileID: 9093061654363556753}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -31554,7 +31554,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061653333981062}
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -38860,7 +38860,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -45320,7 +45320,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061655282686621}
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -48554,8 +48554,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654135754304}
   - {fileID: 9093061654518704622}
   - {fileID: 9093061654518704622}
+  - {fileID: 9093061654135754304}
   m_Father: {fileID: 9093061654363556753}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -49731,7 +49731,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 9093061654544985612}
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

Diferenças do arquivo suprimidas por serem muito extensas
+ 97 - 0
Assets/Scene 1.unity


+ 1 - 1
Assets/Scripts/HttpGetData.cs

@@ -48,7 +48,7 @@ public class SensorData
     /// 闸门电源正常
     /// 闸门电源正常
     /// </summary>
     /// </summary>
     public bool gate_power;
     public bool gate_power;
-
+    
     public long record_id;
     public long record_id;
     public int record_ts;
     public int record_ts;
     public int sensor_id;
     public int sensor_id;

+ 6 - 0
Assets/Scripts/UI/UIView/3D/ThreeDNav.cs

@@ -54,7 +54,13 @@ public class ThreeDNav : MonoBehaviour
                 Tweener tw = s_image.GetComponent<RectTransform>().DOLocalMoveX(targetPos[index].x, 0.3f);
                 Tweener tw = s_image.GetComponent<RectTransform>().DOLocalMoveX(targetPos[index].x, 0.3f);
                 tw.SetEase(Ease.OutBack);
                 tw.SetEase(Ease.OutBack);
                 if (index < layers.Count)
                 if (index < layers.Count)
+                {
                     layers[index].gameObject.SetActive(true);
                     layers[index].gameObject.SetActive(true);
+                }
+                if (index == 1)
+                {
+                    StaticLod.instance.OnFoucusStatic("Bird0");
+                }
             });
             });
         }
         }
     }
     }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff