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

Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.16210404, g: 0.3058086, b: 0.66891867, a: 1}
+  m_IndirectSpecularColor: {r: 0.16228932, g: 0.30693555, b: 0.67375255, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -54300,6 +54300,7 @@ MonoBehaviour:
   - {fileID: 745447508}
   - {fileID: 1213021907}
   mastermanagement: {fileID: 147647013}
+  wrjGroupView: {fileID: 1585142378}
   eventsystem: {fileID: 1646249875}
   postureBtn: {fileID: 1594140421}
   teacherBtn: {fileID: 1565322412}
@@ -70422,7 +70423,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 430664031
+  randSeed: 498661468
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574

Assets/Zion/Scripts/Adam/FormationManager.cs

@@ -8,7 +8,7 @@ using UnityEngine.UI;
 [Serializable]
 public class FormationInfo
 {
-    public int groupName;
+    public int groupIndex;
     public List<UnmannedAerialVehicleManage> uavms = new List<UnmannedAerialVehicleManage>();
 }
 
@@ -59,7 +59,7 @@ public class FormationManager : MonoSingleton<FormationManager>
                             if (!formationInfo.uavms.Contains(uavmTemp))
                             {
                                 uavmTemp.isGroup = true;
-                                uavmTemp.groupId = formationInfo.groupName;
+                                uavmTemp.groupId = formationInfo.groupIndex;
                                 formationInfo.uavms.Add(uavmTemp);
                             }
                         }
@@ -138,7 +138,7 @@ public class FormationManager : MonoSingleton<FormationManager>
         for (int i = 0; i < formationInfos.Count; i++)
         {
             int indexI = i;
-            if (formationInfos[indexI].groupName == uavmGroupID)
+            if (formationInfos[indexI].groupIndex == uavmGroupID)
             {
                 uavms = formationInfos[indexI].uavms;
             }
@@ -152,7 +152,7 @@ public class FormationManager : MonoSingleton<FormationManager>
     {
         isStartFormation = true;
         formationInfo = new FormationInfo();
-        formationInfo.groupName = formationInfos.Count;
+        formationInfo.groupIndex = formationInfos.Count;
         CheckBtns(1);
     }
 
@@ -164,6 +164,7 @@ public class FormationManager : MonoSingleton<FormationManager>
             if (!formationInfos.Contains(formationInfo))
                 formationInfos.Add(formationInfo);
         }
+        formationInfo = null;
         CheckBtns(0);
     }
 

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -41,6 +41,10 @@ public class GameManager : MonoSingleton<GameManager>
     public DragController[] wrjDrags;
 
     public Mastermanagement mastermanagement;
+    /// <summary>
+    /// 无人机打组操作页面
+    /// </summary>
+    public GameObject wrjGroupView;
 
     public EventSystem eventsystem;
     /// <summary>
@@ -70,6 +74,7 @@ public class GameManager : MonoSingleton<GameManager>
             satelliteImagery.SetActive(true);
             ChangeView(2);
         });
+        wrjGroupView.SetActive(false);
         HighPriorityTarget.HighPriorityTargets.Clear();
         SyncCreateRoom.getroomusersRequset += OnGetRoomUsers;
         SyncCreateRoom.send2roomRequset += OnRoomInfo;
@@ -104,6 +109,7 @@ public class GameManager : MonoSingleton<GameManager>
                     wrjDrags[0].gameObject.SetActive(false);
                 }
             }
+            wrjGroupView.SetActive(true);
         }
         else
         {

Assets/Zion/Scripts/Adam/WRJManager.cs

@@ -23,7 +23,8 @@ namespace Assets.Zion.Scripts.Adam
         {
             if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0))
             {
-                if (EventSystem.current.IsPointerOverGameObject()) return; 
+                if (EventSystem.current.IsPointerOverGameObject()) return;
+                if (FormationManager.Instance.isStartFormation) return;
                 Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                 RaycastHit hitInfo;
                 if (Physics.Raycast(ray, out hitInfo, 1000))
@@ -32,7 +33,7 @@ namespace Assets.Zion.Scripts.Adam
                     EquipmentCommon ec = hitInfo.collider.GetComponent<EquipmentCommon>();
                     if (ec != null && ec.isPlayer)
                     {
-                        if (hitInfo.collider.tag == "WRJ" )
+                        if (hitInfo.collider.tag == "WRJ")
                         {
                             wrjMenuSetPanel.localScale = Vector3.one;
                             Vector3 posItem = GetScreenPosition(hitInfo.collider.gameObject);

Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs

@@ -65,7 +65,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
     public int groupId = -1;
 
     public bool isGroup = false;
-
+    
     /// <summary>
     /// 无人机预制体
     /// </summary>