From 6754d710b243fcaf4e7d88c10a43f5dcaa5aa0f8 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sun, 29 Jan 2023 01:54:53 +0100 Subject: [PATCH] Client Timeout --- .../.idea.FlufflParty/.idea/workspace.xml | 2 +- .../Assets/Materials/WorldTextBackground.mat | 82 +++ .../Materials/WorldTextBackground.mat.meta | 8 + FlufflParty/Assets/Prefabs/Player.prefab | 175 ++++++- FlufflParty/Assets/Scenes/Start.unity | 486 ++++++++++++++++++ FlufflParty/Assets/Scenes/WesternMap.unity | 383 ++++++++------ FlufflParty/Assets/Scripts/Client.cs | 11 +- .../Scripts/Players/NoPlayablePlayer.cs | 3 + .../Assets/Scripts/Players/PlayablePlayer.cs | 3 + .../Assets/Scripts/Start/StartHandler.cs | 13 +- FlufflParty/Assets/Scripts/UIHandler.cs | 18 + FlufflParty/Assets/Scripts/UIHandler.cs.meta | 11 + .../LiberationSans SDF.asset | 4 +- Server/.idea/workspace.xml | 2 +- Server/out/artifacts/Server_jar/Server.jar | Bin 10276 -> 10591 bytes Server/out/production/Server/Client.class | Bin 619 -> 688 bytes Server/out/production/Server/Room$1.class | Bin 1184 -> 1657 bytes Server/out/production/Server/Room$2.class | Bin 2530 -> 2288 bytes Server/out/production/Server/Room.class | Bin 5325 -> 5381 bytes Server/src/Client.java | 2 + Server/src/Room.java | 41 +- 21 files changed, 1057 insertions(+), 187 deletions(-) create mode 100644 FlufflParty/Assets/Materials/WorldTextBackground.mat create mode 100644 FlufflParty/Assets/Materials/WorldTextBackground.mat.meta create mode 100644 FlufflParty/Assets/Scripts/UIHandler.cs create mode 100644 FlufflParty/Assets/Scripts/UIHandler.cs.meta diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 0e05e29..5e6c788 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -108,7 +108,7 @@ - + diff --git a/FlufflParty/Assets/Materials/WorldTextBackground.mat b/FlufflParty/Assets/Materials/WorldTextBackground.mat new file mode 100644 index 0000000..e69cf6e --- /dev/null +++ b/FlufflParty/Assets/Materials/WorldTextBackground.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WorldTextBackground + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 0.09411765} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/WorldTextBackground.mat.meta b/FlufflParty/Assets/Materials/WorldTextBackground.mat.meta new file mode 100644 index 0000000..74bec60 --- /dev/null +++ b/FlufflParty/Assets/Materials/WorldTextBackground.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4406d3bf14a6884abffda2d9bbe1f24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/Player.prefab b/FlufflParty/Assets/Prefabs/Player.prefab index 750ae01..1e02aa8 100644 --- a/FlufflParty/Assets/Prefabs/Player.prefab +++ b/FlufflParty/Assets/Prefabs/Player.prefab @@ -30,7 +30,8 @@ Transform: m_LocalPosition: {x: 93.3, y: 1.71, z: 128.16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7779146846865786779} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -97,3 +98,175 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3284309164958886127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7779146846865786779} + - component: {fileID: 7187540252645105935} + - component: {fileID: 912919570358582354} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7779146846865786779 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3284309164958886127} + m_LocalRotation: {x: -0, y: 0.9665028, z: -0, w: 0.25665617} + m_LocalPosition: {x: 0, y: 0, z: 0.0055389404} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 711685448941949416} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 150.256, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.001411438, y: 1.4000001} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &7187540252645105935 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3284309164958886127} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &912919570358582354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3284309164958886127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: aaaaaaaa + 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: 6.7 + m_fontSizeBase: 6.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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: 0 + 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 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7187540252645105935} + m_maskType: 0 diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index 3c2ec53..ea76910 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -123,6 +123,141 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &255154816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 255154817} + - component: {fileID: 255154819} + - component: {fileID: 255154818} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &255154817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 255154816} + 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: 921655956} + m_RootOrder: 0 + 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.0000076293945, y: 0.000007748604} + m_SizeDelta: {x: 200, y: 41.262} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &255154818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 255154816} + 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: Name + 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: 20 + m_fontSizeBase: 20 + 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 &255154819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 255154816} + m_CullTransparentMesh: 1 --- !u!1 &261030767 GameObject: m_ObjectHideFlags: 0 @@ -425,6 +560,8 @@ RectTransform: - {fileID: 261030768} - {fileID: 2031235215} - {fileID: 1640298563} + - {fileID: 1398048955} + - {fileID: 921655956} m_Father: {fileID: 1035793954} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -943,6 +1080,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 505032542} m_CullTransparentMesh: 1 +--- !u!1 &618081796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618081797} + - component: {fileID: 618081799} + - component: {fileID: 618081798} + 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 &618081797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618081796} + 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: 1398048955} + 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 &618081798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618081796} + 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: 'Edit Name + +' + 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: 20 + m_fontSizeBase: 20 + 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 &618081799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618081796} + m_CullTransparentMesh: 1 --- !u!1 &651215245 GameObject: m_ObjectHideFlags: 0 @@ -1157,6 +1431,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729803760} m_CullTransparentMesh: 1 +--- !u!1 &921655955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 921655956} + - component: {fileID: 921655958} + - component: {fileID: 921655957} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &921655956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921655955} + 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: 255154817} + m_Father: {fileID: 293557777} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -182, y: 96.64} + m_SizeDelta: {x: 200, y: 41.261993} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &921655957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921655955} + 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: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &921655958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921655955} + m_CullTransparentMesh: 1 --- !u!1 &1000282453 GameObject: m_ObjectHideFlags: 0 @@ -2028,6 +2379,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1337600622} m_CullTransparentMesh: 1 +--- !u!1 &1398048954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1398048955} + - component: {fileID: 1398048958} + - component: {fileID: 1398048957} + - component: {fileID: 1398048956} + m_Layer: 5 + m_Name: EditName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1398048955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398048954} + 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: 618081797} + m_Father: {fileID: 293557777} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -182, y: 56.399994} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1398048956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398048954} + 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: 1398048957} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2045552894} + m_TargetAssemblyTypeName: StartHandler, Assembly-CSharp + m_MethodName: ButtonEditName + 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 &1398048957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398048954} + 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: 0.92941177, b: 0.78039217, 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: 952a5200c3226fd418c93d8ffb2708a0, 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 &1398048958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398048954} + m_CullTransparentMesh: 1 --- !u!1 &1479699059 GameObject: m_ObjectHideFlags: 0 @@ -3173,6 +3658,7 @@ MonoBehaviour: nameEnter: {fileID: 1202941988} buttonJoin: {fileID: 1640298562} buttonSubmitName: {fileID: 1596386837} + playerName: {fileID: 255154818} --- !u!1 &2072539372 GameObject: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index be448d0..add6116 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -407,6 +407,7 @@ GameObject: - component: {fileID: 47812146} - component: {fileID: 47812145} - component: {fileID: 47812148} + - component: {fileID: 47812149} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -480,6 +481,20 @@ MonoBehaviour: dice: {fileID: 2005766824} nextField: {fileID: 1406090859} cam: {fileID: 1328561024} + uiHandler: {fileID: 47812149} +--- !u!114 &47812149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47812144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56798c9c6d93720458be25d44a5729f7, type: 3} + m_Name: + m_EditorClassIdentifier: + layout0: {fileID: 98175701} --- !u!1001 &55786170 PrefabInstance: m_ObjectHideFlags: 0 @@ -767,6 +782,43 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4015f6f60de231b43a33843ede469dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &98175701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 98175702} + m_Layer: 5 + m_Name: Layout0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &98175702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98175701} + 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: 944703998} + m_Father: {fileID: 335464105} + 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.00061035156} + m_SizeDelta: {x: 0, y: -0.48999023} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &114112117 PrefabInstance: m_ObjectHideFlags: 0 @@ -780,7 +832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 58 + value: 57 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y @@ -935,7 +987,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 64 + value: 63 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -1063,7 +1115,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 60 + value: 59 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -1275,7 +1327,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 53 + value: 52 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -1632,7 +1684,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_RootOrder - value: 39 + value: 38 objectReference: {fileID: 0} - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} propertyPath: m_LocalPosition.x @@ -2705,7 +2757,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1416818652} + - {fileID: 98175702} m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3293,7 +3345,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 40 + value: 39 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -4157,7 +4209,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 52 + value: 51 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y @@ -4223,7 +4275,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 51 + value: 50 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5071,7 +5123,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 57 + value: 56 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5133,7 +5185,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 67 + value: 66 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -5936,7 +5988,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 42 + value: 41 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6072,7 +6124,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 62 + value: 61 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6398,7 +6450,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 66 + value: 65 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6724,7 +6776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 48 + value: 47 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -6794,7 +6846,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 50 + value: 49 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -6965,7 +7017,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 44 + value: 43 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -7165,6 +7217,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &944703997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 944703998} + - component: {fileID: 944704000} + - component: {fileID: 944703999} + m_Layer: 5 + m_Name: WaitingForPlayers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &944703998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944703997} + 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: 98175702} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0.00024414062, y: 0} + m_SizeDelta: {x: 0.00048828, y: 148.40442} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &944703999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944703997} + 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: Waiting for Other Players... + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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 &944704000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944703997} + m_CullTransparentMesh: 1 --- !u!1001 &948506759 PrefabInstance: m_ObjectHideFlags: 0 @@ -7178,7 +7365,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 65 + value: 64 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -9029,7 +9216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 54 + value: 53 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -9541,7 +9728,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f02425538b327cc47a5d70da69804669, type: 3} m_Name: m_EditorClassIdentifier: - followUp: {fileID: 0} --- !u!114 &1328561029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10009,141 +10195,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4015f6f60de231b43a33843ede469dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1416818651 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1416818652} - - component: {fileID: 1416818654} - - component: {fileID: 1416818653} - 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 &1416818652 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416818651} - 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: 335464105} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 126.600006, y: -44} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1416818653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416818651} - 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: - 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: 36 - m_fontSizeBase: 36 - 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_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 &1416818654 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416818651} - m_CullTransparentMesh: 1 --- !u!1001 &1427402484 PrefabInstance: m_ObjectHideFlags: 0 @@ -10368,7 +10419,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_RootOrder - value: 41 + value: 40 objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_LocalPosition.x @@ -10911,7 +10962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 55 + value: 54 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.z @@ -11163,7 +11214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 56 + value: 55 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -11229,7 +11280,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 49 + value: 48 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -11621,7 +11672,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 61 + value: 60 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -12411,7 +12462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 46 + value: 45 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -12570,7 +12621,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 45 + value: 44 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.x @@ -13178,7 +13229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 59 + value: 58 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -14353,7 +14404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 47 + value: 46 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -14865,7 +14916,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 43 + value: 42 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -15153,7 +15204,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 63 + value: 62 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalScale.y diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 40bd88b..80e1ffb 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -19,6 +19,7 @@ public class Client : MonoBehaviour [SerializeField] private Field nextField; [SerializeField] private GameObject cam; + [SerializeField] private UIHandler uiHandler; private void Start() { @@ -29,9 +30,9 @@ public class Client : MonoBehaviour string roomCode = PlayerPrefs.GetString("roomcode"); - stream.Write(Encoding.ASCII.GetBytes(roomCode)); + stream.Write(Encoding.ASCII.GetBytes(roomCode), 0, 10); string name = PlayerPrefs.GetString("name"); - stream.Write(Encoding.ASCII.GetBytes(name)); + stream.Write(Encoding.ASCII.GetBytes(name), 0, 10); new Thread(Read).Start(); } @@ -97,7 +98,11 @@ public class Client : MonoBehaviour players[job.data[1]].name = Encoding.ASCII.GetString(name).Replace(" ", ""); players[job.data[1]].Init(); - Debug.Log("test"); + uiHandler.DeactivateLayout0(); + + break; + case 126: + stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10); break; case 127: client.Close(); diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs index 870ec9f..18a16eb 100644 --- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class NoPlayablePlayer : Player @@ -23,6 +24,8 @@ public class NoPlayablePlayer : Player public override void Init() { + GetComponentInChildren().text = name; + activated = false; diceScript = dice.GetComponent(); } diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index 87c0a61..9e152be 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class PlayablePlayer : Player @@ -26,6 +27,8 @@ public class PlayablePlayer : Player public override void Init() { + GetComponentInChildren().text = name; + activated = false; QualitySettings.vSyncCount = 0; Application.targetFrameRate = 59; diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs index 73a0b45..a4fb8bb 100644 --- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs +++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs @@ -17,20 +17,21 @@ public class StartHandler : MonoBehaviour [SerializeField] private TMP_Text nameEnter; [SerializeField] private GameObject buttonJoin; [SerializeField] private GameObject buttonSubmitName; + [SerializeField] private TMP_Text playerName; private string roomcode; private void Start() { - PlayerPrefs.DeleteAll(); - if (PlayerPrefs.HasKey("name")) { + playerName.text = "Name: " + PlayerPrefs.GetString("name"); layout0.SetActive(false); layout1.SetActive(true); } else { + playerName.text = ""; layout0.SetActive(true); layout1.SetActive(false); } @@ -127,7 +128,15 @@ public class StartHandler : MonoBehaviour PlayerPrefs.SetString("name", name); PlayerPrefs.Save(); + playerName.text = "Name: " + PlayerPrefs.GetString("name"); + layout0.SetActive(false); layout1.SetActive(true); } + + public void ButtonEditName() + { + layout0.SetActive(true); + layout1.SetActive(false); + } } \ No newline at end of file diff --git a/FlufflParty/Assets/Scripts/UIHandler.cs b/FlufflParty/Assets/Scripts/UIHandler.cs new file mode 100644 index 0000000..56a5bb2 --- /dev/null +++ b/FlufflParty/Assets/Scripts/UIHandler.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIHandler : MonoBehaviour +{ + [SerializeField] private GameObject layout0; + + private void Start() + { + layout0.SetActive(true); + } + + public void DeactivateLayout0() + { + layout0.SetActive(false); + } +} diff --git a/FlufflParty/Assets/Scripts/UIHandler.cs.meta b/FlufflParty/Assets/Scripts/UIHandler.cs.meta new file mode 100644 index 0000000..6d8ee79 --- /dev/null +++ b/FlufflParty/Assets/Scripts/UIHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 56798c9c6d93720458be25d44a5729f7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/FlufflParty/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index 5c56715..522b6b9 100644 --- a/FlufflParty/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/FlufflParty/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -33,7 +33,7 @@ Material: - _MaskSoftnessX: 0 - _MaskSoftnessY: 0 - _OutlineSoftness: 0 - - _OutlineWidth: 0 + - _OutlineWidth: 0.201 - _PerspectiveFilter: 0.875 - _ScaleRatioA: 0.9 - _ScaleRatioB: 1 @@ -50,7 +50,7 @@ Material: - _TextureHeight: 1024 - _TextureWidth: 1024 - _UnderlayDilate: 0 - - _UnderlayOffsetX: 0 + - _UnderlayOffsetX: 1 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - _VertexOffsetX: 0 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index eeb9173..32f324b 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -75,7 +75,7 @@ - + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index d10a25c95dfb6db15df41a19258e461158c02e58..c039e1c7f9006b56e57b4a5d03c15742ae8bbf2c 100644 GIT binary patch delta 5840 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 delta 5600 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 delta 275 zcmXAjO-@2V5QM)O=J9+u{0JyM1eApfN8FLP_hP#70K|*v;)R3-aqSg60(T%(59y?; zI$d3<@8S@i{*Jpnux8nzq^@W)HMldF8O%!-CHI@x&&~huWWYn@f-2JCG7{-Vdi1}x z?(w~?1PC}YNICOlmMycKnH>YJbRTN_z*C5)X^TtG4L+?JTIr=Bq&hSdKe~EG=20J% s5%gavp{InAre@6eO{euaifeAP*@IPaSy>sMmDOowWreKpM4RXK1pM$8d;kCd diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class index 69c93ee1f673171340b8c4cc33317e1395bc2e3e..526efd8c1cde8e42eccb19e740e66ba0547fea6b 100644 GIT binary patch literal 1657 zcmZuxOLG)e6#j1J(KBt6Ou~f3#Nb4NOa}5oL?IC{Lx98yL1v7`h|-z4BuzTqV^4R) zjVo7fTnJUNap8uAD<~3DXi=_Q_y^p}zYt6OZqFo{s-&y#<2>&9zH`p)`{#d8p8+_9 zFO%rQyJ|Y4rn5Q@V_e5+Oz3zI=aM*&3o&}~3r1rv8=sE%F{x~M9TzdB;gULXx$c-e z_Ir|NuV|Rok;ZreGiv=n9V#R+o4{2i&*`{^4>erZP!!PDO?#jwy>;mcBnriFH!ff( zz2~}XdAA}3ItsVVb#ufvo#m0D?^(_=ed7L#RT~)Prf{8}N;6?OmVZv*NVcxp4!HOD z;JiSz9=xq!Ir3_-wj{lhxnzfMZrQZwP0vztLm5?YWH#+M(#zXsttKfZLZE>$qDQ>I z;ha^WMU`V(;6Twg%d4|yH4MUnG3BBgcx8FXQb&O`B#~VsFY+xQAYxu;#0zTESXy7y4(D1o|FL2XUKGO+B5YKUOm+gLSVV@*K2kx^_jJdsgEWhGMyWX5+h zzO^RZ!0$KUU`>N-po*JphjJen+h!2>mOWCUE6ZG4W%-p^pf9_(JKKFzrPR%GS=QL- zQMS6h(b&PoLf*Ed;KPJ%44u{#5pvM1V>5}-kQY1}VMx`{Q-lKhc$#p>xzib-k1N0b0UAJp0ssI2 delta 589 zcmXYv%}*0i6vclt({?(~*ILG65y8(E6s-k86wspL2OuD}Yz(WhOiZ+KeE9}UvEh;BqJg4;ONxF< zig6|sV_c5Q5O|~eo=B4}Qwl{X$rZ!XimO~pGLvN1^mB^q+%RID7)e6!Jb zvC!BGE&P>dK`SWL+xw|@d!YRzAHB1OqqMb|PE~h;+Vj=m4UW|U)MNb8_TDZNPACLB&r*5JeHd|pc%Ei{BvNJfNw!(V26ILWXr{r+@T@qmy_sx4|_wc@=9)ISLuREl=qy_!M0y1cuIwR1buY)g&6CTJ%KFYQZCX6qe w!-Vi8W%>0>O!tE6gHQesHX<`|tlzTiFe;7BInE2mYF`G4ht?8&sfef$ z4^8nRmWT(Dc=K#|kVtrt@E{^Yf|PToJo%FIKj+;0KPP9o-@CNW{o>EMA3X*paXdf< z(_98o;!@0Xhp^Q%0?cHVODVHm{LFEf>oCv7Wxn+nxRg9UYT)?I92iG`&W zmRVTtQpF0(Tj{XMVYP#-Ie+1st9Ce%xWGFv<1*G7*0J7@#b84=d4_6ggmkY)(lZSk z*yymyP|IeAh@pF4ns3L9d;RZ6En0>W7uP1FZ&Gp zIbb-*A&0|;BOEovIp%dGRc96kgF;~R!sX4)O(pr|f?FGjL}RhspqJzOCKK-t@b{5$ zMq_QPWko|%v?{uz&gvz5TISS8BijY3V5p9D5JD!>x36tUr=6sd%@94!@opz)g@>x2 zq8@BynBu?$!(}+R>Y>B7ahi^i7`b!ba}kWBN$>2g zSo}Y&JETP$MreTng7RKIsP<|5(58(*MB9ieqh2|U%4%SgE-0ug3F$^kbQkl9@8_^q zcba2d-~=z!e$7eV(8?!H@s%?&g;oi3PG-?AWn7eXT#^WvCB_wbr1}Y0WPqf>fY_s^6q`UHCpLvn|)6yVbo{WQ#m z=-B@*$Ca;)(_q2K7sfL|rx4U`OG*8$P5K-ribEj^MS)*bI!yA~0yza~Kj<@C&oo&` X=}AmxifX_9CR24lcITomC-MCOyk4Nt delta 1175 zcmb7@TWnNi5XXOWcDu(td}(URV!2c()^>LRyRB`Zv{0#v7HZ3-2qL#_SxQT3E4$^6 z+t!MJAev)hRGv&s6BB)bp!h(jiHXVsiHV61#s{8AeBq@K4F%@g784#hoBhws|IExc z-^`rbPv0!e{&xSzt3Wj$hndGpk761<8hFWNm6c6lUgi~#S6S^5wP3 zM+SC`;x1oo9F1?2R^jVL7e?n@qB@7te z;ebopkYUhpkVA&U9C0~nIL2|q3HBJ?wUA}VFwBVIJw{#LH=N`H!zoU?oH2aJS;IL# z5(;{f2a^@O$-b_N_PqyENiFO=aUry!zkh#e)&CCusIx{Y{Toh^RQb1@2}xZ1JCH9~ zFWK3dN~cR}6A7Ux+G4}%V=cL?gPHE$ik9wlre4T@oDqWQ?xQIo5REk}cBL{xB-%V3 znX9L*qbJpAV}t2T{{Rbgro{-)A_WDudpc^zQz&7f($D#^ytyk%)eflzYk6LA7LKAv z8Bvv1vw@<&7;zf~fuA%YPjfZ+!+Fi+-&i;K)}lVjOW%~8^mjZHiw)eqiR5h+Jk?pf(r@PMObKp-A|O;%PGyyuxgUYs|UK+|i(nJ@|9% z{_@r*i+Jq7tUYmT@~+<5=*`LqlaM>|ugUd~$~Ta?*Ex$bg;9n`Rk zdOBFmZU%G>hv?P4>El<`Z|L&<&LB5A#4V1SR}6)$S1sZLW{RM JCc3J*=OJ*C+~xoP diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 47d93fd618384a27d7dfe50fe4803fed95052dc8..fd392fe3d9a0e34a26ee7400db9b347cb2de16b0 100644 GIT binary patch delta 2684 zcma)+4|tVz6~{m4z3;v6z3<+|8vh0xGXD6$E`yELLp{$xWI#0o7XM{7W6TR~4My95 zVSlbBq?u{(hLT_rL}ZDgY;2QURQxd#A+YPxZ88idC%|s z`JO+&-+`Q!@#OvsPqhJ`hAa zxm<%E3XHGjaAi{NCZ& z?b)(fT$K(uJg1=jgVqYSD(K4|hlze!Xn@}o>fzrL%Dnal!7Z<-NYvF0F38UpVnZiQ ztEpL7m{WZDV5I+iXpMiroiX4BKJW24ian+=)#D3>OlOA21SWdSrolg8_n+@EiOCKJ zJr3~)!I_n)sIRI0gvV$2tg(7t=vGy}v^;M~ePwmtjLL%VwwRF~@HoO> z{8i!MX@_~$0 z!&@G2bIRi#{^Rhj$A3BP@g8UVyhz57_h}H)$7L_BE?=Ig&Azp~F1tE0zkYznS_v>;J0^c-58GwE{OCG)DZ zgM~Vr%0=~w+S(lvWiT%@}h!!pfR$ujK?xDF`bI<0`~G!Ui)a*5jM*aBH+2&Jmf z5e5pKfpSlcXLF;{IUw`2kG5(bi#OxM!%q`!A`;(8Y)&(76Djdf6Sg6tc&v$Vyams& zVNFwv`fY(j0Nk^swgtB4vb3 zPHyH)%8g`-(xIwk%CeZNaxbildLcp%4DiDWT6f_Cuci^`-5zz{;)^#Eajme5P z5^3AW-SNf@B3T9dSZ*{~!=}gQG-BIxwIF|AO1@bBnUtK-DZ^VSu$aAt*a}OwTwJ2Y zb`WBNoV^rHR)?i5DZNCeIU?=6YUw?( zx-0L)F>44XtT?Y*xg57f(rSH*W@`*@TQhjax>xyX-m}*5uJr(?t%rC&80ALN6mYu2 zT%e?|Q{u2Bc7c_8_@U>KvxN2k0Z6y%amkfD6`jci`H;wCk)L$N{4HT@XX^CDmAZH=%dhh zmm0C+|7+10rj(C#zTCx?d`r_NO&bffk^pEtv-CrgU#XUitVx%u_(U>^YD;{v4s delta 2669 zcma)+dvsOR5r@Bh?m745p6qCN1;Ip-vS_&w64EZJhGzh6(kNC^kswM8w|HqtAS58# zdVGM|`an5FEEGkMA_^2G;i>V3SW&CB_*STjh@c{hsK_GDK6&{Eu(<24nK^qNdww&s zXLkJMUjDYDn;L*$@okJj+-}GnhTLh$97FChgvWS)a-V zHX8R$F-dE)A&(pKghvBUb~n+Uit#kh80lG;EgtziXOi0L^1REx*Ji6_$`k1Ymu-?~ z@SZixn;2GMi%UT;DRPz<`$h4^RaKModldzXB3apm3a_lZJTYxrkG$MmMY|UD*y3Ro z$wXyMew#sVuro5RN3(T*V|`kSb@8OK>18>!HOY#c;^efNV2YjDvydXq`TRyRg7Y*Z zxll8d0?h?Rx`^LtN~jH1*=PDLFKS-mWrcf5qP(W6`j?tv3^xY4lx&30awnrYtPO@%eCo8}LkC%SIROvMYDw|G04?qvJhc}MduZ@Rpvd7mAM^tQ+) zS5+sGIX+M*bQ%;%Tj}|mr=_hosWIL4h(#+EZb9X`ANAOlj3w;)I z6Ay4FOSoHX=ChooQoq%*E;jO*ERl7p3+q)b8&rQbs(d!7p**gNX;7C6znrI41<$D} zo>5cTqNa;HlWl4{FZya9FR26aLJ!G{Ji@D%%WGB#;azy$`Z;e~ao(`{@Rrq&N3377 z!WzhjRtdYT+l9~NQ)?c(t$WyGEnr{R$|a;r!tLcLPmor|BK1{+es?TcC1mi@J9(9VVSy@3Ui4hb~cl##F3Qj zFrH;5pkFtb%8t$_Vv zeNfOH5}zN$>wEEPq*PGOS5X!yn}y2bK_%-L0s&qou}2(}r>8KT8BGNtN6KLyv?B#@SBW5ROlUMbOl`YG>UOo+ z0^&TAYg(P9Gk&vobmd8TU(26<>fP+@tT`#?KXYBPbG{^GmXjOz&m1SK?%1izYBDxW zsfUs;#a061`c@GArG2IX+Uy;>)GQwRL{M~VA#Mm`__Cm-j8X~Vri>@_ZY$%BvPQz~ zE^9Z^lxO_((&Ju!EGQQmC_b~8-5lwsX+%!0q&IWRF`TWFbH0_o5D^f;nvNO0PB=FL Q@UK!Ii`y6y?C+TIBR${$DF6Tf diff --git a/Server/src/Client.java b/Server/src/Client.java index bb6964d..9aa83af 100644 --- a/Server/src/Client.java +++ b/Server/src/Client.java @@ -10,6 +10,8 @@ public class Client public String name; + public long lastTimeSendTimeOutCheck = -1; + public Client(DataOutputStream output, DataInputStream input, Socket socket, String name) { diff --git a/Server/src/Room.java b/Server/src/Room.java index 1534fe6..b038921 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -46,6 +46,26 @@ public class Room @Override public void run() { + try + { + for(int p = 0; p < players.length; p++) + { + if(players[p] != null) + { + if(System.currentTimeMillis() - players[p].lastTimeSendTimeOutCheck > 30000 && players[p].lastTimeSendTimeOutCheck != -1) + { + server.deleteRoom(roomCode); + } + + players[p].output.write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + } + } + } + catch(Exception e) + { + + } + if(System.currentTimeMillis() - timeOut > 600000) { System.out.println("[" + Server.getDateTime() + "] Room " + roomCode + " closed due to timeout!"); @@ -54,7 +74,7 @@ public class Room } }; - t.scheduleAtFixedRate(tt, 0, 60000); + t.scheduleAtFixedRate(tt, 0, 10000); }catch(Exception e){} } @@ -138,20 +158,14 @@ public class Room break; case 0: server.deleteRoom(roomCode); - for(int i = 0; i < threads.size(); i++) - { - threads.get(i).stop(); - } + break; + case 126: + players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis(); break; } } catch (IOException e) { - - for(int i = 0; i < threads.size(); i++) - { - threads.get(i).stop(); - } server.deleteRoom(roomCode); } } @@ -236,7 +250,7 @@ public class Room public void closeRoom() { - t.cancel(); + System.out.println(Server.getDateTime() + " A player has left!"); try { @@ -282,5 +296,10 @@ public class Room } catch (Exception ex) { } + + for(int i = 0; i < threads.size(); i++) + { + threads.get(i).interrupt(); + } } }