diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 78d019e..484d203 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -37,6 +37,7 @@ public class GachaUI : uScrollViewMgr { var cal = GachaAutoRefillTime - InternetTime.Ins.Time; fRefillTime -= Time.deltaTime; + if (cal.TotalSeconds <= 0) fRefillTime = 0f; texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F2}s" : "0s"; var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime"); if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f; @@ -61,6 +62,10 @@ public class GachaUI : uScrollViewMgr texts_luckypoint[i].alpha = 0f; Set_UI(false); Init_GachaAnim(); + + var cal = GachaAutoRefillTime - InternetTime.Ins.Time; + if (cal.TotalMilliseconds > 0f) + fRefillTime = (float)cal.TotalMilliseconds * 0.001f; } void Set_UI(bool updateSlider) @@ -262,10 +267,13 @@ public class GachaUI : uScrollViewMgr if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTime -= fRefillTime * 0.9f; GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(fRefillTime); - if (gradedata.n_GachaGrade <= 2) gos_effect[1].SetActive(true); - else if (gradedata.n_GachaGrade <= 4) gos_effect[2].SetActive(true); - else if (gradedata.n_GachaGrade <= 6) gos_effect[3].SetActive(true); - else gos_effect[4].SetActive(true); + switch (gradedata.n_GachaGrade) + { + case 1: case 2: case 3: gos_effect[1].SetActive(true); break; + case 4: case 5: gos_effect[2].SetActive(true); break; + case 6: case 7: gos_effect[3].SetActive(true); break; + case 8: case 9: gos_effect[4].SetActive(true); break; + } yield return new WaitForSeconds(0.5f); diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index fcdf06a..2d72dee 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -43,7 +43,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate m_AttandanceUI.Set(); ADInfo.Ins.Set_Banner(true); m_LobbyCenterProfileUI.Set(); - minigamechargingTime = (float)(SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time).TotalMilliseconds; + minigamechargingTime = (float)(SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time).TotalMilliseconds * 0.001f; DSUtil.InActivateGameObjects(gos_minigame, minigamechargingTime > 0f ? 1 : 0); //Act_Repeat_for1sec = () => //{