SarContDeli c9d9ca6cc5 Merge branch 'bug_fix' into base ...

# Conflicts:
#	alas.py
#	config/template.json
#	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/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/map.py

2022-11-30 20:56:52 +08:00

..

assets.py

Del: Remove SWITCH_1_HARD_ALCHEMIST, just no need anymore

2022-11-25 20:23:21 +08:00

campaign_base.py

Fix: map_is_2x_book is in emotion calculation before map_get_info()

2022-06-09 23:24:51 +08:00

campaign_event.py

Refactor: Abstract CampaignStatus class and fix task balancer in Raid

2022-10-30 14:49:04 +08:00

campaign_ocr.py

Refactor: Move del_cached_property to module.base.decorator

2022-09-25 00:31:42 +08:00

campaign_status.py

Refactor: Abstract CampaignStatus class and fix task balancer in Raid

2022-10-30 14:49:04 +08:00

campaign_ui.py

Add: Virtual Tower (event_20220324_cn)

2022-03-24 19:20:02 +08:00

gems_farming.py

Merge branch 'bug_fix' into dockScanner

2022-11-14 09:56:42 +08:00

os_run.py

Merge branch 'bug_fix' into base

2022-11-30 20:56:52 +08:00

run.py

Fix: Task balance is not working in loop stages (fixed #1920)

2022-11-29 21:18:11 +08:00