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

Merge remote-tracking branch 'origin/UI/main-ui' into UI/siva-ui

Browse Source
This commit is contained in:
alantrix0012 2026-01-30 22:34:45 +05:30
commit ca6561b418
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Scripts/Gameplay/GameplayManager.cs
View File

@ -121,13 +121,16 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
allPlayerTypes.Add(playerType);
playerDatas.Add(new PlayerData { playerType = selectedPlayerData.playerType, playerName = $"{playerType}" });
}
else
else if (selectedPlayerData.playerType == playerType)
{
allPlayerTypes.Add(selectedPlayerData.playerType);
playerDatas.Add(new PlayerData { playerType = selectedPlayerData.playerType, playerName = $"{selectedPlayerData.playerName}" });
}
}
foreach (var type in allPlayerTypes)
Debug.Log($"allPlayerTypes ::: {type}");
tilesManager.InitTilesData();
playerBaseHandler.InitPlayerTypes(allPlayerTypes);
InitCurrentGamePlayerInfo();
@ -929,7 +932,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
{
UpdatePlayerState(playerPawn, PlayerState.InFinishingPath);
DisplayPlayerCountOnTile(playerPawn, false);
playerPawn.MoveToTile(
tilesManager.RetrievePositionForFinishingTile(currentPlayerTypeTurn, index).position,
onComplete: () =>
@ -949,7 +952,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
}
else
{
DisplayPlayerCountOnTile(playerPawn, true);
Debug.Log($"CurrentTileIndex: {playerPawn.CurrentTileIndex} == lastIndex: {tilesManager.GetFinishingTileDataLength(currentPlayerTypeTurn) - 1}");
if (playerPawn.CurrentTileIndex == tilesManager.GetFinishingTileDataLength(currentPlayerTypeTurn) - 1)
{

1
Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs
View File

@ -13,7 +13,6 @@ public class GameOverPopup : PopupBase
private GameModeHandler gameModeHandler;
private ScreenManager screenManager;
private PopupManager popupManager;
private void OnEnable()
{