diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity index 56d94e2b..f1ed8b37 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity @@ -1858,7 +1858,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &15231291 RectTransform: 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 @@ -8884,9 +8929,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 1 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: -40.5948} + 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 &91025466 @@ -12155,10 +12200,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -247.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &123732998 MonoBehaviour: @@ -20177,8 +20222,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: 654.94275, y: -420} - m_SizeDelta: {x: 29.2473, y: 351} + m_AnchoredPosition: {x: 672.2, y: -543.4} + m_SizeDelta: {x: 29.2473, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &208773503 MonoBehaviour: @@ -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 @@ -28677,10 +28722,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -292.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &291983702 MonoBehaviour: @@ -29953,7 +29998,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -29989,11 +30034,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -676.6753 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -30086,10 +30131,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 @@ -30257,7 +30302,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 @@ -32409,9 +32454,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -206} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &334558393 @@ -32667,8 +32712,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: 140.56, y: -100} - m_SizeDelta: {x: 182.4254, y: 270.632} + m_AnchoredPosition: {x: 123.2782, y: -166} + m_SizeDelta: {x: 198.2593, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &336835584 MonoBehaviour: @@ -32702,7 +32747,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 10.5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 @@ -32917,10 +32962,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -13.5316} - m_SizeDelta: {x: 182.4254, 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 &337677089 MonoBehaviour: @@ -36020,7 +36065,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 @@ -37014,10 +37059,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -22.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374549530 MonoBehaviour: @@ -37179,7 +37224,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 374859221} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -37192,7 +37237,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8326c6d881c9888429caa3c18416632b, type: 3} + m_Sprite: {fileID: 21300000, guid: 2f32981209ffb7c4b9c3f878ed62d2e5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38682,9 +38727,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -296} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &386346862 @@ -43489,8 +43534,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: 325.95026, y: -100} - m_SizeDelta: {x: 183.1654, y: 270.632} + m_AnchoredPosition: {x: 325.95, y: -161.58081} + m_SizeDelta: {x: 205.2278, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &431218847 MonoBehaviour: @@ -43524,7 +43569,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 3 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 @@ -45099,7 +45144,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -45135,11 +45180,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -290.0037 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -46215,10 +46260,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -202.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &450150463 MonoBehaviour: @@ -48107,7 +48152,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &465806889 RectTransform: m_ObjectHideFlags: 0 @@ -51420,7 +51465,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 @@ -51762,7 +51807,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 @@ -53807,8 +53852,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: 509.12, y: -100} - m_SizeDelta: {x: 175.07, y: 270.632} + m_AnchoredPosition: {x: 531.18, y: -161.58} + m_SizeDelta: {x: 196.82, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &512220492 MonoBehaviour: @@ -53842,7 +53887,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 3 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 @@ -55949,9 +55994,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 5 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: -148.8476} + 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 &537220805 @@ -57130,7 +57175,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 1035.657} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &548777199 MonoBehaviour: @@ -59559,8 +59604,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: 360} + 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: @@ -59592,15 +59637,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: @@ -60653,10 +60698,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -112.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &584457082 MonoBehaviour: @@ -61334,7 +61379,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 @@ -63185,7 +63230,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &602624091 RectTransform: m_ObjectHideFlags: 0 @@ -63205,8 +63250,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: 91.5827, y: -257.1004} - m_SizeDelta: {x: 183.1654, y: 27.0632} + m_AnchoredPosition: {x: 102.6139, y: -257.1004} + m_SizeDelta: {x: 205.2278, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &602624092 MonoBehaviour: @@ -64636,7 +64681,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -64672,11 +64717,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -193.3358 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -66007,10 +66052,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -112.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &633825085 MonoBehaviour: @@ -67533,9 +67578,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 @@ -68377,7 +68422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -68413,11 +68458,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -483.3395 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -71662,7 +71707,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: 360} + m_SizeDelta: {x: 325, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &679825365 MonoBehaviour: @@ -71696,13 +71741,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: @@ -75929,9 +75974,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -26} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &716215793 @@ -76714,9 +76759,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 @@ -79994,10 +80039,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -121.7844} - m_SizeDelta: {x: 183.1654, 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 &753163099 MonoBehaviour: @@ -80046,7 +80091,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 @@ -80221,10 +80266,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -40.5948} - m_SizeDelta: {x: 183.1654, 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 &753877132 MonoBehaviour: @@ -80273,7 +80318,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 @@ -82130,9 +82175,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 0 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: -13.5316} + 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 &773816792 @@ -82514,10 +82559,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -67.658} - m_SizeDelta: {x: 183.1654, 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 &782242341 MonoBehaviour: @@ -82566,7 +82611,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 @@ -86940,9 +86985,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 2 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: -67.658} + 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 &818528368 @@ -89306,10 +89351,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -121.7844} - m_SizeDelta: {x: 175.07, 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 &839890136 MonoBehaviour: @@ -89358,7 +89403,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 @@ -92217,10 +92262,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -67.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &858728156 MonoBehaviour: @@ -94154,10 +94199,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: 91.2127, y: -202.974} - m_SizeDelta: {x: 182.4254, 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: @@ -108519,7 +108564,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 @@ -110856,7 +110901,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -110892,11 +110937,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -386.6716 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -112097,7 +112142,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -112133,11 +112178,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -580.0074 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -112198,10 +112243,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -67.658} - m_SizeDelta: {x: 182.4254, 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 &1049691641 MonoBehaviour: @@ -113514,9 +113559,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -116} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059451619 @@ -114447,6 +114492,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 @@ -117780,10 +117828,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -202.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1108970332 MonoBehaviour: @@ -120009,7 +120057,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 @@ -121000,9 +121048,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -161} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1150301410 @@ -123366,7 +123414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -123402,11 +123450,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -870.0111 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -124733,10 +124781,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -121.7844} - m_SizeDelta: {x: 182.4254, 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 &1178700180 MonoBehaviour: @@ -126705,10 +126753,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -67.658} - m_SizeDelta: {x: 175.07, 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 &1193373340 MonoBehaviour: @@ -126757,7 +126805,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 @@ -128778,10 +128826,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -40.5948} - m_SizeDelta: {x: 182.4254, 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 &1207499134 MonoBehaviour: @@ -130464,10 +130512,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -175.9108} - m_SizeDelta: {x: 182.4254, 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 &1221746744 MonoBehaviour: @@ -132539,10 +132587,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: 87.535, y: -202.974} - m_SizeDelta: {x: 175.07, 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: @@ -132591,7 +132639,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 @@ -132668,7 +132716,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1256665879 RectTransform: m_ObjectHideFlags: 0 @@ -132688,8 +132736,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: 87.535, y: -257.1004} - m_SizeDelta: {x: 175.07, y: 27.0632} + m_AnchoredPosition: {x: 98.41, y: -257.1004} + m_SizeDelta: {x: 196.82, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1256665880 MonoBehaviour: @@ -133495,10 +133543,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -175.9108} - m_SizeDelta: {x: 175.07, 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 &1262442490 MonoBehaviour: @@ -133547,7 +133595,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 @@ -135454,10 +135502,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -13.5316} - m_SizeDelta: {x: 175.07, 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 &1283395034 MonoBehaviour: @@ -135506,7 +135554,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 @@ -135522,7 +135570,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 @@ -138828,10 +138876,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -247.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1310686314 MonoBehaviour: @@ -140569,10 +140617,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -13.5316} - m_SizeDelta: {x: 183.1654, 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 &1326318312 MonoBehaviour: @@ -144423,7 +144471,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -144459,11 +144507,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -773.3432 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -145296,9 +145344,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -251} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1378539591 @@ -145738,10 +145786,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -94.7212} - m_SizeDelta: {x: 175.07, 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 &1382471490 MonoBehaviour: @@ -145790,7 +145838,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 @@ -146841,7 +146889,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 @@ -147503,6 +147551,7 @@ GameObject: - component: {fileID: 1395790149} - component: {fileID: 1395790151} - component: {fileID: 1395790150} + - component: {fileID: 1395790152} m_Layer: 5 m_Name: SafetyMeasuresBtn m_TagString: Untagged @@ -147528,8 +147577,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: @@ -147569,6 +147618,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 @@ -151132,8 +151225,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.899994, y: -100} - m_SizeDelta: {x: 106.6563, y: 270.632} + m_AnchoredPosition: {x: 7, y: -166} + m_SizeDelta: {x: 106.6563, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1429505999 MonoBehaviour: @@ -151167,7 +151260,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 10.5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -152561,7 +152654,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 @@ -153717,7 +153810,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1461985204 RectTransform: m_ObjectHideFlags: 0 @@ -153737,8 +153830,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: 91.2127, y: -257.1004} - m_SizeDelta: {x: 182.4254, y: 27.0632} + m_AnchoredPosition: {x: 99.12965, y: -257.1004} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1461985205 MonoBehaviour: @@ -153973,10 +154066,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -94.7212} - m_SizeDelta: {x: 183.1654, 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 &1463019794 MonoBehaviour: @@ -154025,7 +154118,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 @@ -154804,10 +154897,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: 91.5827, y: -202.974} - m_SizeDelta: {x: 183.1654, 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: @@ -154856,7 +154949,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 @@ -157218,7 +157311,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 @@ -157880,7 +157973,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 @@ 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 @@ -160507,10 +160600,10 @@ RectTransform: m_Father: {fileID: 573643627} 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: 155, y: -337.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1516507624 MonoBehaviour: @@ -160746,7 +160839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -160782,11 +160875,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -966.679 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -162006,7 +162099,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: @@ -162015,7 +162108,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: @@ -162028,7 +162121,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 @@ -164406,10 +164499,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -148.8476} - m_SizeDelta: {x: 182.4254, 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 &1552025122 MonoBehaviour: @@ -166557,10 +166650,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.2127, y: -94.7212} - m_SizeDelta: {x: 182.4254, 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 &1575827519 MonoBehaviour: @@ -166966,9 +167059,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 3 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: -94.7212} + 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 &1579322803 @@ -167375,10 +167468,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -40.5948} - m_SizeDelta: {x: 175.07, 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 &1580307328 MonoBehaviour: @@ -167427,7 +167520,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 @@ -169061,10 +169154,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -148.8476} - m_SizeDelta: {x: 183.1654, 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 &1596243171 MonoBehaviour: @@ -169113,7 +169206,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 @@ -175545,10 +175638,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -22.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1658240167 MonoBehaviour: @@ -176056,10 +176149,10 @@ RectTransform: m_Father: {fileID: 679825364} 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: 155, y: -337.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1663611001 MonoBehaviour: @@ -178344,10 +178437,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -292.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1680882947 MonoBehaviour: @@ -180703,7 +180796,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 @@ -181185,7 +181278,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 @@ -182416,10 +182509,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: 87.535, y: -230.0372} - m_SizeDelta: {x: 175.07, 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: @@ -182468,7 +182561,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 @@ -186435,9 +186528,9 @@ RectTransform: m_Father: {fileID: 208773502} 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: 14.62365, y: -341} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1766664520 @@ -187528,10 +187621,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -157.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1780268396 MonoBehaviour: @@ -191182,10 +191275,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87.535, y: -148.8476} - m_SizeDelta: {x: 175.07, 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 &1811449545 MonoBehaviour: @@ -191234,7 +191327,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 @@ -195635,7 +195728,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 @@ -204325,9 +204418,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 4 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: -121.7844} + 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 &1946808544 @@ -205556,10 +205649,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -157.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1960782612 MonoBehaviour: @@ -206205,10 +206298,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -67.5} - m_SizeDelta: {x: 310, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1963469773 MonoBehaviour: @@ -206440,9 +206533,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.62365, y: -71} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1964802744 @@ -206743,7 +206836,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 @@ -207588,10 +207681,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: 91.5827, y: -230.0372} - m_SizeDelta: {x: 183.1654, 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: @@ -207640,7 +207733,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 @@ -213872,10 +213965,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5827, y: -175.9108} - m_SizeDelta: {x: 183.1654, 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 &2043892319 MonoBehaviour: @@ -213924,7 +214017,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 @@ -214622,7 +214715,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 151, y: 159} - m_SizeDelta: {x: 206, y: 52} + m_SizeDelta: {x: 192, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2050579557 MonoBehaviour: @@ -214688,7 +214781,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5aad0842cdbbbeb4897bd34d3da286cd, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b6f6753f1d4c9f4b908dcdee62d03eb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -214903,7 +214996,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -214939,11 +215032,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y - value: -96.6679 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -216004,10 +216097,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: 91.2127, y: -230.0372} - m_SizeDelta: {x: 182.4254, 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: @@ -218119,7 +218212,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -100, y: 159} - m_SizeDelta: {x: 206, y: 52} + m_SizeDelta: {x: 192, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2078711472 MonoBehaviour: @@ -218185,7 +218278,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a3d4a1f27080535428ebf9769ee2fb0d, type: 3} + m_Sprite: {fileID: 21300000, guid: a79d9816021e7e34eb73eb4af0e90a3d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -218789,7 +218882,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2087751351 RectTransform: m_ObjectHideFlags: 0 @@ -221145,8 +221238,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: @@ -224394,9 +224487,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 6 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: -175.9108} + 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 &2138110494 @@ -225810,7 +225903,6 @@ MonoBehaviour: NameSelf: "\u5DE5\u4F5C\u8BC1" selfBtn: {fileID: 5799929949428093906} showName: {fileID: 230418245} - myRect: {fileID: 5799929949178873662} tips: {fileID: 1476623015} panel: {fileID: 0} modeName: 2 @@ -226041,7 +226133,6 @@ MonoBehaviour: NameSelf: "\u79FB\u52A8\u4F5C\u4E1A\u7EC8\u7AEF" selfBtn: {fileID: 5799929948761912364} showName: {fileID: 230418245} - myRect: {fileID: 5799929950087749824} tips: {fileID: 1476623015} panel: {fileID: 503037641} modeName: 1 @@ -226227,7 +226318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.x - value: 689 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_SizeDelta.y @@ -226263,7 +226354,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.x - value: 364.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7841566712123838754, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} propertyPath: m_AnchoredPosition.y 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)/Model/NEW/三相_无互感器_无光伏_电箱门.fbx.meta b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.fbx.meta index d899ee53..709b4c2a 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.fbx.meta +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.fbx.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: 13e6757fcb98e1e4bbc94e07f67e0dbb ModelImporter: serializedVersion: 21300 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_有互感器_无光伏_电箱门.fbx.meta b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_有互感器_无光伏_电箱门.fbx.meta index 1cae2821..5431d3e7 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_有互感器_无光伏_电箱门.fbx.meta +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_有互感器_无光伏_电箱门.fbx.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: 6fbd9caa46e05824fb3eba389c7d1b27 ModelImporter: serializedVersion: 21300 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index e2e45796..41606ad2 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -5761,7 +5761,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_LocalPosition.y diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab index 082c78e0..be5d34be 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -8776,7 +8776,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} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs index bbe2f573..9566b457 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs @@ -28,7 +28,7 @@ public class newfollow : MonoBehaviour // ײ bool res = Physics.Raycast(ray, out hit) && !EventSystem.current.IsPointerOverGameObject(); - + // ײ if (hit.transform.name.Equals(name)) { diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png b/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png new file mode 100644 index 00000000..4aa1cfaa Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png.meta b/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png.meta new file mode 100644 index 00000000..de8f7ef5 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/UI/组 1.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 540d7d65d7474ff438c8d4e736491510 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + 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: 0 + 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 + 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: diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png b/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png new file mode 100644 index 00000000..459fd1ab Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png.meta b/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png.meta new file mode 100644 index 00000000..eaac92bc --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/UI/组 2.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 2be832ad962fd8344a0a05dfc5f3bc2a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png b/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png new file mode 100644 index 00000000..df7d34ea Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png.meta b/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png.meta new file mode 100644 index 00000000..20bdc405 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/UI/组 3.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 8b6f6753f1d4c9f4b908dcdee62d03eb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + 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: 0 + 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 + 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: diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png b/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png new file mode 100644 index 00000000..6757187b Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png.meta b/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png.meta new file mode 100644 index 00000000..1128cecb --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/UI/组 4.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a79d9816021e7e34eb73eb4af0e90a3d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + 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: 0 + 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 + 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: diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index f98f7bdf..0cbeb9db 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json +++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json @@ -35,12 +35,12 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.16", + "com.unity.ide.rider": "3.0.15", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.2.2" + "com.unity.testtools.codecoverage": "1.0.1" } }, "com.unity.ide.rider": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.6.0", + "version": "1.4.2", "depth": 1, "source": "registry", "dependencies": { @@ -121,7 +121,7 @@ "url": "https://packages.unity.cn" }, "com.unity.testtools.codecoverage": { - "version": "1.2.2", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": {