From eb10c139299858f44671683edbea4cad23c54a57 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 18 Sep 2023 03:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Adam/Prefabs/Item/OptionItem.prefab | 46 + .../Assets/Adam/Scenes/UI.unity | 984 +++++++++--------- .../Adam/Scripts/AssignmentController.cs | 1 + .../Assets/Adam/Scripts/BottomController.cs | 4 + .../Adam/Scripts/Components/OptionItem.cs | 1 + .../Adam/Scripts/Components/ToolItem.cs | 13 +- .../Adam/Scripts/Components/ToolModelClick.cs | 17 +- .../Assets/Adam/Scripts/Data/UserViewData.cs | 353 +++---- .../Assets/Adam/Scripts/JobCardController.cs | 19 +- .../Adam/Scripts/MobileTerminalController.cs | 53 +- .../Assets/Adam/Scripts/ToolModelManager.cs | 9 +- .../Assets/Adam/Scripts/ToolsItemManager.cs | 9 + .../Assets/Adam/Scripts/UIManager.cs | 26 +- .../Assets/Scenes/工具间场景.unity | 165 +-- .../Assets/Script/KDLURL/newfollow.cs | 129 ++- .../Assets/Textures/切图-2/底框-2.png | Bin 0 -> 23861 bytes .../Assets/Textures/切图-2/底框-2.png.meta | 147 +++ .../Assets/Textures/底框-2.png | Bin 0 -> 23899 bytes .../Assets/Textures/底框-2.png.meta | 147 +++ .../Packages/manifest.json | 1 - .../Packages/packages-lock.json | 26 - .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/TagManager.asset | 1 + 23 files changed, 1295 insertions(+), 860 deletions(-) create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png create mode 100644 Electrical_inspectionCompetitionSystem/Assets/Textures/底框-2.png.meta 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 0000000000000000000000000000000000000000..b1dd8c3d0995e019c1901c47d8a708a08ed825bb GIT binary patch literal 23861 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

c~|WFBdaLTd85!)jH=}**(xG3 ztjZl-cPdCn@9ulk!7@)9l6vfz1Z$Z|O)$B(Id{;4`c0M8Ei^(~=<~f(NO5Cgr#&cX zT3YYi+kIAWl>YQ6rZy8ad3^gT-9{Yum`DOs<^utjD~m9$!v;6tHrR^EoZZ10HG4KL zG@y&4vi%RF<_W>iH-VaUMHaNDPzL~9*SH{JC{S1@R!y@qYOHbG=WR7}ysl^s^FqtJ z^o&8;aa-Nv)r3q&lO^7rVrdC4Y@%NQ-hGrqV-+9d`sVW+V*Q)m*jP#K%6q3}sT3R$ zoRgTTWiD_HLt+RGHFLy;5)&a$}5;+-+H9g@lWQ0gYpS z^lE@6Z9fV{7g=K_P2;lIiYetu+|BPgmT*W-STrp$KBP}LKjpE^+{&{n@VAP3@8K@g zCz5Gr-I`B55kuKzc7B>4K{nr&sS*5yZHaneA(|H;n(TF+w_8E+*F8<^qvCkpWdT2F z>WhvtEO>;2e&Ju_cyDE@>W~1p&2&ItTH2MCkz$RnI>?z;ZgKvSIsw9Si#n2v%qHsV zdsMIHanh4Nh{I0#k1w`1r1;hbWckXG_|j?l6KHs74so@EQ?(CRxrWr`MutrHT$j|# zmu>L*DVv;vZgSUiBbvc4dbPWtYh6WpwBvS%5Zc2*4?62pd%4OU-{LpvV;Ht3tMSNF zgpvCz3B1U8m;`tc`XaNyHPrjNN5XeIsMb3hdy#-;=TjNJ`P84J$zOPqAAkJke5(FA z)$$+f#b#s(D-}>P2zoj#s0(h-osc67iu;_Lk=(Xz7vK35P$qZ+RLvW{u_^z6Fd$_3 z8F13#2kwx869I#|A2PoO{%IyZ@MoLo`4L$Gu4>?tgGynhq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d37e3851e7be30283ce82e2f8a47d639295a21a GIT binary patch literal 23899 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 literal 0 HcmV?d00001 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