diff --git a/.gitignore b/.gitignore index b07286e3273e1a04ddd68a97737b420a2016bcd4..184d4873765c80af9bc0773b09aa01bffedab19c 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ crashlytics-build.properties UserSettings/ /Assets/Images/frameit_logo_512x512.png.meta /Assets/Images/ScreenCapture_1024x500.png.meta +UserSettings/EditorUserSettings.asset diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab index 4b7300e5e9f4521c49fd6ba296eec5ea4298023e..bc2594b4e98c7de61caa82f8692558764643bf44 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3626534419239844809 +--- !u!1 &1177080122081013299 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,57 +8,159 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 181174027184840716} - - component: {fileID: 4807527662681863594} - - component: {fileID: 396482369099949911} + - component: {fileID: 719022099845621193} + - component: {fileID: 8123962603447503523} + - component: {fileID: 2413317119636172969} + - component: {fileID: 5625475347088290230} m_Layer: 5 - m_Name: CheckServerStatsT + m_Name: CanS4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &181174027184840716 +--- !u!224 &719022099845621193 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626534419239844809} + m_GameObject: {fileID: 1177080122081013299} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7706734949720537587} + m_Father: {fileID: 6804933135534487217} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.3} + m_AnchorMax: {x: 1, y: 0.45} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8123962603447503523 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177080122081013299} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2413317119636172969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177080122081013299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &5625475347088290230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177080122081013299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &2085137125120066390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4212142804601098675} + - component: {fileID: 4058351579209569645} + - component: {fileID: 4776260341792478282} + m_Layer: 5 + m_Name: TextSlot5safe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4212142804601098675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085137125120066390} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 326880964291367137} + m_Father: {fileID: 1961210065918169277} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.95, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4807527662681863594 +--- !u!222 &4058351579209569645 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626534419239844809} + m_GameObject: {fileID: 2085137125120066390} m_CullTransparentMesh: 1 ---- !u!114 &396482369099949911 +--- !u!114 &4776260341792478282 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626534419239844809} + m_GameObject: {fileID: 2085137125120066390} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7924528, g: 0.78818655, b: 0.03364185, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -67,10 +169,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 4 + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -78,8 +180,10 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Refresh Status ---- !u!1 &4029100039495127693 + m_Text: 'Slot5 + +' +--- !u!1 &2170161788501389535 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -87,53 +191,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1355285701250162891} - - component: {fileID: 4761931870164053965} - - component: {fileID: 3765509529914593402} - - component: {fileID: 7525964783889678570} - - component: {fileID: 669448231502471547} + - component: {fileID: 1961210065918169277} + - component: {fileID: 945862860031508145} + - component: {fileID: 2704620498775453431} + - component: {fileID: 2262047248369569431} + - component: {fileID: 3508033855892761920} m_Layer: 5 - m_Name: CheckServerStats_bttn (1) + m_Name: IPSlot5_b m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1355285701250162891 +--- !u!224 &1961210065918169277 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029100039495127693} + m_GameObject: {fileID: 2170161788501389535} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 278084127933505797} + - {fileID: 4212142804601098675} m_Father: {fileID: 6804933135199878348} - m_RootOrder: 0 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.625, y: 0.1776021} - m_AnchorMax: {x: 0.97114486, y: 0.306} - m_AnchoredPosition: {x: -6.748657, y: -1.065979} - m_SizeDelta: {x: -3.6152039, y: 0.47473526} + m_AnchorMin: {x: 0, y: 0.02} + m_AnchorMax: {x: 0.5, y: 0.15} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4761931870164053965 +--- !u!222 &945862860031508145 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029100039495127693} + m_GameObject: {fileID: 2170161788501389535} m_CullTransparentMesh: 1 ---- !u!114 &3765509529914593402 +--- !u!114 &2704620498775453431 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029100039495127693} + m_GameObject: {fileID: 2170161788501389535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -157,13 +262,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7525964783889678570 +--- !u!114 &2262047248369569431 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029100039495127693} + m_GameObject: {fileID: 2170161788501389535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -180,7 +285,7 @@ MonoBehaviour: 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.5226458, g: 0.9056604, b: 0.46564615, 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 @@ -197,13 +302,13 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3765509529914593402} + m_TargetGraphic: {fileID: 2704620498775453431} m_OnClick: m_PersistentCalls: m_Calls: - m_Target: {fileID: 7082117259097792556} m_TargetAssemblyTypeName: SaveNetwAddr_mobile, Assembly-CSharp - m_MethodName: Refresh_pressed + m_MethodName: Slot5_s m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -213,13 +318,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &669448231502471547 +--- !u!114 &3508033855892761920 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029100039495127693} + m_GameObject: {fileID: 2170161788501389535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} @@ -228,11 +333,13 @@ MonoBehaviour: CheckServer_0: 0 CheckServer_1: 0 CheckServer_2: 0 - CheckServer_3: 1 - CheckServer_4: 1 - CheckServer_5: 1 - CheckServer_6: 1 ---- !u!1 &5346988243437520816 + CheckServer_3: 0 + CheckServer_4: 0 + CheckServer_5: 0 + CheckServer_6: 0 + CheckServer_7: 0 + CheckServer_8: 1 +--- !u!1 &2612381536711993907 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -240,132 +347,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 278084127933505797} - - component: {fileID: 1959017583589385720} - - component: {fileID: 4210693037155128309} + - component: {fileID: 7706734949720537587} + - component: {fileID: 8978594943726308693} + - component: {fileID: 3350594081246934541} + - component: {fileID: 2309820173025330692} + - component: {fileID: 5693681469268630866} m_Layer: 5 - m_Name: CheckServerStatsT + m_Name: IPSlot4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &278084127933505797 +--- !u!224 &7706734949720537587 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5346988243437520816} + m_GameObject: {fileID: 2612381536711993907} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1355285701250162891} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4310316035340749373} + m_Father: {fileID: 719022099845621193} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1959017583589385720 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5346988243437520816} - m_CullTransparentMesh: 1 ---- !u!114 &4210693037155128309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5346988243437520816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.7924528, g: 0.78818655, b: 0.03364185, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Refresh Status ---- !u!1 &5830113132235727416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 326880964291367137} - - component: {fileID: 5298290736975623558} - - component: {fileID: 5526397899810971461} - - component: {fileID: 7413693203499840345} - - component: {fileID: 2632426336278283975} - m_Layer: 5 - m_Name: CheckServerStats_bttn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &326880964291367137 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5830113132235727416} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 181174027184840716} - m_Father: {fileID: 6804933134092012848} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.625, y: 0.1776021} - m_AnchorMax: {x: 0.97114486, y: 0.306} - m_AnchoredPosition: {x: -0.00012207031, y: 0} - m_SizeDelta: {x: 0.000091553, y: 0.0000038146973} + m_AnchoredPosition: {x: 0, y: 15} + m_SizeDelta: {x: 0, y: -30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5298290736975623558 +--- !u!222 &8978594943726308693 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5830113132235727416} + m_GameObject: {fileID: 2612381536711993907} m_CullTransparentMesh: 1 ---- !u!114 &5526397899810971461 +--- !u!114 &3350594081246934541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5830113132235727416} + m_GameObject: {fileID: 2612381536711993907} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -389,13 +418,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7413693203499840345 +--- !u!114 &2309820173025330692 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5830113132235727416} + m_GameObject: {fileID: 2612381536711993907} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -412,7 +441,7 @@ MonoBehaviour: 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.5226458, g: 0.9056604, b: 0.46564615, 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 @@ -429,30 +458,41 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 5526397899810971461} + m_TargetGraphic: {fileID: 3350594081246934541} m_OnClick: m_PersistentCalls: - m_Calls: [] ---- !u!114 &2632426336278283975 -MonoBehaviour: - m_ObjectHideFlags: 0 + m_Calls: + - m_Target: {fileID: 5693681469268630866} + m_TargetAssemblyTypeName: SelectNetwServer_mobile, Assembly-CSharp + m_MethodName: Slot4 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &5693681469268630866 +MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5830113132235727416} + m_GameObject: {fileID: 2612381536711993907} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} + m_Script: {fileID: 11500000, guid: ffd50588bd413a942ae5239c62b86c60, type: 3} m_Name: m_EditorClassIdentifier: - CheckServer_0: 1 - CheckServer_1: 1 - CheckServer_2: 1 - CheckServer_3: 1 - CheckServer_4: 1 - CheckServer_5: 1 - CheckServer_6: 1 ---- !u!1 &6306888285157031103 + LPS_B_GObj: {fileID: 6804933134293540438} + Slot1_B_GObj: {fileID: 6804933134493043127} + Slot2_B_GObj: {fileID: 6804933134781575515} + Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} +--- !u!1 &3626534419239844809 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -460,53 +500,134 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3945265027114084427} - - component: {fileID: 5393118602708895645} - - component: {fileID: 3099885042430086760} - - component: {fileID: 3007504168179177640} - - component: {fileID: 5441456761614205944} + - component: {fileID: 181174027184840716} + - component: {fileID: 4807527662681863594} + - component: {fileID: 396482369099949911} m_Layer: 5 - m_Name: CheckServerStats_bttn (1) + m_Name: CheckServerStatsT m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3945265027114084427 +--- !u!224 &181174027184840716 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6306888285157031103} + m_GameObject: {fileID: 3626534419239844809} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1907274096705096044} - m_Father: {fileID: 6804933133910524110} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 326880964291367137} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.3, y: 0.15} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5393118602708895645 +--- !u!222 &4807527662681863594 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6306888285157031103} + m_GameObject: {fileID: 3626534419239844809} m_CullTransparentMesh: 1 ---- !u!114 &3099885042430086760 +--- !u!114 &396482369099949911 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6306888285157031103} + m_GameObject: {fileID: 3626534419239844809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7924528, g: 0.78818655, b: 0.03364185, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Refresh Status +--- !u!1 &4029100039495127693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1355285701250162891} + - component: {fileID: 4761931870164053965} + - component: {fileID: 3765509529914593402} + - component: {fileID: 7525964783889678570} + - component: {fileID: 669448231502471547} + m_Layer: 5 + m_Name: CheckServerStats_bttn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1355285701250162891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029100039495127693} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 278084127933505797} + m_Father: {fileID: 6804933135199878348} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.625, y: 0.1776021} + m_AnchorMax: {x: 0.97114486, y: 0.306} + m_AnchoredPosition: {x: -6.748657, y: -1.065979} + m_SizeDelta: {x: -3.6152039, y: 0.47473526} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4761931870164053965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029100039495127693} + m_CullTransparentMesh: 1 +--- !u!114 &3765509529914593402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029100039495127693} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -530,13 +651,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3007504168179177640 +--- !u!114 &7525964783889678570 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6306888285157031103} + m_GameObject: {fileID: 4029100039495127693} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -570,17 +691,29 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3099885042430086760} + m_TargetGraphic: {fileID: 3765509529914593402} m_OnClick: m_PersistentCalls: - m_Calls: [] ---- !u!114 &5441456761614205944 + m_Calls: + - m_Target: {fileID: 7082117259097792556} + m_TargetAssemblyTypeName: SaveNetwAddr_mobile, Assembly-CSharp + m_MethodName: Refresh_pressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &669448231502471547 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6306888285157031103} + m_GameObject: {fileID: 4029100039495127693} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} @@ -588,12 +721,14 @@ MonoBehaviour: m_EditorClassIdentifier: CheckServer_0: 0 CheckServer_1: 0 - CheckServer_2: 1 - CheckServer_3: 0 - CheckServer_4: 0 - CheckServer_5: 0 - CheckServer_6: 0 ---- !u!1 &6804933133619018584 + CheckServer_2: 0 + CheckServer_3: 1 + CheckServer_4: 1 + CheckServer_5: 1 + CheckServer_6: 1 + CheckServer_7: 1 + CheckServer_8: 1 +--- !u!1 &5346988243437520816 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -601,75 +736,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133619018567} - - component: {fileID: 6804933133619018565} - - component: {fileID: 6804933133619018566} + - component: {fileID: 278084127933505797} + - component: {fileID: 1959017583589385720} + - component: {fileID: 4210693037155128309} m_Layer: 5 - m_Name: SelNAddrW + m_Name: CheckServerStatsT m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133619018567 +--- !u!224 &278084127933505797 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133619018584} + m_GameObject: {fileID: 5346988243437520816} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6804933133770887911} - m_Father: {fileID: 6804933134092012848} - m_RootOrder: 4 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1355285701250162891} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.597, y: 0.3364677} - m_AnchorMax: {x: 1, y: 0.7183929} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.000030518, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933133619018565 +--- !u!222 &1959017583589385720 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133619018584} + m_GameObject: {fileID: 5346988243437520816} m_CullTransparentMesh: 1 ---- !u!114 &6804933133619018566 +--- !u!114 &4210693037155128309 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133619018584} + m_GameObject: {fileID: 5346988243437520816} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.7924528, g: 0.78818655, b: 0.03364185, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e3d9f567e2360d48a129140146c5ab1, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6804933133654275062 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Refresh Status +--- !u!1 &5830113132235727416 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -677,53 +816,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133654275061} - - component: {fileID: 6804933133654275057} - - component: {fileID: 6804933133654275058} - - component: {fileID: 6804933133654275059} - - component: {fileID: 6804933133654275060} + - component: {fileID: 326880964291367137} + - component: {fileID: 5298290736975623558} + - component: {fileID: 5526397899810971461} + - component: {fileID: 7413693203499840345} + - component: {fileID: 2632426336278283975} m_Layer: 5 - m_Name: BackButton_1 + m_Name: CheckServerStats_bttn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133654275061 +--- !u!224 &326880964291367137 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133654275062} + m_GameObject: {fileID: 5830113132235727416} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -20} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6804933133779202036} - m_Father: {fileID: 6804933135262999837} - m_RootOrder: 0 + - {fileID: 181174027184840716} + m_Father: {fileID: 6804933134092012848} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.9} - m_AnchorMax: {x: 0.15, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.625, y: 0.1776021} + m_AnchorMax: {x: 0.97114486, y: 0.306} + m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_SizeDelta: {x: 0.000091553, y: 0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933133654275057 +--- !u!222 &5298290736975623558 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133654275062} + m_GameObject: {fileID: 5830113132235727416} m_CullTransparentMesh: 1 ---- !u!114 &6804933133654275058 +--- !u!114 &5526397899810971461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133654275062} + m_GameObject: {fileID: 5830113132235727416} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -747,13 +887,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6804933133654275059 +--- !u!114 &7413693203499840345 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133654275062} + m_GameObject: {fileID: 5830113132235727416} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -770,7 +910,7 @@ MonoBehaviour: 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_PressedColor: {r: 0.5226458, g: 0.9056604, b: 0.46564615, 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 @@ -787,37 +927,32 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 6804933133654275058} + m_TargetGraphic: {fileID: 5526397899810971461} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6804933133654275060} - m_TargetAssemblyTypeName: BackToButton_mobile, Assembly-CSharp - m_MethodName: goBackButtonOPTM - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &6804933133654275060 + m_Calls: [] +--- !u!114 &2632426336278283975 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133654275062} + m_GameObject: {fileID: 5830113132235727416} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 51f84efea67973f4da6f63dfb9df08d6, type: 3} + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} m_Name: m_EditorClassIdentifier: - backTo_GObj: {fileID: 6804933133725562054} - parentM_GObj: {fileID: 6804933135173173967} ---- !u!1 &6804933133725562054 + CheckServer_0: 1 + CheckServer_1: 1 + CheckServer_2: 1 + CheckServer_3: 1 + CheckServer_4: 1 + CheckServer_5: 1 + CheckServer_6: 1 + CheckServer_7: 1 + CheckServer_8: 1 +--- !u!1 &6306888285157031103 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -825,99 +960,143 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133725562050} - - component: {fileID: 6804933133725562051} - - component: {fileID: 6804933133725562052} - - component: {fileID: 6804933133725562053} + - component: {fileID: 3945265027114084427} + - component: {fileID: 5393118602708895645} + - component: {fileID: 3099885042430086760} + - component: {fileID: 3007504168179177640} + - component: {fileID: 5441456761614205944} m_Layer: 5 - m_Name: NetworkIpF + m_Name: CheckServerStats_bttn (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133725562050 +--- !u!224 &3945265027114084427 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133725562054} + m_GameObject: {fileID: 6306888285157031103} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6804933133910524110} - m_Father: {fileID: 6804933135173173966} + - {fileID: 1907274096705096044} + m_Father: {fileID: 6804933133910524110} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0.3, y: 0.15} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6804933133725562051 -Canvas: +--- !u!222 &5393118602708895645 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133725562054} + m_GameObject: {fileID: 6306888285157031103} + m_CullTransparentMesh: 1 +--- !u!114 &3099885042430086760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6306888285157031103} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &6804933133725562052 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e4f1fee3de32377429fd1348fae62b10, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3007504168179177640 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133725562054} - m_Enabled: 0 + m_GameObject: {fileID: 6306888285157031103} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 450} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &6804933133725562053 + 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.5226458, g: 0.9056604, b: 0.46564615, 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: 3099885042430086760} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5441456761614205944 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133725562054} + m_GameObject: {fileID: 6306888285157031103} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &6804933133770887928 + CheckServer_0: 0 + CheckServer_1: 0 + CheckServer_2: 1 + CheckServer_3: 0 + CheckServer_4: 0 + CheckServer_5: 0 + CheckServer_6: 0 + CheckServer_7: 0 + CheckServer_8: 0 +--- !u!1 &6804933133619018584 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -925,83 +1104,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133770887911} - - component: {fileID: 6804933133770887909} - - component: {fileID: 6804933133770887910} + - component: {fileID: 6804933133619018567} + - component: {fileID: 6804933133619018565} + - component: {fileID: 6804933133619018566} m_Layer: 5 - m_Name: SelNAddrT + m_Name: SelNAddrW m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133770887911 +--- !u!224 &6804933133619018567 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133770887928} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6804933133619018584} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6804933134177876338} - - {fileID: 6804933135229905759} - m_Father: {fileID: 6804933133619018567} - m_RootOrder: 0 + - {fileID: 6804933133770887911} + m_Father: {fileID: 6804933134092012848} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05911386, y: 0.04950176} - m_AnchorMax: {x: 0.9385992, y: 0.9367526} - m_AnchoredPosition: {x: 0.00012207031, y: 0.00048828125} - m_SizeDelta: {x: 0, y: 0.0010071} + m_AnchorMin: {x: 0.597, y: 0.3364677} + m_AnchorMax: {x: 1, y: 0.7183929} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.000030518, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933133770887909 +--- !u!222 &6804933133619018565 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133770887928} + m_GameObject: {fileID: 6804933133619018584} m_CullTransparentMesh: 1 ---- !u!114 &6804933133770887910 +--- !u!114 &6804933133619018566 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133770887928} + m_GameObject: {fileID: 6804933133619018584} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Selected Server: - - -' ---- !u!1 &6804933133779202037 + m_Sprite: {fileID: 21300000, guid: 7e3d9f567e2360d48a129140146c5ab1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6804933133654275062 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1009,78 +1181,148 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133779202036} - - component: {fileID: 6804933133779202034} - - component: {fileID: 6804933133779202035} + - component: {fileID: 6804933133654275061} + - component: {fileID: 6804933133654275057} + - component: {fileID: 6804933133654275058} + - component: {fileID: 6804933133654275059} + - component: {fileID: 6804933133654275060} m_Layer: 5 - m_Name: BackButton_1_t + m_Name: BackButton_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133779202036 +--- !u!224 &6804933133654275061 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133779202037} + m_GameObject: {fileID: 6804933133654275062} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -30} + m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6804933133654275061} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933133779202036} + m_Father: {fileID: 6804933135262999837} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.9} + m_AnchorMax: {x: 0.15, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933133779202034 +--- !u!222 &6804933133654275057 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133779202037} + m_GameObject: {fileID: 6804933133654275062} m_CullTransparentMesh: 1 ---- !u!114 &6804933133779202035 +--- !u!114 &6804933133654275058 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133779202037} + m_GameObject: {fileID: 6804933133654275062} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: < Back ---- !u!1 &6804933133787945503 + m_Sprite: {fileID: 21300000, guid: e4f1fee3de32377429fd1348fae62b10, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6804933133654275059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133654275062} + 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: 6804933133654275058} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6804933133654275060} + m_TargetAssemblyTypeName: BackToButton_mobile, Assembly-CSharp + m_MethodName: goBackButtonOPTM + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &6804933133654275060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133654275062} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51f84efea67973f4da6f63dfb9df08d6, type: 3} + m_Name: + m_EditorClassIdentifier: + backTo_GObj: {fileID: 6804933133725562054} + parentM_GObj: {fileID: 6804933135173173967} +--- !u!1 &6804933133725562054 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1088,28 +1330,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133787945502} - - component: {fileID: 6804933133787945500} - - component: {fileID: 6804933133787945501} + - component: {fileID: 6804933133725562050} + - component: {fileID: 6804933133725562051} + - component: {fileID: 6804933133725562052} + - component: {fileID: 6804933133725562053} m_Layer: 5 - m_Name: TextSlot3 + m_Name: NetworkIpF m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133787945502 +--- !u!224 &6804933133725562050 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133787945503} + m_GameObject: {fileID: 6804933133725562054} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6804933135399905327} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933133910524110} + m_Father: {fileID: 6804933135173173966} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1117,49 +1362,68 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933133787945500 -CanvasRenderer: +--- !u!223 &6804933133725562051 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133787945503} - m_CullTransparentMesh: 1 ---- !u!114 &6804933133787945501 + m_GameObject: {fileID: 6804933133725562054} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6804933133725562052 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933133787945503} + m_GameObject: {fileID: 6804933133725562054} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 450} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6804933133725562053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133725562054} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Slot2 ---- !u!1 &6804933133799552095 + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6804933133770887928 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1167,17 +1431,262 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933133799552094} - - component: {fileID: 6804933133799552092} - - component: {fileID: 6804933133799552093} + - component: {fileID: 6804933133770887911} + - component: {fileID: 6804933133770887909} + - component: {fileID: 6804933133770887910} m_Layer: 5 - m_Name: InfoIP1 + m_Name: SelNAddrT m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933133799552094 +--- !u!224 &6804933133770887911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133770887928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933134177876338} + - {fileID: 6804933135229905759} + m_Father: {fileID: 6804933133619018567} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.05911386, y: 0.04950176} + m_AnchorMax: {x: 0.9385992, y: 0.9367526} + m_AnchoredPosition: {x: 0.00012207031, y: 0.00048828125} + m_SizeDelta: {x: 0, y: 0.0010071} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933133770887909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133770887928} + m_CullTransparentMesh: 1 +--- !u!114 &6804933133770887910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133770887928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Selected Server: + + +' +--- !u!1 &6804933133779202037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933133779202036} + - component: {fileID: 6804933133779202034} + - component: {fileID: 6804933133779202035} + m_Layer: 5 + m_Name: BackButton_1_t + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933133779202036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133779202037} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -30} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933133654275061} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933133779202034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133779202037} + m_CullTransparentMesh: 1 +--- !u!114 &6804933133779202035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133779202037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: < Back +--- !u!1 &6804933133787945503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933133787945502} + - component: {fileID: 6804933133787945500} + - component: {fileID: 6804933133787945501} + m_Layer: 5 + m_Name: TextSlot3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933133787945502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133787945503} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933135399905327} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933133787945500 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133787945503} + m_CullTransparentMesh: 1 +--- !u!114 &6804933133787945501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933133787945503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Slot2 +--- !u!1 &6804933133799552095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933133799552094} + - component: {fileID: 6804933133799552092} + - component: {fileID: 6804933133799552093} + m_Layer: 5 + m_Name: InfoIP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933133799552094 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1187,6 +1696,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134958277453} m_Father: {fileID: 6804933133910524110} @@ -1272,6 +1782,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933135079270124} m_RootOrder: 0 @@ -1353,6 +1864,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134003485162} m_Father: {fileID: 6804933135459908465} @@ -1500,13 +2012,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134493043122} m_Father: {fileID: 6804933135534487217} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.60200006} - m_AnchorMax: {x: 1, y: 0.801453} + m_AnchorMin: {x: 0, y: 0.75} + m_AnchorMax: {x: 1, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1599,6 +2112,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933135079270124} m_RootOrder: 1 @@ -1678,12 +2192,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933135136988414} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.95, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1719,7 +2234,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 @@ -1760,6 +2275,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3945265027114084427} - {fileID: 6804933134749119677} @@ -1866,15 +2382,16 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135382236683} m_Father: {fileID: 6804933135534487217} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.19700001} + m_AnchorMax: {x: 1, y: 0.15} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0.000061035} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6804933133913440194 Canvas: @@ -1966,6 +2483,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -45} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135040138870} m_Father: {fileID: 6804933134092012848} @@ -2065,6 +2583,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134563633346} m_RootOrder: 0 @@ -2144,6 +2663,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933133855156451} m_RootOrder: 0 @@ -2225,6 +2745,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135437235285} - {fileID: 6804933135173173966} @@ -2339,6 +2860,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933135199878348} m_RootOrder: 1 @@ -2419,10 +2941,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134236100693} m_Father: {fileID: 6804933135199878348} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.597, y: 0.3364677} m_AnchorMax: {x: 1, y: 0.7183929} @@ -2496,6 +3019,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135505386918} - {fileID: 6804933135534487217} @@ -2601,6 +3125,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933133770887911} m_RootOrder: 0 @@ -2682,6 +3207,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134571440257} m_Father: {fileID: 6804933135173173966} @@ -2795,6 +3321,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134533650098} - {fileID: 6804933134483331467} @@ -2881,6 +3408,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134665790984} m_Father: {fileID: 6804933134976646754} @@ -2888,8 +3416,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 14.999904} - m_SizeDelta: {x: 0, y: -30.000193} + m_AnchoredPosition: {x: 0, y: 15} + m_SizeDelta: {x: 0, y: -30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933134293540434 CanvasRenderer: @@ -3001,6 +3529,8 @@ MonoBehaviour: Slot1_B_GObj: {fileID: 6804933134493043127} Slot2_B_GObj: {fileID: 6804933134781575515} Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} --- !u!1 &6804933134412221018 GameObject: m_ObjectHideFlags: 0 @@ -3029,12 +3559,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134781575494} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3070,7 +3601,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 @@ -3108,6 +3639,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933135040138870} m_RootOrder: 0 @@ -3187,6 +3719,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134236100693} m_RootOrder: 1 @@ -3268,6 +3801,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135470774421} m_Father: {fileID: 6804933133859766039} @@ -3275,7 +3809,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: 0, y: 14.999925} + m_AnchoredPosition: {x: 0, y: 14.999939} m_SizeDelta: {x: 0, y: -30.000149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933134493043123 @@ -3388,6 +3922,8 @@ MonoBehaviour: Slot1_B_GObj: {fileID: 6804933134493043127} Slot2_B_GObj: {fileID: 6804933134781575515} Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} --- !u!1 &6804933134516953956 GameObject: m_ObjectHideFlags: 0 @@ -3416,12 +3952,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134680540464} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.95, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3457,7 +3994,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 @@ -3497,6 +4034,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134236100693} m_RootOrder: 0 @@ -3578,10 +4116,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133987808309} m_Father: {fileID: 6804933135199878348} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.62417907, y: 0.034} m_AnchorMax: {x: 0.96871644, y: 0.16619785} @@ -3728,6 +4267,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135199878348} m_Father: {fileID: 6804933134212033900} @@ -3827,12 +4367,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134293540433} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3868,7 +4409,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 @@ -3908,15 +4449,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134516953955} m_Father: {fileID: 6804933135199878348} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.30010974} - m_AnchorMax: {x: 0.5, y: 0.41969246} - m_AnchoredPosition: {x: 0.00024414062, y: 0} - m_SizeDelta: {x: -0.00048828, y: 0.0000076294} + m_AnchorMin: {x: 0, y: 0.47} + m_AnchorMax: {x: 0.5, y: 0.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 3.0559022e-10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933134680540465 CanvasRenderer: @@ -4026,11 +4568,13 @@ MonoBehaviour: m_EditorClassIdentifier: CheckServer_0: 0 CheckServer_1: 0 - CheckServer_2: 1 + CheckServer_2: 0 CheckServer_3: 0 - CheckServer_4: 0 + CheckServer_4: 1 CheckServer_5: 0 CheckServer_6: 0 + CheckServer_7: 0 + CheckServer_8: 0 --- !u!1 &6804933134749119678 GameObject: m_ObjectHideFlags: 0 @@ -4062,6 +4606,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135322143357} m_Father: {fileID: 6804933133910524110} @@ -4203,6 +4748,8 @@ MonoBehaviour: CheckServer_4: 1 CheckServer_5: 1 CheckServer_6: 1 + CheckServer_7: 0 + CheckServer_8: 0 --- !u!1 &6804933134781575515 GameObject: m_ObjectHideFlags: 0 @@ -4233,6 +4780,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134412221017} m_Father: {fileID: 6804933135346706608} @@ -4240,7 +4788,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: 0, y: 14.999954} + m_AnchoredPosition: {x: 0, y: 14.9999695} m_SizeDelta: {x: 0.000061035, y: -30.000105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933134781575495 @@ -4353,6 +4901,8 @@ MonoBehaviour: Slot1_B_GObj: {fileID: 6804933134493043127} Slot2_B_GObj: {fileID: 6804933134781575515} Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} --- !u!1 &6804933134800354606 GameObject: m_ObjectHideFlags: 0 @@ -4381,12 +4931,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134906003400} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.95, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4422,7 +4973,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 @@ -4460,6 +5011,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134092012848} m_RootOrder: 3 @@ -4543,6 +5095,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135147035554} m_Father: {fileID: 6804933134092012848} @@ -4692,6 +5245,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933133910524110} m_RootOrder: 5 @@ -4773,15 +5327,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134800354605} m_Father: {fileID: 6804933135199878348} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.61839294} - m_AnchoredPosition: {x: 0.00024414062, y: 0} - m_SizeDelta: {x: -0.00048828, y: 0} + m_AnchorMin: {x: 0, y: 0.62} + m_AnchorMax: {x: 0.5, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933134906003401 CanvasRenderer: @@ -4890,12 +5445,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CheckServer_0: 0 - CheckServer_1: 1 + CheckServer_1: 0 CheckServer_2: 0 - CheckServer_3: 0 + CheckServer_3: 1 CheckServer_4: 0 CheckServer_5: 0 CheckServer_6: 0 + CheckServer_7: 0 + CheckServer_8: 0 --- !u!1 &6804933134958277454 GameObject: m_ObjectHideFlags: 0 @@ -4924,6 +5481,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933133799552094} m_RootOrder: 0 @@ -5004,15 +5562,16 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134293540433} m_Father: {fileID: 6804933135534487217} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.801453} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.9} + m_AnchorMax: {x: 1, y: 1.05} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.00012207, y: -0.000030518} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6804933134976646767 Canvas: @@ -5105,6 +5664,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134458049486} m_Father: {fileID: 6804933133938060299} @@ -5252,6 +5812,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133847786911} - {fileID: 6804933133877517530} @@ -5352,7 +5913,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -5396,15 +5960,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133885746262} m_Father: {fileID: 6804933135199878348} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.09549462} - m_AnchorMax: {x: 0.5, y: 0.21119785} - m_AnchoredPosition: {x: 0, y: -0.00012207031} - m_SizeDelta: {x: 0, y: 0.00023651} + m_AnchorMin: {x: 0, y: 0.32} + m_AnchorMax: {x: 0.5, y: 0.45} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933135136988410 CanvasRenderer: @@ -5515,10 +6080,12 @@ MonoBehaviour: CheckServer_0: 0 CheckServer_1: 0 CheckServer_2: 0 - CheckServer_3: 1 + CheckServer_3: 0 CheckServer_4: 0 - CheckServer_5: 0 + CheckServer_5: 1 CheckServer_6: 0 + CheckServer_7: 0 + CheckServer_8: 0 --- !u!1 &6804933135147035555 GameObject: m_ObjectHideFlags: 0 @@ -5547,6 +6114,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134859173097} m_RootOrder: 0 @@ -5627,15 +6195,16 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135399905327} m_Father: {fileID: 6804933135534487217} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.19700001} - m_AnchorMax: {x: 1, y: 0.40500003} - m_AnchoredPosition: {x: 0, y: -0.000061035156} - m_SizeDelta: {x: 0, y: -0.000091553} + m_AnchorMin: {x: 0, y: 0.45} + m_AnchorMax: {x: 1, y: 0.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6804933135164053783 Canvas: @@ -5728,6 +6297,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133725562050} - {fileID: 6804933134212033900} @@ -5844,12 +6414,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1355285701250162891} - {fileID: 6804933134011317761} - {fileID: 6804933134906003400} - {fileID: 6804933134680540464} - {fileID: 6804933135136988414} + - {fileID: 5420762807851874571} + - {fileID: 1961210065918169277} - {fileID: 6804933134563633346} - {fileID: 6804933134068952780} - {fileID: 6804933135262999837} @@ -5937,9 +6510,13 @@ MonoBehaviour: SaveSlot1_B_GObj: {fileID: 6804933134906003405} SaveSlot2_B_GObj: {fileID: 6804933134680540469} SaveSlot3_B_GObj: {fileID: 6804933135136988415} + SaveSlot4_B_GObj: {fileID: 8124467789003833634} + SaveSlot5_B_GObj: {fileID: 2170161788501389535} Ip1_sup: Ip2_sup: Ip3_sup: + Ip4_sup: + Ip5_sup: --- !u!1 &6804933135229905744 GameObject: m_ObjectHideFlags: 0 @@ -5968,6 +6545,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933133770887911} m_RootOrder: 1 @@ -6048,10 +6626,11 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -45} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133654275061} m_Father: {fileID: 6804933135199878348} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6147,6 +6726,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804933134749119677} m_RootOrder: 0 @@ -6227,15 +6807,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933134781575494} m_Father: {fileID: 6804933135534487217} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.40500003} - m_AnchorMax: {x: 1, y: 0.60200006} - m_AnchoredPosition: {x: 0, y: -0.0005340576} - m_SizeDelta: {x: 0, y: 0.0010071} + m_AnchorMin: {x: 0, y: 0.6} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6804933135346706621 Canvas: @@ -6328,6 +6909,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933135425238176} m_Father: {fileID: 6804933133913440197} @@ -6335,8 +6917,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.00048828125, y: 15.000053} - m_SizeDelta: {x: 0.0010986, y: -29.999899} + m_AnchoredPosition: {x: -0.00048828125, y: 15.000002} + m_SizeDelta: {x: 0.0010986, y: -30.000004} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933135382236727 CanvasRenderer: @@ -6476,6 +7058,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6804933133787945502} m_Father: {fileID: 6804933135164073706} @@ -6483,7 +7066,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: 0, y: 15} + m_AnchoredPosition: {x: 0, y: 15.0000305} m_SizeDelta: {x: 0, y: -30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6804933135399905323 @@ -6596,6 +7179,8 @@ MonoBehaviour: Slot1_B_GObj: {fileID: 6804933134493043127} Slot2_B_GObj: {fileID: 6804933134781575515} Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} --- !u!1 &6804933135425238177 GameObject: m_ObjectHideFlags: 0 @@ -6624,58 +7209,608 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6804933135382236683} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933135382236683} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933135425238190 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135425238177} + m_CullTransparentMesh: 1 +--- !u!114 &6804933135425238191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135425238177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: NEW < Server Address > +--- !u!1 &6804933135437235241 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135437235285} + - component: {fileID: 6804933135437235286} + - component: {fileID: 6804933135437235287} + - component: {fileID: 6804933135437235240} + m_Layer: 5 + m_Name: NetworkButtons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135437235285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135437235241} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933134092012848} + m_Father: {fileID: 6804933134010575746} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &6804933135437235286 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135437235241} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6804933135437235287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135437235241} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 450} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6804933135437235240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135437235241} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6804933135440186785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135440186784} + - component: {fileID: 6804933135440186798} + - component: {fileID: 6804933135440186799} + m_Layer: 5 + m_Name: NewServerUT + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135440186784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135440186785} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933133910524110} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.46050543} + m_AnchorMax: {x: 0.26900002, y: 0.55600005} + m_AnchoredPosition: {x: -0.00024414062, y: 0} + m_SizeDelta: {x: 0.00036621, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933135440186798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135440186785} + m_CullTransparentMesh: 1 +--- !u!114 &6804933135440186799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135440186785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'New Server:' +--- !u!1 &6804933135459908466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135459908465} + - component: {fileID: 6804933135459908478} + - component: {fileID: 6804933135459908479} + - component: {fileID: 6804933135459908464} + m_Layer: 5 + m_Name: OM_BackButton_1_Can (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135459908465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135459908466} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933133855156451} + m_Father: {fileID: 6804933133910524110} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.3413086, y: 2.1363525} + m_SizeDelta: {x: 118.89636, y: 90.826355} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &6804933135459908478 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135459908466} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6804933135459908479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135459908466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6804933135459908464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135459908466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6804933135470774422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135470774421} + - component: {fileID: 6804933135470774419} + - component: {fileID: 6804933135470774420} + m_Layer: 5 + m_Name: TextSlot1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135470774421 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135470774422} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933134493043122} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933135470774419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135470774422} + m_CullTransparentMesh: 1 +--- !u!114 &6804933135470774420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135470774422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Slot1 +--- !u!1 &6804933135505386919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135505386918} + - component: {fileID: 6804933135505386916} + - component: {fileID: 6804933135505386917} + m_Layer: 5 + m_Name: NOptMT (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135505386918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135505386919} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6804933134092012848} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.31751314, y: 0.85} + m_AnchorMax: {x: 0.751658, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 7.2759576e-11, y: -0.0000076293945} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6804933135505386916 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135505386919} + m_CullTransparentMesh: 1 +--- !u!114 &6804933135505386917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135505386919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Select Server +--- !u!1 &6804933135534487218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804933135534487217} + - component: {fileID: 6804933135534487230} + - component: {fileID: 6804933135534487231} + - component: {fileID: 6804933135534487216} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804933135534487217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135534487218} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6804933134976646754} + - {fileID: 6804933133859766039} + - {fileID: 6804933135346706608} + - {fileID: 6804933135164073706} + - {fileID: 719022099845621193} + - {fileID: 5342390913877487726} + - {fileID: 6804933133913440197} + m_Father: {fileID: 6804933134092012848} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0.55, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933135425238190 -CanvasRenderer: +--- !u!223 &6804933135534487230 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135425238177} - m_CullTransparentMesh: 1 ---- !u!114 &6804933135425238191 + m_GameObject: {fileID: 6804933135534487218} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6804933135534487231 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135425238177} + m_GameObject: {fileID: 6804933135534487218} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: NEW < Server Address > ---- !u!1 &6804933135437235241 + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6804933135534487216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804933135534487218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6851752722866316322 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6683,44 +7818,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135437235285} - - component: {fileID: 6804933135437235286} - - component: {fileID: 6804933135437235287} - - component: {fileID: 6804933135437235240} + - component: {fileID: 5342390913877487726} + - component: {fileID: 5551975773078342459} + - component: {fileID: 2197532700970325432} + - component: {fileID: 2172229482500976344} m_Layer: 5 - m_Name: NetworkButtons + m_Name: CanS5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135437235285 +--- !u!224 &5342390913877487726 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135437235241} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6851752722866316322} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6804933134092012848} - m_Father: {fileID: 6804933134010575746} - m_RootOrder: 0 + - {fileID: 6329158689855302471} + m_Father: {fileID: 6804933135534487217} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.15} + m_AnchorMax: {x: 1, y: 0.3} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6804933135437235286 +--- !u!223 &5551975773078342459 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135437235241} + m_GameObject: {fileID: 6851752722866316322} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 0 @@ -6735,36 +7871,36 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &6804933135437235287 +--- !u!114 &2197532700970325432 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135437235241} - m_Enabled: 0 + m_GameObject: {fileID: 6851752722866316322} + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 + m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 450} + m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &6804933135437235240 + m_PresetInfoIsWorld: 1 +--- !u!114 &2172229482500976344 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135437235241} + m_GameObject: {fileID: 6851752722866316322} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -6775,7 +7911,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &6804933135440186785 +--- !u!1 &7134272493754465178 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6783,50 +7919,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135440186784} - - component: {fileID: 6804933135440186798} - - component: {fileID: 6804933135440186799} + - component: {fileID: 840259838298601201} + - component: {fileID: 1088134036875309494} + - component: {fileID: 7891151337501316138} m_Layer: 5 - m_Name: NewServerUT + m_Name: TextSlot4safe m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135440186784 +--- !u!224 &840259838298601201 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135440186785} + m_GameObject: {fileID: 7134272493754465178} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6804933133910524110} - m_RootOrder: 4 + m_Father: {fileID: 5420762807851874571} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.46050543} - m_AnchorMax: {x: 0.26900002, y: 0.55600005} - m_AnchoredPosition: {x: -0.00024414062, y: 0} - m_SizeDelta: {x: 0.00036621, y: 0} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.95, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933135440186798 +--- !u!222 &1088134036875309494 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135440186785} + m_GameObject: {fileID: 7134272493754465178} m_CullTransparentMesh: 1 ---- !u!114 &6804933135440186799 +--- !u!114 &7891151337501316138 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135440186785} + m_GameObject: {fileID: 7134272493754465178} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -6842,19 +7979,21 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 + m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'New Server:' ---- !u!1 &6804933135459908466 + m_Text: 'Slot4 + +' +--- !u!1 &7526129826275811007 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6862,99 +8001,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135459908465} - - component: {fileID: 6804933135459908478} - - component: {fileID: 6804933135459908479} - - component: {fileID: 6804933135459908464} + - component: {fileID: 7524725429459679777} + - component: {fileID: 8554665885953404546} + - component: {fileID: 8720158681733745901} m_Layer: 5 - m_Name: OM_BackButton_1_Can (3) + m_Name: TextSlot5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135459908465 +--- !u!224 &7524725429459679777 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135459908466} + m_GameObject: {fileID: 7526129826275811007} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -45} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6804933133855156451} - m_Father: {fileID: 6804933133910524110} - m_RootOrder: 6 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6329158689855302471} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.3413086, y: 2.1363525} - m_SizeDelta: {x: 118.89636, y: 90.826355} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6804933135459908478 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135459908466} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &6804933135459908479 -MonoBehaviour: +--- !u!222 &8554665885953404546 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135459908466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &6804933135459908464 + m_GameObject: {fileID: 7526129826275811007} + m_CullTransparentMesh: 1 +--- !u!114 &8720158681733745901 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135459908466} + m_GameObject: {fileID: 7526129826275811007} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &6804933135470774422 + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Slot2 +--- !u!1 &7975193317297322790 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6962,50 +8081,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135470774421} - - component: {fileID: 6804933135470774419} - - component: {fileID: 6804933135470774420} + - component: {fileID: 4310316035340749373} + - component: {fileID: 6784884718256904732} + - component: {fileID: 2324161011492672567} m_Layer: 5 - m_Name: TextSlot1 + m_Name: TextSlot4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135470774421 +--- !u!224 &4310316035340749373 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135470774422} + m_GameObject: {fileID: 7975193317297322790} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6804933134493043122} + m_Father: {fileID: 7706734949720537587} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933135470774419 +--- !u!222 &6784884718256904732 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135470774422} + m_GameObject: {fileID: 7975193317297322790} m_CullTransparentMesh: 1 ---- !u!114 &6804933135470774420 +--- !u!114 &2324161011492672567 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135470774422} + m_GameObject: {fileID: 7975193317297322790} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -7023,8 +8143,8 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -7032,8 +8152,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Slot1 ---- !u!1 &6804933135505386919 + m_Text: Slot2 +--- !u!1 &8124467789003833634 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7041,78 +8161,155 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135505386918} - - component: {fileID: 6804933135505386916} - - component: {fileID: 6804933135505386917} + - component: {fileID: 5420762807851874571} + - component: {fileID: 3088265924214344022} + - component: {fileID: 8126522666338609917} + - component: {fileID: 7323611119842993049} + - component: {fileID: 3383223053098715728} m_Layer: 5 - m_Name: NOptMT (1) + m_Name: IPSlot4_b m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135505386918 +--- !u!224 &5420762807851874571 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135505386919} + m_GameObject: {fileID: 8124467789003833634} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6804933134092012848} - m_RootOrder: 0 + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 840259838298601201} + m_Father: {fileID: 6804933135199878348} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.31751314, y: 0.74319375} - m_AnchorMax: {x: 0.751658, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: -0.00012207031} - m_SizeDelta: {x: -0.00012207, y: 0.00021362} + m_AnchorMin: {x: 0, y: 0.17} + m_AnchorMax: {x: 0.5, y: 0.3} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804933135505386916 +--- !u!222 &3088265924214344022 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135505386919} + m_GameObject: {fileID: 8124467789003833634} m_CullTransparentMesh: 1 ---- !u!114 &6804933135505386917 +--- !u!114 &8126522666338609917 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135505386919} + m_GameObject: {fileID: 8124467789003833634} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 80 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 100 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Select Server ---- !u!1 &6804933135534487218 + m_Sprite: {fileID: 21300000, guid: e4f1fee3de32377429fd1348fae62b10, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7323611119842993049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124467789003833634} + 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: 8126522666338609917} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7082117259097792556} + m_TargetAssemblyTypeName: SaveNetwAddr_mobile, Assembly-CSharp + m_MethodName: Slot4_s + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &3383223053098715728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124467789003833634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} + m_Name: + m_EditorClassIdentifier: + CheckServer_0: 0 + CheckServer_1: 0 + CheckServer_2: 0 + CheckServer_3: 0 + CheckServer_4: 0 + CheckServer_5: 0 + CheckServer_6: 0 + CheckServer_7: 1 + CheckServer_8: 0 +--- !u!1 &8404804454343057383 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7120,102 +8317,151 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804933135534487217} - - component: {fileID: 6804933135534487230} - - component: {fileID: 6804933135534487231} - - component: {fileID: 6804933135534487216} + - component: {fileID: 6329158689855302471} + - component: {fileID: 7009742904978503136} + - component: {fileID: 1162851205595212434} + - component: {fileID: 8203663800212459244} + - component: {fileID: 7382630371809464019} m_Layer: 5 - m_Name: Canvas + m_Name: IPSlot5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804933135534487217 +--- !u!224 &6329158689855302471 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135534487218} + m_GameObject: {fileID: 8404804454343057383} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6804933134976646754} - - {fileID: 6804933133859766039} - - {fileID: 6804933135346706608} - - {fileID: 6804933135164073706} - - {fileID: 6804933133913440197} - m_Father: {fileID: 6804933134092012848} - m_RootOrder: 1 + - {fileID: 7524725429459679777} + m_Father: {fileID: 5342390913877487726} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.5, y: 0.64569646} - m_AnchoredPosition: {x: 0, y: 0.00012207031} - m_SizeDelta: {x: 0, y: -0.00018311} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 15} + m_SizeDelta: {x: 0, y: -30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6804933135534487230 -Canvas: +--- !u!222 &7009742904978503136 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135534487218} + m_GameObject: {fileID: 8404804454343057383} + m_CullTransparentMesh: 1 +--- !u!114 &1162851205595212434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8404804454343057383} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &6804933135534487231 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e4f1fee3de32377429fd1348fae62b10, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8203663800212459244 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135534487218} + m_GameObject: {fileID: 8404804454343057383} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &6804933135534487216 + 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: 1162851205595212434} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7382630371809464019} + m_TargetAssemblyTypeName: SelectNetwServer_mobile, Assembly-CSharp + m_MethodName: Slot5 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &7382630371809464019 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804933135534487218} + m_GameObject: {fileID: 8404804454343057383} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: ffd50588bd413a942ae5239c62b86c60, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 + LPS_B_GObj: {fileID: 6804933134293540438} + Slot1_B_GObj: {fileID: 6804933134493043127} + Slot2_B_GObj: {fileID: 6804933134781575515} + Slot3_B_GObj: {fileID: 6804933135399905312} + Slot4_B_GObj: {fileID: 2612381536711993907} + Slot5_B_GObj: {fileID: 8404804454343057383} --- !u!1 &8893485450472100046 GameObject: m_ObjectHideFlags: 0 @@ -7244,6 +8490,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3945265027114084427} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab index 97f514d5047f7ce8ccdc01bc0ba60072bbf02860..28652b9400bf439943f3db30810cd7c7788fe9f7 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab @@ -1070,7 +1070,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &266457293017241419 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1101,6 +1101,7 @@ GameObject: - component: {fileID: 266457293067336600} - component: {fileID: 266457293067336607} - component: {fileID: 266457293067336606} + - component: {fileID: 7533204253834567741} m_Layer: 5 m_Name: Resetconfig m_TagString: Untagged @@ -1235,6 +1236,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 889caf9f7734de545a8f2d218aaf2709, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7533204253834567741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266457293067336604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} + m_Name: + m_EditorClassIdentifier: + CheckServer_0: 1 + CheckServer_1: 1 + CheckServer_2: 1 + CheckServer_3: 1 + CheckServer_4: 1 + CheckServer_5: 1 + CheckServer_6: 1 + CheckServer_7: 1 + CheckServer_8: 1 --- !u!1 &266457293081967573 GameObject: m_ObjectHideFlags: 0 @@ -1318,7 +1340,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &266457293081967574 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1576,6 +1598,7 @@ GameObject: - component: {fileID: 266457293215603216} - component: {fileID: 266457293215603223} - component: {fileID: 266457293215603222} + - component: {fileID: 7431916522980145624} m_Layer: 5 m_Name: ReloadStreamingAsset m_TagString: Untagged @@ -1710,6 +1733,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 889caf9f7734de545a8f2d218aaf2709, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7431916522980145624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266457293215603220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} + m_Name: + m_EditorClassIdentifier: + CheckServer_0: 1 + CheckServer_1: 1 + CheckServer_2: 1 + CheckServer_3: 1 + CheckServer_4: 1 + CheckServer_5: 1 + CheckServer_6: 1 + CheckServer_7: 1 + CheckServer_8: 1 --- !u!1 &266457293269867078 GameObject: m_ObjectHideFlags: 0 @@ -2295,7 +2339,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &266457293633753202 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2518,6 +2562,8 @@ MonoBehaviour: CheckServer_4: 1 CheckServer_5: 1 CheckServer_6: 1 + CheckServer_7: 0 + CheckServer_8: 0 --- !u!1 &266457293727850347 GameObject: m_ObjectHideFlags: 0 @@ -5651,6 +5697,7 @@ GameObject: - component: {fileID: 1279195397739745311} - component: {fileID: 7517320775415504127} - component: {fileID: 2625814485529243557} + - component: {fileID: 380647514342504069} m_Layer: 5 m_Name: ResetDataPath m_TagString: Untagged @@ -5785,6 +5832,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 889caf9f7734de545a8f2d218aaf2709, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &380647514342504069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 448510959831749274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd0d825d6bbc53948826b27a2731f89e, type: 3} + m_Name: + m_EditorClassIdentifier: + CheckServer_0: 1 + CheckServer_1: 1 + CheckServer_2: 1 + CheckServer_3: 1 + CheckServer_4: 1 + CheckServer_5: 1 + CheckServer_6: 1 + CheckServer_7: 1 + CheckServer_8: 1 --- !u!1 &457606526744305644 GameObject: m_ObjectHideFlags: 0 @@ -18048,7 +18116,7 @@ PrefabInstance: - target: {fileID: 6804933134010575759, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3} propertyPath: m_PresetInfoIsWorld - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6804933135040138869, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3} diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity index 219c288c531c21403d48103f1efde719b3beb1f3..23ff4abd0dd69de17793f824c5792adceb199bb0 100644 --- a/Assets/Scenes/Menues/LaunchMenue.unity +++ b/Assets/Scenes/Menues/LaunchMenue.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44648796, g: 0.49640262, b: 0.57479304, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1748,6 +1748,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 163386453996020665, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.00012207031 + objectReference: {fileID: 0} - target: {fileID: 166691744853340724, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -1848,11 +1853,66 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 1662363385579300209, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363385722077356, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363385722077356, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363386145329387, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363386145329387, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1662363386365925260, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 1662363386632543651, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1662363386646799568, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.000061035156 + objectReference: {fileID: 0} + - target: {fileID: 1662363386646799568, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363386939829434, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363387162373650, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1662363387348382220, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1662363387380340857, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -1868,6 +1928,11 @@ PrefabInstance: propertyPath: m_Name value: BackButton_23_t objectReference: {fileID: 0} + - target: {fileID: 2156915110078196708, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.9707642 + objectReference: {fileID: 0} - target: {fileID: 2248387800266229778, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -1878,6 +1943,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2383299177785925779, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2522040357882909789, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -1908,16 +1978,31 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 3100971661806590510, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.9999695 + objectReference: {fileID: 0} - target: {fileID: 3102464668348079172, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3106400641319494412, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5 + objectReference: {fileID: 0} - target: {fileID: 3193466678055259699, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: setMouse_GObj value: objectReference: {fileID: 0} + - target: {fileID: 3253093900832493534, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000061035156 + objectReference: {fileID: 0} - target: {fileID: 3363358823963176404, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -2158,6 +2243,11 @@ PrefabInstance: propertyPath: m_Name value: ResetAll objectReference: {fileID: 0} + - target: {fileID: 4648953805413023611, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.9707642 + objectReference: {fileID: 0} - target: {fileID: 4676555279213551107, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2228,6 +2318,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315041981252, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315062296220, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2268,6 +2363,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315190395667, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315232266399, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2278,6 +2378,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -0.0009765625 objectReference: {fileID: 0} + - target: {fileID: 5366996315269793442, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315315902374, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2298,6 +2403,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315378746484, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315513376719, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2313,6 +2423,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315557418035, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315577793013, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2448,6 +2563,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315629255401, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315660712346, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2488,6 +2608,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996315950796513, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5366996315951870446, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996315967852897, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2508,6 +2638,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996316045321875, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316045321885, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -2553,16 +2688,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996316262721733, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316262721735, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996316274445542, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5366996316282231264, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316298261217, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.0234375 objectReference: {fileID: 0} + - target: {fileID: 5366996316298261223, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316430620756, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2588,6 +2743,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996316537981562, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316539093901, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2638,6 +2798,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 15 objectReference: {fileID: 0} + - target: {fileID: 5366996316706322469, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5366996316721072925, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2673,11 +2838,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5366996317015339085, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5366996317015339087, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.000061035156 + objectReference: {fileID: 0} - target: {fileID: 5366996317072312636, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x value: 1.2109375 objectReference: {fileID: 0} + - target: {fileID: 5366996317072312636, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5366996317078651365, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -2713,6 +2893,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 6269336453185523466, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6858690975884048166, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.00012207031 + objectReference: {fileID: 0} - target: {fileID: 6914020161757597414, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -2758,16 +2948,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7389608447713087043, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 7460865809762904914, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.93743896 + objectReference: {fileID: 0} - target: {fileID: 7475751197872360999, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7495062022093777435, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7865422099400840775, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 7988796428748055370, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5 + objectReference: {fileID: 0} - target: {fileID: 8020720250564787701, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2783,11 +2993,21 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 8263909088933712015, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8316488918581824991, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 8522967146069057291, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5 + objectReference: {fileID: 0} - target: {fileID: 8717619082247649776, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Scripts/CheckServer.cs b/Assets/Scripts/CheckServer.cs index ecbbf3cb14d9e51fa41e6e0e73ecde9a6489a64d..994be5c9495c67fe38e6561fa623635afcb7354c 100644 --- a/Assets/Scripts/CheckServer.cs +++ b/Assets/Scripts/CheckServer.cs @@ -27,6 +27,8 @@ void Start() StartCoroutine(waiter(CommunicationEvents.IPslot2, 4, CommunicationEvents.IPcheckGeneration)); StartCoroutine(waiter(CommunicationEvents.IPslot3, 5, CommunicationEvents.IPcheckGeneration)); StartCoroutine(waiter(CommunicationEvents.IPslot3, 6, CommunicationEvents.IPcheckGeneration)); + StartCoroutine(waiter(CommunicationEvents.IPslot4, 7, CommunicationEvents.IPcheckGeneration)); + StartCoroutine(waiter(CommunicationEvents.IPslot5, 8, CommunicationEvents.IPcheckGeneration)); } public void CheckIPAdr() @@ -63,6 +65,8 @@ IEnumerator waiter(String NetwAddress, int NA_id, double ics) 4 => CommunicationEvents.IPslot2, 5 => CommunicationEvents.IPslot3, 6 => CommunicationEvents.selecIP, + 7 => CommunicationEvents.IPslot4, + 8 => CommunicationEvents.IPslot5, _ => NetwAddress, }; diff --git a/Assets/Scripts/CheckServerPush.cs b/Assets/Scripts/CheckServerPush.cs index 6d8c2e8e2959ed20776d1e520ce7957c54f7bba9..7fd1a9d3bcb977046908b8459ed29beb71983b93 100644 --- a/Assets/Scripts/CheckServerPush.cs +++ b/Assets/Scripts/CheckServerPush.cs @@ -12,6 +12,8 @@ public class CheckServerPush : MonoBehaviour, IPointerDownHandler, IPointerUpHan public int CheckServer_4; public int CheckServer_5; public int CheckServer_6; + public int CheckServer_7; + public int CheckServer_8; public void OnPointerDown(PointerEventData eventData) { @@ -22,6 +24,8 @@ public void OnPointerDown(PointerEventData eventData) CheckServerA[4] = CheckServer_4; CheckServerA[5] = CheckServer_5; CheckServerA[6] = CheckServer_6; + CheckServerA[7] = CheckServer_7; + CheckServerA[8] = CheckServer_8; } diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs index 5cd33fbaebce02f90eebe57f16433d7bbefb7e6f..2004009fdefaa9ba7dcc623c3abdb4c36cd82176 100644 --- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs +++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs @@ -55,15 +55,18 @@ public static class CommunicationEvents public static string IPslot1 = "- if you can read this"; public static string IPslot2 = "- NetworkConfig"; public static string IPslot3 = "- not loaded"; - public static string selecIP = "GO TO -> 'Options'\n-> 'Reset Options'\nPRESS: \n'Reset Configurations'"; + public static string IPslot4 = "- GO TO -> 'Options'"; + public static string IPslot5 = "- -> 'Reset Options'"; + public static string selecIP = "- -> PRESS: 'Reset Configurations'";//"GO TO -> 'Options'\n-> 'Reset Options'\nPRESS: \n'Reset Configurations'"; //------ - public static int[] ServerRunningA = new int[7] { 0, 0, 0, 0, 0, 0, 0 }; //other, lastIP, newIP, IP1, IP2, IP3, selecIP} //0: offline, 1: Checking, 2: online, 3: NoNetworkAddress; - public static bool[] ServerRunningA_test = new bool[7] { false, false, false, false, false, false, false }; //other, lastIP, newIP, IP1, IP2, IP3, selecIP} + public static int[] ServerRunningA = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; //other, lastIP, newIP, IP1, IP2, IP3, selecIP, IP4, IP5,...} //0: offline, 1: Checking, 2: online, 3: NoNetworkAddress; + public static bool[] ServerRunningA_test = new bool[10] { false, false, false, false, false, false, false, false, false, false }; //other, lastIP, newIP, IP1, IP2, IP3, selecIP, IP4, IP5,...} public static double IPcheckGeneration = 0; public static int CheckNetLoop = 1; - public static int[] CheckServerA = new int[7] { 0, 0, 0, 0, 0, 0, 0 }; + public static int[] CheckServerA = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // 1 => CommunicationEvents.lastIP, 2 => CommunicationEvents.newIP,3 => CommunicationEvents.IPslot1, 4 => CommunicationEvents.IPslot2, + // 5 => CommunicationEvents.IPslot3, 6 => CommunicationEvents.selecIP, 7 => CommunicationEvents.IPslot4, 8 => CommunicationEvents.IPslot5, public static bool autoOSrecognition = true; diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs index 0d4e7f6521befece4c3c57e565e6180ef7f2b371..cbdebb456225738d6df9988b0a6c120364f693aa 100644 --- a/Assets/Scripts/Loading/StreamingAssetLoader.cs +++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs @@ -82,6 +82,7 @@ public enum ID_toPath { DataPath = 0, PersistentDataPath = 1, + } @@ -123,6 +124,8 @@ public static void NetworkJSON_Save() myObject.IPslot1 = CommunicationEvents.IPslot1; myObject.IPslot2 = CommunicationEvents.IPslot2; myObject.IPslot3 = CommunicationEvents.IPslot3; + myObject.IPslot4 = CommunicationEvents.IPslot4; + myObject.IPslot5 = CommunicationEvents.IPslot5; myObject.selecIP = CommunicationEvents.selecIP; myObject.ControlMode = UIconfig.controlMode.ToString(); myObject.TouchMode = UIconfig.touchControlMode; @@ -360,6 +363,22 @@ public static void NetworkJSON_Load_x(string path) { CommunicationEvents.IPslot3 = myObjs.IPslot3; } + if (string.IsNullOrEmpty(myObjsOnlyStrings.IPslot4)) + { + CommunicationEvents.IPslot4= ""; + } + else + { + CommunicationEvents.IPslot4 = myObjs.IPslot4; + } + if (string.IsNullOrEmpty(myObjsOnlyStrings.IPslot5)) + { + CommunicationEvents.IPslot5 = ""; + } + else + { + CommunicationEvents.IPslot5 = myObjs.IPslot5; + } if (string.IsNullOrEmpty(myObjsOnlyStrings.selecIP)) { CommunicationEvents.selecIP = ""; diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs index d790451acc0e5619c004fa43c56ba45cf6caee25..afb57aa8c6712136880b8105a2f71af6892ac348 100644 --- a/Assets/Scripts/StartServer.cs +++ b/Assets/Scripts/StartServer.cs @@ -99,7 +99,8 @@ IEnumerator ServerRoutine() { CommunicationEvents.ServerAddressLocal = ServerAddressLocalhost + ":" + ServerPortDefault; //print(ServerAdress); - UnityWebRequest request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list"); + //UnityWebRequest request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list"); + UnityWebRequest request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/fact/list"); yield return request.SendWebRequest(); if (request.result == UnityWebRequest.Result.ConnectionError @@ -136,7 +137,8 @@ IEnumerator ServerRoutine() yield return new WaitForSecondsRealtime(2f); print("waiting"); - request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list"); + //request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list"); + request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/fact/list"); yield return request.SendWebRequest(); if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError) diff --git a/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs b/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs index ed277aca328ca90f808cdd40dcb50d3c2cd6ac94..2d398b0066d1f45e0c2235771548dbe14b535f45 100644 --- a/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs +++ b/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs @@ -10,6 +10,8 @@ public class SaveNetwAddr_mobile : MonoBehaviour public GameObject SaveSlot1_B_GObj; public GameObject SaveSlot2_B_GObj; public GameObject SaveSlot3_B_GObj; + public GameObject SaveSlot4_B_GObj; + public GameObject SaveSlot5_B_GObj; private Color32 firstColB; private float transCol; @@ -18,6 +20,8 @@ public class SaveNetwAddr_mobile : MonoBehaviour public string Ip1_sup; public string Ip2_sup; public string Ip3_sup; + public string Ip4_sup; + public string Ip5_sup; void Start() @@ -25,6 +29,8 @@ void Start() Ip1_sup = CommunicationEvents.IPslot1; Ip2_sup = CommunicationEvents.IPslot2; Ip3_sup = CommunicationEvents.IPslot3; + Ip4_sup = CommunicationEvents.IPslot4; + Ip5_sup = CommunicationEvents.IPslot5; } @@ -37,6 +43,8 @@ private void Update() UpdateUI_4_f(); UpdateUI_5_f(); + UpdateUI_7_f(); + UpdateUI_8_f(); } public void Refresh_pressed() @@ -44,7 +52,9 @@ public void Refresh_pressed() Ip1_sup = CommunicationEvents.IPslot1; Ip2_sup = CommunicationEvents.IPslot2; Ip3_sup = CommunicationEvents.IPslot3; - print("se" + Ip1_sup); + Ip3_sup = CommunicationEvents.IPslot4; + Ip3_sup = CommunicationEvents.IPslot5; + //print("se" + Ip1_sup); } @@ -72,7 +82,7 @@ void UpdateUI_3_f() if (Ip1_sup.Equals(CommunicationEvents.IPslot1)) { - SaveSlot1_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot1 + " (Offline)"; + SaveSlot1_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 1 (Offline) \n" + CommunicationEvents.IPslot1; } else { @@ -89,7 +99,7 @@ void UpdateUI_3_f() if (Ip1_sup.Equals(CommunicationEvents.IPslot1)) { tempColB.normalColor = colOnline; - SaveSlot1_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot1 + " (Online)"; + SaveSlot1_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 1 (Online) \n" + CommunicationEvents.IPslot1; } else { @@ -133,7 +143,7 @@ void UpdateUI_4_f() { if (Ip2_sup.Equals(CommunicationEvents.IPslot2)) { - SaveSlot2_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot2 + " (Offline)"; + SaveSlot2_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 2 (Offline) \n" + CommunicationEvents.IPslot2; } else { @@ -148,7 +158,7 @@ void UpdateUI_4_f() if (Ip2_sup.Equals(CommunicationEvents.IPslot2)) { tempColB.normalColor = colOnline; - SaveSlot2_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot2 + " (Online)"; + SaveSlot2_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 2 (Online) \n" + CommunicationEvents.IPslot2; } else { @@ -183,7 +193,7 @@ void UpdateUI_5_f() { if (Ip3_sup.Equals(CommunicationEvents.IPslot3)) { - SaveSlot3_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Offline)"; + SaveSlot3_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 3 (Offline) \n" + CommunicationEvents.IPslot3; } else { @@ -198,7 +208,7 @@ void UpdateUI_5_f() if (Ip3_sup.Equals(CommunicationEvents.IPslot3)) { tempColB.normalColor = colOnline; - SaveSlot3_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Online)"; + SaveSlot3_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 3 (Onnline) \n" + CommunicationEvents.IPslot3; } else { @@ -216,6 +226,106 @@ void UpdateUI_5_f() } + void UpdateUI_7_f() + { + //--------------------------------------------------------------------------- + tempColB = SaveSlot4_B_GObj.GetComponent<Button>().colors; + tempColB.pressedColor = colPressed; + tempColB.selectedColor = colSelect; + if (CommunicationEvents.ServerRunningA[7] == 0) + { + tempColB.normalColor = colOffline; + if (string.IsNullOrEmpty(CommunicationEvents.IPslot4))// || CommunicationEvents.IPslot3.Length < 1) + { + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + else + { + if (Ip4_sup.Equals(CommunicationEvents.IPslot4)) + { + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 4 (Offline) \n" + CommunicationEvents.IPslot4; + } + else + { + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot4; + } + } + } + else + { + if (CommunicationEvents.ServerRunningA[7] == 2) + { + if (Ip4_sup.Equals(CommunicationEvents.IPslot4)) + { + tempColB.normalColor = colOnline; + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 4 (Online) \n" + CommunicationEvents.IPslot4; + } + else + { + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot4; + + } + } + else + { + tempColB.normalColor = colOffline; + SaveSlot4_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + } + SaveSlot4_B_GObj.GetComponent<Button>().colors = tempColB; + + } + + void UpdateUI_8_f() + { + //--------------------------------------------------------------------------- + tempColB = SaveSlot3_B_GObj.GetComponent<Button>().colors; + tempColB.pressedColor = colPressed; + tempColB.selectedColor = colSelect; + if (CommunicationEvents.ServerRunningA[8] == 0) + { + tempColB.normalColor = colOffline; + if (string.IsNullOrEmpty(CommunicationEvents.IPslot5))// || CommunicationEvents.IPslot3.Length < 1) + { + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + else + { + if (Ip5_sup.Equals(CommunicationEvents.IPslot5)) + { + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 5 (Offline) \n" + CommunicationEvents.IPslot5; + } + else + { + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot5; + } + } + } + else + { + if (CommunicationEvents.ServerRunningA[8] == 2) + { + if (Ip5_sup.Equals(CommunicationEvents.IPslot5)) + { + tempColB.normalColor = colOnline; + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer 5 (Online) \n" + CommunicationEvents.IPslot5; + } + else + { + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot5; + + } + } + else + { + tempColB.normalColor = colOffline; + SaveSlot5_B_GObj.GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + } + SaveSlot5_B_GObj.GetComponent<Button>().colors = tempColB; + + } + public void Slot1_s() { @@ -259,6 +369,34 @@ public void Slot3_s() NetworkJSON_Save(); //CSform.CheckIPAdr(); } + + public void Slot4_s() + { + //CheckServer ani = new CheckServer();//= obj.AddComponent<CheckServer>(); + // ani.StartCheck(); + CommunicationEvents.IPslot4 = CommunicationEvents.newIP; + Update(); + CheckServerA[7] = 1; + + Refresh_pressed(); + + NetworkJSON_Save(); + //CSform.CheckIPAdr(); + } + + public void Slot5_s() + { + //CheckServer ani = new CheckServer();//= obj.AddComponent<CheckServer>(); + // ani.StartCheck(); + CommunicationEvents.IPslot5 = CommunicationEvents.newIP; + Update(); + CheckServerA[8] = 1; + + Refresh_pressed(); + + NetworkJSON_Save(); + //CSform.CheckIPAdr(); + } } diff --git a/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs b/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs index 9bbd2705af98760a1a0e954de4d1996c1760fbad..2efbebc95c2b7811abca8e70564bc5c0d8bfab0d 100644 --- a/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs +++ b/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs @@ -9,6 +9,8 @@ public class SelectNetwServer_mobile : MonoBehaviour public GameObject Slot1_B_GObj; public GameObject Slot2_B_GObj; public GameObject Slot3_B_GObj; + public GameObject Slot4_B_GObj; + public GameObject Slot5_B_GObj; private Color32 firstColB; private float transCol; @@ -28,6 +30,9 @@ private void Update() UpdateUI_4_f(); UpdateUI_5_f(); + + UpdateUI_7_f(); + UpdateUI_8_f(); } public void SlotLPS() @@ -89,6 +94,32 @@ public void Slot3() NetworkJSON_Save(); + } + + public void Slot4() + { + //CheckServer ani = new CheckServer();//= obj.AddComponent<CheckServer>(); + // ani.StartCheck(); + + CommunicationEvents.ServerRunningA[6] = CommunicationEvents.ServerRunningA[7]; + CommunicationEvents.selecIP = CommunicationEvents.IPslot4; + CommunicationEvents.IPcheckGeneration++; + NetworkJSON_Save(); + + + } + + public void Slot5() + { + //CheckServer ani = new CheckServer();//= obj.AddComponent<CheckServer>(); + // ani.StartCheck(); + + CommunicationEvents.ServerRunningA[6] = CommunicationEvents.ServerRunningA[8]; + CommunicationEvents.selecIP = CommunicationEvents.IPslot5; + CommunicationEvents.IPcheckGeneration++; + NetworkJSON_Save(); + + } void UpdateUI_1_f() @@ -108,7 +139,7 @@ void UpdateUI_1_f() } else { - LPS_B_GObj.GetComponentInChildren<Text>().text = "Last played on " + CommunicationEvents.lastIP + " (Offline)"; + LPS_B_GObj.GetComponentInChildren<Text>().text = "Last played on (offline) \n" + CommunicationEvents.lastIP; } } else @@ -117,7 +148,7 @@ void UpdateUI_1_f() if (CommunicationEvents.ServerRunningA[1] == 2) { tempColB.normalColor = colOnline; - LPS_B_GObj.GetComponentInChildren<Text>().text = "Last played on " + CommunicationEvents.lastIP + " (Online)"; + LPS_B_GObj.GetComponentInChildren<Text>().text = "Last played on (online) \n" + CommunicationEvents.lastIP; } else { @@ -146,7 +177,7 @@ void UpdateUI_3_f() else { - Slot1_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot1 + " (Offline)"; + Slot1_B_GObj.GetComponentInChildren<Text>().text = "Server 1 (Offline) \n" + CommunicationEvents.IPslot1; //GameObject.Find("IPSlot1_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot1 + " (Offline)"; } } @@ -155,13 +186,13 @@ void UpdateUI_3_f() if (CommunicationEvents.ServerRunningA[3] == 2) { tempColB.normalColor = colOnline; - Slot1_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot1 + " (Online)"; + Slot1_B_GObj.GetComponentInChildren<Text>().text = "Server 1 (Online) \n" + CommunicationEvents.IPslot1; //GameObject.Find("IPSlot1_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot1 + " (Online)"; } else { tempColB.normalColor = colOffline; - Slot1_B_GObj.GetComponentInChildren<Text>().text = "< empty >"; + Slot1_B_GObj.GetComponentInChildren<Text>().text = "Server 1 \n" + CommunicationEvents.IPslot1; //GameObject.Find("IPSlot1_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; } } @@ -189,7 +220,7 @@ void UpdateUI_4_f() } else { - Slot2_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot2 + " (Offline)"; + Slot2_B_GObj.GetComponentInChildren<Text>().text = "Server 2 (Offline) \n" + CommunicationEvents.IPslot2; //GameObject.Find("IPSlot2_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot2 + " (Offline)"; } } @@ -198,13 +229,13 @@ void UpdateUI_4_f() if (CommunicationEvents.ServerRunningA[4] == 2) { tempColB.normalColor = colOnline; - Slot2_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot2 + " (Online)"; + Slot2_B_GObj.GetComponentInChildren<Text>().text = "Server 2 (Online) \n" + CommunicationEvents.IPslot2; //GameObject.Find("IPSlot2_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot2 + " (Online)"; } else { tempColB.normalColor = colOffline; - Slot2_B_GObj.GetComponentInChildren<Text>().text = "< empty >"; + Slot2_B_GObj.GetComponentInChildren<Text>().text = "Server 2 \n" + CommunicationEvents.IPslot2; //GameObject.Find("IPSlot2_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; } } @@ -228,7 +259,8 @@ void UpdateUI_5_f() } else { - Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot3 + " (Offline)"; + //Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot3 + " (Offline)"; + Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server 3 (Offline) \n" + CommunicationEvents.IPslot3; //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Offline)"; } } @@ -237,19 +269,93 @@ void UpdateUI_5_f() if (CommunicationEvents.ServerRunningA[5] == 2) { tempColB.normalColor = colOnline; - Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server " + CommunicationEvents.IPslot3 + " (Online)"; + Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server 3 (Online) \n" + CommunicationEvents.IPslot3; //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Online)"; } else { tempColB.normalColor = colOffline; - Slot3_B_GObj.GetComponentInChildren<Text>().text = "< empty >"; + Slot3_B_GObj.GetComponentInChildren<Text>().text = "Server 3 \n" + CommunicationEvents.IPslot3; //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; } } Slot3_B_GObj.GetComponent<Button>().colors = tempColB; } + void UpdateUI_7_f() + { + //--------------------------------------------------------------------------- + tempColB = Slot4_B_GObj.GetComponent<Button>().colors; + tempColB.pressedColor = colPressed; + tempColB.selectedColor = colSelect; + if (CommunicationEvents.ServerRunningA[7] == 0) + { + tempColB.normalColor = colOffline; + if (string.IsNullOrEmpty(CommunicationEvents.IPslot4))// || CommunicationEvents.IPslot3.Length < 1) + { + Slot4_B_GObj.GetComponentInChildren<Text>().text = "< empty >"; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + else + { + Slot4_B_GObj.GetComponentInChildren<Text>().text = "Server 4 (Offline) \n" + CommunicationEvents.IPslot4; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Offline)"; + } + } + else + { + if (CommunicationEvents.ServerRunningA[7] == 2) + { + tempColB.normalColor = colOnline; + Slot4_B_GObj.GetComponentInChildren<Text>().text = "Server 4 (Online) \n" + CommunicationEvents.IPslot4; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Online)"; + } + else + { + tempColB.normalColor = colOffline; + Slot4_B_GObj.GetComponentInChildren<Text>().text = "Server 4 \n" + CommunicationEvents.IPslot4; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + } + Slot4_B_GObj.GetComponent<Button>().colors = tempColB; + } + void UpdateUI_8_f() + { + //--------------------------------------------------------------------------- + tempColB = Slot5_B_GObj.GetComponent<Button>().colors; + tempColB.pressedColor = colPressed; + tempColB.selectedColor = colSelect; + if (CommunicationEvents.ServerRunningA[8] == 0) + { + tempColB.normalColor = colOffline; + if (string.IsNullOrEmpty(CommunicationEvents.IPslot5))// || CommunicationEvents.IPslot3.Length < 1) + { + Slot5_B_GObj.GetComponentInChildren<Text>().text = "< empty >"; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + else + { + Slot5_B_GObj.GetComponentInChildren<Text>().text = "Server 5 (Offline) \n" + CommunicationEvents.IPslot5; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Offline)"; + } + } + else + { + if (CommunicationEvents.ServerRunningA[8] == 2) + { + tempColB.normalColor = colOnline; + Slot5_B_GObj.GetComponentInChildren<Text>().text = "Server 5 (Online) \n" + CommunicationEvents.IPslot5; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \nServer " + CommunicationEvents.IPslot3 + " (Online)"; + } + else + { + tempColB.normalColor = colOffline; + Slot5_B_GObj.GetComponentInChildren<Text>().text = "Server 5 \n" + CommunicationEvents.IPslot5; + //GameObject.Find("IPSlot3_b").GetComponentInChildren<Text>().text = "OVERWRITE: \n< empty >"; + } + } + Slot5_B_GObj.GetComponent<Button>().colors = tempColB; + } } diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs index 087f10b6cde0318d9312cca80cdf1b9c92ba444d..f9f95fe567ee5c5b39cef1cb019e8a5fde7050d8 100644 --- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs @@ -36,9 +36,14 @@ private void Awake() GObj_text.text = Application.platform + " -> " + CommunicationEvents.Opsys + ""; //GObj_text.text = "2: " + Application.streamingAssetsPath + " " + Application.persistentDataPath + " " + Application.dataPath; //Debug.Log(Application.streamingAssetsPath); - CheckServerA[1] = 1; - CheckServerA[2] = 1; - CheckServerA[3] = 1; + //CheckServerA[1] = 1; + //CheckServerA[2] = 1; + //CheckServerA[3] = 1; + for(int i=0; i<CheckServerA.Length; i++) + { + CheckServerA[i] = 1; + } + } @@ -113,10 +118,12 @@ void start2_CheckOS_CheckConfig() //Debug.Log("EndAdaption"); NetworkJSON_Load(); - if (!checkDataPath() || true) + if (!checkDataPath() )//|| true) + Debug.Log("Todo: Prüfen auf Bugs bzl DataPath"); + //if (!checkDataPath()) { ResetDataPath(); - //Debug.Log("DataPath new finished"); + //Debug.Log("Info: DataPath Resetted"); }; //Debug.Log("DataPath finished"); setMouse(); diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs index cca338939636fafd7e536a87037a0453b8dc6f2d..baf6412fe71127b82476d9e7fb56102cf8e5223d 100644 --- a/Assets/Scripts/UI/UIconfig.cs +++ b/Assets/Scripts/UI/UIconfig.cs @@ -42,7 +42,7 @@ public enum InteractingRangeMode public static double cursorSize_SliderMax = 1; //Faktor public static double cursorsize_default = 0.03125; public static bool checkOperationSystemAlreadyDone = false; - public static bool checkOperationSystemAlreadyDone_check = false; + public static bool checkOperationSystemAlreadyDone_check = true; public static int refHeight = -1; public static int refWidth = -1; @@ -102,6 +102,8 @@ public class NetworkJSON public string IPslot1; public string IPslot2; public string IPslot3; + public string IPslot4; + public string IPslot5; public string selecIP; public string ControlMode; public int TouchMode; @@ -124,6 +126,8 @@ public class NetworkJSONonlyString public string IPslot1; public string IPslot2; public string IPslot3; + public string IPslot4; + public string IPslot5; public string selecIP; public string ControlMode; public string TouchMode; diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 2D.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 2D.JSON.meta index 5cd0997981c3bfdb64561763254bd613853a908d..6aa160d13bd9e524bb72d3e28f8a57fa5ceca79f 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 2D.JSON.meta +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 2D.JSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2932a986640f1c542bde9b273b7fa97b +guid: ce8e4f40f12811b41b4eb2c1b7b6ece7 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 3D.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 3D.JSON.meta index 4b2424fae10a21f2e8ca2a2187fdbee5581ac48d..7464d73bc532edc55281c9f663290b382fbf9e6d 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 3D.JSON.meta +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/CanonBall 3D.JSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bf68c7e4f91226245be6968def3cba3d +guid: 5eea08c14507fec4c94d684de8fa90d4 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON index 43212e6ea63becea22805a3e66a43b5d73bf0d3c..c13f433010bb05600e3cda4ff32f5572d2a1c2de 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON @@ -1 +1,163 @@ -{"category":"Demo Category","number":1,"description":"Tree Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact9"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact7":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact7","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact8":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact8","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact9":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact7","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact8","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact9","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact7":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact8":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact9":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact7","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact8","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact9","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[],"AllowedScrolls":null,"AllowedGadgets":null,"name":"TechDemo A","path":null} \ No newline at end of file +{ + "category": "Demo Category", + "number": 1, + "description": "Tree Stage", + "scene": "RiverWorld", + "use_install_folder": true, + "solution": { + "ValidationSet": [ + { + "MasterIDs": [ + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3" + ], + "SolutionIndex": [], + "RelationIndex": [], + "ComparerString": "LineFactHightDirectionComparer" + } + ], + "ExposedSolutionFacts": [], + "ImmutableFacts": [], + "WorkflowGadgetDict": { + "-1": null + }, + "MetaInf": { + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1": { + "workflow_id": 0, + "active": true, + "isImmutable": false + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2": { + "workflow_id": 1, + "active": true, + "isImmutable": false + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3": { + "workflow_id": 2, + "active": true, + "isImmutable": false + } + }, + "Workflow": [ + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1", + "samestep": false, + "steplink": 3, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + }, + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2", + "samestep": true, + "steplink": 0, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + }, + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3", + "samestep": true, + "steplink": 0, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + } + ], + "marker": 3, + "worksteps": 1, + "backlog": 0, + "soft_resetted": false, + "invoke": true, + "MaxLabelId": 2, + "UnusedLabelIds": [], + "JsonFactSpace": { + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1": { + "Point": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "magnitude": 0.0, + "sqrMagnitude": 0.0 + }, + "Normal": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "s_type": "PointFact", + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1" + }, + "Label": "A", + "hasCustomLabel": false, + "LabelId": 1 + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2": { + "Point": { + "x": 0.0, + "y": 6.0, + "z": 0.0, + "normalized": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "magnitude": 6.0, + "sqrMagnitude": 36.0 + }, + "Normal": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "s_type": "PointFact", + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2" + }, + "Label": "B", + "hasCustomLabel": false, + "LabelId": 2 + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3": { + "s_type": "LineFact", + "Pid1": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1", + "Pid2": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2", + "Dir": { + "x": 0.0, + "y": -1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3" + }, + "Label": "[AB]", + "hasCustomLabel": false, + "LabelId": 0 + } + }, + "name": null, + "path": null + }, + "solution_approches": [], + "AllowedScrolls": null, + "AllowedGadgets": null, + "name": "TechDemo A", + "path": null +} \ No newline at end of file diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta index 82effc0443c2af058411e53c1caf8aec13c4c604..d61d9d1f8e1278bfbda2a71c03f0e808142b1f6b 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo A.JSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2e37628a8059854296e01828e253fe8 +guid: 06d0d19df08933a4a8846351bb46ea37 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON index 8e88e515956aa47bb993ea71bc76e5a6f3e8284a..50d370c069a1941494deb1160f3cb4fd9086368e 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON @@ -1 +1,296 @@ -{"category":"Demo Category","number":2,"description":"River Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact10":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact10","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact11":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact11","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact10","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact11","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact10":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact11":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact10","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact11","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact12","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null,"GadgetFlow":[],"GadgetTime":0.0}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[],"AllowedScrolls":["OppositeLen","AngleSum","Pythagoras","CircleScroll","CircleAreaScroll","ConeVolumeScroll","TruncatedConeVolumeScroll","CylinderVolumeScroll","MidPoint","CircleLineAngleScroll","CircleLineAngleToAngle","SupplementaryAngles"],"AllowedGadgets":[{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":7682},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":129538},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":129538},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"LineTool","Rank":4,"UiName":"Line Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":4,"MaterialIndx":0,"IgnoreLayerMask":{"value":129538},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"LotTool","Rank":5,"UiName":"Lot Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":5,"MaterialIndx":0,"IgnoreLayerMask":{"value":102914},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":129538},"SecondaryLayerMask":{"value":1},"Workflow":[]},{"s_type":"Remover","Rank":8,"UiName":"Delete Fact","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":8,"MaterialIndx":0,"IgnoreLayerMask":{"value":66067},"SecondaryLayerMask":{"value":0},"Workflow":[]},{"s_type":"EqualCircles","Rank":9,"UiName":"Not Defined","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":9,"MaterialIndx":0,"IgnoreLayerMask":{"value":0},"SecondaryLayerMask":{"value":0},"Workflow":[]}],"name":"TechDemo B","path":null} \ No newline at end of file +{ + "category": "Demo Category", + "number": 2, + "description": "River Stage", + "scene": "RiverWorld", + "use_install_folder": true, + "solution": { + "ValidationSet": [ + { + "MasterIDs": [ + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6" + ], + "SolutionIndex": [], + "RelationIndex": [], + "ComparerString": "LineFactHightDirectionComparer" + }, + { + "MasterIDs": [ + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6" + ], + "SolutionIndex": [], + "RelationIndex": [], + "ComparerString": "LineSpanningOverRiverWorldComparer" + }, + { + "MasterIDs": [], + "SolutionIndex": [ + 1 + ], + "RelationIndex": [ + 0 + ], + "ComparerString": "LineFactHightComparer" + } + ], + "ExposedSolutionFacts": [], + "ImmutableFacts": [], + "WorkflowGadgetDict": { + "-1": null + }, + "MetaInf": { + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4": { + "workflow_id": 0, + "active": true, + "isImmutable": false + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5": { + "workflow_id": 1, + "active": true, + "isImmutable": false + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6": { + "workflow_id": 2, + "active": true, + "isImmutable": false + } + }, + "Workflow": [ + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4", + "samestep": false, + "steplink": 3, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + }, + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5", + "samestep": true, + "steplink": 0, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + }, + { + "Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6", + "samestep": true, + "steplink": 0, + "creation": true, + "gadget_rank": -1, + "scroll_label": null, + "GadgetFlow": [], + "GadgetTime": 0.9207362000000785 + } + ], + "marker": 3, + "worksteps": 1, + "backlog": 0, + "soft_resetted": false, + "invoke": true, + "MaxLabelId": 2, + "UnusedLabelIds": [], + "JsonFactSpace": { + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4": { + "Point": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "magnitude": 0.0, + "sqrMagnitude": 0.0 + }, + "Normal": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "s_type": "PointFact", + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4" + }, + "Label": "A", + "hasCustomLabel": false, + "LabelId": 1 + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5": { + "Point": { + "x": 0.0, + "y": 6.0, + "z": 0.0, + "normalized": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "magnitude": 6.0, + "sqrMagnitude": 36.0 + }, + "Normal": { + "x": 0.0, + "y": 1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "s_type": "PointFact", + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5" + }, + "Label": "B", + "hasCustomLabel": false, + "LabelId": 2 + }, + "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6": { + "s_type": "LineFact", + "Pid1": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4", + "Pid2": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5", + "Dir": { + "x": 0.0, + "y": -1.0, + "z": 0.0, + "magnitude": 1.0, + "sqrMagnitude": 1.0 + }, + "ServerDefinition": { + "kind": "OMS", + "uri": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6" + }, + "Label": "[AB]", + "hasCustomLabel": false, + "LabelId": 0 + } + }, + "name": null, + "path": null + }, + "solution_approches": [], + "AllowedScrolls": [ + "http://mathhub.info/FrameIT/frameworld?OppositeLen" + ], + "AllowedGadgets": [ + { + "s_type": "Pointer", + "Rank": 1, + "UiName": "Pointer", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 1, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 1581105 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + }, + { + "s_type": "Tape", + "Rank": 2, + "UiName": "Tape", + "MaxRange": 2.5, + "MaxHeight": 2.5, + "ButtonIndx": 2, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 1024 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + }, + { + "s_type": "AngleTool", + "Rank": 3, + "UiName": "Angle Tool", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 3, + "MaterialIndx": 1, + "LayerHitMask": { + "value": 1024 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + }, + { + "s_type": "LineTool", + "Rank": 4, + "UiName": "Line Tool", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 4, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 1024 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + }, + { + "s_type": "LotTool", + "Rank": 5, + "UiName": "Lot Tool", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 5, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 535569 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + }, + { + "s_type": "Pendulum", + "Rank": 6, + "UiName": "Pendulum", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 6, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 1024 + }, + "SecondaryLayerMask": { + "value": 1 + }, + "Workflow": [] + }, + { + "s_type": "Remover", + "Rank": 8, + "UiName": "Delete Fact", + "MaxRange": "Infinity", + "MaxHeight": "Infinity", + "ButtonIndx": 8, + "MaterialIndx": 0, + "LayerHitMask": { + "value": 64512 + }, + "SecondaryLayerMask": { + "value": 0 + }, + "Workflow": [] + } + ], + "name": "TechDemo B", + "path": null +} \ No newline at end of file diff --git a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta index 86d8ad30ebf246bac7572f92c13222acca6a3509..8fa8794e3e62caa548b2fd4fbf62c853a4ffa656 100644 --- a/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta +++ b/Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/TechDemo B.JSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b1513329d0fef044b7540512a69fc60 +guid: ae1880b5e2f44cf479c0c5e6f94d37ba TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON index ac0e842d55b0880107545430c7a39264d208b3b8..39fc32397547a594580e93f23681192af7d8fdac 100644 --- a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON +++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON @@ -1,9 +1,11 @@ { "lastIP": "", "newIP": "", - "IPslot1": "uframeit.informatik.uni-erlangen.de:8085", - "IPslot2": "uframeit.informatik.uni-erlangen.de:8086", - "IPslot3": "", + "IPslot1": "devel.uframeit.informatik.uni-erlangen.de:8088", + "IPslot2": "master.uframeit.informatik.uni-erlangen.de:8087", + "IPslot3": "stable.uframeit.informatik.uni-erlangen.de:8086", + "IPslot4": "oldstable.uframeit.informatik.uni-erlangen.de:8085", + "IPslot5": "uframeit.informatik.uni-erlangen.de:8089", "selecIP": "", "ControlMode": "Keyboard", "TouchMode": 1,