yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改 缩放 移动 逻辑

This commit is contained in:
YangHua 2024-03-07 11:25:14 +08:00
parent 7e4c70f308
commit 0d190e9e40
3 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741} 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 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -48711,7 +48711,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578} 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} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &996536657 --- !u!114 &996536657
MonoBehaviour: MonoBehaviour:
@ -68550,7 +68550,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1719983406 --- !u!224 &1719983406
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -68634,7 +68634,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578} 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} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1720385562 --- !u!114 &1720385562
MonoBehaviour: MonoBehaviour:
@ -70680,7 +70680,7 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
randSeed: 27443000 randSeed: 667614828
isDoingTransition: 0 isDoingTransition: 0
minimumHeight: 0 minimumHeight: 0
--- !u!114 &1820978574 --- !u!114 &1820978574
@ -98960,7 +98960,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -948, y: 10} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &6368481658076565719 --- !u!114 &6368481658076565719
MonoBehaviour: MonoBehaviour:
@ -100516,7 +100516,7 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20} m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -100574,8 +100574,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -71, y: -28.6} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 167.36975, y: -41.188477} m_SizeDelta: {x: 15.067139, y: -130.77124}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6368481659655708051 --- !u!1 &6368481659655708051
GameObject: GameObject:
@ -100825,9 +100825,9 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 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_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -7, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &6368481659665436127 --- !u!114 &6368481659665436127
MonoBehaviour: MonoBehaviour:

39
Assets/Zion/Scripts/Adam/Components/PostureController.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
public class PostureController : MonoBehaviour public class PostureController : MonoBehaviour
@ -32,13 +33,14 @@ public class PostureController : MonoBehaviour
{ {
deviceManager = DeviceManager.Instance; deviceManager = DeviceManager.Instance;
droneViewDisplay = DroneViewDisplay.Instance; droneViewDisplay = DroneViewDisplay.Instance;
upBtn.onClick.AddListener(OnUp); upBtn.onClick.AddListener(OnDown);
downBtn.onClick.AddListener(OnDown); downBtn.onClick.AddListener(OnUp);
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
//if (EventSystem.current.IsPointerOverGameObject()) return;
if (Input.GetMouseButton(0)) if (Input.GetMouseButton(0))
{ {
float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime; float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime;
@ -50,38 +52,40 @@ public class PostureController : MonoBehaviour
private void OnUp() private void OnUp()
{ {
//if (currentCoroutine != null) return;
//if (isScale) return;
distance = satelliteImagery.orthographicSize; distance = satelliteImagery.orthographicSize;
distance += 100; distance += 100;
if (distance >= 1120) if (distance >= 1120)
{ {
distance = 1120; distance = 1120;
currentCoroutine = null;
return; return;
} }
satelliteImagery.orthographicSize = distance;
if (currentCoroutine == null) //if (currentCoroutine == null)
{ //{
isScale = true; // isScale = true;
currentCoroutine = StartCoroutine(Merge(distance)); // currentCoroutine = StartCoroutine(Merge(distance));
} //}
} }
private void OnDown() private void OnDown()
{ {
//if (currentCoroutine != null) return;
//if (isScale) return;
distance = satelliteImagery.orthographicSize; distance = satelliteImagery.orthographicSize;
distance -= 100; distance -= 100;
if (distance <= 200f) if (distance <= 200f)
{ {
distance = 200f; distance = 200f;
currentCoroutine = null;
return; return;
} }
satelliteImagery.orthographicSize = distance;
if (currentCoroutine == null) //if (currentCoroutine == null)
{ //{
isScale = true; // isScale = true;
currentCoroutine = StartCoroutine(Merge(distance)); // currentCoroutine = StartCoroutine(Merge(distance));
} //}
} }
private IEnumerator Merge(float targetPoint) private IEnumerator Merge(float targetPoint)
@ -90,8 +94,9 @@ public class PostureController : MonoBehaviour
{ {
Debug.Log("update"); Debug.Log("update");
satelliteImagery.orthographicSize = Mathf.Lerp(satelliteImagery.orthographicSize, targetPoint, Time.deltaTime * 20f); 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; isScale = false;
currentCoroutine = null; currentCoroutine = null;
} }

3
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -10,6 +10,7 @@ using Tenkoku.Core;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
using UnityTemplateProjects;
using static InterfaceManager; using static InterfaceManager;
public class GameManager : MonoSingleton<GameManager> public class GameManager : MonoSingleton<GameManager>
@ -66,11 +67,13 @@ public class GameManager : MonoSingleton<GameManager>
satelliteImagery.SetActive(false); satelliteImagery.SetActive(false);
postureBtn.onClick.AddListener(() => postureBtn.onClick.AddListener(() =>
{ {
currentSpt.GetComponent<SimpleCameraController>().enabled = true;
satelliteImagery.SetActive(false); satelliteImagery.SetActive(false);
ChangeView(0); ChangeView(0);
}); });
teacherBtn.onClick.AddListener(() => teacherBtn.onClick.AddListener(() =>
{ {
currentSpt.GetComponent<SimpleCameraController>().enabled = false;
satelliteImagery.SetActive(true); satelliteImagery.SetActive(true);
ChangeView(2); ChangeView(2);
}); });