Merge remote-tracking branch 'origin/Gameplay/siva-gameplay' into Gameplay/main-gameplay

This commit is contained in:
Ashby Issac 2026-02-02 12:33:09 +05:30
commit 273c86d5b9
3 changed files with 17 additions and 1 deletions

View File

@ -215,7 +215,7 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25 m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 5
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!114 &1334714064113256010 --- !u!114 &1334714064113256010
MonoBehaviour: MonoBehaviour:

View File

@ -23126,6 +23126,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4180996271043359930, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
propertyPath: m_LocalScale.x
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 4180996271043359930, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
propertyPath: m_LocalScale.y
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 4180996271043359930, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
propertyPath: m_LocalScale.z
value: 0.2
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
--- !u!33 &4946864981684608825 --- !u!33 &4946864981684608825

View File

@ -877,6 +877,8 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
if (CheckForMaxDiceRollAttempt()) if (CheckForMaxDiceRollAttempt())
{ {
nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn); nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
DisplayPlayerCountOnTile(playerPawn, true);
return; return;
} }
@ -886,6 +888,8 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
} }
nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn); nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
DisplayPlayerCountOnTile(playerPawn, true);
if (CheckForMaxDiceRollAttempt()) if (CheckForMaxDiceRollAttempt())
{ {
return; return;