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

Assets/Zion/Scripts/Adam/FormationManager.cs

@@ -60,6 +60,7 @@ public class FormationManager : MonoSingleton<FormationManager>
                             {
                                 uavmTemp.isGroup = true;
                                 uavmTemp.groupId = formationInfo.groupIndex;
+                                uavmTemp.SetGroupTips(formationInfo.groupIndex);
                                 formationInfo.uavms.Add(uavmTemp);
                             }
                         }

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>
@@ -214,6 +214,18 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// 设置组得标志
+    /// </summary>
+    public void SetGroupTips(int index)
+    {
+        UnmannedAerialVehicle uav = unmannedAerialVehicles[0];
+        if (uav != null)
+        {
+            uav.tips.text = uav.tips.text + "\n" + "组" + index.ToString();
+        }
+    }
+
     /// <summary>
     /// 频段设置
     /// </summary>