Ashby/Ludo-3D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Ashby:71b6dee8acc6ea984ba4d29ea471383b86985f2d
Branches Tags
Ashby:main
Ashby:Gameplay/ashby-gameplay
Ashby:Gameplay/main-gameplay
Ashby:Gameplay/siva-gameplay
Ashby:UI/ashby-ui
Ashby:UI/main-ui
Ashby:UI/siva-ui
..
compare: Ashby:87dfbaf5d1222a406402d660e42b1a0b9a51d8b2
Branches Tags
Ashby:Gameplay/ashby-gameplay
Ashby:Gameplay/main-gameplay
Ashby:main
Ashby:Gameplay/siva-gameplay
Ashby:UI/ashby-ui
Ashby:UI/main-ui
Ashby:UI/siva-ui

No commits in common. "71b6dee8acc6ea984ba4d29ea471383b86985f2d" and "87dfbaf5d1222a406402d660e42b1a0b9a51d8b2" have entirely different histories.
71b6dee8ac ... 87dfbaf5d1

2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

5
Assets/Scripts/Gameplay/GameplayManager.cs
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,12 +302,11 @@ 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();

3
Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs
View File

@ -56,7 +56,6 @@ 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);
} }
} }