diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/Item/OptionItem.prefab b/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/Item/OptionItem.prefab index be6e5ea4..49c0b287 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/Item/OptionItem.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/Item/OptionItem.prefab @@ -248,6 +248,7 @@ GameObject: - component: {fileID: 7841566712123838780} - component: {fileID: 7841566712123838781} - component: {fileID: 7841566712123838783} + - component: {fileID: -7945763279749003775} m_Layer: 5 m_Name: OptionItem m_TagString: Untagged @@ -330,3 +331,48 @@ MonoBehaviour: m_EditorClassIdentifier: ID: {fileID: 7841566711167579075} info: {fileID: 7841566711052037343} + selfBtn: {fileID: -7945763279749003775} +--- !u!114 &-7945763279749003775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7841566712123838755} + 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: 7841566712123838781} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity index f545d0d4..36d614db 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity @@ -762,7 +762,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: cdsacadvadsvdvdsvsavdsvdsvadsvdsvsv + m_Text: --- !u!222 &49315393 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1090,9 +1090,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -51.094803} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &91025466 @@ -1158,7 +1158,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -1547,7 +1547,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &118099545 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1592,10 +1592,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -207.5} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &123732998 MonoBehaviour: @@ -1660,7 +1660,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -1887,7 +1887,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &168423115 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2047,7 +2047,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &180237439 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2101,7 +2101,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 198662832} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -2257,7 +2257,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 672.2, y: -543.4} - m_SizeDelta: {x: 29.2473, y: 0} + m_SizeDelta: {x: 29.2473, y: 281.52002} m_Pivot: {x: 0, y: 1} --- !u!114 &208773503 MonoBehaviour: @@ -2378,7 +2378,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &210735113 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2458,7 +2458,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &223882192 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2581,7 +2581,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0.000005722046, y: 0.000015258789} m_SizeDelta: {x: 0, y: -0.000015259} m_Pivot: {x: 0.5, y: 0.5} @@ -2839,7 +2839,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 256203756} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -3012,7 +3012,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 281317439} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -3083,10 +3083,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -245} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &291983702 MonoBehaviour: @@ -3151,7 +3151,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -3239,7 +3239,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 297158746} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -3345,7 +3345,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343323kjlllllklklklklokkoklklk + m_Text: --- !u!222 &304636831 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3425,7 +3425,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &304986765 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3467,9 +3467,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -159.44} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &334558393 @@ -3566,7 +3566,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 123.2782, y: -166} - m_SizeDelta: {x: 198.2593, y: 0} + m_SizeDelta: {x: 198.2593, y: 327.56882} m_Pivot: {x: 0, y: 1} --- !u!114 &336835584 MonoBehaviour: @@ -3644,10 +3644,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -13.5316} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &337677089 MonoBehaviour: @@ -3712,7 +3712,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -4185,7 +4185,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &360837878 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4310,10 +4310,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -20} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374549530 MonoBehaviour: @@ -4378,7 +4378,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: "\u4F7F\u7528\u4E0D\u5408\u683C\u7684\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\uFF0C\u6216\u4F7F\u7528\u7684\u9632\u62A4\u7528\u54C1\u4E0D\u9F50\u5168\u3002\u8FDB\u5165\u4F5C\u4E1A\u73B0\u573A\u672A\u6309\u89C4\u5B9A\u6B63\u786E\u4F69\u6234\u5B89\u5168\u5E3D\u3001\u7740\u88C5\u3002" + m_Text: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -4466,7 +4466,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -332, y: -9} - m_SizeDelta: {x: 728, y: 838.895} + m_SizeDelta: {x: 728, y: 839} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374859223 MonoBehaviour: @@ -4488,7 +4488,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2f32981209ffb7c4b9c3f878ed62d2e5, type: 3} + m_Sprite: {fileID: 21300000, guid: 6bdaa1e1cf231284685da170dba13ee9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4748,9 +4748,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -234.16} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &386346862 @@ -5105,7 +5105,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &397031182 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5317,7 +5317,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 325.95, y: -161.58081} - m_SizeDelta: {x: 205.2278, y: 0} + m_SizeDelta: {x: 205.2278, y: 339} m_Pivot: {x: 0, y: 1} --- !u!114 &431218847 MonoBehaviour: @@ -5796,7 +5796,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &445147319 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5918,10 +5918,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -170} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &450150463 MonoBehaviour: @@ -5986,7 +5986,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -6195,7 +6195,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 457586776} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -6677,7 +6677,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &493798129 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6757,7 +6757,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &494952673 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6849,7 +6849,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506260501} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -6930,7 +6930,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 531.18, y: -161.58} - m_SizeDelta: {x: 196.82, y: 0} + m_SizeDelta: {x: 196.82, y: 339} m_Pivot: {x: 0, y: 1} --- !u!114 &512220492 MonoBehaviour: @@ -7032,18 +7032,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &513932099 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7203,7 +7203,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &536020536 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7248,9 +7248,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -201.34761} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &537220805 @@ -7316,7 +7316,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -7819,18 +7819,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &565245471 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7883,7 +7883,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0.000030518, y: 0.51000977} - m_SizeDelta: {x: 325.95, y: 0} + m_SizeDelta: {x: 325.95, y: 320.5} m_Pivot: {x: 0, y: 1} --- !u!114 &573643628 MonoBehaviour: @@ -7970,7 +7970,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581879827} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -8041,10 +8041,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -95} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &584457082 MonoBehaviour: @@ -8109,7 +8109,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -8223,7 +8223,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &588869100 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8739,7 +8739,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623035870} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -8894,10 +8894,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -95} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &633825085 MonoBehaviour: @@ -8962,7 +8962,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -9050,7 +9050,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634356990} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -9121,9 +9121,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -276.474} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &644882244 @@ -9189,7 +9189,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -9729,7 +9729,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4EE5\u6253\u5F00\u670D\u52A1\u8BB0\u5F55\u4EEA" + m_Text: "\u5DF2\u6253\u5F00\u670D\u52A1\u8BB0\u5F55\u4EEA" --- !u!222 &675899984 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9863,7 +9863,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 325, y: 0} + m_SizeDelta: {x: 325, y: 302.5} m_Pivot: {x: 0, y: 1} --- !u!114 &679825365 MonoBehaviour: @@ -10198,7 +10198,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 701142960} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -10293,18 +10293,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &708802823 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10346,9 +10346,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -10} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &716215793 @@ -10709,9 +10709,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -314.0372} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &721573664 @@ -10777,7 +10777,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -10880,18 +10880,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &723467595 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10960,18 +10960,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &723687586 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11040,18 +11040,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &740694096 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11173,10 +11173,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -169.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &753163099 MonoBehaviour: @@ -11241,7 +11241,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -11400,10 +11400,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -55.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &753877132 MonoBehaviour: @@ -11468,7 +11468,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -11699,7 +11699,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758585023} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -11770,9 +11770,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -13.5316} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &773816792 @@ -11838,7 +11838,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -11994,10 +11994,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -93.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &782242341 MonoBehaviour: @@ -12062,7 +12062,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -12242,18 +12242,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &798819126 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12307,7 +12307,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801278304} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -12402,18 +12402,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &802956174 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12614,9 +12614,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -88.658005} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &818528368 @@ -12682,7 +12682,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -12758,7 +12758,7 @@ RectTransform: m_Father: {fileID: 959720304} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.97759575} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -12846,7 +12846,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 837254747} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -12917,10 +12917,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -169.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &839890136 MonoBehaviour: @@ -12985,7 +12985,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -13423,10 +13423,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -57.5} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &858728156 MonoBehaviour: @@ -13491,7 +13491,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -13570,10 +13570,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -276.474} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &877118239 MonoBehaviour: @@ -13638,7 +13638,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -13726,7 +13726,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 877276545} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -14314,7 +14314,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 934673976} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -14409,18 +14409,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &938139658 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14465,7 +14465,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: 29480.576} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &950677058 MonoBehaviour: @@ -15016,7 +15016,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977800512} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -15096,7 +15096,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 986630094} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -15632,7 +15632,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1007045861 CanvasRenderer: m_ObjectHideFlags: 0 @@ -15678,8 +15678,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.6696472, y: -18.444695} - m_SizeDelta: {x: -27.289, y: -130.88939} + m_AnchoredPosition: {x: -0.6696472, y: -1.9447021} + m_SizeDelta: {x: -27.289, y: -163.8894} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1017772166 MonoBehaviour: @@ -15757,7 +15757,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: 0} + m_SizeDelta: {x: -19, y: 46} m_Pivot: {x: 0, y: 1} --- !u!114 &1021690654 MonoBehaviour: @@ -15842,7 +15842,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1023504324} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -15913,10 +15913,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -88.658005} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1049691641 MonoBehaviour: @@ -15981,7 +15981,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -16041,7 +16041,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1052689576 RectTransform: m_ObjectHideFlags: 0 @@ -16224,9 +16224,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -2.6999998, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1056303075 MonoBehaviour: @@ -16430,9 +16430,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -84.72} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059451619 @@ -16505,6 +16505,7 @@ GameObject: - component: {fileID: 1067605749} - component: {fileID: 1067605750} - component: {fileID: 1067605751} + - component: {fileID: 1067605752} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -16569,7 +16570,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 + m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 m_SortingOrder: 2 m_TargetDisplay: 0 @@ -16619,6 +16620,7 @@ MonoBehaviour: bottomCotroller: {fileID: 1067605746} jobCardController: {fileID: 1067605748} exitCheckController: {fileID: 1067605749} + toolModelManager: {fileID: 1067605752} exitBtn: {fileID: 1602550215} backToToolBtn: {fileID: 1505331878} threeDTip: {fileID: 559075117} @@ -16634,8 +16636,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d66cf522186e2243a9ac2573aa9d8c8, type: 3} m_Name: m_EditorClassIdentifier: - userViewUrl: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao=3004892662 - tabelViewUrl: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao= + userViewUrl: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao= + tabelViewUrl: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao= number: {fileID: 1195716959} outsideBtn: {fileID: 1639748883} electricitBtn: {fileID: 1156757688} @@ -16648,10 +16650,7 @@ MonoBehaviour: mData: state: message: - data: - jbsx: [] - jbxx: [] - jlzzxx: [] + data: [] tData: state: message: @@ -16678,6 +16677,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] recoverBtn: {fileID: 1876085501} + recoverEvent: + m_PersistentCalls: + m_Calls: [] bottomToolToggle: {fileID: 754664720} currentTool: {fileID: 0} ServerRecorderPanel: {fileID: 1102537591} @@ -16739,6 +16741,7 @@ MonoBehaviour: - {fileID: 1189450973} buttomPanel: {fileID: 1935876357} BirdEyeView: {fileID: 932668468} + firstPersonController: {fileID: 0} --- !u!114 &1067605748 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16786,6 +16789,24 @@ MonoBehaviour: - {fileID: 1470071477} - {fileID: 1973380977} - {fileID: 602624092} + aqcss: + - {fileID: 1658240167} + - {fileID: 858728156} + - {fileID: 584457082} + - {fileID: 1960782612} + - {fileID: 1108970332} + - {fileID: 123732998} + - {fileID: 291983702} + - {fileID: 1663611001} + fxdfx: + - {fileID: 374549530} + - {fileID: 1963469773} + - {fileID: 633825085} + - {fileID: 1780268396} + - {fileID: 450150463} + - {fileID: 1310686314} + - {fileID: 1680882947} + - {fileID: 1516507624} jobCardPanel: {fileID: 2087751350} jobChoiceQuestionPanel: {fileID: 1528062685} optionItemPrefab: {fileID: 7841566712123838783, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3} @@ -16855,6 +16876,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loadingPanel: {fileID: 449920027} +--- !u!114 &1067605752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067605736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bbdc92a427f66b4ab0ae87c35cb0544, type: 3} + m_Name: + m_EditorClassIdentifier: + toolModelClicks: [] --- !u!1 &1091536119 GameObject: m_ObjectHideFlags: 0 @@ -16900,7 +16934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1091536119} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -17230,7 +17264,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1107758365 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17275,10 +17309,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -170} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1108970332 MonoBehaviour: @@ -17343,7 +17377,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -17717,7 +17751,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1143227508 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17851,7 +17885,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1145648517} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -17919,9 +17953,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -122.08} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1150301410 @@ -18245,18 +18279,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1163851580 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18301,10 +18335,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -163.78441} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1178700180 MonoBehaviour: @@ -18369,7 +18403,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -18722,7 +18756,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189544119} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -18793,10 +18827,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -93.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1193373340 MonoBehaviour: @@ -18861,7 +18895,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -19087,10 +19121,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -51.094803} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1207499134 MonoBehaviour: @@ -19155,7 +19189,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -19243,7 +19277,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1212672732} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -19338,18 +19372,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1213319460 CanvasRenderer: m_ObjectHideFlags: 0 @@ -19474,10 +19508,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -238.91081} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1221746744 MonoBehaviour: @@ -19542,7 +19576,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -19630,7 +19664,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226594049} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -19725,18 +19759,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1242227661 CanvasRenderer: m_ObjectHideFlags: 0 @@ -19781,10 +19815,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -283.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1253207852 MonoBehaviour: @@ -19849,7 +19883,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -20075,10 +20109,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -245.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1262442490 MonoBehaviour: @@ -20143,7 +20177,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -20231,7 +20265,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1277968150} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -20302,10 +20336,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -17.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1283395034 MonoBehaviour: @@ -20370,7 +20404,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: 9103504343323kjlllllklklklklokkoklklk + m_Text: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -20458,7 +20492,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1289589485} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -20528,7 +20562,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6.8999634, y: 21.939949} + m_AnchoredPosition: {x: 6.8999023, y: 21.939941} m_SizeDelta: {x: -513.80005, y: -353.3401} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1292970890 @@ -20609,10 +20643,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -207.5} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1310686314 MonoBehaviour: @@ -20677,7 +20711,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -20833,10 +20867,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -17.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1326318312 MonoBehaviour: @@ -20901,7 +20935,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: cdsacadvadsvdvdsvsavdsvdsvadsvdsvsv + m_Text: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -21069,7 +21103,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1338241357} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -21445,9 +21479,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -196.8} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1378539591 @@ -21534,10 +21568,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -131.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1382471490 MonoBehaviour: @@ -21602,7 +21636,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -21716,7 +21750,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1391648209 CanvasRenderer: m_ObjectHideFlags: 0 @@ -22041,7 +22075,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1416232577} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -22202,7 +22236,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 7, y: -166} - m_SizeDelta: {x: 106.6563, y: 0} + m_SizeDelta: {x: 106.6563, y: 327.56882} m_Pivot: {x: 0, y: 1} --- !u!114 &1429505999 MonoBehaviour: @@ -22281,8 +22315,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.36494446, y: -18.445} - m_SizeDelta: {x: -29.358, y: -130.89} + m_AnchoredPosition: {x: 0.36494446, y: -1.9450073} + m_SizeDelta: {x: -29.358, y: -163.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1439680282 MonoBehaviour: @@ -22443,7 +22477,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1444785950} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -22595,7 +22629,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 1447165520} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -22670,7 +22704,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1448946067 CanvasRenderer: m_ObjectHideFlags: 0 @@ -22724,7 +22758,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449090498} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -22819,18 +22853,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1450532159 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23235,10 +23269,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -131.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1463019794 MonoBehaviour: @@ -23303,7 +23337,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -23382,10 +23416,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -283.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1470071477 MonoBehaviour: @@ -23450,7 +23484,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -23543,7 +23577,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479679717} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -23699,7 +23733,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1482159789} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -23805,7 +23839,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1482553544 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23885,7 +23919,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1493388863 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23939,7 +23973,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495694255} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -24045,7 +24079,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1496658739 CanvasRenderer: m_ObjectHideFlags: 0 @@ -24125,7 +24159,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1499230402 CanvasRenderer: m_ObjectHideFlags: 0 @@ -24252,7 +24286,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: -76.4, y: -36.1} + m_AnchoredPosition: {x: -76.3999, y: -36.1} m_SizeDelta: {x: 41, y: 36} m_Pivot: {x: 1, y: 1} --- !u!114 &1505331878 @@ -24423,7 +24457,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1514773722 CanvasRenderer: m_ObjectHideFlags: 0 @@ -24468,10 +24502,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -282.5} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1516507624 MonoBehaviour: @@ -24536,7 +24570,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -24974,18 +25008,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1543911441 CanvasRenderer: m_ObjectHideFlags: 0 @@ -25030,10 +25064,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -201.34761} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1552025122 MonoBehaviour: @@ -25098,7 +25132,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -25212,7 +25246,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1555768426 CanvasRenderer: m_ObjectHideFlags: 0 @@ -25422,7 +25456,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1569846211} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -25493,10 +25527,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -126.22121} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1575827519 MonoBehaviour: @@ -25561,7 +25595,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -25649,7 +25683,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578698511} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -25720,9 +25754,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -126.22121} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1579322803 @@ -25788,7 +25822,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -25876,7 +25910,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1579692140} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -25947,10 +25981,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -55.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1580307328 MonoBehaviour: @@ -26015,7 +26049,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -26103,7 +26137,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1587753955} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -26174,10 +26208,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -207.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1596243171 MonoBehaviour: @@ -26242,7 +26276,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -26330,7 +26364,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1600415696} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -27188,7 +27222,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1636504763} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -27381,7 +27415,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: -31.2, y: -135.6} + m_AnchoredPosition: {x: -31.199951, y: -135.59998} m_SizeDelta: {x: 219.1186, y: 72.339} m_Pivot: {x: 1, y: 1} --- !u!114 &1640898744 @@ -27694,7 +27728,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1656660729} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -27842,10 +27876,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -20} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1658240167 MonoBehaviour: @@ -27910,7 +27944,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -27989,10 +28023,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -282.5} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1663611001 MonoBehaviour: @@ -28057,7 +28091,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -28443,10 +28477,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -245} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1680882947 MonoBehaviour: @@ -28511,7 +28545,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -28705,7 +28739,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1695943086 CanvasRenderer: m_ObjectHideFlags: 0 @@ -28759,7 +28793,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699577551} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -29010,7 +29044,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1712522641 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29212,10 +29246,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -321.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1720517305 MonoBehaviour: @@ -29280,7 +29314,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -29368,7 +29402,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722678565} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -29516,9 +29550,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -271.52002} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1766664520 @@ -29640,7 +29674,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1770151756 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29685,10 +29719,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -132.5} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1780268396 MonoBehaviour: @@ -29753,7 +29787,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -30165,7 +30199,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -30176,7 +30210,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4F7F\u7528\u4E0D\u5408\u683C\u7684\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\uFF0C\u6216\u4F7F\u7528\u7684\u9632\u62A4\u7528\u54C1\u4E0D\u9F50\u5168\u3002\u8FDB\u5165\u4F5C\u4E1A\u73B0\u573A\u672A\u6309\u89C4\u5B9A\u6B63\u786E\u4F69\u6234\u5B89\u5168\u5E3D\u3001\u7740\u88C5\u3002" + m_Text: --- !u!222 &1810392305 CanvasRenderer: m_ObjectHideFlags: 0 @@ -30221,10 +30255,10 @@ RectTransform: m_Father: {fileID: 512220491} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 98.41, y: -207.5} + m_SizeDelta: {x: 196.82, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1811449545 MonoBehaviour: @@ -30289,7 +30323,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -30533,7 +30567,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1816980566} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -30773,7 +30807,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833038283} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -30933,7 +30967,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839787296} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -31039,7 +31073,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1858783383 CanvasRenderer: m_ObjectHideFlags: 0 @@ -31093,7 +31127,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866357210} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -31569,7 +31603,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1903223500 CanvasRenderer: m_ObjectHideFlags: 0 @@ -31876,7 +31910,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1938454226} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -32150,9 +32184,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -163.78441} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1946808544 @@ -32218,7 +32252,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -32306,7 +32340,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951167346} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -32377,10 +32411,10 @@ RectTransform: m_Father: {fileID: 679825364} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -132.5} + m_SizeDelta: {x: 325, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1960782612 MonoBehaviour: @@ -32445,7 +32479,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -32524,10 +32558,10 @@ RectTransform: m_Father: {fileID: 573643627} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.975, y: -57.5} + m_SizeDelta: {x: 325.95, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1963469773 MonoBehaviour: @@ -32592,7 +32626,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -32668,9 +32702,9 @@ RectTransform: m_Father: {fileID: 208773502} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 14.62365, y: -47.36} m_SizeDelta: {x: 21.4061, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1964802744 @@ -32792,7 +32826,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &1966528296 CanvasRenderer: m_ObjectHideFlags: 0 @@ -32837,10 +32871,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -321.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1973380977 MonoBehaviour: @@ -32905,7 +32939,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -33073,7 +33107,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980938290} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -33383,7 +33417,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2027878913} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -33454,10 +33488,10 @@ RectTransform: m_Father: {fileID: 431218846} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 35} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.6139, y: -245.5} + m_SizeDelta: {x: 205.2278, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2043892319 MonoBehaviour: @@ -33522,7 +33556,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -33790,7 +33824,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050368021} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -34006,18 +34040,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 13 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &2056404363 CanvasRenderer: m_ObjectHideFlags: 0 @@ -34097,7 +34131,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &2060225734 CanvasRenderer: m_ObjectHideFlags: 0 @@ -34253,7 +34287,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &2062360901 CanvasRenderer: m_ObjectHideFlags: 0 @@ -34298,10 +34332,10 @@ RectTransform: m_Father: {fileID: 336835583} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 27.0632} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99.12965, y: -314.0372} + m_SizeDelta: {x: 198.2593, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2062969513 MonoBehaviour: @@ -34366,7 +34400,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -34777,7 +34811,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2087751351 RectTransform: m_ObjectHideFlags: 0 @@ -34846,7 +34880,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2091988123} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -35295,7 +35329,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099231856} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -35401,7 +35435,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &2108499043 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35549,7 +35583,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9103504343 + m_Text: --- !u!222 &2117080021 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35798,8 +35832,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 828138125} m_HandleRect: {fileID: 828138124} m_Direction: 2 - m_Value: 1 - m_Size: 0.022404231 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -35958,9 +35992,9 @@ RectTransform: m_Father: {fileID: 1429505998} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.1678, y: -238.91081} m_SizeDelta: {x: 104.3356, y: 27.0632} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2138110494 @@ -36026,7 +36060,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: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -36321,7 +36355,7 @@ RectTransform: m_GameObject: {fileID: 5090827398298492658} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.49219194, y: 0.47440186, z: 0.47440186} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7550337382994350724} @@ -36331,8 +36365,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: 14, y: -0.00018310547} - m_SizeDelta: {x: 1980.9, y: 1196.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1747107931428092760 MonoBehaviour: @@ -37368,10 +37402,10 @@ RectTransform: m_Father: {fileID: 1021690653} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 84, y: -26} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5799929949178873663 MonoBehaviour: @@ -37541,10 +37575,10 @@ RectTransform: m_Father: {fileID: 1021690653} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 39, y: -26} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5799929950087749826 MonoBehaviour: @@ -37802,7 +37836,7 @@ RectTransform: m_GameObject: {fileID: 1946602691223842720} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.0317278, y: 2.1079175, z: 2.1079175} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6531847754770110265} @@ -37813,7 +37847,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -416, y: -65} + m_AnchoredPosition: {x: -204.75183, y: -30.83612} m_SizeDelta: {x: 1059, y: 585} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7687634571803238697 @@ -38461,7 +38495,7 @@ RectTransform: m_GameObject: {fileID: 5256109648177090218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.0317278, y: 2.1079175, z: 2.1079175} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1550143346451741042} @@ -38469,7 +38503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -377.90143, y: -777.82117} + m_AnchoredPosition: {x: -186, y: -368.99982} m_SizeDelta: {x: 206, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9187364478408729666 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs index be3f7874..46720ef3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs @@ -55,6 +55,7 @@ namespace Adam closeBtn.gameObject.SetActive(true); SwitchPanel(false); SceneLoad.Instance.SceneChange("工具间场景"); + } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs index bf231f38..2e14c1d3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs @@ -18,6 +18,7 @@ namespace Adam public GameObject[] panels; public GameObject buttomPanel; public Toggle BirdEyeView; + public FirstPersonController firstPersonController; // Use this for initialization private void Start() { @@ -31,6 +32,9 @@ namespace Adam toggles[index].onValueChanged.AddListener((isOn) => { panels[index].SetActive(isOn); + if (firstPersonController == null) + firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent(); + firstPersonController.enabled = !isOn; }); } SwitchPanel(false); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs index d1e7ecf0..bb5b0864 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs @@ -16,6 +16,7 @@ namespace Components { public Text ID; public Text info; + public Button selfBtn; public void SetValue(string _id, string _info) { ID.text = _id; diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs index 09cd6abf..13559fdb 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs @@ -13,7 +13,7 @@ using UnityEngine.UI; //@description: //============================================================ -public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler +public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { public string toolName; public Button closeButton; @@ -39,7 +39,7 @@ public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler { toolName = name; closeButton.onClick.AddListener(OnClose); - + Texture2D icon = Resources.Load("New/UI/" + name); showIcon.sprite = ToSprite(icon); originPos = modelTransform.localPosition; @@ -51,7 +51,10 @@ public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler public void SetState(bool isActive) { closeButton.gameObject.SetActive(isActive); - selfButton.interactable = !isActive; + if (toolName == "工作卡") + selfButton.interactable = isActive; + else + selfButton.interactable = !isActive; } /// @@ -74,7 +77,7 @@ public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler } } - + private Sprite ToSprite(Texture2D t) { @@ -96,7 +99,7 @@ public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler public void OnPointerEnter(PointerEventData eventData) { showName.text = toolName; - tips.transform.position = transform.position + new Vector3(0,35 , 0); + tips.transform.position = transform.position + new Vector3(0, 35, 0); tips.SetActive(true); } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs index 8ad45d07..839a4b6c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs @@ -50,7 +50,6 @@ public enum RightAndWrong public class ToolModelClick : MonoBehaviour { - public Attribute attribute = Attribute.defaultModel; public RightAndWrong rightAndWrong = RightAndWrong.defaultModel; @@ -64,13 +63,6 @@ public class ToolModelClick : MonoBehaviour public Highlighter selfHighlighter; - //public GameObject tipPrefab; - //public GameObject tip; - //[ContextMenu("Set")] - //public void TTTTT() - //{ - // tipPrefab = Resources.Load("ModelTips"); - //} private void Awake() { @@ -92,18 +84,14 @@ public class ToolModelClick : MonoBehaviour var current = SceneManager.GetActiveScene(); if (current.name == "工具间场景") UIManager.Instance.SetThreeDTip(gameObject.name); - //tip = Instantiate(tipPrefab); - //tip.GetComponentInChildren().text = gameObject.name; - //tip.transform.localPosition = transform.localPosition; - //tip.transform.localScale = Vector3.one; - //tip.transform.LookAt(Camera.main.transform.position); - //tip.transform.localEulerAngles = new Vector3(90f, 0, 0); } private void OnMouseDown() { if (EventSystem.current.IsPointerOverGameObject()) return; + var current = SceneManager.GetActiveScene(); + if (current.name != "工具间场景") return; onDown?.Invoke(); ToolsItemManager.Instance.CreatToolItem(gameObject); UIManager.Instance.SetThreeDTip(""); @@ -124,6 +112,5 @@ public class ToolModelClick : MonoBehaviour return; onExit?.Invoke(); UIManager.Instance.SetThreeDTip(""); - //Destroy(tip); } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs index c3e7bd4d..390c4449 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs @@ -18,181 +18,182 @@ namespace MobileTerminal { public string state; public string message; - public Data data; - } - [Serializable] - public class Data - { - public JBSX[] jbsx; - public JBXX[] jbxx; - public JLZZXX[] jlzzxx; - } - [Serializable] - public class JBSX - { - /// - /// 周保林 用电户:3209600004110 - /// - public string 名称; - /// - /// - /// - public string 用户编号; - /// - /// 仪征市供电公司 - /// - public string 供电单位; - /// - /// 考核 - /// - public string 用户分类; - /// - /// 否 - /// - public string 是否专线; - /// - /// 正常用电客户 - /// - public string 用户状态; - /// - /// - /// - public string 合同容量; - /// - /// - /// - public string 运行容量; - /// - /// - /// - public string 首次建档日期; - /// - /// 江苏省扬州市仪征市真州镇(仪征市区)镇解放东路12号 - /// - public string 用电地址; - /// - /// 无转供 - /// - public string 转供户信息; - } - [Serializable] - public class JBXX - { - /// - /// 周保林 - /// - public string 用户名称; - /// - /// - /// - public string 用户编号; - /// - /// 正常用电客户 - /// - public string 用户状态; - /// - /// 考核 - /// - public string 用户分类; - /// - /// 仪征市供电公司 - /// - public string 供电单位; - /// - /// 太阳能发电 - /// - public string 所属行业; - /// - /// - /// - public string 合同容量; - /// - /// - /// - public string 运行容量; - /// - /// - /// - public string 电压等级; - /// - /// - /// - public string 重要等级; - /// - /// 考核 - /// - public string 用电类别; - /// - /// 否 - /// - public string 是否重点用户; - /// - /// 否 - /// - public string 是否专线; - /// - /// - /// - public string 首次建档; - /// - /// 否 - /// - public string 是否双电源; - /// - /// PMS_石桥146线 - /// - public string 线路名称; - /// - /// 江苏省扬州市仪征市真州镇(仪征市区)镇解放东路12号 - /// - public string 用电地址; - } - [Serializable] - public class JLZZXX - { - /// - /// - /// - public string 序号; - /// - /// 上网计量点1 - /// - public string 计量点名称; - /// - /// - /// - public string 计量点ID; - /// - /// - /// - public string 电表ID; - /// - /// - /// - public string 电表资产编号; - /// - /// 否 - /// - public string 是否参考表; - /// - /// 否 - /// - public string 是否专线; - /// - /// 上网关口 - /// - public string 主用途类型; - /// - /// - /// - public string 计量点级数; - /// - /// 在用 - /// - public string 状态; - /// - /// - /// - public string 倍率; + public List data; } + + //[Serializable] + //public class Data + //{ + // public JBSX[] jbsx; + // public JBXX[] jbxx; + // public JLZZXX[] jlzzxx; + //} + //[Serializable] + //public class JBSX + //{ + // /// + // /// 周保林 用电户:3209600004110 + // /// + // public string 名称; + // /// + // /// + // /// + // public string 用户编号; + // /// + // /// 仪征市供电公司 + // /// + // public string 供电单位; + // /// + // /// 考核 + // /// + // public string 用户分类; + // /// + // /// 否 + // /// + // public string 是否专线; + // /// + // /// 正常用电客户 + // /// + // public string 用户状态; + // /// + // /// + // /// + // public string 合同容量; + // /// + // /// + // /// + // public string 运行容量; + // /// + // /// + // /// + // public string 首次建档日期; + // /// + // /// 江苏省扬州市仪征市真州镇(仪征市区)镇解放东路12号 + // /// + // public string 用电地址; + // /// + // /// 无转供 + // /// + // public string 转供户信息; + //} + //[Serializable] + //public class JBXX + //{ + // /// + // /// 周保林 + // /// + // public string 用户名称; + // /// + // /// + // /// + // public string 用户编号; + // /// + // /// 正常用电客户 + // /// + // public string 用户状态; + // /// + // /// 考核 + // /// + // public string 用户分类; + // /// + // /// 仪征市供电公司 + // /// + // public string 供电单位; + // /// + // /// 太阳能发电 + // /// + // public string 所属行业; + // /// + // /// + // /// + // public string 合同容量; + // /// + // /// + // /// + // public string 运行容量; + // /// + // /// + // /// + // public string 电压等级; + // /// + // /// + // /// + // public string 重要等级; + // /// + // /// 考核 + // /// + // public string 用电类别; + // /// + // /// 否 + // /// + // public string 是否重点用户; + // /// + // /// 否 + // /// + // public string 是否专线; + // /// + // /// + // /// + // public string 首次建档; + // /// + // /// 否 + // /// + // public string 是否双电源; + // /// + // /// PMS_石桥146线 + // /// + // public string 线路名称; + // /// + // /// 江苏省扬州市仪征市真州镇(仪征市区)镇解放东路12号 + // /// + // public string 用电地址; + //} + //[Serializable] + //public class JLZZXX + //{ + // /// + // /// + // /// + // public string 序号; + // /// + // /// 上网计量点1 + // /// + // public string 计量点名称; + // /// + // /// + // /// + // public string 计量点ID; + // /// + // /// + // /// + // public string 电表ID; + // /// + // /// + // /// + // public string 电表资产编号; + // /// + // /// 否 + // /// + // public string 是否参考表; + // /// + // /// 否 + // /// + // public string 是否专线; + // /// + // /// 上网关口 + // /// + // public string 主用途类型; + // /// + // /// + // /// + // public string 计量点级数; + // /// + // /// 在用 + // /// + // public string 状态; + // /// + // /// + // /// + // public string 倍率; + //} } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs index d89db98a..8245d7a4 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs @@ -103,15 +103,28 @@ namespace Adam for (int i = 0; i < af.data.Length; i++) { int index = i; + string infoTemp = af.data[index]; OptionItem optionItemTemp = Instantiate(optionItemPrefab, optionItemContent); - optionItemTemp.SetValue(index.ToString(), af.data[i]); + optionItemTemp.SetValue(index.ToString(), infoTemp); + optionItemTemp.selfBtn.onClick.AddListener(() => + { + OnOptionItemClick(index, infoTemp, name); + }); } } - private void OnOptionItemClick(int index,string info) + private void OnOptionItemClick(int index, string info,string name) { - aqcss[index].text = info; + if (name == "FXDFX") + { + fxdfx[index].text = info; + } + else if (name == "AQCS") + { + aqcss[index].text = info; + } + } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs index be9b1979..7cc564c7 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs @@ -18,8 +18,8 @@ using UnityEngine.UI; public class MobileTerminalController : MonoBehaviour { - public string userViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao="; - public string tabelViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao="; + public string userViewUrl; + public string tabelViewUrl; public InputField number; /// /// 表记数据 @@ -68,32 +68,37 @@ public class MobileTerminalController : MonoBehaviour isOnLoad = true; string url = userViewUrl + number.text; mData = await AsyncWebReq.Get(url); - string jsonData = JsonConvert.SerializeObject(mData); - AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx); - - foreach (var item in jbsx) + for (int i = 0; i < mData.data.Count; i++) { MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); - string info = item.Key + ": " + item.Value; - itemTip.SetValue(info); + itemTip.SetValue(mData.data[i]); } + //string jsonData = JsonConvert.SerializeObject(mData); + //AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx); - foreach (var item in jbxx) - { - MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); - string info = item.Key + ": " + item.Value; - itemTip.SetValue(info); - } + //foreach (var item in jbsx) + //{ + // MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); + // string info = item.Key + ": " + item.Value; + // itemTip.SetValue(info); + //} - for (int i = 0; i < jlzzxx.Count; i++) - { - foreach (var item in jlzzxx[i]) - { - MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); - string info = item.Key + ": " + item.Value; - itemTip.SetValue(info); - } - } + //foreach (var item in jbxx) + //{ + // MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); + // string info = item.Key + ": " + item.Value; + // itemTip.SetValue(info); + //} + + //for (int i = 0; i < jlzzxx.Count; i++) + //{ + // foreach (var item in jlzzxx[i]) + // { + // MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent); + // string info = item.Key + ": " + item.Value; + // itemTip.SetValue(info); + // } + //} SwitchView(0); isOnLoad = false; } @@ -125,7 +130,7 @@ public class MobileTerminalController : MonoBehaviour /// public void OnElectricitView() { - if(isOnLoad ) return; + if (isOnLoad) return; if (number.text == "") return; OnUser(); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs index ec11b041..eb05dffb 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs @@ -12,5 +12,12 @@ using UnityEngine; public class ToolModelManager : MonoBehaviour { - + public ToolModelClick[] toolModelClicks; + + public void GetAllToolModels() + { + GameObject toolContent = GameObject.FindGameObjectWithTag("AllTools"); + toolModelClicks = toolContent.transform.GetComponentsInChildren(); + + } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs index a6275b8a..b57f1de7 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs @@ -128,6 +128,15 @@ public class ToolsItemManager : MonoSingleton } } + public void ResetState() + { + for (int i = 0; i < toolItems.Count; i++) + { + toolItems[i].SetState(true); + } + } + + public IEnumerator WaitShowServerRecorderPanel() { ServerRecorderPanel.gameObject.SetActive(true); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs index 28ac0628..fb9d8210 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs @@ -1,6 +1,7 @@ using Adam; using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; //============================================================ @@ -20,6 +21,7 @@ public class UIManager : MonoSingleton public BottomController bottomCotroller; public JobCardController jobCardController; public ExitCheckController exitCheckController; + public ToolModelManager toolModelManager; public Button exitBtn; public Button backToToolBtn; public Text threeDTip; @@ -39,14 +41,34 @@ public class UIManager : MonoSingleton } }); exitBtn.gameObject.SetActive(false); - backToToolBtn.onClick.AddListener(BackToTool); + backToToolBtn.onClick.AddListener(() => + { + ToolsItemManager.recoverEvent.RemoveAllListeners(); + ToolsItemManager.ResetState(); + backToToolBtn.gameObject.SetActive(false); + bottomCotroller.BirdEyeView.gameObject.SetActive(false); + BackToTool(); + }); backToToolBtn.gameObject.SetActive(false); DontDestroyOnLoad(this); } - private void BackToTool() + private async void BackToTool() { SceneLoad.Instance.SceneChange("工具间场景"); + await Task.Delay(500); + toolModelManager.GetAllToolModels(); + for (int i = 0; i < ToolsItemManager.toolItems.Count; i++) + { + for (int j = 0; j < toolModelManager.toolModelClicks.Length; j++) + { + if (ToolsItemManager.toolItems[i].originPos == toolModelManager.toolModelClicks[j].transform.localPosition) + { + Destroy(toolModelManager.toolModelClicks[j].gameObject); + } + } + } + } public void SetThreeDTip(string name) diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity index c516543c..bbe38968 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity @@ -185,6 +185,39 @@ Transform: m_CorrespondingSourceObject: {fileID: 3822654451255398218, guid: 2ac06dd92c2069f4db98276a4465b943, type: 3} m_PrefabInstance: {fileID: 1875591} m_PrefabAsset: {fileID: 0} +--- !u!1 &2400468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2400469} + m_Layer: 0 + m_Name: "All\u5DE5\u5177\u5668" + m_TagString: AllTools + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2400469 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2400468} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1873, y: 1024.4, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 865266376} + - {fileID: 1233633457} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &15887556 GameObject: m_ObjectHideFlags: 0 @@ -845,7 +878,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &214298342 GameObject: @@ -2966,7 +2999,6 @@ GameObject: - component: {fileID: 333646760} - component: {fileID: 333646759} - component: {fileID: 333646758} - - component: {fileID: 333646762} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -3007,7 +3039,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -3033,7 +3065,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 3 m_TargetDisplay: 0 --- !u!224 &333646761 RectTransform: @@ -3046,29 +3078,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1214987529} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &333646762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 333646757} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2ef62ef58861f594ca67aff0391b0765, type: 3} - m_Name: - m_EditorClassIdentifier: - browser: {fileID: 0} --- !u!1001 &379696848 PrefabInstance: m_ObjectHideFlags: 0 @@ -4814,11 +4832,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 7974993928628611473, guid: 20ffa010543df1a46896595ac300588e, type: 3} ---- !u!1 &786522454 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - m_PrefabInstance: {fileID: 1214987528} - m_PrefabAsset: {fileID: 0} --- !u!1 &809465737 GameObject: m_ObjectHideFlags: 0 @@ -5069,7 +5082,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865266375} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -1873, y: -1024.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5115,8 +5128,8 @@ Transform: - {fileID: 6166402648483344093} - {fileID: 3190690649765978568} - {fileID: 485612229} - m_Father: {fileID: 0} - m_RootOrder: 1 + m_Father: {fileID: 2400469} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1039716617 PrefabInstance: @@ -5127,7 +5140,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalPosition.x @@ -5333,7 +5346,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 4.747, y: 249.743, z: 439.425} --- !u!1 &1096617073 GameObject: @@ -5680,76 +5693,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8218745123122009150, guid: 4b06ca5b0865ade40b27cf11a123ba5c, type: 3} m_PrefabInstance: {fileID: 1172275066} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1214987528 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 333646761} - m_Modifications: - - target: {fileID: 324364665315715489, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: InstructionMessage - value: - objectReference: {fileID: 333646757} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalPosition.x - value: -960 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalPosition.y - value: -538.8 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_Name - value: SceneManager - objectReference: {fileID: 0} - - target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} ---- !u!4 &1214987529 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3} - m_PrefabInstance: {fileID: 1214987528} - m_PrefabAsset: {fileID: 0} --- !u!1 &1233633456 GameObject: m_ObjectHideFlags: 0 @@ -5761,7 +5704,7 @@ GameObject: - component: {fileID: 1233633457} m_Layer: 0 m_Name: "\u5DE5\u5668\u5177" - m_TagString: Untagged + m_TagString: AllTools m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -5773,8 +5716,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1233633456} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1873, y: -1024.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5807,8 +5750,8 @@ Transform: - {fileID: 1284012090} - {fileID: 1850070997} - {fileID: 643759145} - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 2400469} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1234414489 GameObject: @@ -6053,7 +5996,7 @@ Transform: m_Children: - {fileID: 2059769794} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1265359521 MonoBehaviour: @@ -6129,9 +6072,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 936e1a57cc0a2944a89d7b1617875726, type: 3} m_Name: m_EditorClassIdentifier: - game: {fileID: 786522454} - name: Computer - url: http://192.168.0.104:8089/ + _name: Computer + _focusedPrefab: {fileID: 0} + _canvas: {fileID: 333646757} --- !u!1001 &1266954248 PrefabInstance: m_ObjectHideFlags: 0 @@ -7137,7 +7080,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3} propertyPath: m_LocalPosition.x @@ -7329,7 +7272,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1532770825 PrefabInstance: diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs index d0f73251..46f276b3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs @@ -1,20 +1,16 @@ using UnityEngine; using UnityEngine.EventSystems; +using Vuplex.WebView; public class newfollow : MonoBehaviour { - [SerializeField] GameObject game; - [SerializeField] string name; - public string url; - //[SerializeField] Dialogue dialogue; - // Start is called before the first frame update - //void Start() - //{ - // //EventTriggerListener.Get(transform.gameObject).onClick += g => - // //{ + [SerializeField] string _name; + public CanvasWebViewPrefab _focusedPrefab; + public GameObject _canvas; + private void Start() + { - // //}; - //} + } private void Update() { // @@ -31,18 +27,113 @@ public class newfollow : MonoBehaviour if (res) { // ײ - if (hit.transform.name.Equals(name)) + if (hit.transform.name.Equals(_name)) { Debug.Log(hit.transform.name); - game.SetActive(true); - //game.init(url); + CreatView(); } } } + + if (Input.GetKeyDown(KeyCode.Escape)) + { + if (_focusedPrefab != null) + Destroy(_focusedPrefab.gameObject); + } } - //// Update is called once per frame - //private void FixedUpdate() - //{ - // transform.LookAt(game); - //} + + private void CreatView() + { + // Enable the native touch screen keyboard for Android and iOS. + Web.SetTouchScreenKeyboardEnabled(true); + + //_canvas = GameObject.Find("Canvas"); + // Create a webview for the main content. + var mainWebViewPrefab = CanvasWebViewPrefab.Instantiate(); + mainWebViewPrefab.transform.SetParent(_canvas.transform, false); + var rectTransform = mainWebViewPrefab.transform as RectTransform; + rectTransform.anchoredPosition3D = Vector3.zero; + rectTransform.offsetMin = Vector2.zero; + rectTransform.offsetMax = Vector2.zero; + mainWebViewPrefab.transform.localScale = Vector3.one; + + _focusedPrefab = mainWebViewPrefab; + mainWebViewPrefab.Initialized += (s, e) => + { + var webViewWithPopups = mainWebViewPrefab.WebView as IWithPopups; + if (webViewWithPopups == null) + { + mainWebViewPrefab.WebView.LoadHtml(NOT_SUPPORTED_HTML); + return; + } + + WebViewLogger.Log("Loading Pinterest as an example because it uses popups for third party login. Click 'Login', then select Facebook or Google to open a popup for authentication."); + mainWebViewPrefab.WebView.LoadUrl("http://111.229.30.246:10015/"); + + webViewWithPopups.SetPopupMode(PopupMode.LoadInNewWebView); + webViewWithPopups.PopupRequested += (webView, eventArgs) => + { + WebViewLogger.Log("Popup opened with URL: " + eventArgs.Url); + var popupPrefab = CanvasWebViewPrefab.Instantiate(eventArgs.WebView); + _focusedPrefab = popupPrefab; + + popupPrefab.transform.SetParent(_canvas.transform, false); + var popupRectTransform = popupPrefab.transform as RectTransform; + popupRectTransform.anchoredPosition3D = Vector3.zero; + popupRectTransform.offsetMin = Vector2.zero; + popupRectTransform.offsetMax = Vector2.zero; + popupPrefab.transform.localScale = Vector3.one; + // Place the popup in front of the main webview. + var localPosition = popupPrefab.transform.localPosition; + localPosition.z = 0.1f; + popupPrefab.transform.localPosition = localPosition; + + popupPrefab.Initialized += (sender, initializedEventArgs) => + { + popupPrefab.WebView.CloseRequested += (popupWebView, closeEventArgs) => + { + WebViewLogger.Log("Closing the popup"); + _focusedPrefab = mainWebViewPrefab; + popupPrefab.Destroy(); + }; + }; + }; + }; + } + + const string NOT_SUPPORTED_HTML = @" + + +
+

