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

..

base

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

campaign

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

coalition

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

combat

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

commission

Fix: Handle random white background at page_main in commission receive

2024-06-05 02:49:17 +08:00

config

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

daemon

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

daily

Upd: [CN] Support UI in 2024.05.21

2024-05-23 01:16:41 +08:00

device

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

dorm

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

equipment

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

event

…

exercise

Fix: save global to a single file for cross-module use

2024-05-25 11:16:00 +08:00

freebies

Fix: BATTLE_PASS_RED_DOT.load_offset is now working

2024-06-13 22:30:23 +08:00

gacha

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

game_setting

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

gg_handler

Fix: gg ui display incomplete

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

guild

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

handler

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

hard

Fix: save global to a single file for cross-module use

2024-05-25 11:16:00 +08:00

log_res

…

map

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

map_detection

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

meowfficer

Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917)

2024-06-27 22:20:09 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING

2023-09-28 16:26:20 +08:00

notify

Opt: [ALAS] Lazy import onepush

2024-04-28 17:12:03 +08:00

ocr

Fix: Add atomic OCR method on client side

2024-05-09 18:51:52 +08:00

os

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

os_ash

Merge branch 'master_lme'

2024-05-23 02:31:29 +08:00

os_combat

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

os_handler

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

os_shop

fix: handle sidebar disappear (#3930)

2024-06-28 12:18:08 +08:00

raid

Merge branch 'LmeSzinc:master' into 20230309

2024-03-29 07:09:29 +08:00

research

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

retire

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

reward

Fix: Expand search area of MISSION_MULTI and MISSION_SINGLE

2024-06-26 19:02:36 +08:00

shipyard

Fix: use ui_ensure to handle FATE(Unknown ui page) (#3885)

2024-06-13 22:32:51 +08:00

shop

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

sos

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

statistics

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

storage

Add: Siren templates in chapter A

2023-08-18 22:29:25 +08:00

submodule

Chore: [ALAS] Move func methods to the Alas class

2024-05-30 13:34:24 +08:00

tactical

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

template

Add: Chapter B

2024-05-23 01:16:41 +08:00

ui

Merge branch 'master_lme' into AlasGGdev

2024-06-28 16:01:16 +08:00

ui_white

Fix: Handle mail full popup

2024-06-03 10:22:06 +08:00

war_archives

Add: War Archives The Way Home in the Night

2024-03-11 22:57:37 +08:00

webui

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

exception.py

Fix: set gemsfarming's ship filter to default after this task is set to campaign_main

2024-05-25 19:43:00 +08:00

logger.py

Sync: [SRC] Sync alas changes

2023-09-10 15:04:32 +08:00

logger.pyi

…

server_checker.py

…