Merge branch 'main' of github.com:LeGall29/GGJ2024

Assets/Scenes/PhoneView.unity

@@ -198,6 +198,53 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 105416810}
   m_CullTransparentMesh: 1
+--- !u!1 &157909813
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 157909815}
+  - component: {fileID: 157909814}
+  m_Layer: 0
+  m_Name: RoomCreator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &157909814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 157909813}
+  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!4 &157909815
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 157909813}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 117.24013, y: 248.68315, z: -1.7392539}
+  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 &162738918
 GameObject:
   m_ObjectHideFlags: 0
@@ -2947,7 +2994,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 1202782732}
         m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
-        m_MethodName: PlayerValidateNameAndServerRoom
+        m_MethodName: OnClickSubmitSignIn
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -6901,3 +6948,4 @@ SceneRoots:
   - {fileID: 1174378092}
   - {fileID: 1202782730}
   - {fileID: 865098996}
+  - {fileID: 157909815}

Assets/Scripts/GameManager.cs

@@ -67,7 +67,7 @@ private void Start()
     {
         currentExplanationTime = explanationTime;
         HomeConnection.SetActive(true);
-        submitNewPlayer.GetComponent<UnityEngine.UI.Button>().interactable = false;
+        submitNewPlayer.interactable = false;
     }
 
     public GameState GetCurrentState()
@@ -81,7 +81,7 @@ private void Initialize()
         realtimeDB = FirebaseDatabase.DefaultInstance.RootReference;
         Debug.Log("Realtime DB initialized");
 
-        submitNewPlayer.GetComponent<UnityEngine.UI.Button>().interactable = true;
+        submitNewPlayer.interactable = true;
     }
 
     /// <summary>