diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs index 0e8e0ca1..df98d033 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs @@ -27,7 +27,7 @@ public class door_control : MonoBehaviour // 是否开门 = !是否开门; if (启用交互 == true) - { + {//sssssssss 是否开门 = !是否开门; if (是否开门 == true) { diff --git a/Electrical_inspectionCompetitionSystem/UserSettings/Layouts/default-2021.dwlt b/Electrical_inspectionCompetitionSystem/UserSettings/Layouts/default-2021.dwlt index c7b84ef2..baef2757 100644 --- a/Electrical_inspectionCompetitionSystem/UserSettings/Layouts/default-2021.dwlt +++ b/Electrical_inspectionCompetitionSystem/UserSettings/Layouts/default-2021.dwlt @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 200} m_MaxSize: {x: 40480, y: 16192} vertical: 0 - controlID: 50 + controlID: 108 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1076 + width: 1234 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 60 + controlID: 109 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,12 +166,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1076 + width: 1234 height: 629 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 61 + controlID: 110 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,14 +189,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 442 + width: 471 height: 629 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 --- !u!114 &9 @@ -214,15 +214,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 442 + x: 471 y: 0 - width: 634 + width: 763 height: 629 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 16} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &10 @@ -235,23 +235,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: AnimationWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 629 - width: 1076 + width: 1234 height: 310 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,9 +267,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1076 + x: 1234 y: 0 - width: 469 + width: 100 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} @@ -293,9 +293,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1545 + x: 1334 y: 0 - width: 100 + width: 284 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -319,12 +319,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1645 + x: 1618 y: 0 - width: 275 + width: 302 height: 939 - 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: 21} m_Panes: - {fileID: 21} @@ -332,6 +332,98 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 1 --- !u!114 &14 +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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 471 + y: 73 + width: 761 + height: 608 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 761 + height: 587 + m_Scale: {x: 0.39635417, y: 0.39635417} + m_Translation: {x: 380.5, y: 293.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -960 + y: -740.4993 + width: 1920 + height: 1480.9987 + m_MinimalGUI: 1 + m_defaultScale: 0.39635417 + m_LastWindowPixelSize: {x: 761, y: 608} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -353,7 +445,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 441 + width: 470 height: 608 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -589,9 +681,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 32.83627, y: 1.9646744, z: 337.68616} + m_Target: {x: 92.478226, y: -1.4564351, z: 308.32166} speed: 2 - m_Value: {x: 32.83627, y: 1.9646744, z: 337.68616} + m_Value: {x: 92.478226, y: -1.4564351, z: 308.32166} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -638,13 +730,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.0074045956, y: -0.681061, z: 0.0012928029, w: -0.7326755} + m_Target: {x: 0.1457019, y: 0.77000856, z: -0.18645526, w: 0.5931773} speed: 2 - m_Value: {x: -0.0041082078, y: -0.68081695, z: -0.0017736873, w: -0.73244} + m_Value: {x: 0.14564605, y: 0.7697134, z: -0.18638378, w: 0.5929499} m_Size: - m_Target: 0.17136686 + m_Target: 2.7455053 speed: 2 - m_Value: 0.17136686 + m_Value: 2.7455053 m_Ortho: m_Target: 0 speed: 2 @@ -669,7 +761,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -691,7 +783,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 675 + width: 480 height: 608 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -707,6 +799,9 @@ MonoBehaviour: - {fileID: 2955933578529822798, guid: 56bc1f517a5117d4e918dc8c3b2792af, type: 2} - {fileID: -5560507133062112814, guid: 42724b9c4aa38b34db7e063c34005ae2, type: 2} - {fileID: -7582557373829614237, guid: 4a610310a43a723468d8fe338d662e16, type: 2} + - {fileID: 5522693152336857074, guid: 8a1d475c43918fc409c6d76721bd1fe7, type: 2} + - {fileID: 7167971859103261350, guid: 895bc322c9246ff4c9afe385b0ec76ed, type: 2} + - {fileID: 4662287232169145759, guid: b22172302763e504e8ed84e4a25e72e3, type: 2} m_ValueSerializationHelper: - e00: 0.5357895 e01: 0 @@ -836,10 +931,58 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: -287 + e10: 0 + e11: 1 + e12: 0 + e13: 132 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.32967034 + e01: 0 + e02: 0 + e03: -1.4835205 + e10: 0 + e11: 0.32967034 + e12: 0 + e13: 238.20212 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 4a610310a43a723468d8fe338d662e16, type: 2} + m_AnimatorController: {fileID: 9100000, guid: b22172302763e504e8ed84e4a25e72e3, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -7582557373829614237, guid: 4a610310a43a723468d8fe338d662e16, type: 2} + - m_Target: {fileID: 4662287232169145759, guid: b22172302763e504e8ed84e4a25e72e3, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -852,98 +995,6 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 -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: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 442 - y: 73 - width: 632 - height: 608 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 1 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 632 - height: 587 - m_Scale: {x: 0.32916668, y: 0.32916668} - m_Translation: {x: 315.99997, y: 293.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -959.9999 - y: -891.6455 - width: 1919.9999 - height: 1783.291 - m_MinimalGUI: 1 - m_defaultScale: 0.32916668 - m_LastWindowPixelSize: {x: 632, y: 608} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 @@ -966,7 +1017,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 702 - width: 1075 + width: 907 height: 289 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -994,7 +1045,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 702 - width: 1125 + width: 1233 height: 289 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1002,7 +1053,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 36406 + m_LastSelectedObjectID: 47670 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1023,9 +1074,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1076 + x: 1234 y: 73 - width: 467 + width: 98 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1034,23 +1085,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 1a150000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 669efeffb8f1ffff06fbffff68620000ca620000bc64000054680000186a0000427600003a7700000e790000a87a00006a7e00002a820000568400007884000012870000f68700009c8c0000368e0000e08f00000093000094940000a896000000970000fa9b000060a4000058aa000034ad00008cae00008eae000090ae000036b0000016b10000f8b5000074b6000088b600009cb60000b8b7000012bd000008c000009ac5000070c800000aca0000 + m_ExpandedIDs: 06fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: "\u79FB\u52A8\u8BB0\u5F55\u4EEA" - m_OriginalName: "\u79FB\u52A8\u8BB0\u5F55\u4EEA" + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 42080 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 11} m_SearchString: @@ -1080,9 +1131,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1545 + x: 1334 y: 73 - width: 98 + width: 282 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1101,7 +1152,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Script/Interactive objects + - Assets/MainUI/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -1115,7 +1166,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: a8130100 m_LastClickedID: 70568 - m_ExpandedIDs: 000000006eda0000660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c01008c0c01008e0c0100900c0100920c0100940c0100960c0100 + m_ExpandedIDs: 00000000d8150100da150100dc150100de150100e0150100e2150100e4150100e6150100e8150100ea150100ec150100ee150100f0150100f2150100f4150100f6150100f8150100fa150100fc150100fe15010000160100021601000416010006160100081601000a1601000c1601000e16010010160100121601001416010016160100181601001a1601001c1601001e16010020160100221601002416010026160100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1140,10 +1191,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 180} + scrollPos: {x: 0, y: 3304} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000006eda0000660c0100720c0100740c0100760c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c01008c0c01008e0c0100900c0100920c0100940c0100960c01000c10010044100100481001004a1001004c1001004e100100 + m_ExpandedIDs: ffffffff00000000d8150100da150100dc150100de150100e0150100e2150100e4150100e6150100e8150100ea150100ec150100ee150100f0150100f2150100f4150100f6150100f8150100fa150100fc150100fe15010000160100021601000416010006160100081601000a1601000c1601000e16010010160100121601001416010016160100181601001a1601001c1601001e16010020160100221601002416010026160100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1170,7 +1221,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d27fffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1219,9 +1270,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1645 + x: 1618 y: 73 - width: 274 + width: 301 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: