Zuosizhu 5120649acb Merge remote-tracking branch 'Lme/master' into dev ...

# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json

2025-11-27 21:53:49 +08:00

..

assets.py

Add: [EN] assets for coalition_20251120 (#5347)

2025-11-27 02:08:42 +08:00

coalition_sp.py

Fix: Override mode in CoalitionSp

2024-06-28 01:54:38 +08:00

coalition.py

Merge remote-tracking branch 'Lme/master' into dev

2025-11-27 21:53:49 +08:00

combat.py

Fix: Stop clicking BATTLE_STATUS after coalition reward

2025-04-19 21:55:09 +08:00

ui.py

Fix: ui misclick in coalition_20251120

2025-11-25 12:53:26 +08:00