Zuosizhu d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor ...

# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py

2026-01-24 14:18:46 +08:00

..

ATTACKER_HP_AREA_New.png

Upd: Exercise HP daemon on new battle UI theme

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

ATTACKER_HP_AREA.png

Fix: [CN][EN] HP area in exercise

2020-09-07 22:26:56 +08:00

CLICK_SAFE_AREA.png

Upd: EXP_INFO_* and the exercise one

2023-05-25 21:45:19 +08:00

DEFENDER_HP_AREA_New.png

Upd: Exercise HP daemon on new battle UI theme

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

DEFENDER_HP_AREA.png

Fix: [CN][EN] HP area in exercise

2020-09-07 22:26:56 +08:00

EQUIP_EDIT_ACTIVE.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

EQUIP_EDIT_INACTIVE.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

EQUIP_ENTER_NEW.png

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

EQUIP_ENTER_OLD.png

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

EQUIP_ENTER.png

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

EXERCISE_PREPARATION.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

NEW_OPPONENT.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

OCR_EXERCISE_REMAIN.png

Fix: OCR in exercises

2020-07-15 04:33:39 +08:00

OCR_EXERCISE_TIME_REMAIN.png

Fix: lost asset for OCR_EXERCISE_TIME_REMAIN

2023-03-08 23:39:46 +08:00

OCR_PERIOD_REMAIN.png

New: Asset for exercise period ocr

2023-03-30 21:32:31 +08:00

OPPONENT_1.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

OPPONENT_2.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

OPPONENT_3.png

Add: multi-server support

2020-05-25 22:05:42 +08:00

OPPONENT_4.png

Add: multi-server support

2020-05-25 22:05:42 +08:00