From 9788da9e7f82287966d08dd6dcf7b9d65d95d73f Mon Sep 17 00:00:00 2001 From: Morgan - 6 Freedom Date: Sat, 27 Jan 2024 18:45:15 +0100 Subject: [PATCH 1/5] rework room connect state --- Assets/2DAssets/Snaparazzi.png | 3 + Assets/2DAssets/Snaparazzi.png.meta | 166 +++++ Assets/2DAssets/fond_pc_1.png.meta | 31 +- Assets/2DAssets/fond_tel_1.png.meta | 31 +- ...logout_FILL0_wght400_GRAD0_opsz24.png.meta | 15 +- ..._sound_FILL0_wght400_GRAD0_opsz24.png.meta | 15 +- Assets/2DAssets/return.png.meta | 15 +- ...target (bouton de prise de photo).png.meta | 15 +- .../timer_FILL0_wght400_GRAD0_opsz24.png.meta | 15 +- Assets/2DAssets/timer_white.png.meta | 15 +- ...ume_up_FILL0_wght400_GRAD0_opsz24.png.meta | 15 +- Assets/Scenes/ComputerView.unity | 610 ++++++++++-------- Assets/Scripts/GameManager.cs | 6 +- 13 files changed, 661 insertions(+), 291 deletions(-) create mode 100644 Assets/2DAssets/Snaparazzi.png create mode 100644 Assets/2DAssets/Snaparazzi.png.meta diff --git a/Assets/2DAssets/Snaparazzi.png b/Assets/2DAssets/Snaparazzi.png new file mode 100644 index 0000000..b5822d9 --- /dev/null +++ b/Assets/2DAssets/Snaparazzi.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a073223df064ebe8780b725591ec9524fedc20feb9aafa5fe217b193d843e01e +size 22001 diff --git a/Assets/2DAssets/Snaparazzi.png.meta b/Assets/2DAssets/Snaparazzi.png.meta new file mode 100644 index 0000000..1d8ff46 --- /dev/null +++ b/Assets/2DAssets/Snaparazzi.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 8ecc59dae983e4540af29b7b3340b4fe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2DAssets/fond_pc_1.png.meta b/Assets/2DAssets/fond_pc_1.png.meta index 2db2895..adbe086 100644 --- a/Assets/2DAssets/fond_pc_1.png.meta +++ b/Assets/2DAssets/fond_pc_1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,13 +132,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/2DAssets/fond_tel_1.png.meta b/Assets/2DAssets/fond_tel_1.png.meta index 03dc5c8..874005c 100644 --- a/Assets/2DAssets/fond_tel_1.png.meta +++ b/Assets/2DAssets/fond_tel_1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,13 +132,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/2DAssets/logout_FILL0_wght400_GRAD0_opsz24.png.meta b/Assets/2DAssets/logout_FILL0_wght400_GRAD0_opsz24.png.meta index b1640f0..cd9790f 100644 --- a/Assets/2DAssets/logout_FILL0_wght400_GRAD0_opsz24.png.meta +++ b/Assets/2DAssets/logout_FILL0_wght400_GRAD0_opsz24.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/no_sound_FILL0_wght400_GRAD0_opsz24.png.meta b/Assets/2DAssets/no_sound_FILL0_wght400_GRAD0_opsz24.png.meta index 5edda85..5fc0833 100644 --- a/Assets/2DAssets/no_sound_FILL0_wght400_GRAD0_opsz24.png.meta +++ b/Assets/2DAssets/no_sound_FILL0_wght400_GRAD0_opsz24.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/return.png.meta b/Assets/2DAssets/return.png.meta index b726d31..1e2983a 100644 --- a/Assets/2DAssets/return.png.meta +++ b/Assets/2DAssets/return.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/target (bouton de prise de photo).png.meta b/Assets/2DAssets/target (bouton de prise de photo).png.meta index 9194191..82cfff8 100644 --- a/Assets/2DAssets/target (bouton de prise de photo).png.meta +++ b/Assets/2DAssets/target (bouton de prise de photo).png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/timer_FILL0_wght400_GRAD0_opsz24.png.meta b/Assets/2DAssets/timer_FILL0_wght400_GRAD0_opsz24.png.meta index d85d699..a672a08 100644 --- a/Assets/2DAssets/timer_FILL0_wght400_GRAD0_opsz24.png.meta +++ b/Assets/2DAssets/timer_FILL0_wght400_GRAD0_opsz24.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/timer_white.png.meta b/Assets/2DAssets/timer_white.png.meta index c34f71b..22b31c8 100644 --- a/Assets/2DAssets/timer_white.png.meta +++ b/Assets/2DAssets/timer_white.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/2DAssets/volume_up_FILL0_wght400_GRAD0_opsz24.png.meta b/Assets/2DAssets/volume_up_FILL0_wght400_GRAD0_opsz24.png.meta index c2d3ae1..94b3000 100644 --- a/Assets/2DAssets/volume_up_FILL0_wght400_GRAD0_opsz24.png.meta +++ b/Assets/2DAssets/volume_up_FILL0_wght400_GRAD0_opsz24.png.meta @@ -74,7 +74,7 @@ TextureImporter: textureFormat: -1 textureCompression: 1 compressionQuality: 50 - crunchedCompression: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/ComputerView.unity b/Assets/Scenes/ComputerView.unity index 77c3b0b..2ebd4ba 100644 --- a/Assets/Scenes/ComputerView.unity +++ b/Assets/Scenes/ComputerView.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18018535, g: 0.22559482, b: 0.30677685, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -132,6 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6747543} + - component: {fileID: 6747544} m_Layer: 0 m_Name: Players m_TagString: Untagged @@ -147,8 +148,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6747542} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 642.6174} - m_LocalScale: {x: 2.1006565, y: 2.1006565, z: 2.1006565} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1794849354} @@ -162,10 +163,34 @@ RectTransform: m_Father: {fileID: 1117928115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1476, y: 261} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -262.5, y: 100} + m_SizeDelta: {x: -525, y: 400} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &6747544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6747542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 300, y: 200} + m_Spacing: {x: 50, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &9253746 GameObject: m_ObjectHideFlags: 0 @@ -567,16 +592,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132605378} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -650, y: -72.034355} - m_SizeDelta: {x: 100, y: 100.06871} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &132605380 MonoBehaviour: @@ -598,10 +623,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -631,9 +656,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -910,14 +935,14 @@ RectTransform: m_GameObject: {fileID: 220251969} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.61065006, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117928115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -887.0002, y: 458.86877} + m_AnchoredPosition: {x: 25, y: -25} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0, y: 1} --- !u!114 &220251971 @@ -1162,16 +1187,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340074659} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -215, y: -72.18437} - m_SizeDelta: {x: 100, y: 100.36875} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &340074661 MonoBehaviour: @@ -1193,10 +1218,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1226,9 +1251,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1270,6 +1295,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340074659} m_CullTransparentMesh: 0 +--- !u!1 &375256411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 375256414} + - component: {fileID: 375256413} + - component: {fileID: 375256412} + m_Layer: 0 + m_Name: '[Managers]' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &375256412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375256411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de098f8fd5f884a1aa55db7874246b92, type: 3} + m_Name: + m_EditorClassIdentifier: + propositionTime: 60 + votingTime: 20 + roomCodeLabel: {fileID: 0} +--- !u!114 &375256413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375256411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 153bd176c0ad8f82692512264f5245ba, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &375256414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375256411} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &427170778 GameObject: m_ObjectHideFlags: 0 @@ -1302,10 +1387,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1117928115} 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, y: -0.000030517578} - m_SizeDelta: {x: 1920, y: 1080} + 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 &427170780 MonoBehaviour: @@ -1320,14 +1405,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9716981, g: 0.75627446, b: 0.75627446, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1436,16 +1521,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496953432} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -525, y: -71.98436} - m_SizeDelta: {x: 100, y: 99.96871} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &496953434 MonoBehaviour: @@ -1467,10 +1552,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1500,9 +1585,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1610,14 +1695,14 @@ RectTransform: m_GameObject: {fileID: 593191224} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.61065006, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117928115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -84, y: -46} + m_AnchoredPosition: {x: -25, y: -25} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 1, y: 1} --- !u!114 &593191226 @@ -2969,16 +3054,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983174565} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -215, y: -1.6714172} - m_SizeDelta: {x: 100, y: 99.73743} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &983174567 MonoBehaviour: @@ -3000,10 +3085,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3033,9 +3118,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -3414,16 +3499,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018720200} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -375, y: -1.7700653} - m_SizeDelta: {x: 100, y: 99.54013} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1018720202 MonoBehaviour: @@ -3445,10 +3530,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3478,9 +3563,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -3629,8 +3714,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -220, y: 250} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -220, y: 185.00496} + m_SizeDelta: {x: 200, y: 179.9901} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1102286563 MonoBehaviour: @@ -3764,11 +3849,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 427170779} - - {fileID: 1394667042} - {fileID: 6747543} - {fileID: 220251970} - {fileID: 593191225} - {fileID: 1677433386} + - {fileID: 1805240026} - {fileID: 1102286562} - {fileID: 1499472362} m_Father: {fileID: 610087870} @@ -4831,140 +4916,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1374681047} m_CullTransparentMesh: 0 ---- !u!1 &1394667041 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1394667042} - - component: {fileID: 1394667044} - - component: {fileID: 1394667043} - 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 &1394667042 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394667041} - 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: 1117928115} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 178.03003} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1394667043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394667041} - 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: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} - m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, 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 &1394667044 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394667041} - m_CullTransparentMesh: 1 --- !u!1 &1434182171 GameObject: m_ObjectHideFlags: 0 @@ -5164,16 +5115,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452182575} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -525, y: -1.7700653} - m_SizeDelta: {x: 100, y: 99.54013} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1452182577 MonoBehaviour: @@ -5195,10 +5146,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5228,9 +5179,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -5258,7 +5209,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 1.0697252, w: 133.0019} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -5347,11 +5298,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1117928115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -348, y: -343} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 484.0331, y: 320.8223} + m_Pivot: {x: 1, y: 0} --- !u!114 &1499472363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5372,7 +5323,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Hideo Kojima n'est pas ex\xE9cutif director sur ce projet" + m_text: Hideo Kojima is not executive director on this project m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5407,7 +5358,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -5435,7 +5386,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -71.9462, y: 0, z: -239.82011, w: -95.92803} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -5501,7 +5452,7 @@ GameObject: - component: {fileID: 1677433388} - component: {fileID: 1677433387} m_Layer: 5 - m_Name: RoomCode + m_Name: RoomCodeHeader m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5521,11 +5472,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1117928115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -0.000061035156, y: 262} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -213} m_SizeDelta: {x: 474, y: 50} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &1677433387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5546,10 +5497,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Room Code XXX + m_text: 'Room Code :' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5573,8 +5524,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 48 - m_fontSizeBase: 48 + m_fontSize: 72 + m_fontSizeBase: 72 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6091,16 +6042,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1794849353} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -650, y: -1.9343491} - m_SizeDelta: {x: 100, y: 99.86871} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1794849355 MonoBehaviour: @@ -6122,10 +6073,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6155,9 +6106,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -6185,7 +6136,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 1.3201599, w: 123.400795} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -6405,6 +6356,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804262643} m_CullTransparentMesh: 0 +--- !u!1 &1805240025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805240026} + - component: {fileID: 1805240028} + - component: {fileID: 1805240027} + m_Layer: 5 + m_Name: RoomCode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1805240026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805240025} + 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: 1117928115} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -299} + m_SizeDelta: {x: 474, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1805240027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805240025} + 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: 0000 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, 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: 95 + m_fontSizeBase: 95 + 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 &1805240028 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805240025} + m_CullTransparentMesh: 1 --- !u!1 &1825572743 GameObject: m_ObjectHideFlags: 0 @@ -7586,16 +7671,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137991535} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -305.91254} - m_LocalScale: {x: 0.5433541, y: 0.5433541, z: 0.5433541} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6747543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -375, y: -72.134384} - m_SizeDelta: {x: 100, y: 100.26877} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2137991537 MonoBehaviour: @@ -7617,10 +7702,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player 191234567 + m_text: 1234567890123456 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 72af27804d5aa49408430b4b2500f877, type: 2} + m_sharedMaterial: {fileID: 8890805173838430465, guid: 72af27804d5aa49408430b4b2500f877, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7650,9 +7735,9 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -7698,6 +7783,7 @@ CanvasRenderer: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 375256414} - {fileID: 963194228} - {fileID: 705507995} - {fileID: 440351813} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 156e872..54c73da 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -15,7 +15,7 @@ public class GameManager : MonoBehaviour { private GameState currentState; private List players = new List(); - private Player currentPlayer= null; + private Player currentPlayer = null; @@ -158,7 +158,6 @@ private void CheckIfRoomExists(string _roomCode, Action callback_Room) /// private void JoinRoom(Action callback_OnRoomJoined) { - string JSON = JsonUtility.ToJson(currentPlayer); myOnlineRoom.Child("players").Child(currentPlayer.id).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => { @@ -172,7 +171,6 @@ private void JoinRoom(Action callback_OnRoomJoined) callback_OnRoomJoined?.Invoke(); } }); - } /// @@ -256,7 +254,7 @@ private void OnRoomUpdate(object sender, ChildChangedEventArgs e) case GameState.EnteringName: { currentState = GameState.WaitingForOtherPlayersToJoin; - + //TEMP From 787c090621130a2436aaa3e078cb236ff6da5454 Mon Sep 17 00:00:00 2001 From: Morgan - 6 Freedom Date: Sat, 27 Jan 2024 18:46:32 +0100 Subject: [PATCH 2/5] add logo to scene --- Assets/Scenes/ComputerView.unity | 76 ++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/Assets/Scenes/ComputerView.unity b/Assets/Scenes/ComputerView.unity index 2ebd4ba..7771eb2 100644 --- a/Assets/Scenes/ComputerView.unity +++ b/Assets/Scenes/ComputerView.unity @@ -3856,6 +3856,7 @@ RectTransform: - {fileID: 1805240026} - {fileID: 1102286562} - {fileID: 1499472362} + - {fileID: 1901141295} m_Father: {fileID: 610087870} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6903,6 +6904,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868885117} m_CullTransparentMesh: 1 +--- !u!1 &1901141294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1901141295} + - component: {fileID: 1901141297} + - component: {fileID: 1901141296} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1901141295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901141294} + 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: 1117928115} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 512} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1901141296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901141294} + 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: 8ecc59dae983e4540af29b7b3340b4fe, 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 &1901141297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901141294} + m_CullTransparentMesh: 1 --- !u!1 &1923527564 GameObject: m_ObjectHideFlags: 0 From 3ed3dc31dd644c90e8de85dbf2c6b7017fc97b48 Mon Sep 17 00:00:00 2001 From: Marine Date: Sat, 27 Jan 2024 18:50:04 +0100 Subject: [PATCH 3/5] correct user connect room --- Assets/Scenes/PhoneView.unity | 2 +- Assets/Scripts/GameManager.cs | 49 ++++++++++++++++++++++++----------- Assets/Scripts/RoomManager.cs | 23 +++++++++++----- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Assets/Scenes/PhoneView.unity b/Assets/Scenes/PhoneView.unity index 09b328c..857ae98 100644 --- a/Assets/Scenes/PhoneView.unity +++ b/Assets/Scenes/PhoneView.unity @@ -214,7 +214,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &157909814 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 156e872..08d68e0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -102,6 +102,7 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) //TODO : MARINE : use the error label to explain to the user that they have forget to put a room code return; } + currentPlayer = new Player(_name); //check if the room exists, if not display an error message CheckIfRoomExists(_code, room => @@ -114,13 +115,23 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) } else { + myOnlineRoom = realtimeDB.Child("rooms").Child(_code); + Debug.Log("Before join room"); //if room exists, join it JoinRoom(() => { //then subscribe to it - myOnlineRoom = realtimeDB.Child("rooms").Child(_code); + myOnlineRoom.ChildChanged += OnRoomUpdate; - Debug.Log($"room {myRoom.code} exists, I subscribe to it"); + currentState = GameState.WaitingForOtherPlayersToJoin; + players.Add(currentPlayer); + + WaitingRoom.SetActive(true); + HomeConnection.SetActive(false); + + UpdateDisplayedListUser(); + + }); } }); @@ -160,18 +171,27 @@ private void JoinRoom(Action callback_OnRoomJoined) { string JSON = JsonUtility.ToJson(currentPlayer); - myOnlineRoom.Child("players").Child(currentPlayer.id).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => + Debug.Log(JSON); + try { - if (task.IsFaulted) + myOnlineRoom.Child("players").Child(currentPlayer.id).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => { - Debug.LogException(task.Exception); - } - else - { - Debug.Log($"{currentPlayer.name} has been added to the room", this); - callback_OnRoomJoined?.Invoke(); - } - }); + if (task.IsFaulted) + { + Debug.LogException(task.Exception); + } + else + { + Debug.Log($"{currentPlayer.name} has been added to the room", this); + callback_OnRoomJoined?.Invoke(); + } + }); + } + catch (Exception ex) + { + Debug.LogException(ex); + } + } @@ -246,8 +266,7 @@ private void OnRoomUpdate(object sender, ChildChangedEventArgs e) { case GameState.WaitingForOtherPlayersToJoin: { - WaitingRoom.SetActive(true); - HomeConnection.SetActive(false); + // players = new list en fonction de ce qu'envoie fangh UpdateDisplayedListUser(); @@ -310,7 +329,7 @@ public void OnClickSubmitSignIn() { string playerName = playerNameField.text; string roomCode = roomCodeField.text; - + Debug.Log("click btn"); PlayerValidateNameAndServerRoom(playerName, roomCode); } } diff --git a/Assets/Scripts/RoomManager.cs b/Assets/Scripts/RoomManager.cs index acaafd8..3535528 100644 --- a/Assets/Scripts/RoomManager.cs +++ b/Assets/Scripts/RoomManager.cs @@ -101,14 +101,23 @@ public void CreateNewRoom() { Room newRoom = new Room(GenerateRandomAvailableCode(codes).ToString("D4")); currentRoom = newRoom; - string JSON = JsonUtility.ToJson(newRoom); - realtimeDB.Child("rooms").Child(newRoom.code).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => + + try { - Debug.Log($"room {currentRoom.code} has been created on the server"); - realtimeDB.Child("rooms").Child(newRoom.code).Child("players").ChildAdded += PlayerConnect; - //TODO MARINE : uncomment and reference the correct game object - //roomCodeLabel.text = currentRoom.code; - }); + string JSON = JsonUtility.ToJson(newRoom); + + realtimeDB.Child("rooms").Child(newRoom.code).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => + { + Debug.Log($"room {currentRoom.code} has been created on the server"); + realtimeDB.Child("rooms").Child(newRoom.code).Child("players").ChildAdded += PlayerConnect; + //TODO MARINE : uncomment and reference the correct game object + //roomCodeLabel.text = currentRoom.code; + }); + } + catch (Exception e) + { + Debug.LogException(e); + } }); } From df6c4f08c91de860be0ecd58eeee641968f21425 Mon Sep 17 00:00:00 2001 From: Morgan - 6 Freedom Date: Sat, 27 Jan 2024 19:54:06 +0100 Subject: [PATCH 4/5] players can join room --- Assets/Scenes/ComputerView.unity | 15 ++- Assets/Scripts/DatabaseClasses/Player.cs | 1 + Assets/Scripts/DatabaseClasses/Prompt.cs | 1 + Assets/Scripts/DatabaseClasses/Proposition.cs | 1 + Assets/Scripts/DatabaseClasses/Question.cs | 1 + Assets/Scripts/DatabaseClasses/Room.cs | 22 ++++- Assets/Scripts/GameManager.cs | 3 +- Assets/Scripts/RoomManager.cs | 96 ++++++++++++++----- Packages/manifest.json | 1 + 9 files changed, 110 insertions(+), 31 deletions(-) diff --git a/Assets/Scenes/ComputerView.unity b/Assets/Scenes/ComputerView.unity index 7771eb2..abc2a2d 100644 --- a/Assets/Scenes/ComputerView.unity +++ b/Assets/Scenes/ComputerView.unity @@ -1325,9 +1325,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de098f8fd5f884a1aa55db7874246b92, type: 3} m_Name: m_EditorClassIdentifier: - propositionTime: 60 + playerLabels: + - {fileID: 1794849355} + - {fileID: 1452182577} + - {fileID: 1018720202} + - {fileID: 983174567} + - {fileID: 132605380} + - {fileID: 496953434} + - {fileID: 2137991537} + - {fileID: 340074661} + propositionTime: 59.8 votingTime: 20 - roomCodeLabel: {fileID: 0} + roomCodeLabel: {fileID: 1805240027} --- !u!114 &375256413 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6916,7 +6925,7 @@ GameObject: - component: {fileID: 1901141297} - component: {fileID: 1901141296} m_Layer: 5 - m_Name: Image + m_Name: Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/DatabaseClasses/Player.cs b/Assets/Scripts/DatabaseClasses/Player.cs index d03d3a8..11ed8d7 100644 --- a/Assets/Scripts/DatabaseClasses/Player.cs +++ b/Assets/Scripts/DatabaseClasses/Player.cs @@ -3,6 +3,7 @@ using System.Text.RegularExpressions; [System.Serializable] +[Newtonsoft.Json.JsonObject] public class Player { public string name; diff --git a/Assets/Scripts/DatabaseClasses/Prompt.cs b/Assets/Scripts/DatabaseClasses/Prompt.cs index c19c6e2..6cc576f 100644 --- a/Assets/Scripts/DatabaseClasses/Prompt.cs +++ b/Assets/Scripts/DatabaseClasses/Prompt.cs @@ -4,6 +4,7 @@ using UnityEngine; [System.Serializable, FirestoreData] +[Newtonsoft.Json.JsonObject] public class Prompt { [field: SerializeField] diff --git a/Assets/Scripts/DatabaseClasses/Proposition.cs b/Assets/Scripts/DatabaseClasses/Proposition.cs index 74d5059..65198d8 100644 --- a/Assets/Scripts/DatabaseClasses/Proposition.cs +++ b/Assets/Scripts/DatabaseClasses/Proposition.cs @@ -3,6 +3,7 @@ using UnityEngine; [System.Serializable] +[Newtonsoft.Json.JsonObject] public class Proposition { public string photoUrl; diff --git a/Assets/Scripts/DatabaseClasses/Question.cs b/Assets/Scripts/DatabaseClasses/Question.cs index 5bc2f3e..52f6837 100644 --- a/Assets/Scripts/DatabaseClasses/Question.cs +++ b/Assets/Scripts/DatabaseClasses/Question.cs @@ -4,6 +4,7 @@ using UnityEngine; [System.Serializable] +[Newtonsoft.Json.JsonObject] public class Question { public string promptId; diff --git a/Assets/Scripts/DatabaseClasses/Room.cs b/Assets/Scripts/DatabaseClasses/Room.cs index 27e43a2..e147eda 100644 --- a/Assets/Scripts/DatabaseClasses/Room.cs +++ b/Assets/Scripts/DatabaseClasses/Room.cs @@ -1,12 +1,15 @@ using System.Collections.Generic; using UnityEngine; +using Newtonsoft.Json; +using System.Collections; [System.Serializable] +[Newtonsoft.Json.JsonObject] public class Room { public string code; - public List questions; - public List players; + public Dictionary questions; + public Dictionary players; public int currentQuestion; public double creationDate; @@ -15,8 +18,19 @@ public Room(string _code) { this.code = _code; this.creationDate = System.DateTime.Now.ToOADate(); - this.players = new List(); - this.questions = new List(); + this.players = new Dictionary(); + this.questions = new Dictionary(); this.currentQuestion = 0; } + + public List GetPlayerList() + { + return new List(players.Values); + } + + public List GetQuestionList() + { + return new List(questions.Values); + } } + diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 3411685..f7ff232 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -23,7 +23,7 @@ public class GameManager : MonoBehaviour public float explanationTime = 4f; private float currentExplanationTime = 0; - [Header("Home Component")] + [Header("Home Connection Component")] public TMP_InputField roomCodeField; public TextMeshProUGUI roomError; public TMP_InputField playerNameField; @@ -70,6 +70,7 @@ private void Start() submitNewPlayer.interactable = false; } + public GameState GetCurrentState() { return currentState; diff --git a/Assets/Scripts/RoomManager.cs b/Assets/Scripts/RoomManager.cs index 3535528..533fc34 100644 --- a/Assets/Scripts/RoomManager.cs +++ b/Assets/Scripts/RoomManager.cs @@ -6,11 +6,17 @@ using TMPro; using UnityEngine; using System; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System.Linq; public class RoomManager : MonoBehaviour { + public List playerLabels = new List(); + + private RoomState currentState; - private Room currentRoom = null; + private Room myRoom = null; private List players; public float propositionTime = 60; @@ -41,6 +47,7 @@ public class RoomManager : MonoBehaviour private void Awake() { FirebaseInitializer.Instance.onFirebaseReady += Initialize; + currentState = RoomState.None; } @@ -48,13 +55,23 @@ private void Start() { propositionCurrentTime = propositionTime; votingCurrentTime = votingTime; + DisableAllPlayerLabels(); + currentState = RoomState.WaitingForPlayers; + } + + private void DisableAllPlayerLabels() + { + for (int i = 0; i < playerLabels.Count; i++) + { + playerLabels[i].text = $"Waiting for P{i + 1}"; + } } private void OnApplicationQuit() { - realtimeDB.Child("rooms").Child(currentRoom.code).RemoveValueAsync(); - Debug.Log($"delete room {currentRoom.code}"); - currentRoom = null; + realtimeDB.Child("rooms").Child(myRoom.code).RemoveValueAsync(); + Debug.Log($"delete room {myRoom.code}"); + myRoom = null; } private void Initialize() @@ -100,20 +117,21 @@ public void CreateNewRoom() WhichCodesAreAlreadyUsed(codes => { Room newRoom = new Room(GenerateRandomAvailableCode(codes).ToString("D4")); - currentRoom = newRoom; - + myRoom = newRoom; + try { string JSON = JsonUtility.ToJson(newRoom); - + realtimeDB.Child("rooms").Child(newRoom.code).SetRawJsonValueAsync(JSON).ContinueWithOnMainThread(task => { - Debug.Log($"room {currentRoom.code} has been created on the server"); - realtimeDB.Child("rooms").Child(newRoom.code).Child("players").ChildAdded += PlayerConnect; - //TODO MARINE : uncomment and reference the correct game object - //roomCodeLabel.text = currentRoom.code; + + //then subscribe to it + realtimeDB.Child("rooms").Child(newRoom.code).ValueChanged += OnRoomUpdate; + roomCodeLabel.text = myRoom.code; + Debug.Log($"room {myRoom.code} has been created on the server"); }); - } + } catch (Exception e) { Debug.LogException(e); @@ -216,28 +234,59 @@ public void GenerateCouples() } /// - /// is automatically called when a player connect to the room + /// Automatically called when something change in your room /// - /// - public void PlayerConnect(object sender, ChildChangedEventArgs args) + private void OnRoomUpdate(object sender, ValueChangedEventArgs value) { - if (args.DatabaseError != null) + Debug.Log("coucou"); + if (value.DatabaseError != null) { - Debug.LogError(args.DatabaseError.Message); + Debug.LogError(value.DatabaseError.Message); return; } + string JSON = value.Snapshot.GetRawJsonValue(); + Debug.Log(JSON); + try + { + myRoom = JsonConvert.DeserializeObject(JSON); + } + catch (Exception ex) + { + Debug.LogException(ex); + } - string JSON = args.Snapshot.GetRawJsonValue(); - Player joinedPlayer = JsonUtility.FromJson(JSON); - Debug.Log($"{joinedPlayer.name} has joined the room"); - //TODO Marine : do somtethjing with the newly joinde player + Debug.Log("caca"); + + switch (currentState) + { + case RoomState.WaitingForPlayers: + Debug.Log("prout"); + UpdateConnectedPlayerList(myRoom.GetPlayerList()); + break; + default: + break; + } + } + + /// + /// Update the player labels on the WaitingForPlayer page + /// + /// + private void UpdateConnectedPlayerList(List _players) + { + Debug.Log($"players count = {_players.Count}"); + for (int i = 0; i < _players.Count; i++) + { + Debug.Log($"player {i} = {_players[i].name}"); + playerLabels[i].text = _players[i].name; + } } [ContextMenu("Fake Player Connection")] private void FakePlayerConnection() { Player temp = new Player("Momo"); - temp.id = System.Guid.NewGuid().ToString(); + temp.id = Guid.NewGuid().ToString(); temp.SetName("Momo"); } @@ -245,7 +294,8 @@ private void FakePlayerConnection() public enum RoomState { - WaitingForPlayer, + None, + WaitingForPlayers, WaitingForPropositions, ShowPropositions, ShowVoters, diff --git a/Packages/manifest.json b/Packages/manifest.json index 91b486a..b696682 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,6 +3,7 @@ "com.unity.collab-proxy": "2.2.0", "com.unity.feature.development": "1.0.1", "com.unity.memoryprofiler": "1.1.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.toolchain.linux-x86_64": "2.0.6", From 2986fc52a23a6013227153e07123cce0c257bb68 Mon Sep 17 00:00:00 2001 From: Marine Date: Sat, 27 Jan 2024 19:57:11 +0100 Subject: [PATCH 5/5] Ui fixes --- Assets/Scenes/PhoneView.unity | 201 +++++++++++++++++++---- Assets/Scripts/DatabaseClasses/Player.cs | 2 +- Assets/Scripts/GameManager.cs | 66 +++----- 3 files changed, 190 insertions(+), 79 deletions(-) diff --git a/Assets/Scenes/PhoneView.unity b/Assets/Scenes/PhoneView.unity index 857ae98..cb956fd 100644 --- a/Assets/Scenes/PhoneView.unity +++ b/Assets/Scenes/PhoneView.unity @@ -152,7 +152,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.8068042, y: 1.8068042, z: 1.8068042} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 2103733877} m_Father: {fileID: 531335862} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -180,7 +181,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 8ce21f9a93b91764ea7ce3f5f295c927, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -354,8 +355,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -61} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: -66.941} + m_SizeDelta: {x: 0, y: 112.377} m_Pivot: {x: 0.5, y: 1} --- !u!114 &204401156 MonoBehaviour: @@ -620,8 +621,8 @@ RectTransform: 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, y: -230} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: -269.436} + m_SizeDelta: {x: 0, y: 128.871} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &339389581 MonoBehaviour: @@ -908,18 +909,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 436596783} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.0040257527, w: -0.99999195} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.4098437, y: 2.4098437, z: 2.4098437} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1891690321} m_Father: {fileID: 1590939978} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.461} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 345, y: 575} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 548.876, y: 125.955} + m_SizeDelta: {x: 419.287, y: 511.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &475172432 GameObject: @@ -1301,8 +1302,8 @@ RectTransform: 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, y: 689} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 652.9936} + m_SizeDelta: {x: 0, y: 122.013} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &668577475 MonoBehaviour: @@ -1569,8 +1570,8 @@ RectTransform: 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, y: 689} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 659.2964} + m_SizeDelta: {x: 0, y: 109.407} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &751581717 MonoBehaviour: @@ -2160,8 +2161,8 @@ RectTransform: 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, y: 335} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 235.55392} + m_SizeDelta: {x: 0, y: 248.892} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &903645290 MonoBehaviour: @@ -3947,8 +3948,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 477} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 434.13525} + m_SizeDelta: {x: 0, y: 135.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1360529142 MonoBehaviour: @@ -4081,8 +4082,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 424} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 386.279} + m_SizeDelta: {x: 0, y: 125.442} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1383251891 MonoBehaviour: @@ -4636,8 +4637,8 @@ RectTransform: 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, y: 689} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 659.7693} + m_SizeDelta: {x: 0, y: 108.462} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1575113405 MonoBehaviour: @@ -4810,7 +4811,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -61} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 125.442} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1611727550 MonoBehaviour: @@ -4944,7 +4945,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -61} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 114.701} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1680408690 MonoBehaviour: @@ -5859,10 +5860,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 436596784} 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: -81, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 209.645, y: -0.0000076293945} + m_SizeDelta: {x: 419.29, y: 511.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1891690322 MonoBehaviour: @@ -5932,7 +5933,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -5961,7 +5962,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: -369.03137} + m_margin: {x: 0, y: 0, z: 0, w: 1.9035797} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -6473,7 +6474,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2027556832 RectTransform: m_ObjectHideFlags: 0 @@ -6705,8 +6706,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 295} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 256.318} + m_SizeDelta: {x: 0, y: 127.364} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2098267450 MonoBehaviour: @@ -6805,6 +6806,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098267448} m_CullTransparentMesh: 1 +--- !u!1 &2103733876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2103733877} + - component: {fileID: 2103733879} + - component: {fileID: 2103733878} + 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 &2103733877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103733876} + 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: 105416811} + 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: -2.731, y: -2.341} + m_SizeDelta: {x: 94.539, y: 46.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2103733878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103733876} + 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: 20 + 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: 26.7 + m_fontSizeBase: 26.7 + 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 &2103733879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103733876} + m_CullTransparentMesh: 1 --- !u!1 &2139867525 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/DatabaseClasses/Player.cs b/Assets/Scripts/DatabaseClasses/Player.cs index d03d3a8..b315a7b 100644 --- a/Assets/Scripts/DatabaseClasses/Player.cs +++ b/Assets/Scripts/DatabaseClasses/Player.cs @@ -11,7 +11,7 @@ public class Player public Player(string _name) { id = System.Guid.NewGuid().ToString(); - name = _name; + SetName( _name); } /// diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 3411685..87a6ee2 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -89,9 +89,15 @@ private void Initialize() /// public void PlayerValidateNameAndServerRoom(string _name, string _code) { + nameError.gameObject.SetActive(false); + roomError.gameObject.SetActive(false); if (string.IsNullOrEmpty(_name)) { Debug.LogError("Player name is empty", this); + + nameError.text = "You have to put a valid name"; + nameError.gameObject.SetActive(true); + //TODO : MARINE : use the error label to explain to the user that they have forget to put a name return; } @@ -99,6 +105,9 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) if (string.IsNullOrEmpty(_code)) { Debug.LogError("Room code is empty", this); + roomError.text = "You have to put a room code"; + roomError.gameObject.SetActive(true); + //TODO : MARINE : use the error label to explain to the user that they have forget to put a room code return; } @@ -116,13 +125,12 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) else { myOnlineRoom = realtimeDB.Child("rooms").Child(_code); - Debug.Log("Before join room"); //if room exists, join it JoinRoom(() => { //then subscribe to it - myOnlineRoom.ChildChanged += OnRoomUpdate; + myOnlineRoom.ValueChanged += OnRoomUpdate; currentState = GameState.WaitingForOtherPlayersToJoin; players.Add(currentPlayer); @@ -206,6 +214,7 @@ public void StartGame() BeforeStart.SetActive(true); + } /// @@ -258,56 +267,24 @@ public void DisplayEndScreen() /// /// Automatically called when something change in your room /// - private void OnRoomUpdate(object sender, ChildChangedEventArgs e) + private void OnRoomUpdate(object sender, ValueChangedEventArgs e) { - myRoom = JsonUtility.FromJson(e.Snapshot.GetRawJsonValue()); + try + { + myRoom = JsonUtility.FromJson(e.Snapshot.GetRawJsonValue()); + } + catch (Exception ex) + { + Debug.LogException(ex); + } + switch (currentState) { case GameState.WaitingForOtherPlayersToJoin: { - // players = new list en fonction de ce qu'envoie fangh UpdateDisplayedListUser(); - break; - } - case GameState.EnteringName: - { - currentState = GameState.WaitingForOtherPlayersToJoin; - - - //TEMP - - players.Add(currentPlayer); - if (players.Count == 1) - { - submitStartGame.SetActive(true); - } - - Player player2 = new Player("3J"); - player2.SetName("3J"); - player2.id = "2"; - Player player3 = new Player("3J"); - player3.SetName("3J"); - player3.id = "3"; - Player player4 = new Player("3J"); - player4.SetName("3J"); - player4.id = "4"; - Player player5 = new Player("3J"); - player5.SetName("3J"); - player5.id = "5"; - Player player6 = new Player("3J"); - player6.SetName("3J"); - player6.id = "6"; - - - players.Add(player2); - players.Add(player3); - players.Add(player4); - players.Add(player5); - players.Add(player6); - UpdateDisplayedListUser(); - break; } } @@ -328,7 +305,6 @@ public void OnClickSubmitSignIn() { string playerName = playerNameField.text; string roomCode = roomCodeField.text; - Debug.Log("click btn"); PlayerValidateNameAndServerRoom(playerName, roomCode); } }