diff --git a/Assets/ResWork/UI_Animation/Gacha_LuckyPoint.anim b/Assets/ResWork/UI_Animation/Gacha_LuckyPoint.anim index d97321c..a13806e 100644 --- a/Assets/ResWork/UI_Animation/Gacha_LuckyPoint.anim +++ b/Assets/ResWork/UI_Animation/Gacha_LuckyPoint.anim @@ -66,7 +66,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 150 + value: 75 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -264,7 +264,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 150 + value: 75 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 6cf4f69..12caba6 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2784,7 +2784,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 2756, y: -25.000015} + m_AnchoredPosition: {x: 2756, y: -25} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &85415561 @@ -15865,7 +15865,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -2756, y: -25.000015} + m_AnchoredPosition: {x: -2756, y: -25} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &420248622 @@ -62590,7 +62590,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -55.77272} + m_AnchoredPosition: {x: 0, y: -55.772705} m_SizeDelta: {x: 0, y: -111.5455} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1630921640 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index a699493..3ed6e02 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -184,7 +184,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate LobbyUI.Ins.m_ToastUI.Set("뽑기 재화가 부족합니다."); break; case eMoney.Lucky: - LobbyUI.Ins.m_ToastUI.Set("클로버가 부족합니다."); + LobbyUI.Ins.m_ToastUI.Set("럭키 포인트가 부족합니다."); break; case eMoney.MiniGameHP: case eMoney.ItemBomb: diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 1f0f032..d84dc2d 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -76,7 +76,7 @@ public class GachaUI : uScrollViewMgr slider_lucky[0].value = slider_lucky[1].value = DSUtil.Get_SliderValue(cal); slider_lucky2[0].value = slider_lucky2[1].value = DSUtil.Get_SliderValue(cal - 1f); images_slider[0].color = images_slider[1].color = Color.white; - texts[0].text = MyText.Get_PercentValueText_100(cal > 2f ? 2f : cal); + texts[0].text = MyText.Get_PercentValueText_100_NoPoint(cal > 2f ? 2f : cal); Set_SliderHandle(); } @@ -115,12 +115,12 @@ public class GachaUI : uScrollViewMgr elapsed += Time.deltaTime; float t = Mathf.Clamp01(elapsed / duration); slider.value = Mathf.Lerp(startValue1, targetValue1, t); - texts[0].text = MyText.Get_PercentValueText_100(slider.value + slider2.value); + texts[0].text = MyText.Get_PercentValueText_100_NoPoint(slider.value + slider2.value); Set_SliderHandle(); yield return null; } slider.value = targetValue1; - texts[0].text = MyText.Get_PercentValueText_100(slider.value + slider2.value); + texts[0].text = MyText.Get_PercentValueText_100_NoPoint(slider.value + slider2.value); // slider_lucky2 다음 elapsed = 0f; @@ -130,12 +130,12 @@ public class GachaUI : uScrollViewMgr elapsed += Time.deltaTime; float t = Mathf.Clamp01(elapsed / duration); slider2.value = Mathf.Lerp(startValue2, targetValue2, t); - texts[0].text = MyText.Get_PercentValueText_100(slider.value + slider2.value); + texts[0].text = MyText.Get_PercentValueText_100_NoPoint(slider.value + slider2.value); Set_SliderHandle(); yield return null; } slider2.value = targetValue2; - texts[0].text = MyText.Get_PercentValueText_100(slider.value + slider2.value); + texts[0].text = MyText.Get_PercentValueText_100_NoPoint(slider.value + slider2.value); } void Set_Money() @@ -248,7 +248,7 @@ public class GachaUI : uScrollViewMgr { if (texts_luckypoint[i].alpha <= 0f) { - texts_luckypoint[i].text = reward.Item3.ToString(); + texts_luckypoint[i].text = $"+{reward.Item3}"; texts_luckypoint[i].GetComponent().Play(); break; } diff --git a/Assets/Scripts/Util/MyText.cs b/Assets/Scripts/Util/MyText.cs index e008210..656375e 100644 --- a/Assets/Scripts/Util/MyText.cs +++ b/Assets/Scripts/Util/MyText.cs @@ -1,7 +1,12 @@ -using System.Data; +using System; public static class MyText { + public static string Get_PercentValueText_100_NoPoint(double _v) + { + int percent = (int)Math.Round(_v * 100.0); // double → int 확정 변환 + return percent.ToString() + "%"; // 문자열 변환 후 % 붙이기 + } public static string Get_PercentValueText_100(double _v) { return DSUtil.Format("{0:#,##0.##}%", _v * 100d); } public static string Get_PercentValueText(double _v) { return DSUtil.Format("{0:#,##0.##}%", _v); } } \ No newline at end of file