Added Screen switching logic (main -> game -> gameOver)

Assets/Prefabs/UI/Canvas - World.prefab

@@ -239,7 +239,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2739169735767897497
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -347,8 +347,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4282166768
+    rgba: 4278190080
-  m_fontColor: {r: 0.9411765, g: 0.6784314, b: 0.23529412, a: 1}
+  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Scenes/Game.unity

@@ -838,6 +838,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0.018799989
       objectReference: {fileID: 0}
+    - target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 3876540017062383922, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 27.564117
@@ -1078,6 +1082,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 12.69047
@@ -1417,6 +1425,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pirate (Grey) (4)
       objectReference: {fileID: 0}
+    - target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
 --- !u!1 &86529552
@@ -1778,6 +1794,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pirate (Grey) (2)
       objectReference: {fileID: 0}
+    - target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
 --- !u!1 &136321829
@@ -3323,6 +3347,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1841959051}
     m_Modifications:
+    - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
       propertyPath: m_Name
       value: Pirate (Blue) (2)
@@ -3371,6 +3399,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
 --- !u!4 &327414285 stripped
@@ -4914,6 +4946,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1094154913}
     m_Modifications:
+    - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
       propertyPath: m_Name
       value: Pirate (Green) (2)
@@ -4962,6 +4998,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
 --- !u!1001 &515214452
@@ -5168,6 +5208,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pirate (Grey) (3)
       objectReference: {fileID: 0}
+    - target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
 --- !u!1 &543219273
@@ -5260,6 +5308,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1841959051}
     m_Modifications:
+    - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
       propertyPath: m_Name
       value: Pirate (Blue) (4)
@@ -5308,6 +5360,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
 --- !u!4 &573724676 stripped
@@ -7593,6 +7649,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1373272158}
     m_Modifications:
+    - target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 6954059691668741325, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_Name
       value: Pirate (Red) (3)
@@ -7641,6 +7701,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
 --- !u!1 &832604100
@@ -8586,6 +8650,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -0.022962524
       objectReference: {fileID: 0}
+    - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3355085080137322900, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 72.00588
@@ -8862,6 +8930,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 164.47597
       objectReference: {fileID: 0}
+    - target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 9177389804466720770, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 2.6976361
@@ -10794,6 +10866,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0.018799989
       objectReference: {fileID: 0}
+    - target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 3876540017062383922, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 27.815733
@@ -11034,6 +11110,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 3.9168587
@@ -13744,6 +13824,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1094154913}
     m_Modifications:
+    - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
       propertyPath: m_Name
       value: Pirate (Green) (4)
@@ -13792,6 +13876,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
 --- !u!1 &1251876826
@@ -14794,6 +14882,9 @@ MonoBehaviour:
   - {fileID: 5608193481705990350}
   - {fileID: 5608193482405246781}
   - {fileID: 5608193483424667983}
+  - {fileID: 5608193481910428233}
+  - {fileID: 5608193482973815120}
+  - {fileID: 5608193482197189505}
   baseObjects:
   - {fileID: 2095159703}
   - {fileID: 247469677}
@@ -15447,6 +15538,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1841959051}
     m_Modifications:
+    - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
       propertyPath: m_Name
       value: Pirate (Blue) (3)
@@ -15495,6 +15590,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
 --- !u!4 &1449273730 stripped
@@ -16113,6 +16212,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1094154913}
     m_Modifications:
+    - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
       propertyPath: m_Name
       value: Pirate (Green) (3)
@@ -16161,6 +16264,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
 --- !u!1 &1545603096
@@ -17959,6 +18066,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1373272158}
     m_Modifications:
+    - target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 6954059691668741325, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
       propertyPath: m_Name
       value: Pirate (Red) (1)
@@ -18007,6 +18118,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
 --- !u!1 &1772548174
