W1NDes 2c41b0a454 Merge remote-tracking branch 'upstream/master' into dev

2025-09-02 13:22:26 +08:00

..

awaken

Opt: Awaken Favourite Ships Only (#4957)

2025-07-16 12:24:08 +08:00

base

Merge remote-tracking branch 'upstream/master'

2025-06-11 03:37:49 +08:00

campaign

fix(OCR_COIN)：修复OCR_COIN的一次冲突

2025-08-27 07:58:08 +08:00

coalition

Upd(Research): 完善检查科研期数功能

2025-07-11 20:23:44 +08:00

combat

Merge remote-tracking branch 'upstream/master'

2025-08-10 18:03:35 +08:00

combat_ui

Upd: Battle UI Star

2025-07-04 23:41:29 +08:00

commission

Merge remote-tracking branch 'upstream/dev'

2025-07-29 21:32:34 +08:00

config

Upd(args): merge update

2025-08-31 13:45:51 +08:00

daemon

…

daily

…

device

Merge remote-tracking branch 'upstream/master'

2025-08-14 23:32:00 +08:00

dorm

Pref: dorm_feed_quit should reuse screenshot

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

equipment

Fix: Skip NPC character when entering first ship in dock (#4725, #3678)

2025-04-11 01:46:06 +08:00

event

…

event_hospital

Upd(Coalition)：添加连战活动的舰队推荐和刷PT功能

2025-06-27 02:27:20 +08:00

eventstory

Merge remote-tracking branch 'upstream/master'

2025-08-24 00:00:24 +08:00

exercise

Fix: Exercise item during battle (#5059)

2025-08-23 22:26:48 +08:00

freebies

Tmp: [TW] Disable shop before it confirm working

2025-08-29 21:53:46 +08:00

gacha

Merge remote-tracking branch 'upstream/master'

2025-08-26 11:41:29 +08:00

game_setting

…

guild

Fix: assets for EN and JP

2025-06-27 22:18:08 +02:00

handler

Upd: [EN] event current and rerun check icons; other button_extract output

2025-08-02 13:32:52 -04:00

hard

…

log_res

…

map

feat(eventSp): 处理今日SP图次数已到上限的情况

2025-08-15 21:31:01 +08:00

map_detection

Opt: Show enemy_genre without name prefix

2025-08-15 23:27:11 +08:00

meowfficer

Fix(Meowfficer): 修复前12个槽位没有需要强化的指挥猫

2025-07-06 01:25:07 +08:00

meta_reward

Merge pull request #4890 from dragonheart107/assets

2025-06-18 18:26:29 +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

Revert "Upd: [JP] digit ocr '1' mistaken as 'L'"

2025-08-31 01:30:01 +08:00

oilkeep

fix(oilkeep): 更新油量检查界面，改为使用主线页面

2025-08-17 22:16:44 +08:00

os

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

2025-09-02 13:22:26 +08:00

os_ash

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

2025-08-30 10:48:27 +08:00

os_combat

Opt: disable handle_get_items in OSCombat.combat_status (#5019)

2025-09-02 01:05:17 +08:00

os_handler

Merge remote-tracking branch 'upstream/master'

2025-08-24 00:00:24 +08:00

os_shop

Opt: a better limit when items need to be handled amount (#4802)

2025-05-19 03:51:25 +08:00

private_quarters

fix: pq stuck when unknown ui

2025-08-15 11:23:25 +08:00

raid

Merge remote-tracking branch 'upstream/master'

2025-03-28 02:25:36 +08:00

regular_inspect

Fix(ResearchInspect): 移除不必要的日志记录

2025-07-23 22:50:51 +08:00

research

Merge remote-tracking branch 'upstream/master'

2025-07-17 22:48:07 +08:00

retire

Merge remote-tracking branch 'upstream/master'

2025-08-24 00:00:24 +08:00

reward

Upd: [TW] assets for _reward_wait_mission_list

2025-07-10 02:41:31 +08:00

ship_ir

Upd(shipIr): 更新图鉴识别船只过滤选项

2025-08-20 02:13:42 +08:00

shipyard

Fix: Shipyard should not reuse coin ocr in shop

2025-08-26 18:31:15 -04:00

shop

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

2025-08-31 13:44:09 +08:00

shop_event

…

smallevent

fix(7Dtask): 完善七天小任务进度的处理逻辑，并调整活动结束时间

2025-08-28 16:34:16 +08:00

sos

…

statistics

Upd: Update new UI 20250814 for server JP, update CN assets

2025-08-21 23:59:59 +08:00

storage

Merge remote-tracking branch 'upstream/master'

2025-08-17 22:59:10 +08:00

submodule

…

tactical

Merge remote-tracking branch 'upstream/master'

2025-08-28 07:47:26 +08:00

template

Merge remote-tracking branch 'upstream/master'

2025-08-17 22:59:10 +08:00

ui

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

2025-08-30 10:48:27 +08:00

ui_white

…

war_archives

Add: war_archives_20220428_cn

2025-07-24 21:31:08 +08:00

webui

feat(process_manager): 添加对Traceback的检测逻辑和渲染拦截

2025-08-22 10:19:51 +08:00

exception.py

feat(eventSp): 处理今日SP图次数已到上限的情况

2025-08-15 21:31:01 +08:00

logger.py

…

logger.pyi

…

server_checker.py

fix(server_checker): 添加对ReadTimeout异常的处理

2025-08-22 06:37:12 +08:00