diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 83e9e7f..78b2239 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -603,6 +603,144 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &601309409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 601309410} + - component: {fileID: 601309412} + - component: {fileID: 601309411} + m_Layer: 5 + m_Name: Offline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &601309410 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601309409} + 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: 1678353607} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -375.02686, y: 442} + m_SizeDelta: {x: 1169.9465, y: 183.4318} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &601309411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601309409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Offline + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 111.64 + m_fontSizeBase: 111.64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &601309412 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601309409} + m_CullTransparentMesh: 1 --- !u!114 &640312359 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4056614590725156132, guid: a99c6b890ab711f4faebdfd6335c5f16, type: 3} @@ -1199,7 +1337,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1294272628 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3623,7 +3761,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1541676340 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3829,6 +3967,7 @@ GameObject: - component: {fileID: 1678353604} - component: {fileID: 1678353603} - component: {fileID: 1678353602} + - component: {fileID: 1678353608} m_Layer: 5 m_Name: DebugUI m_TagString: Untagged @@ -3848,7 +3987,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 776253a67d93df24c808c1d9382e2aaa, type: 3} m_Name: m_EditorClassIdentifier: - KeepEnabledIf: 0 + EnableIf: 0 target: {fileID: 1541676339} --- !u!114 &1678353603 MonoBehaviour: @@ -3862,7 +4001,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 776253a67d93df24c808c1d9382e2aaa, type: 3} m_Name: m_EditorClassIdentifier: - KeepEnabledIf: 1 + EnableIf: 1 target: {fileID: 1294272627} --- !u!114 &1678353604 MonoBehaviour: @@ -3941,6 +4080,7 @@ RectTransform: m_Children: - {fileID: 1294272630} - {fileID: 1541676342} + - {fileID: 601309410} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3948,6 +4088,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1678353608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678353601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 776253a67d93df24c808c1d9382e2aaa, type: 3} + m_Name: + m_EditorClassIdentifier: + EnableIf: 2 + target: {fileID: 601309409} --- !u!1 &1872712129 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MultiplayerTestingScenes/Multi-MainMenu.unity b/Assets/Scenes/MultiplayerTestingScenes/Multi-MainMenu.unity index de68c07..e32b17c 100644 --- a/Assets/Scenes/MultiplayerTestingScenes/Multi-MainMenu.unity +++ b/Assets/Scenes/MultiplayerTestingScenes/Multi-MainMenu.unity @@ -391,6 +391,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37157655} m_CullTransparentMesh: 1 +--- !u!1 &121494738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 121494739} + - component: {fileID: 121494741} + - component: {fileID: 121494740} + m_Layer: 5 + m_Name: Loading text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &121494739 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121494738} + 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: 1601178766} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 240, y: -210} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &121494740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121494738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Loading... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 87.51 + m_fontSizeBase: 87.51 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -455.30408, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &121494741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121494738} + m_CullTransparentMesh: 1 --- !u!1 &149169546 GameObject: m_ObjectHideFlags: 0 @@ -572,6 +708,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 15be44fa2c2f84746867f576fcc271cc, type: 3} m_Name: m_EditorClassIdentifier: + LoadingText: {fileID: 121494738} HostBtn: {fileID: 1034413870} JoinBtn: {fileID: 1568426577} LobbyIdInputField: {fileID: 1701412633} @@ -905,7 +1042,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &343728642 RectTransform: m_ObjectHideFlags: 0 @@ -2624,6 +2761,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7ca0ae2b70cfcfc43858944122b3603c, type: 3} m_Name: m_EditorClassIdentifier: + LoadingText: {fileID: 121494738} HostBtn: {fileID: 1892295616} JoinBtn: {fileID: 2093645296} StartButton: {fileID: 1143680570} @@ -3305,6 +3443,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 121494739} - {fileID: 1265012100} - {fileID: 343728642} m_Father: {fileID: 0} diff --git a/Assets/Scenes/MultiplayerTestingScenes/Multi-SetupLoad.unity b/Assets/Scenes/MultiplayerTestingScenes/Multi-SetupLoad.unity index d3e1ea1..320813d 100644 --- a/Assets/Scenes/MultiplayerTestingScenes/Multi-SetupLoad.unity +++ b/Assets/Scenes/MultiplayerTestingScenes/Multi-SetupLoad.unity @@ -358,6 +358,7 @@ MonoBehaviour: m_EditorClassIdentifier: LocalBtn: {fileID: 1677838174} SteamBtn: {fileID: 72056934} + OfflineBtn: {fileID: 1579436237} ButtonsHolder: {fileID: 602651291} LoadingText: {fileID: 784252204} --- !u!1 &440441323 @@ -569,6 +570,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1677838171} + - {fileID: 1579436236} - {fileID: 72056931} m_Father: {fileID: 162513277} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1056,6 +1058,127 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1579436235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1579436236} + - component: {fileID: 1579436239} + - component: {fileID: 1579436238} + - component: {fileID: 1579436237} + m_Layer: 5 + m_Name: Offline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1579436236 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579436235} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3.26, y: 3.26, z: 3.26} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1686687301} + m_Father: {fileID: 602651292} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.5, y: -401.75} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1579436237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579436235} + 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: 1579436238} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1579436238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579436235} + m_Enabled: 1 + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + 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!222 &1579436239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579436235} + m_CullTransparentMesh: 1 --- !u!1 &1677838170 GameObject: m_ObjectHideFlags: 0 @@ -1177,6 +1300,144 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1686687300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686687301} + - component: {fileID: 1686687303} + - component: {fileID: 1686687302} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1686687301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686687300} + 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: 1579436236} + 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!114 &1686687302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686687300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Offline + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1686687303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686687300} + m_CullTransparentMesh: 1 --- !u!1 &1806809592 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Multiplayer/LocalManager.cs b/Assets/Scripts/Multiplayer/LocalManager.cs index 6d9efaa..0143cbd 100644 --- a/Assets/Scripts/Multiplayer/LocalManager.cs +++ b/Assets/Scripts/Multiplayer/LocalManager.cs @@ -17,7 +17,7 @@ public class LocalManager : ZNetworkData [SerializeField] private GameObject MainMenu; [SerializeField] private GameObject InLobbyMenu; - private void Start() + private void Awake() { if (NetworkManager.Singleton == null) return; @@ -27,6 +27,14 @@ public class LocalManager : ZNetworkData HostBtn.onClick.AddListener(HostLobby); JoinBtn.onClick.AddListener(JoinLobby); StartButton.onClick.AddListener(StartGameServer); + + DisableLoadingText(); + + // Start offline server if selected offline + if (NetworkSetup.serverType != ServerType.Offline) return; + + HostLobby(); + StartGameServer(); } private void HostLobby() diff --git a/Assets/Scripts/Multiplayer/NetworkSetup.cs b/Assets/Scripts/Multiplayer/NetworkSetup.cs index bf8fbc5..70fe7e3 100644 --- a/Assets/Scripts/Multiplayer/NetworkSetup.cs +++ b/Assets/Scripts/Multiplayer/NetworkSetup.cs @@ -1,4 +1,5 @@ using Netcode.Transports.Facepunch; +using System; using Unity.Netcode; using Unity.Netcode.Transports.UTP; using UnityEngine; @@ -9,16 +10,21 @@ public class NetworkSetup : MonoBehaviour { [SerializeField] private Button LocalBtn; [SerializeField] private Button SteamBtn; + [SerializeField] private Button OfflineBtn; [SerializeField] private GameObject ButtonsHolder; [SerializeField] private GameObject LoadingText; + public static ServerType serverType = ServerType.NotSelected; + private void OnEnable() { - LocalBtn.onClick.AddListener(OnLocalClicked); - SteamBtn.onClick.AddListener(OnSteamClicked); + OfflineBtn.onClick.AddListener(() => { StartLocalServer(); serverType = ServerType.Offline; }); + LocalBtn.onClick.AddListener(()=> { StartLocalServer(); serverType = ServerType.Local; }); + + SteamBtn.onClick.AddListener(() => { StartSteamServer(); serverType = ServerType.Steam; }); } - private void OnLocalClicked() + private void StartLocalServer() { LoadingText.SetActive(true); ButtonsHolder.SetActive(false); @@ -29,7 +35,7 @@ public class NetworkSetup : MonoBehaviour NextScene(); } - private void OnSteamClicked() + private void StartSteamServer() { LoadingText.SetActive(true); ButtonsHolder.SetActive(false); @@ -45,3 +51,11 @@ public class NetworkSetup : MonoBehaviour SceneManager.LoadScene(++currentScene); } } + +public enum ServerType +{ + NotSelected, + Offline, + Local, + Steam +} diff --git a/Assets/Scripts/Multiplayer/SteamManager.cs b/Assets/Scripts/Multiplayer/SteamManager.cs index 1be6243..f3da999 100644 --- a/Assets/Scripts/Multiplayer/SteamManager.cs +++ b/Assets/Scripts/Multiplayer/SteamManager.cs @@ -35,6 +35,8 @@ public class SteamManager : ZNetworkData HostBtn.onClick.AddListener(HostLobby); JoinBtn.onClick.AddListener(JoinLobbyWithID); + + DisableLoadingText(); } private void LobbyCreated(Result result, Lobby lobby) diff --git a/Assets/Scripts/Multiplayer/UIZDisabler.cs b/Assets/Scripts/Multiplayer/UIZDisabler.cs index 7515092..c4eafad 100644 --- a/Assets/Scripts/Multiplayer/UIZDisabler.cs +++ b/Assets/Scripts/Multiplayer/UIZDisabler.cs @@ -7,25 +7,28 @@ using UnityEngine; public class UIZDisabler : MonoBehaviour { - [Tooltip("Keep enabled if is [BLANK]")] - public KeepIf KeepEnabledIf = KeepIf.IsHost; + [Tooltip("enable if is [BLANK]")] + public KeepIf EnableIf = KeepIf.IsHost; [SerializeField] private GameObject target; private void OnEnable() { if (NetworkManager.Singleton == null) return; - if (KeepEnabledIf == KeepIf.IsHost && NetworkManager.Singleton.IsHost) return; + if (EnableIf == KeepIf.IsHost && NetworkManager.Singleton.IsHost) return; - if (KeepEnabledIf == KeepIf.IsJoin && !NetworkManager.Singleton.IsHost) return; + if (EnableIf == KeepIf.IsJoin && !NetworkManager.Singleton.IsHost) return; - target.SetActive(false); + if (EnableIf == KeepIf.IsOffline && NetworkSetup.serverType == ServerType.Offline) + + target.SetActive(true); } - // Keep enabled if is [blank] + // enable if is [blank] public enum KeepIf { IsHost, - IsJoin + IsJoin, + IsOffline } } diff --git a/Assets/Scripts/Multiplayer/ZNetworkData.cs b/Assets/Scripts/Multiplayer/ZNetworkData.cs index 6af6b4e..0c6451d 100644 --- a/Assets/Scripts/Multiplayer/ZNetworkData.cs +++ b/Assets/Scripts/Multiplayer/ZNetworkData.cs @@ -1,4 +1,5 @@ using System.Collections; +using TMPro; using UnityEngine; namespace Assets.Scripts.Multiplayer @@ -6,5 +7,7 @@ namespace Assets.Scripts.Multiplayer public abstract class ZNetworkData : MonoBehaviour { public static bool IsServer = false; // Only used during game setup. Do not use after + public GameObject LoadingText; + public void DisableLoadingText() { LoadingText.SetActive(false); } } } \ No newline at end of file