Merge branch 'Gameplay/ashby-gameplay' into Gameplay/main-gameplay

This commit is contained in:
Ashby Issac 2026-02-23 16:11:39 +05:30
commit 71b6dee8ac
2 changed files with 5 additions and 3 deletions

View File

@ -264,7 +264,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
// SetCanRollDiceForUser(!isBotTurn); // TODO :: Need to change // SetCanRollDiceForUser(!isBotTurn); // TODO :: Need to change
if (isBotTurn) if (isBotTurn)
{ {
currentPlayerTurnTimer.KillTimer(); currentPlayerTurnTimer?.KillTimer();
uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn); uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
return; return;
} }
@ -302,11 +302,12 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
private void ResetCurrentPlayerTurnTimer() private void ResetCurrentPlayerTurnTimer()
{ {
currentPlayerTurnTimer.KillTimer(); currentPlayerTurnTimer?.KillTimer();
} }
public void InitCurrentGamePlayerInfo() public void InitCurrentGamePlayerInfo()
{ {
currentPlayerTurnIndex = 0;
UpdateCurrentPlayerTurn(allPlayerTypes[currentPlayerTurnIndex]); UpdateCurrentPlayerTurn(allPlayerTypes[currentPlayerTurnIndex]);
SetCanRollDiceForUser(IsUsersTurn()); SetCanRollDiceForUser(IsUsersTurn());
UpdateDiceView(); UpdateDiceView();

View File

@ -56,6 +56,7 @@ public class PlayerBaseHandler : MonoBehaviour
public void ShowSelectedPlayerBase(PlayerType playerType, bool state) public void ShowSelectedPlayerBase(PlayerType playerType, bool state)
{ {
if (playerBasesDict.ContainsKey(playerType))
playerBasesDict[playerType].ShowPlayerBaseEffect(state); playerBasesDict[playerType].ShowPlayerBaseEffect(state);
} }
} }