From 9afc7778b100f3c789e513af0930fa381b000b1b Mon Sep 17 00:00:00 2001 From: brausjonas Date: Fri, 31 Mar 2023 16:38:47 +0200 Subject: [PATCH] Quality Slider for Android (only) --- FlufflParty/Assets/Scenes/Start.unity | 698 +++++++++++++++++- .../Assets/Scripts/Start/StartHandler.cs | 21 + .../ProjectSettings/ProjectSettings.asset | 12 +- .../ProjectSettings/QualitySettings.asset | 6 +- Server/out/artifacts/Server_jar/Server.jar | Bin 9033 -> 9247 bytes Server/out/production/Server/Client.class | Bin 688 -> 951 bytes Server/out/production/Server/Room.class | Bin 4880 -> 4977 bytes Server/out/production/Server/Server$1.class | Bin 3126 -> 3154 bytes Server/out/production/Server/Server.class | Bin 2588 -> 2588 bytes Server/src/Client.java | 18 + Server/src/Room.java | 4 + Server/src/Server.java | 8 +- 12 files changed, 743 insertions(+), 24 deletions(-) diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index b2c330e..324f588 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -411,6 +411,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} m_PrefabInstance: {fileID: 146891670} m_PrefabAsset: {fileID: 0} +--- !u!1 &152634164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 152634165} + - component: {fileID: 152634167} + - component: {fileID: 152634166} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &152634165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152634164} + 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: 930040470} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + 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!114 &152634166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152634164} + 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: 10907, 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 &152634167 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152634164} + m_CullTransparentMesh: 1 --- !u!1001 &213775732 PrefabInstance: m_ObjectHideFlags: 0 @@ -917,7 +993,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &293557777 RectTransform: m_ObjectHideFlags: 0 @@ -935,12 +1011,14 @@ RectTransform: - {fileID: 1640298563} - {fileID: 1398048955} - {fileID: 921655956} + - {fileID: 930040470} + - {fileID: 540508098} m_Father: {fileID: 1035793954} 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.00012207031, y: -0.11968994} + m_AnchoredPosition: {x: 0, y: -0.125} m_SizeDelta: {x: -0.00012207, y: -0.7226} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &309674616 @@ -1099,6 +1177,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309674616} m_CullTransparentMesh: 1 +--- !u!1 &329034178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 329034179} + - component: {fileID: 329034181} + - component: {fileID: 329034180} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &329034179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329034178} + 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: 1514963091} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &329034180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329034178} + 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + 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!222 &329034181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329034178} + m_CullTransparentMesh: 1 --- !u!1 &352327428 GameObject: m_ObjectHideFlags: 0 @@ -1949,6 +2103,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 505032542} m_CullTransparentMesh: 1 +--- !u!1 &540508097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 540508098} + - component: {fileID: 540508101} + - component: {fileID: 540508100} + - component: {fileID: 540508099} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &540508098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540508097} + 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: 1994710526} + m_Father: {fileID: 293557777} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -109, y: -71.89} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &540508099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540508097} + 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: 540508100} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2045552894} + m_TargetAssemblyTypeName: StartHandler, Assembly-CSharp + m_MethodName: ButtonApply + 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 &540508100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540508097} + 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: 21300000, guid: e888af39e7536424f91f7ac08415ec4d, 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!222 &540508101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540508097} + m_CullTransparentMesh: 1 --- !u!1001 &585820675 PrefabInstance: m_ObjectHideFlags: 0 @@ -2205,7 +2493,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000036679, y: -56.899994} + m_AnchoredPosition: {x: -0.000036679, y: -56.90625} m_SizeDelta: {x: 252.0728, y: 97.99539} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &651215247 @@ -3681,7 +3969,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 67, y: 109.3} + m_AnchoredPosition: {x: 67, y: 109.3125} m_SizeDelta: {x: 200, y: 41.261993} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &921655957 @@ -3722,6 +4010,109 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921655955} m_CullTransparentMesh: 1 +--- !u!1 &930040469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 930040470} + - component: {fileID: 930040471} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &930040470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930040469} + 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: 152634165} + - {fileID: 2143123385} + - {fileID: 1514963091} + m_Father: {fileID: 293557777} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -109, y: -34.1875} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &930040471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930040469} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 329034180} + m_FillRect: {fileID: 1952851095} + m_HandleRect: {fileID: 329034179} + m_Direction: 1 + m_MinValue: 1 + m_MaxValue: 10 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2045552894} + m_TargetAssemblyTypeName: StartHandler, Assembly-CSharp + m_MethodName: OnQualitySliderChanged + m_Mode: 0 + 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!1 &936613649 GameObject: m_ObjectHideFlags: 0 @@ -5220,7 +5611,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 57.300003} + m_AnchoredPosition: {x: 0, y: 57.3125} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1154426428 @@ -5437,7 +5828,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: 0.0038146973} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: -1.4500122} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1184802681 @@ -6690,7 +7081,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 67, y: 56.4} + m_AnchoredPosition: {x: 67, y: 56.40625} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1398048956 @@ -6866,6 +7257,43 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1514963090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1514963091} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1514963091 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1514963090} + 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: 329034179} + m_Father: {fileID: 930040470} + m_RootOrder: 2 + 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: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1515676470 PrefabInstance: m_ObjectHideFlags: 0 @@ -7073,7 +7501,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 339.8, y: 57.3} + m_AnchoredPosition: {x: 339.8, y: 57.3125} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1574528323 @@ -7207,7 +7635,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.079} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.0000052452, y: 72.20001} + m_AnchoredPosition: {x: 0.0000052452, y: 72.1875} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1596386839 @@ -8238,7 +8666,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1780335805 RectTransform: m_ObjectHideFlags: 0 @@ -8260,7 +8688,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.00012207031, y: 0.12142944} + m_AnchoredPosition: {x: 0, y: 0.125} m_SizeDelta: {x: 0, y: -0.730011} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1792022043 @@ -8987,6 +9415,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 8680370992906925654, guid: 4c45f1da82168544688424fb1df22297, type: 3} m_PrefabInstance: {fileID: 1932835940} m_PrefabAsset: {fileID: 0} +--- !u!1 &1952851094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1952851095} + - component: {fileID: 1952851097} + - component: {fileID: 1952851096} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1952851095 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952851094} + 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: 2143123385} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1952851096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952851094} + 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 &1952851097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952851094} + m_CullTransparentMesh: 1 --- !u!1001 &1955378246 PrefabInstance: m_ObjectHideFlags: 0 @@ -9234,6 +9738,141 @@ Transform: m_CorrespondingSourceObject: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} m_PrefabInstance: {fileID: 1969037589} m_PrefabAsset: {fileID: 0} +--- !u!1 &1994710525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1994710526} + - component: {fileID: 1994710528} + - component: {fileID: 1994710527} + 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 &1994710526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994710525} + 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: 540508098} + 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 &1994710527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994710525} + 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: Apply + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + 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: 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 &1994710528 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994710525} + m_CullTransparentMesh: 1 --- !u!1 &2031235214 GameObject: m_ObjectHideFlags: 0 @@ -10029,6 +10668,43 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2103446172} m_Mesh: {fileID: 4300000, guid: fb23023907e20a245b4d6817b249be82, type: 2} +--- !u!1 &2143123384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143123385} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2143123385 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143123384} + 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: 1952851095} + m_Father: {fileID: 930040470} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &2147008931 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs index 99d2255..91dd64c 100644 --- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs +++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs @@ -5,6 +5,7 @@ using System.IO; using System.Net.Sockets; using System.Text; using TMPro; +using UnityEditor; using UnityEngine; using UnityEngine.SceneManagement; @@ -23,6 +24,11 @@ public class StartHandler : MonoBehaviour [SerializeField] private TMP_Text backgroundNameText; private string roomcode; + + int width = Screen.width; + int height = Screen.height; + private float divisionLevel = 1; + private void Start() { @@ -43,6 +49,7 @@ public class StartHandler : MonoBehaviour layout2.SetActive(false); client = new TcpClient("185.245.96.48", 8051); buttonJoin.SetActive(false); + } public void ButtonNewRoom() @@ -161,4 +168,18 @@ public class StartHandler : MonoBehaviour Stream stream = client.GetStream(); stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0}); } + + public void OnQualitySliderChanged(float value) + { + divisionLevel = value; + + } + + public void ButtonApply() + { + if(Application.platform == RuntimePlatform.Android) + { + Screen.SetResolution(width / (int)divisionLevel, height / (int)divisionLevel, Screen.fullScreen); + } + } } \ No newline at end of file diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index a38f65e..df99f39 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -136,10 +136,8 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.13 - preloadedAssets: - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + bundleVersion: 0.14 + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -153,8 +151,8 @@ PlayerSettings: useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 - targetPixelDensity: 100 - resolutionScalingMode: 1 + targetPixelDensity: 1000 + resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 @@ -166,7 +164,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 3 + AndroidBundleVersionCode: 4 AndroidMinSdkVersion: 26 AndroidTargetSdkVersion: 31 AndroidPreferredInstallLocation: 2 diff --git a/FlufflParty/ProjectSettings/QualitySettings.asset b/FlufflParty/ProjectSettings/QualitySettings.asset index 793a8ff..1753ca2 100644 --- a/FlufflParty/ProjectSettings/QualitySettings.asset +++ b/FlufflParty/ProjectSettings/QualitySettings.asset @@ -229,10 +229,10 @@ QualitySettings: Nintendo Switch: 5 PS4: 5 PSP2: 2 - Server: 0 + Server: 2 Stadia: 5 - Standalone: 3 - WebGL: 3 + Standalone: 2 + WebGL: 2 Windows Store Apps: 5 XboxOne: 5 iPhone: 2 diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 9efffe7722248db9ec353ac7008b906fca8334a0..f60d8462e3ed58969fe6b8958a6306d8f0202def 100644 GIT binary patch delta 6663 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 diff --git a/Server/out/production/Server/Client.class b/Server/out/production/Server/Client.class index 3515d47a5de5a319b755faac5ce702af6e7316b1..6bb37a8e0f81e147463f326cdf0871647b542dd0 100644 GIT binary patch delta 491 zcmXX?%T5A85Ug2PH!OoM#6^*pC{J}2Nj!PO14QBhW8!fn#GnX77h__gAF&_dRT2Y< z2S31%QoASaCRLU0n(Cf;H)mG;`{(luKn;gBBG@*6|Gy9<@(cxrB14IxY@>o53%fS< zm|Y9|lcR=6o1Omfp(_w5mM#P$ZBKP>TWWN!uKHcF`!6DS97jfC6^_I_79N>fL5Fvq&{7P)2Q}L%r2+=fw?I{ZwQ`}G^Yr&oam+noBl98MT|Ir1RZFl rU=gJWb5zVwJ5Po(Sqk)o74Uvi@8bOLm(`VE)50bi4Ajk0&A`?lq_;q| delta 246 zcmXYqI}XAy5JblgCQ2}W!Y?5Z!nZ|{=z)d{a50N(AgGWis1b((c2~HV8Ea?X-uypU2FzXH9 zV93TeHu0QE_IyOEyob%F8D8<_KHZYNRrUZ7#2{-Btfr9d?-D*9>{x#hpBErNf9sxAGZ@ZMltpe>VEnHuzcH8vLjfpHZ4QhV8PMdrgg~RX{4E8AHe_ zyXa^sJQWRds5Dls!Z>Yo5-n=Auk-ll2-R|x)Z$7VzQcHZtUpz8 zTN!q?IoN?IIX=Bj{i%s5WK2dI@;k(*2BD#pCid7M^iX_y)Hua9m|}XGRPH`HiQdxy zBe&T{XNwvVtLRcr^8>UPv6pL_cderJf6U!f)jU;671vkMPP-hqSfuR2&Sa^?HN-Z= z+pXh4uI@()c~PyiMTM=L;jHq%rN3m6A|qv;Y}9iMIqE!zc8bSHA~KqOGKO54$Y2>y zo)j`lCb3>7Q!3NhBGcF^CG6CF`AueVM&@x==4jRhV#z}3C5trwGRcyqk}b=%N_3@6 zmQ`A8jckzns=DP;esN>Wo^&MPJh^&}4{)BG zOY&Mo{vzAB=;bGbb+;zhUv?TDR4^Y-NZ}0aP{9gDjt!K}g6dwq15?b`rqNTGrka6% z^y-#T1J9Lwiw>_08|*XU0%xlR6Mi|Z{bEKYs#K$;cYx5dK&T(e12 LZvKi%%JumN*R)}o delta 1911 zcma)+c~Dh#6vsd3zW2C~>(3x?bj*#MM$H)`S4`9l6N4~K4O7b`B*YLD$)(h1rfH={ zUdys^Bl!aFLpvz**9|~t2gm6YJc(hulxLceAB%FaW%QE+n$^2rkme}A}RESq<2s`rG1u~W+m@}{JWD$bi% zP&OdN@IHqOA5iFW*zh4A89wHS;V8!ppIGuK$6P)$e9jk!FZs&lYr{8uYxs`uh2&{@ zv-47mN>j5&4x5`_Fr&Pvw8Z5H!*LEZSbL-v=am$uHkl1Sa>7ud@u&T^UYs zplU_r5652?%^1^PPsq;bSg=%bEG7Y01Ou*c23(;-7#7Hx>ZiB{vSO~>Q(HDSE6wrS z$FGzT{-*f!)LYb&LP+U+Mlwpdm274ORwbL;QTbLz+sLX`-U&xTPn)AL8@ho+rg9Bq z7^_Jf)^VE_b0mu^0x3@VYSX!lBP{9k<93xIGF#7XJQD~zUX$OSO@6hFeok7WA3Mco zqGk@UNj7qatr2qy^d-8JNkp8=21iHXscM`8-x3DJtR^(Dou=^i z&`We1*;a11hu)5!eWz;rY$s_S$>Vp?DyeTZZU1BLr>dkhCDnAOrlaN?u|%Zu+?H+H zHDr=SPd%CneC2EOm}``ul&hpGJtZwB_;W{s4wUdlNx^Qh6-ld^zcB&G?MNLN`b-DJ6>$qE@RD>Zk8%#l?xS9J?zHTK+E z>k7N;so5hFVv1_RvL~zYS`yEasT-KeS%x*sYZ3X29P6TcON>&ahY{?FROR;MBMMPu zvkFcyRa~IFEU0ek9k|!NCmQS)GhJ0V{;A7b$1DW@=UhUm^;NI)D}}aRQl%NpY$n(_ zFSv8iTl0OE)eq^fP3mxwHcit^vzi4&E)9@!?rUf>J@^{vXRCX=2|M{WeDDPr={j|M ax4w8F%?=jpFeiXzE(4U?4_AtE{rv-(vs97* diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index 8ece73afc0e8b4ebf39d400c96703f74d509953a..aeaa3fab3eb04e8f1aa0add0aafc13c1eedcb846 100644 GIT binary patch delta 1323 zcmZvb+gH?86vsbjhMDu5pFaggxlBPpU=f!nq_QEh!mLbE!$OSIX&3?=E-?d2rsFM0 zF(t-K?5bU;tc*(oLArYAsmE3it=8(T{(;_FtrhJ9KDd_s*6-}I_u04a-e;dw?$5c2 zpZ=Y@3RH8|M;SW|dETa+X3YyWJK1HE#%@i>2rt@b!sevKh!Klco0n*_*-pFBb!hfz zqCPt5vdN^|XnJfic-e5hHZkHp`sml}wF$7X*#x06gqsvgl5uVifM&fC#%5WTT%`) z%qqNf(e_AJ+@$!~pU!lbcmk;L6A_T>#moB{Bdm zSyikNZFO?aDyY3zWUol@0QU*aUbIN(ev!?WzUU`72vTFbz`a~NY)~V~9N(Hmy;!9! z+Cr)9Ce~$HCXFBIv0Icv7U#lhHI!W>dg3iGPNb zOX^iKWCguTeD?L~fHy@><0QHB1ey{v+~mJGMc(xmBKq@%q_`!;txL(rxlkTROJO%I zTBa?f3hMtmv;vmDz+af+wxD$lKtQJ`8lz;M;--r7vVb+i>Y%T5I?Gg&ZM3)lKt{lq z;*N3FCb!zviFASJFA)IaIQ51v6@Ee*(bqFKIlVIHmS;Mjd5LV4PJ$oKvSczj*&WERzJCJV>no8s#YgwhpiOuHs=H!6%`Q z^Qb`850W1^yFKT2Vsn=1B>YCJ8JyN+=l#HF9mVJZhLtGMY*% zMJmz@Ql>}qv}Utri)O3l8CdZTeG9bVyFsIAkRKLgCU5jxz^=lz9 zm1~;aEX}s;3fK$DOw+G5)lB`=U(jz&e*iPlb9ViKCTHGr-tTk&p65L0_m~&U{`Ak~ z?|~*J!qkwo+mkL!*{a#*vYj0+0iM!4ZH1JJW~bG(I6ULh$}X2?(pJ4&)23+;^DG@M z5%yS1r%M?bi@IE%qdUxAdNj|w#MtW4>#h^9&!NvMUT}Gl{SF5lUa}ebZAex#;8M-Y zRyb(W9dbCVIpT0s^NMCrb8Ps>b85EWSB11t)vORE;*;<9)yG~lN`@M>H1AQ-EEy|&3lIT`M_p5Yxt0lEIMa6&&QezhEFJHJ~e#CMd9+F z@cf{^-2XXWDSuXQygqlgJ^F;0~6_KDX#m#%!VZFI&srn#Wz)m%c2 zb4?;x7Y};OoS-Z@K_nRujxcMCXvsW#jPgXNgy&2*$3q@-n@6aaAeI~>9-Zf9shsZN zQ5n5fHjnup3kqDUjR!p3=AuuaR3xFVrgY*?bYZm0XkNrx_RhK)5U(_PDXY>U_p+YMfahTso|vQZu!~ zOl8QaZjP%yPN)G+OP!PIFsD>bhS%P17c(S(nmbuRP%5lrC3g{0)mh3}#odIZM2^+m zBX4_>eXJ4WFiR4z6=xswRSWlWpOCLs+qqxT1f+n&1FW|fu7<7*PEZZEfR|Osp4D;{1;OY=O_RG diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index fba16fa5c901b11423a5b040be6c67698c038d7a..d0a0db2670f195b76a856bf5b1792f8f30af2f3b 100644 GIT binary patch delta 68 zcmbOuGDl>CGzae-23v-?3=RzQ7#tZEP1fMpqPmuWm0>*tFT*AVQHCuH8VoxbEP#AF YhJ6fP3$SKVT09G{+-2eap delta 68 zcmbOuGDl>CGzaf223v;N3=Rx)7#tZEOxEDoqPm)am0>LdFT(}~QHD(n8VuVREP#AF YhCK{k4Eq^E84fZ;F&x><$SKVT08*t8!2kdN diff --git a/Server/src/Client.java b/Server/src/Client.java index d0eceea..d995470 100644 --- a/Server/src/Client.java +++ b/Server/src/Client.java @@ -23,4 +23,22 @@ public class Client this.socket = socket; this.name = name; } + + public void close() + { + try + { + input.close(); + }catch(Exception e) + { + + } + try + { + output.close(); + }catch(Exception e) + { + + } + } } diff --git a/Server/src/Room.java b/Server/src/Room.java index 895acac..e90fc1e 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -348,6 +348,7 @@ public class Room { //127 is the action for room cick players[0].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + players[0].close(); } } catch (Exception ex) @@ -359,6 +360,7 @@ public class Room if (players[1] != null) { players[1].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + players[1].close(); } } catch (Exception ex) @@ -370,6 +372,7 @@ public class Room if (players[2] != null) { players[2].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + players[2].close(); } } catch (Exception ex) @@ -381,6 +384,7 @@ public class Room if (players[3] != null) { players[3].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + players[3].close(); } } catch (Exception ex) diff --git a/Server/src/Server.java b/Server/src/Server.java index 665e86a..db2e3da 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -83,6 +83,9 @@ public class Server * !!!!!!!!!!!!!!!!!!! 0 is not used because of possible empty arrays read in because of inital connection errors !!!!!!!!!!!!!!!!!!!! */ case 0: + case 126: + client.close(); + client = null; Integer.parseInt("crash"); break; @@ -100,6 +103,8 @@ public class Server //LOG System.out.println("Room " + new String(code, StandardCharsets.US_ASCII) + " successfully created!"); + client.close(); + client = null; break; //in this case a player wants to join an existing room (even the room creator will join via this method) case 1: @@ -137,9 +142,6 @@ public class Server output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } - break; - case 126: - Integer.parseInt("crash"); break; }