fix: only one background

fix: correct pages should toggle at correct time
2024-02-04 13:33:24 +01:00 · 2024-02-04 13:32:08 +01:00
2 changed files with 100 additions and 343 deletions
--- a/Assets/Scenes/ComputerView.unity
+++ b/Assets/Scenes/ComputerView.unity
@ -191,78 +191,6 @@ MonoBehaviour:
  m_Spacing: {x: 50, y: 50}
  m_Constraint: 0
  m_ConstraintCount: 2
--- !u!1 &9253746
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9253747}
-  - component: {fileID: 9253749}
-  - component: {fileID: 9253748}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &9253747
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9253746}
-  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: 581333954}
-  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 &9253748
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9253746}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &9253749
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9253746}
-  m_CullTransparentMesh: 1
 --- !u!1 &45150984
 GameObject:
  m_ObjectHideFlags: 0
@ -291,7 +219,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 500028487}
  - {fileID: 619055281}
  - {fileID: 1798182258}
  - {fileID: 1350310808}
@ -720,6 +647,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (5)
@ -1489,6 +1420,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (4)
@ -1813,6 +1748,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (1)
@ -2110,78 +2049,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 411140634}
  m_CullTransparentMesh: 1
--- !u!1 &427170778
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 427170779}
-  - component: {fileID: 427170781}
-  - component: {fileID: 427170780}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &427170779
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 427170778}
-  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: 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:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 427170778}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &427170781
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 427170778}
-  m_CullTransparentMesh: 1
 --- !u!1 &440351810
 GameObject:
  m_ObjectHideFlags: 0
@ -2318,78 +2185,6 @@ MonoBehaviour:
  m_Spacing: {x: 150, y: 100}
  m_Constraint: 0
  m_ConstraintCount: 2
--- !u!1 &500028486
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 500028487}
-  - component: {fileID: 500028489}
-  - component: {fileID: 500028488}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &500028487
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 500028486}
-  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: 45150985}
-  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 &500028488
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 500028486}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &500028489
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 500028486}
-  m_CullTransparentMesh: 1
 --- !u!1 &516717322
 GameObject:
  m_ObjectHideFlags: 0
@ -2495,7 +2290,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 9253747}
  - {fileID: 190388869}
  - {fileID: 1813019851}
  - {fileID: 98075281}
@ -2779,6 +2573,7 @@ RectTransform:
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 1836364712}
  - {fileID: 1117928115}
  - {fileID: 45150985}
  - {fileID: 1730465903}
@ -3014,6 +2809,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker
@ -3261,6 +3060,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (7)
@ -4187,6 +3990,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (6)
@ -4526,6 +4333,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (3)
@ -5014,7 +4825,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 427170779}
  - {fileID: 2078353088}
  - {fileID: 1901141295}
  - {fileID: 1499472362}
@ -7638,7 +7448,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1542177990}
-  - {fileID: 1850877722}
  - {fileID: 1351333135}
  - {fileID: 1236996027}
  - {fileID: 1567271222}
@ -7977,7 +7786,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 1803918110}
  - {fileID: 1165659435}
  - {fileID: 987875882}
  - {fileID: 157938956}
@ -8385,78 +8193,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1798182257}
  m_CullTransparentMesh: 1
--- !u!1 &1803918109
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1803918110}
-  - component: {fileID: 1803918112}
-  - component: {fileID: 1803918111}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1803918110
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1803918109}
-  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: 1730465903}
-  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 &1803918111
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1803918109}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &1803918112
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1803918109}
-  m_CullTransparentMesh: 1
 --- !u!1 &1805240025
 GameObject:
  m_ObjectHideFlags: 0
@ -8666,7 +8402,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1813019850}
  m_CullTransparentMesh: 1
--- !u!1 &1850877721
+--- !u!1 &1836364711
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -8674,9 +8410,9 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 1850877722}
-  - component: {fileID: 1850877724}
-  - component: {fileID: 1850877723}
+  - component: {fileID: 1836364712}
+  - component: {fileID: 1836364714}
+  - component: {fileID: 1836364713}
  m_Layer: 5
  m_Name: Background
  m_TagString: Untagged
@ -8684,35 +8420,35 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &1850877722
+--- !u!224 &1836364712
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1850877721}
+  m_GameObject: {fileID: 1836364711}
  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: 1660260834}
+  m_Father: {fileID: 610087870}
  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.000030517578, y: 0}
-  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 &1850877723
+--- !u!114 &1836364713
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1850877721}
+  m_GameObject: {fileID: 1836364711}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@ -8723,20 +8459,23 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 51cab6d235722024da1a1ba85f4d2e99, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &1850877724
+  m_Sprite: {fileID: 21300000, guid: 51cab6d235722024da1a1ba85f4d2e99, 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 &1836364714
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1850877721}
+  m_GameObject: {fileID: 1836364711}
  m_CullTransparentMesh: 1
 --- !u!1 &1854893634
 GameObject:
