Addressed all pawns in finishing path scenarios.
This commit is contained in:
parent
ffabbf808f
commit
76659bc964
@ -11554,7 +11554,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
diceView: {fileID: 1619592888}
|
||||
diceTestValue: 6
|
||||
diceTestValue: 1
|
||||
--- !u!4 &1039618837 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5672526856521419272, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
|
||||
@ -24566,7 +24566,7 @@ GameObject:
|
||||
- component: {fileID: 5608193481910428234}
|
||||
- component: {fileID: 5608193481910428235}
|
||||
m_Layer: 5
|
||||
m_Name: Main Menu
|
||||
m_Name: MainMenuScreen
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -25314,7 +25314,7 @@ GameObject:
|
||||
- component: {fileID: 5608193482197189504}
|
||||
- component: {fileID: 5608193482197189506}
|
||||
m_Layer: 5
|
||||
m_Name: Game Over
|
||||
m_Name: GameOverScreen
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -27072,7 +27072,7 @@ GameObject:
|
||||
- component: {fileID: 5608193482973815122}
|
||||
- component: {fileID: 5608193482973815124}
|
||||
m_Layer: 5
|
||||
m_Name: Game
|
||||
m_Name: GameScreen
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
||||
@ -268,7 +268,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
|
||||
private bool CheckForMaxDiceRollAttempt()
|
||||
{
|
||||
if (diceSixRollCounter == 3)
|
||||
if (diceSixRollCounter > 2)
|
||||
{
|
||||
CanRollDiceAgain = false;
|
||||
SwitchPlayer();
|
||||
@ -418,7 +418,17 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
}
|
||||
|
||||
Debug.Log($"AI playerPawn :: {pawn.name} :: SelectedPawn: {pawn.name}");
|
||||
if (pawn != null)
|
||||
OnPawnSelected(pawn);
|
||||
else
|
||||
{
|
||||
if (CheckForMaxDiceRollAttempt())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
HandleDiceRoll();
|
||||
}
|
||||
|
||||
void InitPawnBasedOnState(BotMove botMove)
|
||||
{
|
||||
@ -970,6 +980,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
Debug.Log($"currentPlayerTypeTurn: {currentPlayerTypeTurn}");
|
||||
Debug.Log($"playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn): {playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn)}");
|
||||
playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
||||
Debug.Log($"ranking: {playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking}");
|
||||
}
|
||||
|
||||
if (allPlayerTypes.Count == 1)
|
||||
@ -977,6 +988,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
// Game is over
|
||||
allPlayerTypes.RemoveAt(0);
|
||||
playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
||||
Debug.Log($"ranking: {playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking}");
|
||||
|
||||
// Show Game Over panel
|
||||
gameManager.OnGameStateChanged(GameState.GameOver);
|
||||
|
||||
@ -49,17 +49,6 @@ public class GameOverPopup : PopupBase
|
||||
|
||||
public void InitData(List<PlayerData> playerDatas)
|
||||
{
|
||||
for (int i = 0; i < playerDatas.Count; i++)
|
||||
{
|
||||
if (i == 0)
|
||||
{
|
||||
texts[i].text = $"{playerDatas[i].playerName} Wins";
|
||||
continue;
|
||||
}
|
||||
|
||||
texts[i].text = $"{(i + 1)}. {playerDatas[i].playerName}";
|
||||
}
|
||||
|
||||
foreach (var playerData in playerDatas)
|
||||
{
|
||||
if (playerData.ranking == 1)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user