From 6548bf0e450165c3bbc7d946102e298977d7f712 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 11 Sep 2025 07:30:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A0=84=20=ED=8C=90=EC=9D=84=20?= =?UTF-8?q?=EB=B0=80=EA=B8=B0=ED=95=9C=20=EC=83=81=ED=83=9C=EB=A1=9C=20?= =?UTF-8?q?=EC=B4=9D=ED=86=B5=20=EC=8A=B9=EB=A6=AC=ED=95=A0=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0,=20=EB=B0=80=EA=B8=B0=EB=A1=9C=20=EC=A6=9D=EA=B0=80?= =?UTF-8?q?=ED=95=9C=20=EB=B0=B0=EC=88=98=EA=B0=80=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EC=95=88=EB=90=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/UI/GamePanel/GamePanel.cs | 2 ++ Assets/Scripts/UI/Popup/ResultPopup.cs | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) 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"; }