diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
index 2200cb61..c93b28ff 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
@@ -47824,7 +47824,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &465806889
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab b/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab
new file mode 100644
index 00000000..f5f5a44d
--- /dev/null
+++ b/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab
@@ -0,0 +1,256 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8127750739860549049
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8127750739860549050}
+ - component: {fileID: 8127750739860549052}
+ - component: {fileID: 8127750739860549051}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8127750739860549050
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750739860549049}
+ m_LocalRotation: {x: 0, y: 0, z: 0.6427876, w: 0.7660445}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 8127750740177397163}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 80}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.0000019073, y: -32}
+ m_SizeDelta: {x: 109.8447, y: 163.69}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8127750739860549052
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750739860549049}
+ m_CullTransparentMesh: 1
+--- !u!114 &8127750739860549051
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750739860549049}
+ 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: ea55b0ddb30e3414eb83903f01f8a1aa, 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!1 &8127750740177397162
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8127750740177397163}
+ - component: {fileID: 8127750740177397165}
+ - component: {fileID: 8127750740177397164}
+ m_Layer: 5
+ m_Name: BG
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8127750740177397163
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740177397162}
+ 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: 8127750739860549050}
+ m_Father: {fileID: 8127750740951410860}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: -167, y: 302}
+ m_SizeDelta: {x: 267.3312, y: 215.3501}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8127750740177397165
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740177397162}
+ m_CullTransparentMesh: 1
+--- !u!114 &8127750740177397164
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740177397162}
+ 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: c3c4e7b6ac51c114b9658e4a8cd0d5aa, 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!1 &8127750740951410856
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8127750740951410860}
+ - component: {fileID: 8127750740951410859}
+ - component: {fileID: 8127750740951410858}
+ - component: {fileID: 8127750740951410857}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8127750740951410860
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740951410856}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 8127750740177397163}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!223 &8127750740951410859
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740951410856}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 1
+ m_TargetDisplay: 0
+--- !u!114 &8127750740951410858
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740951410856}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 1
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 1920, y: 1080}
+ m_ScreenMatchMode: 1
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!114 &8127750740951410857
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8127750740951410856}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab.meta b/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab.meta
new file mode 100644
index 00000000..95dfe619
--- /dev/null
+++ b/Electrical_inspectionCompetitionSystem/Assets/Prefeb/Canvas.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d2bc672ac7a5a974da0d2b5922a20c79
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
index 08eefd50..4c0d7e0c 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
@@ -6245,7 +6245,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &150689801
Transform:
m_ObjectHideFlags: 0
@@ -17985,7 +17985,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &494084402
Transform:
m_ObjectHideFlags: 0
@@ -18560,6 +18560,17 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2453338610437327410, guid: 0f22f05b1fedf1a4faee3549b8a2178f, type: 3}
+--- !u!114 &518436699 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8127750739860549051, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ m_PrefabInstance: {fileID: 8127750739564485344}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &518878358
GameObject:
m_ObjectHideFlags: 0
@@ -28206,7 +28217,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &737102818
Transform:
m_ObjectHideFlags: 0
@@ -33445,7 +33456,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &867734346
Transform:
m_ObjectHideFlags: 0
@@ -40440,7 +40451,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &999477131
Transform:
m_ObjectHideFlags: 0
@@ -46648,7 +46659,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1130540356
Transform:
m_ObjectHideFlags: 0
@@ -48083,7 +48094,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1173345005
Transform:
m_ObjectHideFlags: 0
@@ -53252,7 +53263,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1335495635
Transform:
m_ObjectHideFlags: 0
@@ -58701,7 +58712,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1481060986
Transform:
m_ObjectHideFlags: 0
@@ -61994,7 +62005,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1547303527
Transform:
m_ObjectHideFlags: 0
@@ -65603,7 +65614,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1658414749
Transform:
m_ObjectHideFlags: 0
@@ -70316,7 +70327,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1789315854
Transform:
m_ObjectHideFlags: 0
@@ -70643,7 +70654,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1804278331
Transform:
m_ObjectHideFlags: 0
@@ -72386,6 +72397,28 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838686357}
m_Mesh: {fileID: 7846583993629016765, guid: 41f2923b6c9471c4f8107e7294e80a9f, type: 3}
+--- !u!1 &1838808906 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8127750740177397162, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ m_PrefabInstance: {fileID: 8127750739564485344}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1838808910
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1838808906}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b97fc131199427b429ff1fa4ef30af6f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ stopValveImage: {fileID: 518436699}
+ timeCount: 0
+ limitTime: 0.1
+ index: 0
+ currentPos: {x: 0, y: 0}
--- !u!1 &1841197670
GameObject:
m_ObjectHideFlags: 0
@@ -78151,6 +78184,8 @@ MonoBehaviour:
- {fileID: 1912991233}
trans: {fileID: 0}
temp: {fileID: 0}
+ interactive: []
+ interactiveEnum: 0
--- !u!4 &1965873574
Transform:
m_ObjectHideFlags: 0
@@ -167211,6 +167246,103 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5770378694895695222}
m_Mesh: {fileID: -8305633189254962764, guid: 140dbd01f0d9bb7429f6b5362e4e3c60, type: 3}
+--- !u!1001 &8127750739564485344
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8127750740951410856, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_Name
+ value: Canvas
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_RootOrder
+ value: 24
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8127750740951410860, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d2bc672ac7a5a974da0d2b5922a20c79, type: 3}
--- !u!1 &8130084172558687164
GameObject:
m_ObjectHideFlags: 0
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
index 2cf51a37..7651effb 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
@@ -109,6 +109,8 @@ public class GameManager : MonoBehaviour
Destroy(temp.gameObject);
}
temp = Instantiate(tools, Player.transform);
+
+ UIManager.Instance.ToolsItemManager.currentTool = temp;
string name = Filter(temp.name, TempChar);
Debug.Log(name);
switch (name)
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs
index 7445387f..35435916 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs
@@ -11,18 +11,14 @@ using ZenFulcrum.EmbeddedBrowser;
public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler
{
- //滑动点
- private Vector3 end;
private Vector3 start = new Vector3(0, 0, -80);
//滑动点到阀门图片中点的向量
private Vector3 v1;
- private Vector3 v2;
- private float al;
[SerializeField] private Image stopValveImage; //截止阀
- Vector2 tempPos;
-
- private float valveOpen; //阀门开度
+ public float timeCount = 0;
+ public float limitTime = 0;
public int index; //阀门旋转多少圈可以开到100
+ public Vector2 currentPos = new Vector2();
int sum = 80;
void OnEnable()
{
@@ -34,14 +30,13 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
/// 开始拖拽
///
///
- public Vector2 currentPos = new Vector2();
+
public void OnBeginDrag(PointerEventData eventData)
{
v1 = start - stopValveImage.transform.position;
currentPos = eventData.position;
}
- public float timeCount = 0;
- public float limitTime = 0;
+
///
/// 拖拽中
///
@@ -51,14 +46,13 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
timeCount += Time.deltaTime;
if (timeCount > limitTime)
{
- Debug.Log(currentPos.x-eventData.position.x);
if (currentPos.x - eventData.position.x > 0)
{
- sum = 10;
+ sum += 10;
}
if (currentPos.x - eventData.position.x < 0)
{
- sum = -10;
+ sum += -10;
}
Debug.Log("旋转的方法");
Deng(sum);
@@ -67,9 +61,15 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
}
void Deng(float angle)
{
- float Temp = Math.Clamp(angle,-80,80);
- stopValveImage.transform.Rotate(new Vector3(0,0, Temp));
+ //stopValveImage.transform.Rotate(new Vector3(0, 0, angle));
+ float z = Mathf.Clamp(angle, -80, 80);
+ stopValveImage.transform.eulerAngles = new Vector3(0, 0, z);
+ //stopValveImage.transform.Rotate(new Vector3(0, 0, z));
+ Debug.Log(z);
+
}
+
+
///
/// 拖拽结束
///