LA_DI_DA 573210af2b Merge branch 'refs/heads/lme-alas/master' into dev ...

# Conflicts:
#	alas.py
#	module/os/fleet.py

2024-06-22 20:31:35 +08:00

..

assets.py

…

gacha_reward.py

Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9)

2024-04-13 11:54:12 +08:00

ui.py

Opt: wait until navbar active is not None (#3832)

2024-06-03 00:05:23 +08:00