From d3c9a7cd20a051720a851d1e414799d00b3c679e Mon Sep 17 00:00:00 2001 From: Oscar Date: Sun, 17 Mar 2024 00:30:59 +0300 Subject: [PATCH] #16 #20 --- Assets/Scenes/Menu.unity | 537 +++++++++++++++++- Assets/Scenes/Space.unity | 75 +-- .../PersonController/PersonController.cs | 2 +- .../Scripts/Environment/Energy/CellSpawner.cs | 19 +- .../Scripts/Network/CustomNetworkManager.cs | 1 + Assets/Scripts/Network/NetworkGameManager.cs | 26 +- Assets/Scripts/Network/NetworkManagerUI.cs | 10 +- 7 files changed, 582 insertions(+), 88 deletions(-) diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index a635152..de83e67 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -1112,6 +1112,59 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &254767933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 254767934} + - component: {fileID: 254767935} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &254767934 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254767933} + 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: 2134212169} + - {fileID: 744978806} + m_Father: {fileID: 863434784} + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &254767935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254767933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} --- !u!1 &271460149 GameObject: m_ObjectHideFlags: 0 @@ -1646,9 +1699,11 @@ MonoBehaviour: - {fileID: 1616436523348048, guid: 88afe7a6f7a2e7945b0460c0f3bf5882, type: 3} - {fileID: 6830579541325509221, guid: 6a3d7d21ac1b5f14683645eb9e411130, type: 3} - {fileID: 1111625383645307261, guid: 3b4f47d49ae2b88408b97d3cae5dbcdf, type: 3} + - {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} players: [] alive: [] dead: [] + maxMonsters: 1 --- !u!1 &336702750 GameObject: m_ObjectHideFlags: 0 @@ -2916,6 +2971,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &744978805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744978806} + - component: {fileID: 744978808} + - component: {fileID: 744978807} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744978806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744978805} + 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: 254767934} + m_RootOrder: 1 + 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 &744978807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744978805} + 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: "\u200B" + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 72 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 72 + m_fontStyle: 16 + 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_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 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: 5, y: 5, z: 5, w: 5} + 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 &744978808 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744978805} + m_CullTransparentMesh: 1 --- !u!1 &765332757 GameObject: m_ObjectHideFlags: 0 @@ -3446,6 +3636,194 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 824770437} m_CullTransparentMesh: 1 +--- !u!1 &863434783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 863434784} + - component: {fileID: 863434786} + - component: {fileID: 863434785} + - component: {fileID: 863434787} + m_Layer: 5 + m_Name: maxMonsters + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &863434784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863434783} + 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: 254767934} + m_Father: {fileID: 1314114586} + m_RootOrder: 5 + 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: -80, y: -88.6} + m_SizeDelta: {x: 140, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &863434785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863434783} + 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: 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 &863434786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863434783} + m_CullTransparentMesh: 1 +--- !u!114 &863434787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863434783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, 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: 863434785} + m_TextViewport: {fileID: 254767934} + m_TextComponent: {fileID: 744978807} + m_Placeholder: {fileID: 2134212171} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1149611467} + m_TargetAssemblyTypeName: NetworkManagerUI, Assembly-CSharp + m_MethodName: SetMaxMonsters + 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 + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} --- !u!1 &864175614 GameObject: m_ObjectHideFlags: 0 @@ -4233,10 +4611,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: manager: {fileID: 323210807} - adressInputGO: {fileID: 1782252640} adressInput: {fileID: 1782252642} nicknameInput: {fileID: 1316460380} MaxPlayersInput: {fileID: 168191963} + MaxMonstersInput: {fileID: 863434787} menu: {fileID: 1008686330} playMenu: {fileID: 1314114585} settingsMenu: {fileID: 252602600} @@ -4676,6 +5054,7 @@ RectTransform: - {fileID: 1617371548} - {fileID: 1782252641} - {fileID: 168191962} + - {fileID: 863434784} m_Father: {fileID: 1149611466} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8950,3 +9329,159 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126766548} m_CullTransparentMesh: 1 +--- !u!1 &2134212168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2134212169} + - component: {fileID: 2134212172} + - component: {fileID: 2134212171} + - component: {fileID: 2134212170} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2134212169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134212168} + 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: 254767934} + 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!114 &2134212170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134212168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &2134212171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134212168} + 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: Monsters + 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: 2147483648 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5} + 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: 18 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 18 + 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_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 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: 5, y: 5, z: 5, w: 5} + 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 &2134212172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134212168} + m_CullTransparentMesh: 1 diff --git a/Assets/Scenes/Space.unity b/Assets/Scenes/Space.unity index 30a7566..2bd1521 100644 --- a/Assets/Scenes/Space.unity +++ b/Assets/Scenes/Space.unity @@ -13507,7 +13507,9 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 + enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} winner: {fileID: 0} + gameStart: 0 --- !u!114 &283209175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17094,71 +17096,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 409034, guid: ff7a27c6e4e06a840957103bcd05d2ad, type: 3} m_PrefabInstance: {fileID: 354398172} m_PrefabAsset: {fileID: 0} ---- !u!1001 &355185552 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_Name - value: Alien (2) - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalPosition.x - value: 72 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalPosition.z - value: -43.3 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026852, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: sceneId - value: 286193838 - objectReference: {fileID: 0} - - target: {fileID: 5531527120828026853, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} - propertyPath: patrolPointsParent - value: - objectReference: {fileID: 471980977} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} --- !u!1 &355620099 GameObject: m_ObjectHideFlags: 0 @@ -39332,7 +39269,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &816184545 GameObject: @@ -73328,13 +73265,17 @@ PrefabInstance: propertyPath: m_Name value: Alien (1) objectReference: {fileID: 0} + - target: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} propertyPath: m_LocalPosition.x - value: 119 + value: 80.15 objectReference: {fileID: 0} - target: {fileID: 5531527120828026849, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Scripts/Characters/PersonController/PersonController.cs b/Assets/Scripts/Characters/PersonController/PersonController.cs index 37ac40c..0ee1561 100644 --- a/Assets/Scripts/Characters/PersonController/PersonController.cs +++ b/Assets/Scripts/Characters/PersonController/PersonController.cs @@ -329,7 +329,7 @@ namespace StarterAssets void SpectatorMove() { - float inputZ = (Input.GetKey(KeyCode.E) ? 1 : 0) - (Input.GetKey(KeyCode.Q) ? 1 : 0); + float inputZ = (Input.GetKey(KeyCode.E) ? 1 : 0) - (Input.GetKey(KeyCode.Q) ? 1 : 0) + (Input.GetKey(KeyCode.Space) ? 1 : 0) - (Input.GetKey(KeyCode.LeftShift) ? 1 : 0); float targetSpeed = MoveSpeed; //Input.GetKey(KeyCode.LeftShift) ? SprintSpeed : MoveSpeed; diff --git a/Assets/Scripts/Environment/Energy/CellSpawner.cs b/Assets/Scripts/Environment/Energy/CellSpawner.cs index 4c8abdf..0c57f66 100644 --- a/Assets/Scripts/Environment/Energy/CellSpawner.cs +++ b/Assets/Scripts/Environment/Energy/CellSpawner.cs @@ -8,7 +8,7 @@ public class CellSpawner : NetworkBehaviour { public GameObject prefab; public float spawnTime; - public int _capacity; + public int _maxConnections; private CustomNetworkManager _networkManager; private GameObject _instance; @@ -20,14 +20,13 @@ public class CellSpawner : NetworkBehaviour { if (!isServer) return; _networkManager = NetworkManager.singleton.GetComponent(); - _capacity = _networkManager.maxConnections; - Console.WriteLine(_capacity); + _maxConnections = _networkManager.maxConnections; SpawnPref(); } void FixedUpdate() { - if (!isServer || _capacity <= 0) return; + if (!isServer || _maxConnections <= 0) return; if (_instance == null && _spawnStarted == false) { @@ -46,20 +45,12 @@ public class CellSpawner : NetworkBehaviour } } - - // IEnumerator RespawnTimer() - // { - // spawnStarted = true; - // yield return new WaitForSeconds(); - - // SpawnPref(); - // } - + void SpawnPref() { _instance = Instantiate(prefab, transform.position + transform.up * 1.2f, Quaternion.identity); //* 1.8f NetworkServer.Spawn(_instance); _spawnStarted = false; - _capacity--; + _maxConnections--; } } diff --git a/Assets/Scripts/Network/CustomNetworkManager.cs b/Assets/Scripts/Network/CustomNetworkManager.cs index 5bace4e..2d2b648 100644 --- a/Assets/Scripts/Network/CustomNetworkManager.cs +++ b/Assets/Scripts/Network/CustomNetworkManager.cs @@ -18,6 +18,7 @@ public class CustomNetworkManager : NetworkManager public event Action OnLiveStateCallback; private float _restartTime = 5f; + public int maxMonsters; public override void OnServerSceneChanged(string sceneName) { diff --git a/Assets/Scripts/Network/NetworkGameManager.cs b/Assets/Scripts/Network/NetworkGameManager.cs index a60302e..2e3c9f1 100644 --- a/Assets/Scripts/Network/NetworkGameManager.cs +++ b/Assets/Scripts/Network/NetworkGameManager.cs @@ -9,8 +9,12 @@ public class NetworkGameManager : NetworkBehaviour { public static NetworkGameManager singleton { get; private set; } private CustomNetworkManager networkManager; + + public GameObject enemyPrefab; + public List enemyList = new List(); public GameObject winner; + public bool gameStart = false; // public List alive; // public List dead; @@ -50,10 +54,10 @@ public class NetworkGameManager : NetworkBehaviour CmdRestartScene(); } - // if (networkManager.alive.Count == 1) - // { - // SetWinner(networkManager.alive[0].gameObject); - // } + if (networkManager.alive.Count == 1 && networkManager.players.Count > 1) + { + SetWinner(networkManager.alive[0].gameObject); + } } [ClientRpc] @@ -77,4 +81,18 @@ public class NetworkGameManager : NetworkBehaviour networkManager.RestartScene(); } + private void FixedUpdate() + { + if (enemyList.Count == networkManager.maxMonsters) return; + + if (networkManager.players.Count == networkManager.maxConnections) + { + for (int i = 0; i < networkManager.maxMonsters; i++) + { + GameObject go = Instantiate(enemyPrefab, new Vector3(80 + i, 0, 30.7f), Quaternion.identity); + NetworkServer.Spawn(go); + enemyList.Add(go); + } + } + } } diff --git a/Assets/Scripts/Network/NetworkManagerUI.cs b/Assets/Scripts/Network/NetworkManagerUI.cs index f26c25c..7e59845 100644 --- a/Assets/Scripts/Network/NetworkManagerUI.cs +++ b/Assets/Scripts/Network/NetworkManagerUI.cs @@ -7,10 +7,11 @@ using TMPro; public class NetworkManagerUI : MonoBehaviour { - public NetworkManager manager; + public CustomNetworkManager manager; public TMP_InputField adressInput; public TMP_InputField nicknameInput; public TMP_InputField MaxPlayersInput; + public TMP_InputField MaxMonstersInput; public GameObject menu; public GameObject playMenu; @@ -27,6 +28,7 @@ public class NetworkManagerUI : MonoBehaviour manager.networkAddress = PlayerPrefs.GetString("Adress"); adressInput.text = PlayerPrefs.GetString("Adress"); MaxPlayersInput.text = PlayerPrefs.GetString("MaxPlayers"); + MaxMonstersInput.text = PlayerPrefs.GetString("MaxMonsters"); Cursor.lockState = CursorLockMode.None; } @@ -63,6 +65,12 @@ public class NetworkManagerUI : MonoBehaviour manager.maxConnections = int.Parse(MaxPlayersInput.text); PlayerPrefs.SetString("MaxPlayers", MaxPlayersInput.text); } + + public void SetMaxMonsters() + { + manager.maxMonsters = int.Parse(MaxMonstersInput.text); + PlayerPrefs.SetString("MaxMonsters", MaxMonstersInput.text); + } public void changeStartMenuState() {