+ Sorry, but this 3D WebView package doesn't support yet the IWithPopups interface. Current packages that support popups: +

+ +
+ + "; } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png new file mode 100644 index 00000000..b1dd8c3d Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta new file mode 100644 index 00000000..db009d15 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 82ea5eb356a6ccf4689b59042739154a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png b/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png new file mode 100644 index 00000000..8d37e385 Binary files /dev/null and b/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png differ diff --git a/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png.meta b/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png.meta new file mode 100644 index 00000000..0df0e832 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 6bdaa1e1cf231284685da170dba13ee9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Electrical_inspectionCompetitionSystem/Packages/manifest.json b/Electrical_inspectionCompetitionSystem/Packages/manifest.json index 6d9db300..163e1005 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/manifest.json +++ b/Electrical_inspectionCompetitionSystem/Packages/manifest.json @@ -7,7 +7,6 @@ "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", "com.unity.postprocessing": "3.2.2", - "com.unity.shadergraph": "12.1.8", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index 01ba379e..0cbeb9db 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json +++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json @@ -91,23 +91,6 @@ }, "url": "https://packages.unity.cn" }, - "com.unity.render-pipelines.core": { - "version": "12.1.8", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.searcher": { - "version": "4.9.1", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, "com.unity.services.core": { "version": "1.4.2", "depth": 1, @@ -126,15 +109,6 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.shadergraph": { - "version": "12.1.8", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.searcher": "4.9.1" - } - }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt index cda402b2..bc2ff943 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1c1 -m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda) +m_EditorVersion: 2021.3.10f1c2 +m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5) diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset b/Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset index 0c089122..54f643d7 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset @@ -14,6 +14,7 @@ TagManager: - Line - "\u65CB\u8F6C" - FuAnBiao + - AllTools layers: - Default - TransparentFX