提交一部分蓝图修改

Assets/Prefabs/UI/LayerBtn.prefab

@@ -486,7 +486,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 181.2737, y: -84}
-  m_SizeDelta: {x: 362.5474, y: 0}
+  m_SizeDelta: {x: 362.5474, y: 10}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7712600881674608517
 MonoBehaviour:

Assets/Prefabs/UI/SecLayerBtn.prefab

@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 18
+    m_FontSize: 15
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1

Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -6983,7 +6983,7 @@ RectTransform:
   - {fileID: 1109833120}
   - {fileID: 437822771}
   m_Father: {fileID: 46367775954135417}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -13316,8 +13316,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 756073111}
   m_HandleRect: {fileID: 756073110}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.9817518
+  m_Value: 0.99999595
+  m_Size: 0.98175174
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -17378,7 +17378,7 @@ RectTransform:
   - {fileID: 949418684}
   - {fileID: 1105188069}
   m_Father: {fileID: 46367775954135417}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -30572,7 +30572,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 46367776915037982}
   m_HandleRect: {fileID: 46367776915037983}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -30796,6 +30796,7 @@ GameObject:
   - component: {fileID: 46367775954135417}
   - component: {fileID: 46367775954135423}
   - component: {fileID: 46367775954135416}
+  - component: {fileID: 1688813574}
   m_Layer: 5
   m_Name: Right
   m_TagString: Untagged
@@ -30815,6 +30816,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5446715565697117273}
   - {fileID: 46367777490989167}
   - {fileID: 46367777022837555}
   - {fileID: 489262735}
@@ -30865,6 +30867,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &1688813574
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 46367775954135418}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &46367775964411084
 GameObject:
   m_ObjectHideFlags: 0
@@ -33715,7 +33729,7 @@ RectTransform:
   - {fileID: 46367776015103763}
   - {fileID: 46367777077310786}
   m_Father: {fileID: 46367775954135417}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -34888,7 +34902,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 46367775954135417}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -53051,6 +53065,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2640422900216644140
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5446715565697117273}
+  - component: {fileID: 8360917273552938104}
+  - component: {fileID: 2959570110996505930}
+  m_Layer: 5
+  m_Name: BG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5446715565697117273
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2640422900216644140}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 46367775954135417}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8360917273552938104
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2640422900216644140}
+  m_CullTransparentMesh: 1
+--- !u!114 &2959570110996505930
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2640422900216644140}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1fcfa6489a7331c42a89e73a0ca477ff, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2647377399315682886
 GameObject:
   m_ObjectHideFlags: 0
@@ -65576,6 +65666,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7917872797199088731}
+  - component: {fileID: 1097329767}
   m_Layer: 5
   m_Name: Left
   m_TagString: Untagged
@@ -65601,11 +65692,23 @@ RectTransform:
   m_Father: {fileID: 46367776369383932}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 219.74, y: 0}
+  m_SizeDelta: {x: 439.47, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &1097329767
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5490883828108200110}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &5518055212953391139
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -502,7 +502,7 @@ public class GCJKLayer : YZTRootLayer
                 dropUnits.Add(dropUnit);
 
                 dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
+                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(9));
                 dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 dropUnit.bingObj.transform.localScale = Vector3.one;
                 dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD);
@@ -518,7 +518,7 @@ public class GCJKLayer : YZTRootLayer
                 dropUnits.Add(dropUnit);
 
                 dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
+                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(10));
                 dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 dropUnit.bingObj.transform.localScale = Vector3.one;
                 dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
@@ -550,7 +550,7 @@ public class GCJKLayer : YZTRootLayer
                 weatherUnits.Add(weatherUnit);
 
                 weatherUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
+                weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(10));
                 weatherUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 weatherUnit.bingObj.transform.localScale = Vector3.one;
                 weatherUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);

Assets/Scripts/UI/UIView/RKZY/RKZYLayer.cs

@@ -137,8 +137,8 @@ public class RKZYLayer : YZTRootLayer
     {
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
         beforeC.gameObject.SetActive(true);
-        beforeC = shaPan.transform.GetChild(11);
-        afterC = shaPan.transform.GetChild(12);
+        beforeC = shaPan.transform.GetChild(12);
+        afterC = shaPan.transform.GetChild(13);
         lineInfoStatic = lineInfo;
         await InitMovePlan();
         //TODO 这一块的path应该从movePlan里面生成而不是默认
@@ -229,7 +229,7 @@ public class RKZYLayer : YZTRootLayer
         List<LinePath> beforeLinePaths = new List<LinePath>();
         List<LinePath> afterLinePaths = new List<LinePath>();
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
-        Transform runtimPointParent = shaPan.transform.GetChild(11);
+        Transform runtimPointParent = shaPan.transform.GetChild(12);
         for (int i = 0; i < GlobalData.allServerMovePlans.Count; i++) {
             bool after = GlobalData.allServerMovePlans[i].isAfter;
             bool isOut = GlobalData.allServerMovePlans[i].isOut;

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -362,7 +362,7 @@ public class StationData:IComparable
                 sWHeightUnits.Add(swHUnit);
 
                 swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(9));
+                swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(11));
                 swHUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 swHUnit.bingObj.transform.localScale = Vector3.one;
                 swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD);

