From be43b86000af313d5b0976ed9bd4135d41a51ad7 Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 16 Dec 2025 15:55:40 +0900 Subject: [PATCH] =?UTF-8?q?=E2=80=BB=20=EA=B0=81=20=EC=9E=AC=ED=99=94?= =?UTF-8?q?=EC=9D=98=20=EB=93=B1=EC=9E=A5=20=ED=99=95=EB=A5=A0=EC=9D=80=20?= =?UTF-8?q?GlobalValue=EC=97=90=20=EB=8B=A4=EC=9D=8C=EA=B3=BC=20=EA=B0=99?= =?UTF-8?q?=EC=9D=B4=20=ED=99=95=EB=A5=A0=EC=9D=84=20=EC=85=8B=ED=8C=85?= =?UTF-8?q?=ED=95=B4=20=EC=82=AC=EC=9A=A9=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GoodType_GoldConRate : 97% GoodType_HeartConRate : 2.8% GoodType_ChatConRate : 0.2% —————————————— BadType_Timer : 97% BadType_Bomb : 3% --- .../Prefabs/HorseRush/Script/BubbleCard.cs | 26 +++++-------------- .../HorseRush/Script/HorseRushPanel.cs | 4 +-- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Assets/Resources/Prefabs/HorseRush/Script/BubbleCard.cs b/Assets/Resources/Prefabs/HorseRush/Script/BubbleCard.cs index f6eaece..f4dba2b 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/BubbleCard.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/BubbleCard.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using DG.Tweening; using UnityEngine; using UnityEngine.UI; @@ -10,19 +8,10 @@ public class BubbleCard : MonoBehaviour [SerializeField] GameObject _rightItem; public bool IsLeftCarrot { get; private set; } - public bool IsGoldCarrot { get; private set; } + public bool IsHeartCarrot { get; private set; } public bool IsSkullStone { get; private set; } public bool IsFever { get; private set; } - float APPEAR_GOLD_CARROT_RATE; - float APPEAR_SKULL_RATE; - - void Awake() - { - APPEAR_GOLD_CARROT_RATE = 100f; - APPEAR_SKULL_RATE = 200f; - } - public void SetScale(int index, float moveTime) { Vector3 scale = index == 10 ? new Vector3(1.2f, 1.2f, 1.2f) : index == 11 ? new Vector3(1.5f, 1.5f, 1.5f) : index == 0 ? new Vector3(0.5f, 0.5f, 0.5f) : Vector3.one; @@ -44,20 +33,19 @@ public class BubbleCard : MonoBehaviour if (isFever) { - IsGoldCarrot = true; + IsHeartCarrot = true; carrotObject.GetComponent().sprite = Resources.Load(defaultPath + "Bubble_Fever"); stoneObject.GetComponent().sprite = Resources.Load(defaultPath + "Bubble_Fever"); } else { // HorseRushManager.Instance.APPEAR_GOLD_CARROT_RATE - bool isGoldCarrot = Random.Range(0, 10000) <= APPEAR_GOLD_CARROT_RATE; - IsGoldCarrot = isGoldCarrot; - bool isSkullStone = Random.Range(0, 10000) <= APPEAR_SKULL_RATE; - IsSkullStone = isSkullStone; + IsHeartCarrot = DSUtil.RandomTrue(table_GlobalValue.Ins.Get_Float("GoodType_HeartConRate")); + if (!IsHeartCarrot) + IsSkullStone = DSUtil.RandomTrue(table_GlobalValue.Ins.Get_Float("BadType_Bomb")); - carrotObject.GetComponent().sprite = Resources.Load(defaultPath + (isGoldCarrot ? "Bubble_GoldedCarrot" : "Bubble_Carrot")); - stoneObject.GetComponent().sprite = Resources.Load(defaultPath + (isSkullStone ? "Bubble_Stun" : "Bubble_Stone")); + carrotObject.GetComponent().sprite = Resources.Load(defaultPath + (IsHeartCarrot ? "Bubble_GoldedCarrot" : "Bubble_Carrot")); + stoneObject.GetComponent().sprite = Resources.Load(defaultPath + (IsSkullStone ? "Bubble_Stun" : "Bubble_Stone")); } } diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 98e15e1..1bba437 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -400,7 +400,7 @@ public class HorseRushPanel : MonoBehaviour if (isCorrect) { - AddComboCount(lastBubbleCard.IsGoldCarrot); + AddComboCount(lastBubbleCard.IsHeartCarrot); MoveBubbleCard(); lastBubbleCard.transform.SetAsFirstSibling(); @@ -408,7 +408,7 @@ public class HorseRushPanel : MonoBehaviour if (!IsFever) { - m_ChatCoint += lastBubbleCard.IsGoldCarrot ? 1 : 0; + m_ChatCoint += lastBubbleCard.IsHeartCarrot ? 1 : 0; m_ChatCoint.Obfuscate(); } }