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

Visual gameplay bug fixes.

Browse Source
This commit is contained in:
Ashby Issac 2026-01-23 13:33:16 +05:30
parent 9b1c4f14b0
commit 151823eb36
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
Tile targetTile = tilesManager.RetrieveTileBasedOnIndex(playerGameData.startIndex); Tile targetTile = tilesManager.RetrieveTileBasedOnIndex(playerGameData.startIndex);
playerPawn.MoveToTile( playerPawn.MoveToTile(
GetPositionInsideSafeZone(playerPawn, targetTile), GetAndInitPositionInsideSafeZone(playerPawn, targetTile),
onComplete: () => onComplete: () =>
{ {
CanRollDice = true; CanRollDice = true;
@ -227,7 +227,17 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
Tile currentSittingTile = tilesManager.RetrieveTileBasedOnIndex(playerPawn.CurrentTileIndex); Tile currentSittingTile = tilesManager.RetrieveTileBasedOnIndex(playerPawn.CurrentTileIndex);
if (currentSittingTile.IsSafeZone) if (currentSittingTile.IsSafeZone)
{ {
((SafeTile)currentSittingTile).UpdateSafeZonePlayerData(currentPlayerTypeTurn, playerPawn); SafeTile safeTile = (SafeTile)currentSittingTile;
safeTile.UpdateSafeZonePlayerData(currentPlayerTypeTurn, playerPawn);
if (safeTile.PlayerTypesCount == 1)
{
PlayerTypes playerType = safeTile.GetFirstPlayerType();
var playerPawns = safeTile.GetPlayerPawns(playerType);
foreach (var pawn in playerPawns)
pawn.MoveToCustomTilePosition(safeTile.CenterPlacementPosition);
}
} }
MoveThroughTiles(playerPawn, nextTileIdx, targetIndex: targetIdx); MoveThroughTiles(playerPawn, nextTileIdx, targetIndex: targetIdx);
@ -291,7 +301,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
Tile targetTile = tilesManager.RetrieveTileBasedOnIndex(targetIndex); Tile targetTile = tilesManager.RetrieveTileBasedOnIndex(targetIndex);
if (targetTile.IsSafeZone) if (targetTile.IsSafeZone)
{ {
targetPosition = GetPositionInsideSafeZone(playerPawn, targetTile); targetPosition = GetAndInitPositionInsideSafeZone(playerPawn, targetTile);
} }
} }
@ -335,10 +345,6 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn); nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
} }
// else
// {
// ((SafeTile)nextTile).InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
// }
SwitchPlayer(playerPawn); SwitchPlayer(playerPawn);
CanRollDice = true; CanRollDice = true;
@ -347,7 +353,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
index); index);
} }
private Vector3 GetPositionInsideSafeZone(PlayerPawn playerPawn, Tile targetTile) private Vector3 GetAndInitPositionInsideSafeZone(PlayerPawn playerPawn, Tile targetTile)
{ {
Vector3 targetPosition; Vector3 targetPosition;
SafeTile targetSafeTile = (SafeTile)targetTile; SafeTile targetSafeTile = (SafeTile)targetTile;
@ -357,26 +363,15 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
Debug.Log($"targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn): {targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)}"); Debug.Log($"targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn): {targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)}");
if (!targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)) // means it is a new player type, the second one if (!targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)) // means it is a new player type, the second one
{ {
Debug.Log($"Logging data");
PlayerTypes initialPlayerType = targetSafeTile.GetFirstPlayerType(); PlayerTypes initialPlayerType = targetSafeTile.GetFirstPlayerType();
Debug.Log($"initialPlayerType: {initialPlayerType}");
int playerPawnsCount = targetSafeTile.GetPlayerPawnsCountInTile(initialPlayerType);
Debug.Log($"playerPawnsCount: {playerPawnsCount}");
// rearrange already existing player from center position to it's saved transform // rearrange already existing player from center position to it's saved transform
var playerPawns = targetSafeTile.GetPlayerPawns(initialPlayerType); var playerPawns = targetSafeTile.GetPlayerPawns(initialPlayerType);
Debug.Log($"playerPawns: {playerPawns.Count}");
foreach (var pawn in playerPawns) foreach (var pawn in playerPawns)
{ {
Debug.Log($"Getting placement data");
var placementPoint = targetSafeTile.GetPlacementPoint(initialPlayerType); var placementPoint = targetSafeTile.GetPlacementPoint(initialPlayerType);
Debug.Log($"PlacementPoint: {placementPoint.name}"); pawn.MoveToCustomTilePosition(placementPoint.position);
pawn.MoveToTileSubPosition(placementPoint.position);
} }
// for (int idx = 0; idx < playerPawnsCount; idx++)
// {
// targetSafeTile.IterateAndGetPlayerPawn(initialPlayerType, idx).MoveToTileSubPosition(targetSafeTile.GetPlacementPoint(initialPlayerType).position);
// }
targetSafeTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn); targetSafeTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
targetPosition = targetSafeTile.GetPlacementPoint(currentPlayerTypeTurn).position; targetPosition = targetSafeTile.GetPlacementPoint(currentPlayerTypeTurn).position;

2
Assets/Scripts/Gameplay/Player/PlayerPawn.cs
View File

@ -48,7 +48,7 @@ public class PlayerPawn : MonoBehaviour
transform.DOMove(startingPoint, 0.1f).onComplete = () => onComplete?.Invoke(); transform.DOMove(startingPoint, 0.1f).onComplete = () => onComplete?.Invoke();
} }
public void MoveToTileSubPosition(Vector3 targetPoint) public void MoveToCustomTilePosition(Vector3 targetPoint)
{ {
transform.DOMove(targetPoint, 0.1f); transform.DOMove(targetPoint, 0.1f);
} }