Merge branch 'Gameplay/ashby-gameplay' into Gameplay/main-gameplay
This commit is contained in:
commit
71b6dee8ac
@ -264,7 +264,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
// SetCanRollDiceForUser(!isBotTurn); // TODO :: Need to change
|
||||
if (isBotTurn)
|
||||
{
|
||||
currentPlayerTurnTimer.KillTimer();
|
||||
currentPlayerTurnTimer?.KillTimer();
|
||||
uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
|
||||
return;
|
||||
}
|
||||
@ -302,11 +302,12 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
|
||||
private void ResetCurrentPlayerTurnTimer()
|
||||
{
|
||||
currentPlayerTurnTimer.KillTimer();
|
||||
currentPlayerTurnTimer?.KillTimer();
|
||||
}
|
||||
|
||||
public void InitCurrentGamePlayerInfo()
|
||||
{
|
||||
currentPlayerTurnIndex = 0;
|
||||
UpdateCurrentPlayerTurn(allPlayerTypes[currentPlayerTurnIndex]);
|
||||
SetCanRollDiceForUser(IsUsersTurn());
|
||||
UpdateDiceView();
|
||||
|
||||
@ -56,6 +56,7 @@ public class PlayerBaseHandler : MonoBehaviour
|
||||
|
||||
public void ShowSelectedPlayerBase(PlayerType playerType, bool state)
|
||||
{
|
||||
playerBasesDict[playerType].ShowPlayerBaseEffect(state);
|
||||
if (playerBasesDict.ContainsKey(playerType))
|
||||
playerBasesDict[playerType].ShowPlayerBaseEffect(state);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user