Compare commits
No commits in common. "76659bc964a9d6f1ac9d9ac36afafdd329c45c08" and "d1836cf10c7c06d0c4dc53fba1908c5ed29502b8" have entirely different histories.
76659bc964
...
d1836cf10c
@ -717,7 +717,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -10201,7 +10201,6 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1406544797}
|
||||
- {fileID: 1949792868}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -11554,7 +11553,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
diceView: {fileID: 1619592888}
|
||||
diceTestValue: 1
|
||||
diceTestValue: 6
|
||||
--- !u!4 &1039618837 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5672526856521419272, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
|
||||
@ -12993,7 +12992,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -15134,7 +15133,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
uiBases:
|
||||
- {fileID: 5608193481910428233}
|
||||
- {fileID: 5608193481667689439}
|
||||
- {fileID: 954622985}
|
||||
- {fileID: 1740034542}
|
||||
@ -15142,9 +15140,6 @@ MonoBehaviour:
|
||||
- {fileID: 5608193481705990350}
|
||||
- {fileID: 5608193482405246781}
|
||||
- {fileID: 5608193483424667983}
|
||||
- {fileID: 5608193482973815120}
|
||||
- {fileID: 5608193482197189505}
|
||||
- {fileID: 5608193481571390227}
|
||||
baseObjects:
|
||||
- {fileID: 2095159703}
|
||||
- {fileID: 247469677}
|
||||
@ -15154,7 +15149,6 @@ MonoBehaviour:
|
||||
- {fileID: 1954289399}
|
||||
- {fileID: 1107252688}
|
||||
- {fileID: 1406544794}
|
||||
- {fileID: 1949792867}
|
||||
- {fileID: 884011400}
|
||||
--- !u!4 &1335794571
|
||||
Transform:
|
||||
@ -18436,7 +18430,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -20224,158 +20218,6 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1948153070}
|
||||
m_Mesh: {fileID: 4300004, guid: 25e0b84f10949354b96b98b3742acdde, type: 3}
|
||||
--- !u!1 &1949792867
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1949792868}
|
||||
- component: {fileID: 1949792869}
|
||||
- component: {fileID: 1949792871}
|
||||
m_Layer: 0
|
||||
m_Name: MusicManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1949792868
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1949792867}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 971959279}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &1949792869
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1949792867}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: -176124199341068130, guid: 12870a2f915674f679b5025697171155, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &1949792871
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1949792867}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f598c418041d4a9e89aa7a25efc1185, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
audioSource: {fileID: 1949792869}
|
||||
musicDatas:
|
||||
- musicType: 0
|
||||
priority: 0
|
||||
musicClip: {fileID: 8300000, guid: 2aaeabf9c4da5458d99bb9210024afaf, type: 3}
|
||||
- musicType: 1
|
||||
priority: 0
|
||||
musicClip: {fileID: 8300000, guid: 3fef0c7922e3840f79c05fb9a520dde3, type: 3}
|
||||
- musicType: 2
|
||||
priority: 0
|
||||
musicClip: {fileID: 8300000, guid: 25dd9172f3ed8497bb638d649e5309f0, type: 3}
|
||||
--- !u!1 &1954289399
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -21591,7 +21433,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8621343442563501343, guid: b9f6f4c66b5a34d7eb7286e772505389, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -23785,7 +23627,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0553fd5dfa2fe448ab50cc371257cc20, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
screenType: 0
|
||||
screenType: 3
|
||||
shouldFade: 0
|
||||
pvpModeBtn: {fileID: 5608193482123643063}
|
||||
pvaiModeBtn: {fileID: 5608193482885172035}
|
||||
@ -24564,9 +24406,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 5608193481910428232}
|
||||
- component: {fileID: 5608193481910428234}
|
||||
- component: {fileID: 5608193481910428235}
|
||||
m_Layer: 5
|
||||
m_Name: MainMenuScreen
|
||||
m_Name: Main Menu
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -24580,20 +24421,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5608193481910428233}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5608193481910428235
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5608193481910428233}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 81101c7d4c55a4f1e982f266e7298763, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
screenType: 6
|
||||
shouldFade: 0
|
||||
--- !u!224 &5608193481924487018
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -25312,28 +25139,13 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5608193482197189504}
|
||||
- component: {fileID: 5608193482197189506}
|
||||
m_Layer: 5
|
||||
m_Name: GameOverScreen
|
||||
m_Name: Game Over
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!114 &5608193482197189506
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5608193482197189505}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 14661c82e227e4988a4ad90d300c6e40, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
screenType: 2
|
||||
shouldFade: 0
|
||||
--- !u!222 &5608193482210820768
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -25609,7 +25421,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ac108e78c738f433e8186c831e351d82, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
screenType: 5
|
||||
screenType: 2
|
||||
shouldFade: 0
|
||||
diceBtn: {fileID: 1100918534}
|
||||
pauseBtn: {fileID: 5608193482794695415}
|
||||
@ -27070,14 +26882,13 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 5608193482973815123}
|
||||
- component: {fileID: 5608193482973815122}
|
||||
- component: {fileID: 5608193482973815124}
|
||||
m_Layer: 5
|
||||
m_Name: GameScreen
|
||||
m_Name: Game
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!222 &5608193482973815122
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -27108,20 +26919,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5608193482973815124
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5608193482973815120}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c92cd673ccb28491c89a3d28d8707e79, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
screenType: 1
|
||||
shouldFade: 0
|
||||
--- !u!224 &5608193482985030356
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -28302,7 +28099,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!222 &5608193483354237948
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -28454,7 +28251,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!222 &5608193483406443892
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -119,7 +119,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
if (botTypesInGame.Contains(playerType))
|
||||
{
|
||||
allPlayerTypes.Add(playerType);
|
||||
playerDatas.Add(new PlayerData { playerType = playerType, playerName = $"{playerType}" });
|
||||
playerDatas.Add(new PlayerData { playerType = selectedPlayerData.playerType, playerName = $"{playerType}" });
|
||||
}
|
||||
else if (selectedPlayerData.playerType == playerType)
|
||||
{
|
||||
@ -268,7 +268,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
|
||||
private bool CheckForMaxDiceRollAttempt()
|
||||
{
|
||||
if (diceSixRollCounter > 2)
|
||||
if (diceSixRollCounter == 3)
|
||||
{
|
||||
CanRollDiceAgain = false;
|
||||
SwitchPlayer();
|
||||
@ -418,17 +418,7 @@ 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)
|
||||
{
|
||||
@ -977,18 +967,14 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
if (allPlayerTypes.Contains(currentPlayerTypeTurn))
|
||||
{
|
||||
allPlayerTypes.Remove(currentPlayerTypeTurn);
|
||||
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}");
|
||||
playerDatas[(int)currentPlayerTypeTurn].ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
||||
}
|
||||
|
||||
if (allPlayerTypes.Count == 1)
|
||||
{
|
||||
// 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}");
|
||||
playerDatas[(int)currentPlayerTypeTurn].ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
||||
|
||||
// Show Game Over panel
|
||||
gameManager.OnGameStateChanged(GameState.GameOver);
|
||||
|
||||
@ -49,15 +49,15 @@ public class GameOverPopup : PopupBase
|
||||
|
||||
public void InitData(List<PlayerData> playerDatas)
|
||||
{
|
||||
foreach (var playerData in playerDatas)
|
||||
for (int i = 0; i < playerDatas.Count; i++)
|
||||
{
|
||||
if (playerData.ranking == 1)
|
||||
if (i == 0)
|
||||
{
|
||||
texts[playerData.ranking - 1].text = $"{playerData.playerName} Wins";;
|
||||
texts[i].text = $"{playerDatas[i].playerName} Wins";
|
||||
continue;
|
||||
}
|
||||
|
||||
texts[playerData.ranking - 1].text = $"{playerData.ranking}. {playerData.playerName}";
|
||||
texts[i].text = $"{(i + 1)}. {playerDatas[i].playerName}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user