@@ -22074,6 +22189,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pirate (Grey) (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
 --- !u!1 &1835930482367990250
@@ -22940,7 +23063,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0553fd5dfa2fe448ab50cc371257cc20, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  screenType: 3
+  screenType: 6
   shouldFade: 0
   pvpModeBtn: {fileID: 5608193482123643063}
   pvaiModeBtn: {fileID: 5608193482885172035}
@@ -23719,6 +23842,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5608193481910428232}
   - component: {fileID: 5608193481910428234}
+  - component: {fileID: 5608193481910428235}
   m_Layer: 5
   m_Name: Main Menu
   m_TagString: Untagged
@@ -23734,6 +23858,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5608193481910428233}
   m_CullTransparentMesh: 1
+--- !u!114 &5608193481910428235
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5608193481910428233}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81101c7d4c55a4f1e982f266e7298763, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  screenType: 0
+  shouldFade: 0
 --- !u!224 &5608193481924487018
 RectTransform:
   m_ObjectHideFlags: 0
@@ -24452,6 +24590,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5608193482197189504}
+  - component: {fileID: 5608193482197189506}
   m_Layer: 5
   m_Name: Game Over
   m_TagString: Untagged
@@ -24459,6 +24598,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!114 &5608193482197189506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5608193482197189505}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 14661c82e227e4988a4ad90d300c6e40, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  screenType: 2
+  shouldFade: 0
 --- !u!222 &5608193482210820768
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -24734,7 +24887,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac108e78c738f433e8186c831e351d82, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  screenType: 2
+  screenType: 5
   shouldFade: 0
   diceBtn: {fileID: 1100918534}
   pauseBtn: {fileID: 5608193482794695415}
@@ -26195,13 +26348,14 @@ GameObject:
   m_Component:
   - component: {fileID: 5608193482973815123}
   - component: {fileID: 5608193482973815122}
+  - component: {fileID: 5608193482973815124}
   m_Layer: 5
   m_Name: Game
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!222 &5608193482973815122
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -26232,6 +26386,20 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5608193482973815124
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5608193482973815120}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c92cd673ccb28491c89a3d28d8707e79, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  screenType: 1
+  shouldFade: 0
 --- !u!224 &5608193482985030356
 RectTransform:
   m_ObjectHideFlags: 0
@@ -27412,7 +27580,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!222 &5608193483354237948
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -27871,6 +28039,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1094154913}
     m_Modifications:
+    - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
       propertyPath: m_Name
       value: Pirate (Green) (1)
@@ -27919,6 +28091,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
 --- !u!4 &7686822008443127058

Assets/Scripts/Gameplay/GameplayManager.cs

@@ -31,6 +31,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     [SerializeField] private PlayerBaseHandler playerBaseHandler;
 
     private PlayerType currentPlayerTypeTurn;
+    public PlayerType CurrentPlayerTypeTurn => currentPlayerTypeTurn;
     private int currentPlayerTurnIndex = 0;
 
     private List<PlayerType> allPlayerTypes = new List<PlayerType>();
@@ -43,6 +44,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     private Dictionary<PlayerType, Dictionary<int, BotMove>> botRuntimeMovementData = new Dictionary<PlayerType, Dictionary<int, BotMove>>();
 
     private TilesManager tilesManager;
+    private UIManager uIManager;
     private GameManager gameManager;
 
     private int diceRolledValue;
@@ -75,6 +77,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     public void InitializeData()
     {
         tilesManager = InterfaceManager.Instance.GetInterfaceInstance<TilesManager>();
+        uIManager = InterfaceManager.Instance.GetInterfaceInstance<UIManager>();
         gameManager = InterfaceManager.Instance.GetInterfaceInstance<GameManager>();
     }
 
@@ -729,6 +732,8 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
                 currentPlayerTypeTurn = allPlayerTypes[currentPlayerTurnIndex];
             }
 
+            uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
+
             diceSixRollCounter = 0;
             diceText.text = $"{0}";
 

Assets/Scripts/UI/Managers/UIManager.cs

