0O0o0oOoO00 f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev ...

# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml

2025-06-17 13:19:30 +08:00

..

auto_login

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

awaken

Add: check leveling in cl1 daily

2025-06-08 13:08:19 +09:00

base

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

2025-06-17 13:19:30 +08:00

campaign

Add: check leveling in cl1 daily

2025-06-08 13:08:19 +09:00

cloud_phone

fix: call Restart after phone restarted

2025-05-18 21:38:31 +08:00

coalition

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

combat

Merge branch 'master' into dev

2025-05-23 00:03:44 +08:00

combat_ui

Upd: Battle UI Seaside

2025-05-22 00:30:26 +08:00

commission

Fix: GET_SHIP should ruled by click_timer in commission_receive

2025-05-24 00:21:42 +08:00

config

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

2025-06-17 13:19:30 +08:00

daemon

Add: cheat support for daemon

2025-05-21 03:30:02 +08:00

daily

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

2025-02-28 11:01:23 +08:00

device

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

2025-06-17 13:19:30 +08:00

dorm

Pref: dorm_feed_quit should reuse screenshot

2025-05-19 02:53:10 +08:00

equipment

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

event

…

event_hospital

Merge branch 'master_lme' into dev

2025-05-25 15:18:10 +08:00

eventstory

Feat(eventstory): start game when it is not running (#4817)

2025-05-21 23:45:47 +08:00

exercise

Merge branch 'master' into dev

2025-05-23 00:03:44 +08:00

freebies

Opt: allow entering page_mail from page_main (#4752)

2025-05-17 10:07:51 +08:00

gacha

…

game_setting

…

gg_handler

fix: add main4-6 and event4-6 to gg list

2025-05-28 11:39:06 +08:00

guild

Fix: handle insufficient fund in guild operation

2025-06-06 01:39:18 +08:00

handler

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

2025-06-17 13:19:30 +08:00

hard

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

2025-02-28 11:01:23 +08:00

log_res

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +08:00

luahook

add: add request time limit to luahook api

2025-06-14 19:12:58 +08:00

map

Merge branch 'master_lme' into dev

2025-05-25 15:18:10 +08:00

map_detection

Chore: Rename "threshold" in template matching to "similarity"

2024-12-09 15:37:25 +08:00

meowfficer

Fix: _meow_skip_popup_after_locking exits at MEOWFFICER_TRAIN_START

2025-05-22 00:30:26 +08:00

meta_reward

Merge pull request #4866 from dragonheart107/assets

2025-06-10 17:56:24 +08:00

minigame

Fix: enter minigame ended at minigame menu (#4758)

2025-05-19 01:48:29 +08:00

notify

Fix: [ALAS] Hide traceback of notify

2025-05-12 23:08:27 +08:00

ocr

Fix: Add azur_lane_jp model to ModelProxyFactory

2025-01-17 22:57:43 +08:00

os

Add: check leveling in cl1 daily

2025-06-08 13:08:19 +09:00

os_ash

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

os_combat

Merge branch 'master_lme'

2025-01-16 08:52:42 +08:00

os_handler

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

2025-06-17 13:19:30 +08:00

os_shop

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

raid

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

research

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

2025-02-28 11:01:23 +08:00

research_farming

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +08:00

retire

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

2025-06-17 13:19:30 +08:00

reward

Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH

2025-05-20 23:55:12 +08:00

shipyard

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

shop

fix: fix merge mistake of event shop

2025-05-24 12:05:52 +08:00

shop_event

Add: Commission Event Shop

2025-02-23 10:55:41 +08:00

sos

…

statistics

Refactor: deep methods reworked for better performance

2025-03-17 01:39:06 +08:00

storage

Upd: [TW] Remove switches of storage disassemble, all server synced now

2025-06-14 01:31:44 +08:00

submodule

Add: Tools to do event story

2025-03-10 23:02:16 +08:00

tactical

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

2025-06-17 13:19:30 +08:00

template

Add: chapter SP

2025-05-21 03:02:53 +08:00

ui

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

2025-06-05 23:53:43 +08:00

ui_white

Merge branch 'master_lme'

2025-01-19 15:59:20 +08:00

war_archives

Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets

2025-05-24 23:12:01 +08:00

webui

fix: color of icon stop_all change with style

2025-06-08 02:15:31 +08:00

exception.py

Merge branch 'feature/more' into dev

2025-05-18 22:03:42 +08:00

logger.py

…

logger.pyi

…

server_checker.py

…