diff --git a/Assets/ResWork/UI_Image/Option/sound_icon_3.png.meta b/Assets/ResWork/UI_Image/Option/sound_icon_3.png.meta index 5c511b2..a31ef52 100644 --- a/Assets/ResWork/UI_Image/Option/sound_icon_3.png.meta +++ b/Assets/ResWork/UI_Image/Option/sound_icon_3.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + sound_icon_3_0: 2469934409400987655 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 40c0a29..486bb35 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -37,24 +37,7 @@ public class GachaUI : uScrollViewMgr private void Update() { - if (!SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"), false)) - { - var cal = GachaAutoRefillTime - InternetTime.Ins.Time; - fRefillTime -= Time.deltaTime; - if (cal.TotalSeconds <= 0) fRefillTime = 0f; - texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F1}s" : "0s"; - var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime"); - if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f; - slider_charge.value = DSUtil.Get_SliderValue(fRefillTime / fRefillTimeMax); - if (cal.TotalSeconds <= 0 && fRefillTime <= 0f) - { - SaveMgr.Ins.Add_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAutoRefill_Amount")); - SaveMgr.Ins.Save(); - LobbyUI.Ins.m_ToastUI.Set("별 코인이 자동 충전되었습니다.", ToastY); - - Set_Money(); - } - } + } public void Set() @@ -72,9 +55,7 @@ public class GachaUI : uScrollViewMgr Init_GachaAnim(); Set_Video(); - var cal = GachaAutoRefillTime - InternetTime.Ins.Time; - if (cal.TotalMilliseconds > 0f) - fRefillTime = (float)cal.TotalMilliseconds * 0.001f; + } void Set_UI(bool updateSlider) @@ -157,7 +138,7 @@ public class GachaUI : uScrollViewMgr texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString(); texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString(); - go_autocharge.SetActive(!SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"), false)); + go_autocharge.SetActive(false); } public void OnClick_Lucky() @@ -293,9 +274,7 @@ public class GachaUI : uScrollViewMgr Set_Vertical_ScrollEnd(0); Set_UI(true); - fRefillTime = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime"); - if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTime -= fRefillTime * 0.9f; - GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(fRefillTime); + switch (gradedata.n_GachaGrade) { diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 14fdf25..2b7a85e 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -169,9 +169,28 @@ public class LobbyUI : MonoBehaviourSingletonTemplate return; } - if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, true)) + if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) + { m_MiniGameAlbumSelect.Set(); - //m_MiniGame.GameStart(false); + } + else + { + if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) <= 0) + { + ADInfo.Ins.Show_AD(false, () => + { + SaveMgr.Ins.Set_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney")); + SaveMgr.Ins.Save(); + m_ToastUI.Set("생명력이 모두 충전되었습니다."); + minigamechargingTime = 0f; + Check_MiniGameCharging(); + }); + } + else + { + SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, true); + } + } break; } }