fgb_ino
/
Shegotwet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://burning.i234.me/fgb_ino/Shegotwet

This commit is contained in:
깃 관리자 2025-11-07 15:20:39 +09:00
parent 70c3727f76 bba3296040
commit 7851da177c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Scripts/UI/GachaUI.cs
View File

@ -37,6 +37,7 @@ public class GachaUI : uScrollViewMgr
{ {
var cal = GachaAutoRefillTime - InternetTime.Ins.Time; var cal = GachaAutoRefillTime - InternetTime.Ins.Time;
fRefillTime -= Time.deltaTime; fRefillTime -= Time.deltaTime;
if (cal.TotalSeconds <= 0) fRefillTime = 0f;
texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F2}s" : "0s"; texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F2}s" : "0s";
var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime"); var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime");
if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f; if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f;
@ -61,6 +62,10 @@ public class GachaUI : uScrollViewMgr
texts_luckypoint[i].alpha = 0f; texts_luckypoint[i].alpha = 0f;
Set_UI(false); Set_UI(false);
Init_GachaAnim(); Init_GachaAnim();
var cal = GachaAutoRefillTime - InternetTime.Ins.Time;
if (cal.TotalMilliseconds > 0f)
fRefillTime = (float)cal.TotalMilliseconds * 0.001f;
} }
void Set_UI(bool updateSlider) void Set_UI(bool updateSlider)
@ -262,10 +267,13 @@ public class GachaUI : uScrollViewMgr
if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTime -= fRefillTime * 0.9f; if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTime -= fRefillTime * 0.9f;
GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(fRefillTime); GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(fRefillTime);
if (gradedata.n_GachaGrade <= 2) gos_effect[1].SetActive(true); switch (gradedata.n_GachaGrade)
else if (gradedata.n_GachaGrade <= 4) gos_effect[2].SetActive(true); {
else if (gradedata.n_GachaGrade <= 6) gos_effect[3].SetActive(true); case 1: case 2: case 3: gos_effect[1].SetActive(true); break;
else gos_effect[4].SetActive(true); 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); yield return new WaitForSeconds(0.5f);

2
Assets/Scripts/UI/LobbyUI.cs
View File

@ -43,7 +43,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
m_AttandanceUI.Set(); m_AttandanceUI.Set();
ADInfo.Ins.Set_Banner(true); ADInfo.Ins.Set_Banner(true);
m_LobbyCenterProfileUI.Set(); 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); DSUtil.InActivateGameObjects(gos_minigame, minigamechargingTime > 0f ? 1 : 0);
//Act_Repeat_for1sec = () => //Act_Repeat_for1sec = () =>
//{ //{