Assets/Scripts/UI/UIView/YZT/OnePicNav.cs

@@ -121,7 +121,10 @@ public class OnePicNav : MonoBehaviour
     // Update is called once per frame
     void LateUpdate()
     {
-        znz.transform.rotation = Quaternion.Lerp(znz.transform.rotation, Quaternion.Euler(0, 0, CameraManager.instance.mainCamera.transform.localEulerAngles.y), Time.deltaTime * 4);
+        if (CameraManager.instance.mainCamera.enabled)
+            znz.transform.rotation = Quaternion.Lerp(znz.transform.rotation, Quaternion.Euler(0, 0, CameraManager.instance.mainCamera.transform.localEulerAngles.y), Time.deltaTime * 4);
+        else
+            znz.transform.rotation = Quaternion.identity;
 
         for (int i = 0; i < runtimePointStatic.Length; i++)
         {

Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -10,6 +10,8 @@ using UnityEngine.Networking;
 using UnityEngine.UI;
 using UnityAsync;
 using WaitUntil = UnityAsync.WaitUntil;
+using DG.Tweening;
+using Unity.VisualScripting;
 
 [System.Serializable]
 public class YZTLayerData
@@ -200,21 +202,29 @@ public class YZTLayer : YZTRootLayer
         {
             if (clearBtn.GetComponent<Image>().sprite == sprites[0])
             {
+                for (int i = 0; i < leftButtons.Length; i++)
+                    leftButtons[i].gameObject.SetActive(false);
                 clearBtn.GetComponent<Image>().sprite = sprites[1];
-                leftContent.gameObject.SetActive(false);
+                DOTween.To(() => leftContent.GetComponent<RectTransform>().anchoredPosition, x => leftContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(-219.74f, 0), 0.3f);
+                DOTween.To(() => leftContent.GetComponent<CanvasGroup>().alpha, x => leftContent.GetComponent<CanvasGroup>().alpha = x, 0, 0.3f);
                 pointParent.gameObject.SetActive(true);
-                middleContent.gameObject.SetActive(false);
-                rightContent.gameObject.SetActive(false);
-                clearBtn.GetComponent<RectTransform>().anchoredPosition = new Vector2(-827, clearBtn.GetComponent<RectTransform>().anchoredPosition.y);
+                DOTween.To(() => middleContent.GetComponent<RectTransform>().anchoredPosition, x => middleContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(400f, 540), 0.3f);
+                DOTween.To(() => rightContent.GetComponent<RectTransform>().anchoredPosition, x => rightContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(220.6f, 419.8932f), 0.3f);
+                DOTween.To(() => rightContent.GetComponent<CanvasGroup>().alpha, x => rightContent.GetComponent<CanvasGroup>().alpha = x, 0, 0.3f);
+                clearBtn.GetComponent<RectTransform>().DOLocalMoveX(-827f,0.3f);
             }
             else
             {
+                for (int i = 0; i < leftButtons.Length; i++)
+                    leftButtons[i].gameObject.SetActive(true);
                 clearBtn.GetComponent<Image>().sprite = sprites[0];
-                leftContent.gameObject.SetActive(true);
+                DOTween.To(() => leftContent.GetComponent<RectTransform>().anchoredPosition, x => leftContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(219.74f,0), 0.3f);
+                DOTween.To(() => leftContent.GetComponent<CanvasGroup>().alpha, x => leftContent.GetComponent<CanvasGroup>().alpha = x, 1, 0.3f);
                 pointParent.gameObject.SetActive(true);
-                middleContent.gameObject.SetActive(true);
-                rightContent.gameObject.SetActive(true);
-                clearBtn.GetComponent<RectTransform>().anchoredPosition = new Vector2(-457, clearBtn.GetComponent<RectTransform>().anchoredPosition.y);
+                DOTween.To(() => middleContent.GetComponent<RectTransform>().anchoredPosition, x => middleContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(0f, 540), 0.3f);
+                DOTween.To(() => rightContent.GetComponent<RectTransform>().anchoredPosition, x => rightContent.GetComponent<RectTransform>().anchoredPosition = x, new Vector2(-220.6f, 419.8932f), 0.3f);
+                DOTween.To(() => rightContent.GetComponent<CanvasGroup>().alpha, x => rightContent.GetComponent<CanvasGroup>().alpha = x, 1, 0.3f);
+                clearBtn.GetComponent<RectTransform>().DOLocalMoveX(-457f, 0.3f);
             }
 
         });