Merge branch 'dev-hazim'

dev-hazim
Hazim Bin Ijaz 4 weeks ago
commit 049dc9f04a

@ -11151,8 +11151,8 @@ RectTransform:
- {fileID: 1790415148045805122} - {fileID: 1790415148045805122}
- {fileID: 1790415148045805106} - {fileID: 1790415148045805106}
- {fileID: 1790415148045805094} - {fileID: 1790415148045805094}
- {fileID: 1790415148045805105}
- {fileID: 242488684} - {fileID: 242488684}
- {fileID: 1790415148045805105}
- {fileID: 1790415148045805080} - {fileID: 1790415148045805080}
- {fileID: 706426009} - {fileID: 706426009}
- {fileID: 1040638924} - {fileID: 1040638924}
@ -13959,6 +13959,7 @@ MonoBehaviour:
closeGameOver: 0 closeGameOver: 0
row: 0 row: 0
column: 0 column: 0
levelLeaderBtn: {fileID: 1137828060}
TimerManager: {fileID: 242488685} TimerManager: {fileID: 242488685}
--- !u!114 &1790415148045805218 --- !u!114 &1790415148045805218
MonoBehaviour: MonoBehaviour:
@ -14327,6 +14328,18 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 242488685}
m_TargetAssemblyTypeName: TimerManager, Assembly-CSharp
m_MethodName: StopTimer
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1790415148045805234 --- !u!114 &1790415148045805234
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14999,6 +15012,18 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 242488685}
m_TargetAssemblyTypeName: TimerManager, Assembly-CSharp
m_MethodName: StartTimer
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1790415148045805258 --- !u!114 &1790415148045805258
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15519,6 +15544,18 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 242488685}
m_TargetAssemblyTypeName: TimerManager, Assembly-CSharp
m_MethodName: StartTimer
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1790415148045805283 --- !u!114 &1790415148045805283
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

@ -77,7 +77,7 @@ public class GamePlayManager : MonoBehaviour
private Vector3 _levelContainerPosition; private Vector3 _levelContainerPosition;
private bool isRotating; private bool isRotating;
[SerializeField] private Button levelLeaderBtn;
[SerializeField] private TimerManager TimerManager; [SerializeField] private TimerManager TimerManager;
// Adding the isTimerLevel flag // Adding the isTimerLevel flag
@ -176,8 +176,10 @@ public class GamePlayManager : MonoBehaviour
obj.UpdatePipeColor(); obj.UpdatePipeColor();
}); });
CheckGameOver(); CheckGameOver();
levelLeaderBtn.gameObject.SetActive(isTimerLevel);
} }
public void OnButtonClick(Cell c) public void OnButtonClick(Cell c)
{ {
if (!isRotating && !isGameOver) if (!isRotating && !isGameOver)

Loading…
Cancel
Save