From e4cded328a08df68be516ae4c719a3e7c168ddf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com> Date: Thu, 7 Mar 2024 11:14:43 +0800 Subject: [PATCH 1/2] 1 --- Assets/Zion/Scripts/Adam/GameManager.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 2cedd851..792d230b 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -469,12 +469,6 @@ public class GameManager : MonoSingleton } } - if (uavm) - { - uavm.SetTipsColor(); - DroneViewDisplay.Instance.CreateUI(uavm, false); - } - Debug.Log($"是否是player{data.r3 == GlobalFlag.currentUser.user_id}"); device.GetComponent().FillInTheData(data.list_para, data); device.GetComponent().deviceID = data.id; @@ -482,7 +476,11 @@ public class GameManager : MonoSingleton { device.GetComponent().isPlayer = true; } - + if (uavm) + { + uavm.SetTipsColor(); + DroneViewDisplay.Instance.CreateUI(uavm, false); + } FormationManager.Instance.WhenSpawn(); } From 0d190e9e402aab79f97629c5708f0e08e61ddf04 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 7 Mar 2024 11:25:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E6=94=BE=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=20=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdamTraining_pilot_terminal_panl 1.unity | 22 +++++------ .../Adam/Components/PostureController.cs | 39 +++++++++++-------- Assets/Zion/Scripts/Adam/GameManager.cs | 3 ++ 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 2bb861dc..c9ddf3c2 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.16233233, g: 0.30609074, b: 0.6688971, a: 1} + m_IndirectSpecularColor: {r: 0.1623216, g: 0.30607828, b: 0.6689026, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -48711,7 +48711,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000030517578} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &996536657 MonoBehaviour: @@ -68550,7 +68550,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1719983406 RectTransform: m_ObjectHideFlags: 0 @@ -68634,7 +68634,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000030517578} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1720385562 MonoBehaviour: @@ -70680,7 +70680,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 27443000 + randSeed: 667614828 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -98960,7 +98960,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -948, y: 10} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6368481658076565719 MonoBehaviour: @@ -100516,7 +100516,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -100574,8 +100574,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -71, y: -28.6} - m_SizeDelta: {x: 167.36975, y: -41.188477} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 15.067139, y: -130.77124} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6368481659655708051 GameObject: @@ -100825,9 +100825,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -7, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6368481659665436127 MonoBehaviour: diff --git a/Assets/Zion/Scripts/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs index 11dc05f6..df3bd0e8 100644 --- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs +++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; public class PostureController : MonoBehaviour @@ -32,13 +33,14 @@ public class PostureController : MonoBehaviour { deviceManager = DeviceManager.Instance; droneViewDisplay = DroneViewDisplay.Instance; - upBtn.onClick.AddListener(OnUp); - downBtn.onClick.AddListener(OnDown); + upBtn.onClick.AddListener(OnDown); + downBtn.onClick.AddListener(OnUp); } // Update is called once per frame void Update() { + //if (EventSystem.current.IsPointerOverGameObject()) return; if (Input.GetMouseButton(0)) { float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime; @@ -50,38 +52,40 @@ public class PostureController : MonoBehaviour private void OnUp() { + //if (currentCoroutine != null) return; + //if (isScale) return; distance = satelliteImagery.orthographicSize; distance += 100; if (distance >= 1120) { distance = 1120; - currentCoroutine = null; return; } - - if (currentCoroutine == null) - { - isScale = true; - currentCoroutine = StartCoroutine(Merge(distance)); - } + satelliteImagery.orthographicSize = distance; + //if (currentCoroutine == null) + //{ + // isScale = true; + // currentCoroutine = StartCoroutine(Merge(distance)); + //} } private void OnDown() { + //if (currentCoroutine != null) return; + //if (isScale) return; distance = satelliteImagery.orthographicSize; distance -= 100; if (distance <= 200f) { distance = 200f; - currentCoroutine = null; return; } - - if (currentCoroutine == null) - { - isScale = true; - currentCoroutine = StartCoroutine(Merge(distance)); - } + satelliteImagery.orthographicSize = distance; + //if (currentCoroutine == null) + //{ + // isScale = true; + // currentCoroutine = StartCoroutine(Merge(distance)); + //} } private IEnumerator Merge(float targetPoint) @@ -90,8 +94,9 @@ public class PostureController : MonoBehaviour { Debug.Log("update"); satelliteImagery.orthographicSize = Mathf.Lerp(satelliteImagery.orthographicSize, targetPoint, Time.deltaTime * 20f); - if (Mathf.Abs(targetPoint - satelliteImagery.orthographicSize) < 0.1) + if (Mathf.Abs(targetPoint - satelliteImagery.orthographicSize) < 0.15) { + satelliteImagery.orthographicSize = targetPoint; isScale = false; currentCoroutine = null; } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 2cedd851..91a2150d 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 @@ -66,11 +67,13 @@ public class GameManager : MonoSingleton satelliteImagery.SetActive(false); postureBtn.onClick.AddListener(() => { + currentSpt.GetComponent().enabled = true; satelliteImagery.SetActive(false); ChangeView(0); }); teacherBtn.onClick.AddListener(() => { + currentSpt.GetComponent().enabled = false; satelliteImagery.SetActive(true); ChangeView(2); });