From fe9427b65ab96f80df36041535d58bceb1e71a7b Mon Sep 17 00:00:00 2001 From: kangyanjun <2935661482@qq.com> Date: Tue, 18 Mar 2025 15:04:56 +0800 Subject: [PATCH] UPdate --- Assets/Scripts/AIquestionAnswerImage.cs | 1 + Assets/script/BlackboardOne.cs | 1 + Assets/script/InfoShow.cs | 5 +- .../Layouts/CurrentMaximizeLayout.dwlt | 92 +++++++++---------- UserSettings/Layouts/default-2021.dwlt | 90 +++++++++--------- 5 files changed, 97 insertions(+), 92 deletions(-) diff --git a/Assets/Scripts/AIquestionAnswerImage.cs b/Assets/Scripts/AIquestionAnswerImage.cs index 61b600f6..8cc80a60 100644 --- a/Assets/Scripts/AIquestionAnswerImage.cs +++ b/Assets/Scripts/AIquestionAnswerImage.cs @@ -20,6 +20,7 @@ public class AIquestionAnswerImage : MonoBehaviour } private void OnBbtnEndClick() { + GameManager.Instance.showVideoPlayer("d544ee389b313a457470fab9b220f981.mp4"); GameManager.Instance.ImgMask.SetActive(false); this.gameObject.SetActive(false); } diff --git a/Assets/script/BlackboardOne.cs b/Assets/script/BlackboardOne.cs index fd786cc6..f79fedb0 100644 --- a/Assets/script/BlackboardOne.cs +++ b/Assets/script/BlackboardOne.cs @@ -21,6 +21,7 @@ public class BlackboardOne : MonoBehaviour private void OnBtnReturnClick() { GameManager.Instance.ImgMask.SetActive(false); + GameManager.Instance.showVideoPlayer("d544ee389b313a457470fab9b220f981.mp4"); this.gameObject.SetActive(false); } } diff --git a/Assets/script/InfoShow.cs b/Assets/script/InfoShow.cs index 10ec020d..9d0554c3 100644 --- a/Assets/script/InfoShow.cs +++ b/Assets/script/InfoShow.cs @@ -66,8 +66,10 @@ public class InfoShow : MonoBehaviour, IPointerClickHandler Debug.Log($"点击了 {linkId}，值为: {infoDictionary[linkId]}"); GameManager.Instance.questionAnswer.gameObject.SetActive(true); GameManager.Instance.ImgMask.SetActive(true); + GameManager.Instance.StopVideoPlayer(); + GameManager.Instance.BlackboardOne.gameObject.SetActive(false); // 这里可以扩展点击逻辑，例如弹出详细信息 - + AIquestionAnswer.text = infoDictionary[linkId]; } else if (linkId== "我想进入下一阶段的学习") @@ -91,6 +93,7 @@ public class InfoShow : MonoBehaviour, IPointerClickHandler } else if (linkId == "船是怎么漂浮在水面上的?") { + GameManager.Instance.showVideoPlayer("d544ee389b313a457470fab9b220f981.mp4"); GameManager.Instance.Shop.gameObject.SetActive(false); GameManager.Instance.BlackboardOne.gameObject.SetActive(true); GameManager.Instance.questionAnswer.gameObject.SetActive(false); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 276f2ed6..fc23bcb0 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 341.6 + y: 245.6 width: 724.6 - height: 433.8 + height: 529.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -99,9 +99,9 @@ MonoBehaviour: x: 0 y: 21 width: 724.6 - height: 412.8 + height: 508.8 m_Scale: {x: 0.23587239, y: 0.23587237} - m_Translation: {x: 362.3, y: 206.4} + m_Translation: {x: 362.3, y: 254.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -109,12 +109,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1536 - y: -875.04944 + y: -1078.5493 width: 3072 - height: 1750.0989 + height: 2157.0986 m_MinimalGUI: 1 m_defaultScale: 0.23587239 - m_LastWindowPixelSize: {x: 905.75, y: 542.25} + m_LastWindowPixelSize: {x: 905.75, y: 662.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -163,7 +163,7 @@ MonoBehaviour: x: 0 y: 0 width: 725.6 - height: 268 + height: 172 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} @@ -194,7 +194,7 @@ MonoBehaviour: x: 0 y: 73.6 width: 724.6 - height: 247 + height: 151 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -205,7 +205,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.59999} + snapOffsetDelta: {x: -100, y: -25.599998} snapCorner: 3 id: Tool Settings index: 0 @@ -216,7 +216,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: -23.400002} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -442,7 +442,7 @@ MonoBehaviour: index: 3 layout: 4 m_OverlaysVisible: 1 - m_WindowGUID: f20495f6b9beda44495429613d263b24 + m_WindowGUID: b9ad2978169b9f04f8a8faf45ccdaf9e m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -452,9 +452,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 997.1068, y: 1093.5237, z: 6.847948} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 997.1068, y: 1093.5237, z: 6.847948} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -505,9 +505,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1518.0576 + m_Target: 10 speed: 2 - m_Value: 1518.0576 + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 @@ -548,11 +548,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 268 + y: 172 width: 725.6 - height: 454.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + height: 550.8 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -575,10 +575,10 @@ MonoBehaviour: serializedVersion: 2 x: 725.6 y: 0 - width: 247.20001 + width: 246.40002 height: 722.8 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 8} m_Panes: - {fileID: 8} @@ -606,7 +606,7 @@ MonoBehaviour: serializedVersion: 2 x: 725.60004 y: 73.6 - width: 245.20001 + width: 244.40002 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -616,9 +616,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d62b0100 - m_LastClickedID: 76758 - m_ExpandedIDs: 3484ffff7e84ffffac86ffff26fbffffa413010090140100da140100862b0100 + m_SelectedIDs: 605f0000 + m_LastClickedID: 24416 + m_ExpandedIDs: 26fbffffda5f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -641,7 +641,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 99901e27cd5d19b4693378468aaac437 + m_WindowGUID: 0aaad2f1ed236f047a63aeb6b13f5fb0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -657,9 +657,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 972.8 + x: 972 y: 0 - width: 220.00006 + width: 220 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -688,9 +688,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 972.8 + x: 972 y: 73.6 - width: 218.00006 + width: 218 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -722,9 +722,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 70620000 - m_LastClickedID: 25200 - m_ExpandedIDs: 000000007062000086620000ffffff7f + m_SelectedIDs: 74620000 + m_LastClickedID: 25204 + m_ExpandedIDs: 000000007462000076620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -752,7 +752,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007062000086620000ffffff7f + m_ExpandedIDs: 000000007462000076620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -777,8 +777,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: d62b0100 - m_LastClickedInstanceID: 76758 + m_SelectedInstanceIDs: 605f0000 + m_LastClickedInstanceID: 24416 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -804,7 +804,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 668.2} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 @@ -823,12 +823,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1192.8 + x: 1192 y: 0 - width: 343.19995 + width: 344 height: 722.8 - 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: 12} m_Panes: - {fileID: 12} @@ -854,9 +854,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1192.8 + x: 1192 y: 73.6 - width: 342.19995 + width: 343 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -870,7 +870,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 26.399963 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0db89f05..e7f0b0f9 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,9 +19,9 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Inspector + m_Title: Game m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 492} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 23954 + controlID: 3854 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -146,7 +146,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 23955 + controlID: 3831 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,9 +165,9 @@ MonoBehaviour: x: 0 y: 0 width: 725.6 - height: 268 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 172 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -189,9 +189,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 268 + y: 172 width: 725.6 - height: 454.8 + height: 550.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -216,7 +216,7 @@ MonoBehaviour: serializedVersion: 2 x: 725.6 y: 0 - width: 247.20001 + width: 246.40002 height: 722.8 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -240,9 +240,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 972.8 + x: 972 y: 0 - width: 220.00006 + width: 220 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -266,12 +266,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1192.8 + x: 1192 y: 0 - width: 343.19995 + width: 344 height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -298,9 +298,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 341.6 + y: 245.6 width: 724.6 - height: 433.8 + height: 529.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -349,9 +349,9 @@ MonoBehaviour: x: 0 y: 21 width: 724.6 - height: 412.8 + height: 508.8 m_Scale: {x: 0.23587239, y: 0.23587237} - m_Translation: {x: 362.3, y: 206.4} + m_Translation: {x: 362.3, y: 254.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -359,12 +359,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1536 - y: -875.04944 + y: -1078.5493 width: 3072 - height: 1750.0989 + height: 2157.0986 m_MinimalGUI: 1 m_defaultScale: 0.23587239 - m_LastWindowPixelSize: {x: 905.75, y: 542.25} + m_LastWindowPixelSize: {x: 905.75, y: 662.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -393,7 +393,7 @@ MonoBehaviour: x: 0 y: 73.6 width: 724.6 - height: 247 + height: 151 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -404,7 +404,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.59999} + snapOffsetDelta: {x: -100, y: -25.599998} snapCorner: 3 id: Tool Settings index: 0 @@ -415,7 +415,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: -23.400002} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -641,7 +641,7 @@ MonoBehaviour: index: 3 layout: 4 m_OverlaysVisible: 1 - m_WindowGUID: f20495f6b9beda44495429613d263b24 + m_WindowGUID: b9ad2978169b9f04f8a8faf45ccdaf9e m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -651,9 +651,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1861.3319, y: 1708.45, z: 18.557688} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 1861.3319, y: 1708.45, z: 18.557688} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -704,9 +704,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 347.08093 + m_Target: 10 speed: 2 - m_Value: 347.08093 + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 @@ -753,7 +753,7 @@ MonoBehaviour: serializedVersion: 2 x: 725.60004 y: 73.6 - width: 245.20001 + width: 244.40002 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -765,7 +765,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8470ffffd070fffff872ffff1875ffff6875ffff1a76ffff7279ffffc279fffff07bffff3484ffff7e84ffffac86ffff26fbffffa413010090140100da140100862b0100443a0100a43b01001e3c0100683c0100 + m_ExpandedIDs: e4d9ffff30daffff58dcffff26fbffffda5f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,14 +781,14 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 99901e27cd5d19b4693378468aaac437 + m_WindowGUID: 0aaad2f1ed236f047a63aeb6b13f5fb0 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -809,9 +809,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 972.8 + x: 972 y: 73.6 - width: 218.00006 + width: 218 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -843,9 +843,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 70620000 - m_LastClickedID: 25200 - m_ExpandedIDs: 000000007062000086620000ffffff7f + m_SelectedIDs: 74620000 + m_LastClickedID: 25204 + m_ExpandedIDs: 000000007462000076620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -873,7 +873,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007062000086620000ffffff7f + m_ExpandedIDs: 000000007462000076620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -925,7 +925,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 668.2} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 @@ -949,9 +949,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1192.8 + x: 1192 y: 73.6 - width: 342.19995 + width: 343 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -965,7 +965,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 26.399963 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: