0O0o0oOoO00 d1256f3866 Merge remote-tracking branch 'LmeSzinc/master' into refactor ...

# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py

2025-10-16 23:05:15 +08:00

..

assets.py

Upd: Exercise HP daemon on new battle UI theme

2024-09-25 14:27:49 +08:00

combat.py

Fix: Click safe-click-area in exercise combat (#5213)

2025-10-14 23:26:32 +08:00

equipment.py

Upd: Flagship changing (#3556)

2024-04-19 01:40:40 +08:00

exercise.py

add: migrate exercise delay implementation

2025-09-15 18:01:01 +08:00

hp_daemon.py

Fix: Battle UI Ninja in _at_low_hp

2025-09-27 01:47:50 +08:00

opponent.py

…