添加新场景

Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition
修改load
2023-09-19 15:33:33 +08:00 · 2023-09-19 15:26:51 +08:00 · 2023-09-19 15:26:44 +08:00
13 changed files with 882 additions and 15 deletions
--- 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
--- 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("工具间_正确");
           
        }
    }
--- 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)
--- 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);
    }

--- 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()
--- 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<SceneLoad>
 {
    public GameObject loadingPanel;
+
+    public Slider loadSlider;
+
+    public Text loadingInfoText;
+
    private void Start()
    {
        loadingPanel.SetActive(false);
@ -17,13 +24,33 @@ public class SceneLoad : MonoSingleton<SceneLoad>
    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;
--- 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<RaycastResult>();
+            //gr.Raycast(eventData, results);
+            EventSystem.current.RaycastAll(eventData, results);   //使用此方式也可
+            return results.Count > 0;
+        }
    }
 }
--- 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
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/皮卡.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 2ffb48c6668d04b4ab389275f273e23a
+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: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/进度条.png.meta
+++ 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: 
--- 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: {}
Author	SHA1	Message	Date
YangHua	7b782bbc46	添加新场景	2023-09-19 15:33:33 +08:00
YangHua	e128689ee9	Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition	2023-09-19 15:26:51 +08:00
YangHua	67ba230ffc	修改load	2023-09-19 15:26:44 +08:00