From d8998201582522675cc9cfdb2e52b82e646afabc Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Fri, 8 Mar 2024 15:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=80=81=E5=8A=BF?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E9=94=81=E5=AE=9A=20=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=92=8C=E6=80=81=E5=8A=BF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Zion/Scripts/Adam/GameManager.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index 2cedd851..ebc5b5a4 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -10,6 +10,7 @@ using Tenkoku.Core;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using UnityTemplateProjects;
 using static InterfaceManager;
 
 public class GameManager : MonoSingleton<GameManager>
@@ -66,11 +67,13 @@ public class GameManager : MonoSingleton<GameManager>
             satelliteImagery.SetActive(false);
         postureBtn.onClick.AddListener(() =>
         {
+            currentSpt.GetComponent<SimpleCameraController>().enabled = true;
             satelliteImagery.SetActive(false);
             ChangeView(0);
         });
         teacherBtn.onClick.AddListener(() =>
         {
+            currentSpt.GetComponent<SimpleCameraController>().enabled = false;
             satelliteImagery.SetActive(true);
             ChangeView(2);
         });
@@ -468,13 +471,6 @@ public class GameManager : MonoSingleton<GameManager>
                 uavm.groupId = bdxx;
             }
         }
-
-        if (uavm)
-        {
-            uavm.SetTipsColor();
-            DroneViewDisplay.Instance.CreateUI(uavm, false);
-        }
-
         Debug.Log($"<color=yellow>是否是player{data.r3 == GlobalFlag.currentUser.user_id}</color>");
         device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para, data);
         device.GetComponent<EquipmentCommon>().deviceID = data.id;
@@ -482,7 +478,11 @@ public class GameManager : MonoSingleton<GameManager>
         {
             device.GetComponent<EquipmentCommon>().isPlayer = true;
         }
-        
+        if (uavm)
+        {
+            uavm.SetTipsColor();
+            DroneViewDisplay.Instance.CreateUI(uavm, false);
+        }
         FormationManager.Instance.WhenSpawn();
     }