diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index a1ec836..c67c04b 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -1,4 +1,5 @@ using CodeJay.Enum; +using NUnit.Framework; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -353,6 +354,7 @@ public partial class GamePanel : MonoBehaviour public void ResetScortMultiplyType() { _hashScoreMultiplyTypes.Clear(); + if (Player_Milgi > 0) AddMultiplyType(EScoreMutiplyType.ClickedFromResultPopup); } public void UpdateAIGold() diff --git a/Assets/Scripts/UI/Popup/ResultPopup.cs b/Assets/Scripts/UI/Popup/ResultPopup.cs index 42a99b0..c450d30 100644 --- a/Assets/Scripts/UI/Popup/ResultPopup.cs +++ b/Assets/Scripts/UI/Popup/ResultPopup.cs @@ -174,8 +174,21 @@ public class ResultPopup : PopupBase } else - { - _resultTotalGold = GamePanel.Instance.Stake * fixedScore; + { // 총통으로 승리 시 + int multiply = 1; + var multipleType = GamePanel.Instance.GetAndUpdateScoreMultiplyType(gameResult); + + if (multipleType != null) + { + for (int i = 0; i < multipleType.Count; i++) + { + var val = CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]); + multiply *= val; + list_xinfo.Find(f => f.type == multipleType[i]).mul = val; + } + } + + _resultTotalGold = GamePanel.Instance.Stake * fixedScore * multiply; t_Cal.text = $"{fixedScore}점 \n= 총 {fixedScore}점\n"; }