diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index af264f40..1411dcf4 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.16233939, g: 0.30609006, b: 0.66884065, a: 1} + m_IndirectSpecularColor: {r: 0.1623277, g: 0.30598003, b: 0.66832066, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -68599,7 +68599,6 @@ MonoBehaviour: distance: 0 isScale: 0 satelliteImagery: {fileID: 1378295488} - rect: {fileID: 6368481659655708048} --- !u!1 &1720385560 GameObject: m_ObjectHideFlags: 0 @@ -70681,7 +70680,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 683595140 + randSeed: 102493484 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -72703,6 +72702,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 450 objectReference: {fileID: 0} + - target: {fileID: 5855821740938569037, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5855821741208403615, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_IsActive @@ -72718,6 +72722,11 @@ PrefabInstance: propertyPath: m_Name value: finish objectReference: {fileID: 0} + - target: {fileID: 5855821741593404592, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5855821741614971530, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_Sprite @@ -72735,6 +72744,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3} + - target: {fileID: 5855821741614971575, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_Name @@ -72861,6 +72875,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3} + - target: {fileID: 5855821741819214778, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -72961,11 +72980,21 @@ PrefabInstance: propertyPath: initiate_botn value: objectReference: {fileID: 78139659} + - target: {fileID: 5855821742187232578, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5855821742305114459, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_Text value: objectReference: {fileID: 0} + - target: {fileID: 5855821742456550830, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5855821742633352631, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} propertyPath: m_IsActive @@ -100575,8 +100604,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: 0, y: 0} - m_SizeDelta: {x: 15.067139, y: -130.77124} + m_AnchoredPosition: {x: -71, y: -28.6} + m_SizeDelta: {x: 167.36975, y: -41.188477} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6368481659655708051 GameObject: diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity index cf7207de..1d93b7ca 100644 Binary files a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity and b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity differ diff --git a/Assets/Zion/Scripts/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs index c9ddb540..d56b08fe 100644 --- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs +++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using UnityEngine.EventSystems; using UnityEngine.UI; public class PostureController : MonoBehaviour @@ -34,14 +33,13 @@ public class PostureController : MonoBehaviour { deviceManager = DeviceManager.Instance; droneViewDisplay = DroneViewDisplay.Instance; - upBtn.onClick.AddListener(OnDown); - downBtn.onClick.AddListener(OnUp); + upBtn.onClick.AddListener(OnUp); + downBtn.onClick.AddListener(OnDown); } // Update is called once per frame void Update() { - //if (EventSystem.current.IsPointerOverGameObject()) return; if (Input.GetMouseButton(0)) { if (RectTransformUtility.RectangleContainsScreenPoint(rect, Input.mousePosition)) @@ -56,40 +54,38 @@ 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; } - satelliteImagery.orthographicSize = distance; - //if (currentCoroutine == null) - //{ - // isScale = true; - // currentCoroutine = StartCoroutine(Merge(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; } - satelliteImagery.orthographicSize = distance; - //if (currentCoroutine == null) - //{ - // isScale = true; - // currentCoroutine = StartCoroutine(Merge(distance)); - //} + + if (currentCoroutine == null) + { + isScale = true; + currentCoroutine = StartCoroutine(Merge(distance)); + } } private IEnumerator Merge(float targetPoint) @@ -98,9 +94,8 @@ public class PostureController : MonoBehaviour { Debug.Log("update"); satelliteImagery.orthographicSize = Mathf.Lerp(satelliteImagery.orthographicSize, targetPoint, Time.deltaTime * 20f); - if (Mathf.Abs(targetPoint - satelliteImagery.orthographicSize) < 0.15) + if (Mathf.Abs(targetPoint - satelliteImagery.orthographicSize) < 0.1) { - satelliteImagery.orthographicSize = targetPoint; isScale = false; currentCoroutine = null; } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index f4d68ee2..2cedd851 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -10,7 +10,6 @@ using Tenkoku.Core; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using UnityTemplateProjects; using static InterfaceManager; public class GameManager : MonoSingleton @@ -67,13 +66,11 @@ 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); }); @@ -472,6 +469,12 @@ 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; @@ -479,11 +482,7 @@ public class GameManager : MonoSingleton { device.GetComponent().isPlayer = true; } - if (uavm) - { - uavm.SetTipsColor(); - DroneViewDisplay.Instance.CreateUI(uavm, false); - } + FormationManager.Instance.WhenSpawn(); }