Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -469,12 +469,6 @@ public class GameManager : MonoSingleton<GameManager>
             }
         }
 
-        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 +476,11 @@ public class GameManager : MonoSingleton<GameManager>
         {
             device.GetComponent<EquipmentCommon>().isPlayer = true;
         }
-        
+        if (uavm)
+        {
+            uavm.SetTipsColor();
+            DroneViewDisplay.Instance.CreateUI(uavm, false);
+        }
         FormationManager.Instance.WhenSpawn();
     }