From 645c4f06828870aef73484805e44323294ecadf1 Mon Sep 17 00:00:00 2001 From: Cg-Fly <1499046294@qq.com> Date: Thu, 20 Feb 2025 10:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=9B=E7=9A=84=E5=86=B2?= =?UTF-8?q?=E8=83=9A=E8=80=83=E6=A0=B8=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=91=84?= =?UTF-8?q?=E5=83=8F=E6=9C=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_Scripts/Application/UI/OperationStepPanel.cs | 9 ++++++++- UserSettings/Layouts/CurrentMaximizeLayout.dwlt | 11 ++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index 188563a..fe82a10 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -534,7 +534,14 @@ namespace ZXK.LouDiXvMuNiu _nearCameraTRTog.gameObject.SetActive(true); if (_nearCameraTRTog.isOn) { - NiuSceneMng._Instance.CameraSetNearTR(obj); + if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState") && obj.id == 167) + { + NiuSceneMng._Instance.CameraSetNear2TR(obj); + } + else + { + NiuSceneMng._Instance.CameraSetNearTR(obj); + } } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index b96233b..47368a1 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 26 + controlID: 819 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 27 + controlID: 820 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -928,7 +928,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2efbffff + m_ExpandedIDs: d8c0feff8821ffff2efbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1023,7 +1023,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/_Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1039,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: 000000004e78000050780000527800005478000056780000587800005a7800005c7800005e78000060780000627800006478000066780000687800006a7800006c7800006e78000070780000727800007478000076780000787800007a7800007c7800007e78000080780000827800008478000086780000887800008a7800008c7800008e7800009078000092780000947800009678000098780000 + m_ExpandedIDs: ffffffff000000004e78000050780000527800005478000056780000587800005a7800005c7800005e78000060780000627800006478000066780000687800006a7800006c7800006e78000070780000727800007478000076780000787800007a7800007c7800007e78000080780000827800008478000086780000887800008a7800008c7800008e7800009078000092780000947800009678000098780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: