From 67ba230ffc36146bb41cc3f70f67bf0dcdcf9eea Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 19 Sep 2023 15:26:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Adam/Scenes/UI.unity | 533 +++++++++++++++++- .../Adam/Scripts/Components/BottomTips.cs | 1 + .../Adam/Scripts/GoToSceneController.cs | 5 +- .../Assets/Adam/Scripts/SceneLoad.cs | 27 + .../Adam/Scripts/Utility/ToolUtility.cs | 15 + .../Prefeb/三相_无互感器_无光伏.prefab | 9 + .../Assets/Textures/切图-2/皮卡.png | Bin 0 -> 1978 bytes .../Assets/Textures/切图-2/皮卡.png.meta | 147 +++++ .../Assets/Textures/切图-2/进度条.png | Bin 0 -> 10503 bytes .../Assets/Textures/切图-2/进度条.png.meta | 147 +++++ 10 files changed, 874 insertions(+), 10 deletions(-) create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png.meta create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png.meta diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity index 0a579a76..8bf1a9fd 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity @@ -5838,6 +5838,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1724117672} + - {fileID: 1951964960} + - {fileID: 1498720476} m_Father: {fileID: 1067605740} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6232,6 +6234,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 457586776} m_CullTransparentMesh: 1 +--- !u!1 &458771554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 458771555} + - component: {fileID: 458771557} + - component: {fileID: 458771556} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &458771555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458771554} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1951964960} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &458771556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458771554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &458771557 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458771554} + m_CullTransparentMesh: 1 --- !u!1 &465806888 GameObject: m_ObjectHideFlags: 0 @@ -9546,6 +9624,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 645912384} m_CullTransparentMesh: 1 +--- !u!1 &659223450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 659223451} + - component: {fileID: 659223453} + - component: {fileID: 659223452} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &659223451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659223450} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1549170474} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -38.50006, y: 40.5} + m_SizeDelta: {x: 77, y: -2.088} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &659223452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659223450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2ffb48c6668d04b4ab389275f273e23a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &659223453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659223450} + m_CullTransparentMesh: 1 --- !u!1 &659455334 GameObject: m_ObjectHideFlags: 0 @@ -17466,6 +17620,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loadingPanel: {fileID: 449920027} + loadSlider: {fileID: 1951964961} + loadingInfoText: {fileID: 1724117673} --- !u!114 &1067605752 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24758,6 +24914,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496658736} m_CullTransparentMesh: 1 +--- !u!1 &1498720475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1498720476} + - component: {fileID: 1498720478} + - component: {fileID: 1498720477} + m_Layer: 5 + m_Name: Text (Legacy) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1498720476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498720475} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 449920028} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 51.8244} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1498720477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498720475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 83 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u52A0\u8F7D\u4E2D" +--- !u!222 &1498720478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498720475} + m_CullTransparentMesh: 1 --- !u!1 &1499230399 GameObject: m_ObjectHideFlags: 0 @@ -25699,6 +25935,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1543911438} m_CullTransparentMesh: 1 +--- !u!1 &1549170473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1549170474} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1549170474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549170473} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 659223451} + m_Father: {fileID: 1951964960} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1552025120 GameObject: m_ObjectHideFlags: 0 @@ -30120,7 +30393,7 @@ GameObject: - component: {fileID: 1724117674} - component: {fileID: 1724117673} m_Layer: 5 - m_Name: Text (Legacy) + m_Name: loadInfo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30142,10 +30415,10 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 73.2} + m_SizeDelta: {x: 0, y: 51.8244} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &1724117673 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30168,10 +30441,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 83 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 83 m_Alignment: 4 m_AlignByGeometry: 0 @@ -30179,7 +30452,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u52A0\u8F7D\u573A\u666F\u4E2D\u3002\u3002\u3002" + m_Text: 0% --- !u!222 &1724117674 CanvasRenderer: m_ObjectHideFlags: 0 @@ -30268,6 +30541,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1737077191} m_CullTransparentMesh: 1 +--- !u!1 &1755369232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1755369233} + - component: {fileID: 1755369235} + - component: {fileID: 1755369234} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1755369233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755369232} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1803461813} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1755369234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755369232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2c38b1a67970d254a80ff3e15d5a58db, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1755369235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755369232} + m_CullTransparentMesh: 1 --- !u!1 &1766664518 GameObject: m_ObjectHideFlags: 0 @@ -30890,6 +31239,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790206773} m_CullTransparentMesh: 1 +--- !u!1 &1803461812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1803461813} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1803461813 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803461812} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1755369233} + m_Father: {fileID: 1951964960} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1810392302 GameObject: m_ObjectHideFlags: 0 @@ -32451,6 +32837,8 @@ GameObject: - component: {fileID: 1935876360} - component: {fileID: 1935876359} - component: {fileID: 1935876361} + - component: {fileID: 1935876363} + - component: {fileID: 1935876362} m_Layer: 5 m_Name: Bottom m_TagString: Untagged @@ -32539,6 +32927,44 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 1 +--- !u!114 &1935876362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935876357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1935876363 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935876357} + m_CullTransparentMesh: 1 --- !u!1 &1936561355 GameObject: m_ObjectHideFlags: 0 @@ -33126,6 +33552,97 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951167346} m_CullTransparentMesh: 1 +--- !u!1 &1951964959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1951964960} + - component: {fileID: 1951964961} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1951964960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951964959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 458771555} + - {fileID: 1803461813} + - {fileID: 1549170474} + m_Father: {fileID: 449920028} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 42.9} + m_SizeDelta: {x: 0, y: 41.8653} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1951964961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951964959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 659223452} + m_FillRect: {fileID: 1755369233} + m_HandleRect: {fileID: 659223451} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1960782610 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs index d2dd5c4e..46fc76f0 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs @@ -32,6 +32,7 @@ public class BottomTips : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl { tips.text = gameObject.name; tipsContent.SetActive(true); + UIManager.Instance.threeDTip.transform.parent.gameObject.SetActive(false); } public void OnPointerExit(PointerEventData eventData) diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs index 604fb434..6db7356d 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs @@ -35,6 +35,9 @@ namespace Adam SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]); GlobalFlag.sceneData = sceneInfoData; GlobalFlag.pvw = ExamusersController.Instance.GetPVWByUseNo(userID.text); + SwitchPanel(); + UIManager.Instance.backToToolBtn.gameObject.SetActive(true); + UIManager.Instance.threeDTip.transform.parent.gameObject.SetActive(false); SceneLoad.Instance.SceneChange(tt[3]); //switch (tt[3]) //{ @@ -51,8 +54,6 @@ namespace Adam // SceneLoad.Instance.SceneChange("农贸市场"); // break; //} - SwitchPanel(); - UIManager.Instance.backToToolBtn.gameObject.SetActive(true); } public void SwitchPanel() diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/SceneLoad.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/SceneLoad.cs index 8a966e1a..e4a4b4e1 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/SceneLoad.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/SceneLoad.cs @@ -2,9 +2,16 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; + public class SceneLoad : MonoSingleton { public GameObject loadingPanel; + + public Slider loadSlider; + + public Text loadingInfoText; + private void Start() { loadingPanel.SetActive(false); @@ -17,13 +24,33 @@ public class SceneLoad : MonoSingleton private IEnumerator LoadScene(string loadSceneName) //Эͷloadlevel { + //loadingPanel.SetActive(true); + //AsyncOperation operation = SceneManager.LoadSceneAsync(loadSceneName); + //operation.allowSceneActivation = false; + //while (!operation.isDone) + //{ + // if (operation.progress >= 0.9f) + // { + // operation.allowSceneActivation = true; + // } + // yield return null; + //} + //loadingPanel.SetActive(false); + loadingInfoText.text = "0%"; + loadSlider.value = 0; loadingPanel.SetActive(true); + AsyncOperation operation = SceneManager.LoadSceneAsync(loadSceneName); operation.allowSceneActivation = false; while (!operation.isDone) { + loadSlider.value = operation.progress; + loadingInfoText.text = operation.progress + "%"; + Debug.Log(operation.progress); if (operation.progress >= 0.9f) { + loadSlider.value = 1; + loadingInfoText.text = "100%"; operation.allowSceneActivation = true; } yield return null; diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Utility/ToolUtility.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Utility/ToolUtility.cs index a2c486c7..acb81c7c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Utility/ToolUtility.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Utility/ToolUtility.cs @@ -1,6 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; //============================================================ //支持中文，文件使用UTF-8编码 //@author YangHua @@ -35,5 +37,18 @@ namespace Utility string result = info.Replace(eliminate, ""); return result; } + + + public static bool CheckGuiRaycastObjects() + { + PointerEventData eventData = new PointerEventData(EventSystem.current); + eventData.pressPosition = Input.mousePosition;//touch.position + eventData.position = Input.mousePosition;//touch.position + + var results = new List(); + //gr.Raycast(eventData, results); + EventSystem.current.RaycastAll(eventData, results); //使用此方式也可 + return results.Count > 0; + } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index b886bab8..0ca6b078 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -1018,6 +1018,7 @@ MonoBehaviour: name: "\u7528\u7535_CV2" isBlack: 0 VV: V + isok: 0 --- !u!1 &763471463664476292 GameObject: m_ObjectHideFlags: 0 @@ -1631,6 +1632,7 @@ MonoBehaviour: name: "\u7528\u7535_CV3" isBlack: 0 VV: V + isok: 0 --- !u!1 &1241165713762030815 GameObject: m_ObjectHideFlags: 0 @@ -1995,6 +1997,7 @@ MonoBehaviour: name: "\u7528\u7535_CV3" isBlack: 0 VV: ' V' + isok: 0 --- !u!1 &1918222522557054203 GameObject: m_ObjectHideFlags: 0 @@ -3117,6 +3120,7 @@ MonoBehaviour: name: "\u7528\u7535_CV3" isBlack: 0 VV: V + isok: 0 --- !u!1 &3780776059789330294 GameObject: m_ObjectHideFlags: 0 @@ -4054,6 +4058,7 @@ MonoBehaviour: name: "\u7528\u7535_CV2" isBlack: 0 VV: V + isok: 0 --- !u!1 &5317200332185298439 GameObject: m_ObjectHideFlags: 0 @@ -5271,6 +5276,7 @@ MonoBehaviour: name: N isBlack: 1 VV: + isok: 0 --- !u!1 &8644223648774417466 GameObject: m_ObjectHideFlags: 0 @@ -5469,6 +5475,7 @@ MonoBehaviour: name: "\u7528\u7535_CV2" isBlack: 0 VV: V + isok: 0 --- !u!1 &8686247563076990760 GameObject: m_ObjectHideFlags: 0 @@ -5605,6 +5612,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: clampAmmetersInteractives: [] + Multimeter: [] + Three: {fileID: 0} --- !u!1 &8891900236170593541 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png new file mode 100644 index 0000000000000000000000000000000000000000..c8c87d4ec7b2f3ab6b045736d763b81843dd3336 GIT binary patch literal 1978 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

+LTDR&$o?g%8rSgL0!Wf0Q6&GSS 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 literal 0 HcmV?d00001 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png.meta b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png.meta new file mode 100644 index 00000000..9f75691d --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 2c38b1a67970d254a80ff3e15d5a58db +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 7b782bbc464619878c03cbd6b13d2e10acc7cee7 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 19 Sep 2023 15:33:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=9C=BA?= =?UTF-8?q?=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Adam/Scripts/AssignmentController.cs | 2 +- .../Assets/Adam/Scripts/Components/ToolModelClick.cs | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs index 46720ef3..ef801ee9 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs @@ -54,7 +54,7 @@ namespace Adam loadBtn.gameObject.SetActive(false); closeBtn.gameObject.SetActive(true); SwitchPanel(false); - SceneLoad.Instance.SceneChange("工具间场景"); + SceneLoad.Instance.SceneChange("工具间_正确"); } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs index 839a4b6c..809b58b3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs @@ -82,7 +82,7 @@ public class ToolModelClick : MonoBehaviour return; onEnter?.Invoke(); var current = SceneManager.GetActiveScene(); - if (current.name == "工具间场景") + if (current.name == "工具间_正确") UIManager.Instance.SetThreeDTip(gameObject.name); } diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset b/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset index 917b3117..01e5d9bd 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/EditorBuildSettings.asset @@ -11,9 +11,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/02_MapScene.unity guid: 2a9db4ad80d951b40a13dc809fea74a0 - - enabled: 1 - path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity" - guid: 9c3f2fccc37312b468a01a18ac50fcd9 - enabled: 1 path: "Assets/Scenes/\u519C\u8D38\u5E02\u573A.unity" guid: 8f5e8de28c5defb4cafaabb4ec174d27 @@ -26,4 +23,10 @@ EditorBuildSettings: - enabled: 1 path: "Assets/Scenes/\u519C\u5BB6\u4E50.unity" guid: de0336ee94e67ab4c833d43d5a4b97bc + - enabled: 1 + path: "Assets/Scenes/\u5DE5\u5177\u95F4_\u6B63\u786E.unity" + guid: 162bd169aaa74c245aefc2a970e0012b + - enabled: 1 + path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity" + guid: 9c3f2fccc37312b468a01a18ac50fcd9 m_configObjects: {}