diff --git a/GQ_URP/GQ/.vs/GQ/v16/.suo b/GQ_URP/GQ/.vs/GQ/v16/.suo index c24d993ab..7a9dc53e5 100644 Binary files a/GQ_URP/GQ/.vs/GQ/v16/.suo and b/GQ_URP/GQ/.vs/GQ/v16/.suo differ diff --git a/GQ_URP/GQ/Assets/Scripts/Camera/CameraRT.cs b/GQ_URP/GQ/Assets/Scripts/Camera/CameraRT.cs index 8575e16a1..b27567b5a 100644 --- a/GQ_URP/GQ/Assets/Scripts/Camera/CameraRT.cs +++ b/GQ_URP/GQ/Assets/Scripts/Camera/CameraRT.cs @@ -399,6 +399,10 @@ public class CameraRT : MonoBehaviour Vector3 oldMousePos; void Update() { + //Debug.Log("mask_img.activeSelf: " + mask_img.activeSelf + + // "\nGameManager.Inst.isLoading: " + !GameManager.Inst.isLoading + + // "\nauto_move: " + auto_move + + // "\nautoRotate: " + !autoRotate); if (mask_img.activeSelf) return; else if (!GameManager.Inst.isLoading) return; BoolMonitor.Value = ismove(); diff --git a/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs b/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs index 54f453adb..124df7bca 100644 --- a/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs +++ b/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs @@ -951,8 +951,8 @@ public class ClickEvent : MonoBehaviour public void Zoomin(GameObject cabine) { ExtendedFlycam.Inst.CameraRtDisable(); - ExtendedFlycam.Inst.QieHuan(CabinetUIManager.Instance.current_menu); - + ExtendedFlycam.Inst.QieHuan(CabinetUIManager.Instance.current_menu, 99); + //GameManager.Inst.magnifyState = true; TransparentGlowManage.Inst.is_magnify = true; diff --git a/GQ_URP/GQ/Assets/script/相机/ExtendedFlycam.cs b/GQ_URP/GQ/Assets/script/相机/ExtendedFlycam.cs index 3cf3f4365..6d4fbaf64 100644 --- a/GQ_URP/GQ/Assets/script/相机/ExtendedFlycam.cs +++ b/GQ_URP/GQ/Assets/script/相机/ExtendedFlycam.cs @@ -442,6 +442,10 @@ public class ExtendedFlycam : MonoBehaviour { QuanJing(); } + else if (index == 99) + { + return; + } else { NiaoKan();