@@ -28,17 +28,26 @@ public class UIManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     {
         screenManager = screenManager == null ? InterfaceManager.Instance.GetInterfaceInstance<ScreenManager>() : screenManager;
         screenManager.HideAllScreens();
+        screenManager.ShowScreen(ScreenType.MainMenuScreen);
         screenManager.ShowScreen(ScreenType.MenuScreen);
     }
 
     public void OnInGameScreen()
     {
         screenManager.HideAllScreens();
+        screenManager.ShowScreen(ScreenType.GameScreen);
         screenManager.ShowScreen(ScreenType.InGameHUDScreen);
     }
 
+    public void UpdatePlayerTurnText(PlayerType type)
+    {
+        screenManager.GetScreen<GameHUDS>(ScreenType.InGameHUDScreen).UpdatePlayerTurnText(type);
+    }
+
     public void OnGameOver()
     {
+        screenManager.HideAllScreens();
+        screenManager.ShowScreen(ScreenType.GameOverScreen);
         popupManager.GetPopup<GameOverPopup>(PopupType.GameOverPopup).InitData(gameplayManager.PlayerDatas);
         popupManager.ShowPopup(PopupType.GameOverPopup);
     }

Assets/Scripts/UI/Pages/Bases/ScreenBase.cs

@@ -7,10 +7,13 @@ using UnityEngine;
 
 public enum ScreenType
 {
+    MainMenuScreen,
+    GameScreen,
+    GameOverScreen,
     LoadingScreen,
     LevelsScreen,
     InGameHUDScreen,
-    MenuScreen,
+    MenuScreen
 }
 
 public class ScreenBase : UIBase, IUIBase

Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs

@@ -36,7 +36,6 @@ public class GameOverPopup : PopupBase
 
     private void HidePopup()
     {
-        popupManager = popupManager == null ? InterfaceManager.Instance.GetInterfaceInstance<PopupManager>() : popupManager;
         popupManager.HidePopup(popupType);
     }
 

Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs

@@ -105,6 +105,8 @@ public class PvAIModePopup : PopupBase
         Debug.Log($"Player 1: {playerName}");
 
         popupManager.HidePopup(popupType);
+        screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
+        screenManager.HideScreen(ScreenType.MainMenuScreen);
 
         gameModeHandler = gameModeHandler == null ? InterfaceManager.Instance.GetInterfaceInstance<GameModeHandler>() : gameModeHandler;
         gameModeHandler.InitBotModeData(new PlayerData { playerType = playerType, playerName = playerName }, selectedPlayerCount - 1);

Assets/Scripts/UI/Pages/Screens/GameHUDS.cs

@@ -43,4 +43,27 @@ public class GameHUDS : ScreenBase
         uiManager = uiManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<UIManager>() : uiManager;
         uiManager.OnDiceViewInteracted();
     }
+
+    public void UpdatePlayerTurnText(PlayerType playerType)
+    {
+        Debug.Log($"GameHUDS: UpdatePlayerTurnText: {playerType}");
+        switch (playerType)
+        {
+            case PlayerType.Player1:
+                playerTurnText.text = "Turn : Red";
+                break;
+            case PlayerType.Player2:
+                playerTurnText.text = "Turn : Blue";
+                break;
+            case PlayerType.Player3:
+                playerTurnText.text = "Turn : Grey";
+                break;
+            case PlayerType.Player4:
+                playerTurnText.text = "Turn : Green";
+                break;
+            default:
+                playerTurnText.text = "Turn";
+                break;
+        }
+    }
 }

Assets/Scripts/UI/Pages/Screens/GameOverScreen.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameOverScreen : ScreenBase
+{
+
+}

Assets/Scripts/UI/Pages/Screens/GameOverScreen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14661c82e227e4988a4ad90d300c6e40
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Pages/Screens/GameScreen.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameScreen : ScreenBase
+{
+
+}

Assets/Scripts/UI/Pages/Screens/GameScreen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c92cd673ccb28491c89a3d28d8707e79
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Pages/Screens/MainMenuScreen.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MainMenuScreen : ScreenBase
+{
+
+}

Assets/Scripts/UI/Pages/Screens/MainMenuScreen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81101c7d4c55a4f1e982f266e7298763
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: