ready for matchmaking

Assets/Scenes/Proto.unity

@@ -1590,6 +1590,82 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1135439587}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &455168947
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 455168948}
+  - component: {fileID: 455168950}
+  - component: {fileID: 455168949}
+  m_Layer: 5
+  m_Name: WaitingForOpponents
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &455168948
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455168947}
+  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: 662397535}
+  m_Father: {fileID: 1248226038}
+  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 &455168949
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455168947}
+  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: 0, g: 0, b: 0, a: 0.8117647}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &455168950
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455168947}
+  m_CullTransparentMesh: 1
 --- !u!1 &457077292
 GameObject:
   m_ObjectHideFlags: 0
@@ -2264,6 +2340,142 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &662397534
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 662397535}
+  - component: {fileID: 662397537}
+  - component: {fileID: 662397536}
+  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 &662397535
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662397534}
+  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: 455168948}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &662397536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662397534}
+  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 Opponent \nto join..."
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 605433b68313d491a8ab88bc03a41651, type: 2}
+  m_sharedMaterial: {fileID: 2830636965969884548, guid: 605433b68313d491a8ab88bc03a41651, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294949220
+  m_fontColor: {r: 0.3915094, g: 0.72657365, 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: 83.39
+  m_fontSizeBase: 83.39
+  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_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 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 &662397537
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 662397534}
+  m_CullTransparentMesh: 1
 --- !u!1 &663560860
 GameObject:
   m_ObjectHideFlags: 0
@@ -4314,10 +4526,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1302593951}
+  - {fileID: 959054972}
   - {fileID: 976909849}
   - {fileID: 1716356729}
   - {fileID: 1615513058}
-  - {fileID: 959054972}
+  - {fileID: 455168948}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -4344,6 +4557,7 @@ MonoBehaviour:
   txtWhosTurn: {fileID: 1508373957}
   txtTurnTimer: {fileID: 57141654}
   turnTimerRound: {fileID: 821876707}
+  waitingForOpponentPanel: {fileID: 455168947}
 --- !u!1001 &1254994271
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5591,6 +5805,7 @@ MonoBehaviour:
   syncMode: 0
   syncInterval: 0
   m_isMoving: 0
+  gameStarted: 0
   SelectedTeam: 0
   turnTimer: 10
   turnTimerCounter: 0

Assets/Scripts/GameCanvas.cs

@@ -11,6 +11,8 @@ public class GameCanvas : MonoBehaviour
     void Awake()
     {
         instance = this;
+
+        ShowWaitingForOpponentPanel();
     }
 
     public EventTrigger gameInputPanel;
@@ -22,8 +24,16 @@ public class GameCanvas : MonoBehaviour
     public TMP_Text txtTurnTimer;
     public Image turnTimerRound;
 
+    public GameObject waitingForOpponentPanel;
 
 
+    public void ShowWaitingForOpponentPanel(){
+        waitingForOpponentPanel.SetActive(true);
+    }
+    public void HideWaitingForOpponentPanel(){
+        waitingForOpponentPanel.SetActive(false);
+    }
+
     void Update(){
         UpdateTurnTimer();
     }

Assets/Scripts/GameManager.cs

@@ -16,6 +16,16 @@ public class GameManager : NetworkBehaviour
     }
     [SyncVar]
     public bool m_isMoving =false;
+    [SyncVar(hook = nameof(OnGameStartedChanged))]
+    public bool gameStarted = false;
+    void OnGameStartedChanged(bool oldStarted, bool newStarted){
+        if(newStarted){
+            GameCanvas.instance.HideWaitingForOpponentPanel();
+        }else{
+            GameCanvas.instance.ShowWaitingForOpponentPanel();
+        }
+    }
+
     [SyncVar(hook = nameof(OnSelectedTeamChanged))]
     public Team SelectedTeam = Team.Red;
     void OnSelectedTeamChanged(Team oldTeam, Team newTeam){
@@ -55,6 +65,9 @@ public class GameManager : NetworkBehaviour
     [SyncVar]
     public int hitCounter = 0;
 
+
+    
+
     public static GameManager instance;
 
     public float puckMass{
@@ -234,12 +247,23 @@ public class GameManager : NetworkBehaviour
             m_isMoving=IsMoving();
 
             HandleTurnTimer();
+
+            if(!gameStarted){
+
+                NetPlayer[] players = FindObjectsOfType<NetPlayer>();
+                if (players.Length == 2)
+                {
+                    gameStarted = true;
+                    GameCanvas.instance.HideWaitingForOpponentPanel();
+                    Debug.Log("Game started On Server");
+                }
+            }
         }
     }
 
     void HandleTurnTimer(){
         if(turnTimerCounter < turnTimer){
-            if(!isMoving && !switchingTeams){
+            if(!isMoving && !switchingTeams && gameStarted){
                 turnTimerCounter += Time.deltaTime;
             }
         }else{
@@ -275,14 +299,11 @@ public class GameManager : NetworkBehaviour
 
 
         if(blueScore >= 3){
-            gameOverPanel.SetActive(true);
+            RpcGameOver(Team.Blue);
-
+            gameOver(Team.Blue);
-            blueWon.SetActive(true);
-            redWon.SetActive(false);
         }else if(redScore >= 3){
-            gameOverPanel.SetActive(true);
+            RpcGameOver(Team.Red);
-            blueWon.SetActive(false);
+            gameOver(Team.Red);
-            redWon.SetActive(true);
         }else{
             StartCoroutine(CoroutineOnGoal(team));
         }
@@ -290,6 +311,22 @@ public class GameManager : NetworkBehaviour
         hitCounter = 0;
     }
 
+    [ClientRpc]
+    void RpcGameOver(Team team){
+        gameOver(team);
+    }
+
+    void gameOver(Team team){
+        gameOverPanel.SetActive(true);
+        if(team == Team.Blue){
+            blueWon.SetActive(true);
+            redWon.SetActive(false);
+        }else{
+            blueWon.SetActive(false);
+            redWon.SetActive(true);
+        }
+    }
+
     bool freezeInput = false;
 
     IEnumerator CoroutineOnGoal(Team team, bool kickoff = false){