13 Commits

Author	SHA1	Message	Date
Zuosizhu	1e31cb6de5	Merge branch 'master_lme' into AlasGGdev ... # Conflicts: # module/campaign/gems_farming.py # module/coalition/coalition.py # module/config/argument/argument.yaml # module/config/config_generated.py # module/config/i18n/zh-CN.json # module/config/i18n/zh-TW.json # module/os/operation_siren.py # module/os_handler/os_status.py	2024-06-28 16:01:16 +08:00
LmeSzinc	38874e2982	Fix: No pt check in combat preparation	2024-06-28 02:00:06 +08:00
LmeSzinc	9bdfdb6447	Fix: Override mode in CoalitionSp	2024-06-28 01:54:38 +08:00
LmeSzinc	a8f8432842	Add: [CN] Assets for coalition_20240627	2024-06-28 01:18:59 +08:00
LA-DI-DA	a65f53b966	Merge branch 'lme-alas/master' into smallkai ... # Conflicts: # module/map/assets.py	2023-10-19 23:00:39 +08:00
LmeSzinc	f23c960b97	Fix: Actively clear stuck records in combat	2023-10-14 21:03:58 +08:00
Zuosizhu	b5ac3cc06a	Merge branch 'LmeSzinc:master' into 20230309	2023-04-07 15:46:07 +08:00
LmeSzinc	2cce729a60	Fix: Force emotion control to over prevent_yellow_face in single coalitions	2023-04-04 02:21:15 +08:00
Zuosizhu	5688408f59	Fix: Not logging Coalition PT ... (cherry picked from commit fa73aa561c)	2023-03-25 12:04:46 +08:00
LmeSzinc	9a1e76c366	Fix: Catch ScriptEnd raised from emotion control	2023-03-24 13:52:06 +08:00
LmeSzinc	14870c6807	Fix: ui switches to page_coalition	2023-03-24 05:31:26 +08:00
LmeSzinc	8c8d44a09f	Add: CoalitionSp task	2023-03-24 04:55:34 +08:00
LmeSzinc	7ecf3ac502	Add: Coalition task	2023-03-24 04:41:13 +08:00