@ -9214,6 +8953,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2430977146559507814, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
+      propertyPath: m_fontSize
+      value: 36
+      objectReference: {fileID: 0}
    - target: {fileID: 4312846972391547553, guid: 69942fa558cf34dfc91982c6bccef840, type: 3}
      propertyPath: m_Name
      value: PlayerSticker (2)
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@ -340,56 +340,70 @@ private void OnNewGameState()
        {
            case (int)GameState.EnteringName:
                {
+                    WaitingOtherPlayers.SetActive(false);
+                    BeforeStart.SetActive(false);
+                    TakePicture.SetActive(false);
+                    VotePicture.SetActive(false);
                    EndGame.SetActive(false);
+
                    HomeConnection.SetActive(true);
                    break;
                }
            case (int)GameState.Explanation:
                {
                    Debug.Log("Explanation time.", this);
-                    EndGame.SetActive(false);
+
                    WaitingOtherPlayers.SetActive(false);
+                    TakePicture.SetActive(false);
                    WaitingRoom.SetActive(false);
+                    VotePicture.SetActive(false);
+                    EndGame.SetActive(false);
+
                    BeforeStart.SetActive(true);
                    endOfViewDate = DateTime.Now.AddSeconds(4);
                    break;
                }
            case (int)GameState.MakeProposition:
                {
-                    if (BeforeStart.activeInHierarchy)
-                    {
-                        Debug.Log("It's photo time !", this);
-                        BeforeStart.SetActive(false);
-                        TakePicture.SetActive(true);
-                        endOfViewDate = DateTime.Now.AddSeconds(60);
-                    }
+                    Debug.Log("It's photo time !", this);
+                    WaitingOtherPlayers.SetActive(false);
+                    BeforeStart.SetActive(false);
+                    WaitingRoom.SetActive(false);
+                    VotePicture.SetActive(false);
+                    EndGame.SetActive(false);
+
+                    TakePicture.SetActive(true);
+                    endOfViewDate = DateTime.Now.AddSeconds(60);
                    break;
                }
            case (int)GameState.MakeVote:
                {
-                    if (TakePicture.activeInHierarchy || WaitingOtherPlayers.activeInHierarchy)
-                    {
-                        Debug.Log("It's voting time !", this);
-                        WaitingOtherPlayers.SetActive(false);
-                        TakePicture.SetActive(false);
-                        VotePicture.SetActive(true);
-                        myOnlineRoom.Child("currentQuestionId").ValueChanged += OnCurrentQuestionChanged;
-                    }
+                    Debug.Log("It's voting time !", this);
+                    WaitingOtherPlayers.SetActive(false);
+                    BeforeStart.SetActive(false);
+                    WaitingRoom.SetActive(false);
+                    TakePicture.SetActive(false);
+                    EndGame.SetActive(false);
+
+                    VotePicture.SetActive(true);
+                    myOnlineRoom.Child("currentQuestionId").ValueChanged += OnCurrentQuestionChanged;
                    break;
                }
            case (int)GameState.Score:
                {
-                    if (VotePicture.activeInHierarchy || WaitingOtherPlayers.activeInHierarchy)
-                    {
-                        Debug.Log("it's scoring time !", this);
-                        myOnlineRoom.Child("currentQuestionId").ValueChanged -= OnCurrentQuestionChanged;
+                    Debug.Log("it's scoring time !", this);
+                    myOnlineRoom.Child("currentQuestionId").ValueChanged -= OnCurrentQuestionChanged;

-                        VotePicture.SetActive(false);
-                        WaitingOtherPlayers.SetActive(false);
-                        endGameFirstPlayer.SetActive(CheckIfIAmTheFirst(myRoom.GetPlayerList()));
-                        endGameOtherPlayers.SetActive(!CheckIfIAmTheFirst(myRoom.GetPlayerList()));
-                        EndGame.SetActive(true);
-                    }
+                    WaitingOtherPlayers.SetActive(false);
+                    BeforeStart.SetActive(false);
+                    WaitingRoom.SetActive(false);
+                    TakePicture.SetActive(false);
+                    VotePicture.SetActive(false);
+
+                    EndGame.SetActive(true);
+
+                    endGameFirstPlayer.SetActive(CheckIfIAmTheFirst(myRoom.GetPlayerList()));
+                    endGameOtherPlayers.SetActive(!CheckIfIAmTheFirst(myRoom.GetPlayerList()));
                    break;
                }

@ -514,7 +528,7 @@ private void OnCurrentQuestionChanged(object sender, ValueChangedEventArgs onlin
        Question q = myRoom.questions[questionId];

        //do not vote for your question
-        if(myRoom.GetQuestionsByPlayer(currentPlayer).Contains(q))
+        if (myRoom.GetQuestionsByPlayer(currentPlayer).Contains(q))
        {
            WaitingOtherPlayers.SetActive(true);
            VotePicture.SetActive(false);
Author	SHA1	Message	Date
Fangh	a99f7dca5c	fix: only one background	2024-02-04 13:33:24 +01:00
Fangh	764a39d053	fix: correct pages should toggle at correct time	2024-02-04 13:32:08 +01:00