From 3555b0dcc0b7646de206c02ad266c9a070b1a352 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 23 Feb 2024 22:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity | 5 +++-- Assets/Zion/Scripts/Adam/FormationManager.cs | 9 +++++---- Assets/Zion/Scripts/Adam/GameManager.cs | 6 ++++++ Assets/Zion/Scripts/Adam/WRJManager.cs | 5 +++-- .../ModelFunction/UAV/UnmannedAerialVehicleManage.cs | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index a1d3c27d..b8b17f03 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/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 diff --git a/Assets/Zion/Scripts/Adam/FormationManager.cs b/Assets/Zion/Scripts/Adam/FormationManager.cs index cdea0cdc..01252b95 100644 --- a/Assets/Zion/Scripts/Adam/FormationManager.cs +++ b/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 uavms = new List(); } @@ -59,7 +59,7 @@ public class FormationManager : MonoSingleton 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 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 { isStartFormation = true; formationInfo = new FormationInfo(); - formationInfo.groupName = formationInfos.Count; + formationInfo.groupIndex = formationInfos.Count; CheckBtns(1); } @@ -164,6 +164,7 @@ public class FormationManager : MonoSingleton if (!formationInfos.Contains(formationInfo)) formationInfos.Add(formationInfo); } + formationInfo = null; CheckBtns(0); } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 4d8c3b69..32157b1f 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -41,6 +41,10 @@ public class GameManager : MonoSingleton public DragController[] wrjDrags; public Mastermanagement mastermanagement; + /// + /// 无人机打组操作页面 + /// + public GameObject wrjGroupView; public EventSystem eventsystem; /// @@ -70,6 +74,7 @@ public class GameManager : MonoSingleton 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 wrjDrags[0].gameObject.SetActive(false); } } + wrjGroupView.SetActive(true); } else { diff --git a/Assets/Zion/Scripts/Adam/WRJManager.cs b/Assets/Zion/Scripts/Adam/WRJManager.cs index 29ddb616..833c504f 100644 --- a/Assets/Zion/Scripts/Adam/WRJManager.cs +++ b/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(); 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); diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 9b7e8bdc..5650e9bd 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -65,7 +65,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour public int groupId = -1; public bool isGroup = false; - + /// /// 无人机预制体 ///