From eef8a3c0c491789fa171cab8e7b1a72fb0c25bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CCongG=E2=80=9D?= Date: Thu, 2 Jan 2025 19:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=9C=9F=E5=8F=91=E6=83=85=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=8A=A8=E7=94=BB=E6=9C=80=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/StreamingAssets/ExcelJson/NiuData.txt | 4 +- .../Application/SceneCtrls/NiuSceneMng.cs | 8 +- .../Application/UI/OperationStepPanel.cs | 1 + .../Utilities/TimelineDirectorCtrl.cs | 5 +- .../Layouts/CurrentMaximizeLayout.dwlt | 118 +++++++++--------- 5 files changed, 73 insertions(+), 63 deletions(-) diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index 7028a7f..9e86a0a 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -12,8 +12,8 @@ "SoundPath": "N001", "VideoPath": "", "TimelineLength": 0, - "CameraDefaultTR": "", - "CameraNearTR": "", + "CameraDefaultTR": "3.438194_-2.326728_-2.274946|26.78_7.995024_0", + "CameraNearTR": "-0.2632801_-1.092419_-1.254211|5.589999_282.26_0", "QNextNum": 0, "ExamModelBT": "", "ExamTip": "", diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index dcdcd36..2862f59 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -570,7 +570,13 @@ namespace ZXK.LouDiXvMuNiu } } } - + /// + /// 继续播放Timeline动画 + /// + public void TimelineContinue() + { + _curTimeLineCtrl.Continue(); + } /// /// 跳转动画步骤 /// diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index 5eb360e..6024252 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -409,6 +409,7 @@ namespace ZXK.LouDiXvMuNiu } if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_Finish)) { + NiuSceneMng._Instance.TimelineContinue(); PopUpMng.PopAlert("提示", "当前模块已完成", "确认", null); } } diff --git a/Assets/_Scripts/Framework/Utilities/TimelineDirectorCtrl.cs b/Assets/_Scripts/Framework/Utilities/TimelineDirectorCtrl.cs index 9010295..c30d13d 100644 --- a/Assets/_Scripts/Framework/Utilities/TimelineDirectorCtrl.cs +++ b/Assets/_Scripts/Framework/Utilities/TimelineDirectorCtrl.cs @@ -101,7 +101,10 @@ namespace CG.UTility public void Continue() { OnContinue?.Invoke(CurrentTime, CurrentPlayDirection); - if (m_timeTween.IsActive()) m_timeTween.Play(); + CurrentPlayStatus = Status.PLAYING; + CurrentPlayDirection = Direction.FORWARD; + m_timeTween.Kill(); + RatioExecute(Duration); } /// diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index e34d2c5..afd3e2c 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: 33002 + controlID: 37185 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 + y: 356 width: 974 - height: 528 + height: 635 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -105,22 +105,22 @@ MonoBehaviour: x: 0 y: 21 width: 974 - height: 507 - m_Scale: {x: 0.46944442, y: 0.46944445} - m_Translation: {x: 487, y: 253.5} + height: 614 + m_Scale: {x: 0.5072917, y: 0.5072917} + m_Translation: {x: 487, y: 307} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1037.3965 - y: -540 - width: 2074.793 - height: 1080 + x: -960 + y: -605.1745 + width: 1920 + height: 1210.349 m_MinimalGUI: 1 - m_defaultScale: 0.46944445 - m_LastWindowPixelSize: {x: 974, y: 528} + m_defaultScale: 0.5072917 + m_LastWindowPixelSize: {x: 974, y: 635} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -140,7 +140,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 33003 + controlID: 37186 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,7 +161,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: TimelineWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -169,14 +169,15 @@ MonoBehaviour: x: 0 y: 0 width: 975 - height: 390 - m_MinSize: {x: 201, y: 221} + height: 283 + m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 5} + m_ActualView: {fileID: 7} m_Panes: - {fileID: 5} - {fileID: 6} - m_Selected: 0 + - {fileID: 7} + m_Selected: 2 m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: @@ -202,7 +203,7 @@ MonoBehaviour: x: 0 y: 73 width: 974 - height: 369 + height: 262 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -639,9 +640,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 998, y: 70, z: 0} + m_Target: {x: 1157.1307, y: 310.52832, z: 107.80603} speed: 2 - m_Value: {x: 998, y: 70, z: 0} + m_Value: {x: 1157.1307, y: 310.52832, z: 107.80603} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -691,9 +692,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0.17128856, y: -0.06349899, z: 0.011063301, w: 0.98311025} m_Size: - m_Target: 306.83826 + m_Target: 417.56445 speed: 2 - m_Value: 306.83826 + m_Value: 417.56445 m_Ortho: m_Target: 0 speed: 2 @@ -792,33 +793,6 @@ MonoBehaviour: m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 390 - width: 975 - height: 549 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 2} - - {fileID: 8} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -840,9 +814,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 519 + y: 73 width: 974 - height: 472 + height: 262 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -862,6 +836,32 @@ MonoBehaviour: m_SequencePath: m_SelectionRoot: 0 m_SubElements: [] +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 283 + width: 975 + height: 656 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -928,7 +928,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e051eeff2437efff7853efff4078efff569eefff62b8efffc0bdefff4415f0ffe45bf0ffc4d3f0ffee14f1ff4a74f1ff34b5f1ffbc19f2ff2060f2ff18c3f2ffc2fff2ffda04f3fff46df3ffb6b4f3ffd408f4ff7a49f4ffb27ff4fff288f4ffc289f4ff90c2f4ffaac2f4ff306cf5ff00b9f5ff58b9f5ffe8b9f5ff427ff6ff7ab5f6ff8644f7ffce55f7ffa290fbfffec6fbff745ffdffbc95fdffc698fdfff4ffffff32780200527802005ea50300eee503000ee6030010b7040052bc040092c004002ac104008cf5040062f8040024f90400b8f90400d01f050024200500f8220500ba23050090340500e4340500b83705007a380500928805002a8c0500828c050036dc0500c0dc05008ae10500d2e40500e0e505007ae60500a606060088090600fe0906004e0a0600fa0b060050100600705a0600185e060098840600768706003c880600ca8806008a9906002e9d060078be060098be0600 + m_ExpandedIDs: c8ace9ff8af3e9ff3099eaff029aeaffead2eaff0cd3eaffe051eeff2437efff7853efff4078efff569eefff62b8efffc0bdefff4415f0ffe45bf0ffc4d3f0ffee14f1ff4a74f1ff34b5f1ffbc19f2ff2060f2ff18c3f2ffc2fff2ffda04f3fff46df3ffb6b4f3ffd408f4ff7a49f4ffb27ff4fff288f4ffc289f4ff90c2f4ffaac2f4ff306cf5ff00b9f5ff58b9f5ffe8b9f5ff427ff6ff7ab5f6ff8644f7ffce55f7ffa290fbfffec6fbff745ffdffbc95fdffc698fdfff4ffffff32780200527802005ea50300eee503000ee6030010b7040052bc040092c004002ac104008cf5040062f8040024f90400b8f90400d01f050024200500f8220500ba23050090340500e4340500b83705007a380500928805002a8c0500828c050036dc0500c0dc05008ae10500d2e40500e0e505007ae60500a606060088090600fe0906004e0a0600fa0b060050100600705a0600185e060098840600768706003c880600ca8806008a9906002e9d060078be060098be0600 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1024,7 +1024,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/UIPrefabs + - Assets/StreamingAssets/Excel m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1040,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: 8235fbffffffffff000000003c0600009006000004070000280700003807000064070000f4070000080800007008000060090000dc0a0000a4100000 + m_ExpandedIDs: 8235fbffffffffff000000003c06000080060000e00600000407000008080000700800009008000098080000ac08000060090000dc0a0000740c000054100000a4100000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1068,7 +1068,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8235fbffffffffff000000003c0600009006000004070000280700003807000064070000f4070000080800007008000060090000dc0a0000a4100000 + m_ExpandedIDs: 8235fbffffffffff000000003c06000080060000e00600000407000008080000700800009008000098080000ac08000060090000dc0a0000740c000054100000a4100000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1143,8 +1143,8 @@ MonoBehaviour: y: 0 width: 303 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14}