From 737acb5a7b177d5f081a33326784733199c6bb74 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Sun, 17 Sep 2023 14:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Assets/Adam/Scenes/UI.unity | 359 +++++++++++-------
.../Assets/Adam/Scripts/JobCardController.cs | 36 ++
.../GameAssets/Models/电箱(new)/Anime.meta | 8 -
.../Prefeb/三相_无互感器_无光伏.prefab | 2 +-
.../Prefeb/三相_有互感器_无光伏.prefab | 2 +-
5 files changed, 264 insertions(+), 143 deletions(-)
delete mode 100644 Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Anime.meta
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
index 2e0089b4..3b1181e6 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
@@ -5037,7 +5037,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: cdsacadvadsvdvdsvsavdsvdsv
+ m_Text: cdsacadvadsvdvdsvsavdsvdsvadsvdsvsv
--- !u!222 &49315393
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -8382,6 +8382,7 @@ GameObject:
- component: {fileID: 83858998}
- component: {fileID: 83859000}
- component: {fileID: 83858999}
+ - component: {fileID: 83859001}
m_Layer: 5
m_Name: RiskAnalysisBtn
m_TagString: Untagged
@@ -8407,8 +8408,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 33.9, y: -420}
- m_SizeDelta: {x: 310, y: 360}
+ m_AnchoredPosition: {x: 0, y: -538.1}
+ m_SizeDelta: {x: 321.54, y: 300.8}
m_Pivot: {x: 0, y: 1}
--- !u!114 &83858999
MonoBehaviour:
@@ -8448,6 +8449,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83858997}
m_CullTransparentMesh: 1
+--- !u!114 &83859001
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 83858997}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 83858999}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &84764250
GameObject:
m_ObjectHideFlags: 0
@@ -12158,7 +12203,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &123732998
MonoBehaviour:
@@ -20177,7 +20222,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 654.94275, y: -420}
+ m_AnchoredPosition: {x: 672.2, y: -543.4}
m_SizeDelta: {x: 29.2473, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &208773503
@@ -20209,10 +20254,10 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
- m_Top: 16
+ m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
- m_Spacing: 25
+ m_Spacing: 17.36
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@@ -20376,7 +20421,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -28669,7 +28714,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &291983702
MonoBehaviour:
@@ -30075,10 +30120,10 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 9103504343
+ m_Text: 9103504343323kjlllllklklklklokkoklklk
--- !u!222 &304636831
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -30246,7 +30291,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -36009,7 +36054,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -37006,7 +37051,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &374549530
MonoBehaviour:
@@ -43478,7 +43523,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 325.95, y: -166}
+ m_AnchoredPosition: {x: 325.95, y: -161.58081}
m_SizeDelta: {x: 205.2278, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &431218847
@@ -43513,7 +43558,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 10.5
+ m_Spacing: 3
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
@@ -46207,7 +46252,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &450150463
MonoBehaviour:
@@ -51409,7 +51454,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -51751,7 +51796,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -53796,7 +53841,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 531.18, y: -166}
+ m_AnchoredPosition: {x: 531.18, y: -161.58}
m_SizeDelta: {x: 196.82, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &512220492
@@ -53831,7 +53876,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 10.5
+ m_Spacing: 3
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
@@ -59548,8 +59593,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0.00491333, y: 0.51000977}
- m_SizeDelta: {x: 310, y: 0}
+ m_AnchoredPosition: {x: 0.000030518, y: 0.51000977}
+ m_SizeDelta: {x: 325.95, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &573643628
MonoBehaviour:
@@ -59581,15 +59626,15 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 0
- m_Spacing: 0
+ m_Bottom: 18
+ m_ChildAlignment: 1
+ m_Spacing: -2.5
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 0
+ m_ChildScaleWidth: 1
+ m_ChildScaleHeight: 1
m_ReverseArrangement: 0
--- !u!1 &576396383
GameObject:
@@ -60645,7 +60690,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &584457082
MonoBehaviour:
@@ -61323,7 +61368,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -65999,7 +66044,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &633825085
MonoBehaviour:
@@ -67504,7 +67549,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &644882243
RectTransform:
m_ObjectHideFlags: 0
@@ -67522,9 +67567,9 @@ RectTransform:
m_Father: {fileID: 1429505998}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 52.1678, y: -202.974}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 104.3356, y: 27.0632}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &644882244
@@ -71651,7 +71696,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.000061035156, y: 0}
- m_SizeDelta: {x: 310, y: 0}
+ m_SizeDelta: {x: 325, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &679825365
MonoBehaviour:
@@ -71685,13 +71730,13 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: -2.5
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 0
+ m_ChildScaleWidth: 1
+ m_ChildScaleHeight: 1
m_ReverseArrangement: 0
--- !u!222 &679825368
CanvasRenderer:
@@ -76685,7 +76730,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &721573663
RectTransform:
m_ObjectHideFlags: 0
@@ -76703,9 +76748,9 @@ RectTransform:
m_Father: {fileID: 1429505998}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 52.1678, y: -230.0372}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 104.3356, y: 27.0632}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &721573664
@@ -79986,7 +80031,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &753163099
MonoBehaviour:
@@ -80035,7 +80080,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -80213,7 +80258,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &753877132
MonoBehaviour:
@@ -80262,7 +80307,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -82506,7 +82551,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &782242341
MonoBehaviour:
@@ -82555,7 +82600,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -89298,7 +89343,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &839890136
MonoBehaviour:
@@ -89347,7 +89392,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -92209,7 +92254,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &858728156
MonoBehaviour:
@@ -94125,7 +94170,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &877118238
RectTransform:
m_ObjectHideFlags: 0
@@ -94143,10 +94188,10 @@ RectTransform:
m_Father: {fileID: 336835583}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 99.12965, y: -202.974}
- m_SizeDelta: {x: 198.2593, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 27.0632}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &877118239
MonoBehaviour:
@@ -108393,7 +108438,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -114321,6 +114366,9 @@ MonoBehaviour:
- {fileID: 1973380977}
- {fileID: 602624092}
jobCardPanel: {fileID: 2087751350}
+ jobChoiceQuestionPanel: {fileID: 1528062685}
+ RiskPointAnalysisBtn: {fileID: 83859001}
+ SafetyMeasuresBtn: {fileID: 1395790152}
--- !u!114 &1067605749
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -117657,7 +117705,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1108970332
MonoBehaviour:
@@ -119883,7 +119931,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -126582,7 +126630,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1193373340
MonoBehaviour:
@@ -126631,7 +126679,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -132395,7 +132443,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1253207851
RectTransform:
m_ObjectHideFlags: 0
@@ -132413,10 +132461,10 @@ RectTransform:
m_Father: {fileID: 512220491}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 98.41, y: -202.974}
- m_SizeDelta: {x: 196.82, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1253207852
MonoBehaviour:
@@ -132465,7 +132513,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -133372,7 +133420,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1262442490
MonoBehaviour:
@@ -133421,7 +133469,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -135331,7 +135379,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1283395034
MonoBehaviour:
@@ -135380,7 +135428,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -135396,7 +135444,7 @@ MonoBehaviour:
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
- m_Text: 9103504343
+ m_Text: 9103504343323kjlllllklklklklokkoklklk
m_CaretBlinkRate: 0.85
m_CaretWidth: 1
m_ReadOnly: 0
@@ -138705,7 +138753,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1310686314
MonoBehaviour:
@@ -140446,7 +140494,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1326318312
MonoBehaviour:
@@ -145615,7 +145663,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1382471490
MonoBehaviour:
@@ -145664,7 +145712,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -146715,7 +146763,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -147377,6 +147425,7 @@ GameObject:
- component: {fileID: 1395790149}
- component: {fileID: 1395790151}
- component: {fileID: 1395790150}
+ - component: {fileID: 1395790152}
m_Layer: 5
m_Name: SafetyMeasuresBtn
m_TagString: Untagged
@@ -147402,8 +147451,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 343.9, y: -420}
- m_SizeDelta: {x: 310, y: 360}
+ m_AnchoredPosition: {x: 325.95, y: -538.1}
+ m_SizeDelta: {x: 325, y: 300.8}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1395790150
MonoBehaviour:
@@ -147443,6 +147492,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1395790148}
m_CullTransparentMesh: 1
+--- !u!114 &1395790152
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1395790148}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1395790150}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &1396178093
GameObject:
m_ObjectHideFlags: 0
@@ -152435,7 +152528,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -153850,7 +153943,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1463019794
MonoBehaviour:
@@ -153899,7 +153992,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -154660,7 +154753,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1470071476
RectTransform:
m_ObjectHideFlags: 0
@@ -154678,10 +154771,10 @@ RectTransform:
m_Father: {fileID: 431218846}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 102.6139, y: -202.974}
- m_SizeDelta: {x: 205.2278, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1470071477
MonoBehaviour:
@@ -154730,7 +154823,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -157087,7 +157180,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -157749,7 +157842,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -160248,7 +160341,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -160379,7 +160472,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1516507624
MonoBehaviour:
@@ -161875,7 +161968,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 442, y: -0.000019069}
- m_SizeDelta: {x: 729, y: 682}
+ m_SizeDelta: {x: 730, y: 746}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1528062687
MonoBehaviour:
@@ -161884,7 +161977,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1528062685}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -161897,7 +161990,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 117b608e2ec208146ab65b3274e00d68, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 7b4f1305d52ca1645b69c060cd23dc27, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -167247,7 +167340,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1580307328
MonoBehaviour:
@@ -167296,7 +167389,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -168933,7 +169026,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1596243171
MonoBehaviour:
@@ -168982,7 +169075,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -175417,7 +175510,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1658240167
MonoBehaviour:
@@ -175928,7 +176021,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1663611001
MonoBehaviour:
@@ -178216,7 +178309,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1680882947
MonoBehaviour:
@@ -180572,7 +180665,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -23.4, y: -16.6}
+ m_AnchoredPosition: {x: -7.7526855, y: -6}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1708161588
@@ -181054,7 +181147,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -182267,7 +182360,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1720517304
RectTransform:
m_ObjectHideFlags: 0
@@ -182285,10 +182378,10 @@ RectTransform:
m_Father: {fileID: 512220491}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 98.41, y: -230.0372}
- m_SizeDelta: {x: 196.82, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1720517305
MonoBehaviour:
@@ -182337,7 +182430,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -187400,7 +187493,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1780268396
MonoBehaviour:
@@ -191054,7 +191147,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1811449545
MonoBehaviour:
@@ -191103,7 +191196,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -195504,7 +195597,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -205428,7 +205521,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1960782612
MonoBehaviour:
@@ -206077,7 +206170,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 45}
+ m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1963469773
MonoBehaviour:
@@ -206612,7 +206705,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
- m_HorizontalOverflow: 1
+ m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9103504343
@@ -207439,7 +207532,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1973380976
RectTransform:
m_ObjectHideFlags: 0
@@ -207457,10 +207550,10 @@ RectTransform:
m_Father: {fileID: 431218846}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 102.6139, y: -230.0372}
- m_SizeDelta: {x: 205.2278, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1973380977
MonoBehaviour:
@@ -207509,7 +207602,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -213744,7 +213837,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 27.0632}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2043892319
MonoBehaviour:
@@ -213793,7 +213886,7 @@ MonoBehaviour:
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
- m_LineType: 0
+ m_LineType: 1
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
@@ -215855,7 +215948,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &2062969512
RectTransform:
m_ObjectHideFlags: 0
@@ -215873,10 +215966,10 @@ RectTransform:
m_Father: {fileID: 336835583}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 99.12965, y: -230.0372}
- m_SizeDelta: {x: 198.2593, y: 27.0632}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 27.0632}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2062969513
MonoBehaviour:
@@ -221014,8 +221107,8 @@ RectTransform:
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: -44.920013}
- m_SizeDelta: {x: 0, y: -89.84}
+ m_AnchoredPosition: {x: 0, y: -38.656982}
+ m_SizeDelta: {x: 0, y: -77.314}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2112111167
MonoBehaviour:
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs
index f75dccb4..b77d3a1d 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs
@@ -1,3 +1,4 @@
+using Components;
using JData;
using System.Collections;
using System.Collections.Generic;
@@ -20,6 +21,17 @@ namespace Adam
public InputField[] userNames;
public InputField[] workSpace;
public GameObject jobCardPanel;
+ public GameObject jobChoiceQuestionPanel;
+ public OptionItem optionItemPrefab;
+ public Transform optionItemContent;
+ ///
+ /// 风险点分析
+ ///
+ public Button RiskPointAnalysisBtn;
+ ///
+ /// 安全措施
+ ///
+ public Button SafetyMeasuresBtn;
// Use this for initialization
private void Start()
{
@@ -31,7 +43,11 @@ namespace Adam
GetValue(numb, index);
});
}
+
+
+
jobCardPanel.SetActive(false);
+ jobChoiceQuestionPanel.SetActive(false);
}
public async void GetValue(string numb, int _index)
@@ -41,7 +57,27 @@ namespace Adam
JobCardData jData = await AsyncWebReq.Get(_url);
userNames[_index].text = jData.data.name;
workSpace[_index].text = jData.data.adress;
+ }
+ ///
+ /// 0- 风险点,1-安全措施
+ ///
+ ///
+ public void OnClick(int index)
+ {
+ jobChoiceQuestionPanel.SetActive(true);
+ if (index == 0)
+ {
+
+ }
+ else if (index == 1)
+ {
+
+ }
+ else
+ {
+
+ }
}
}
}
diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Anime.meta b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Anime.meta
deleted file mode 100644
index 4c52fe00..00000000
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Anime.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b38d3ff374cdd7f419e411e4ac549388
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
index 73a29496..b2e1950d 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab
@@ -4478,7 +4478,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
propertyPath: m_LocalRotation.w
diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
index eac1c972..ad50be6a 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
@@ -9280,7 +9280,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}