378 Commits

Author SHA1 Message Date
W1NDes
369b4919e7 Merge remote-tracking branch 'upstream/master' into dev 2025-09-27 21:30:06 +08:00
tonyhom
16da32793b
Merge pull request #5157 from tonyhom/bug_fix/tw/enhance-slot-image
Fix: [TW] Recapture img "EMPTY_ENHANCE_SLOT_PLUS.png"
2025-09-25 12:10:39 +08:00
W1NDes
3a9351099d Merge remote-tracking branch 'upstream/master' 2025-08-24 00:00:24 +08:00
Air111
e32de1bfe2
Opt: clear interval of DOCK_SELECTED for faster ship changing (#5048) 2025-08-21 19:00:29 +08:00
W1NDes
bfd7bcd2b7 Merge remote-tracking branch 'upstream/master' 2025-08-08 02:13:18 +08:00
dragonheart107
4fb37da861 Fix: EN-retire assets 2025-08-07 17:27:36 +08:00
W1NDes
5abd9ecc3e Merge remote-tracking branch 'upstream/master' 2025-07-11 02:08:11 +08:00
W1NDes
03d488aeaf Add(Retire):增加一键退役的修改选项,支持在无法退役时不尝试修改设置 2025-06-27 02:51:16 +08:00
POLARme
8834432c7e Merge remote-tracking branch 'upstream/master' 2025-06-20 01:41:55 +08:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08:00
POLARme
340cbbb331 Merge remote-tracking branch 'upstream/master' 2025-06-01 00:24:28 +08:00
dragonheart107
4172356a9a
Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
POLARme
49d55d7b77 Merge remote-tracking branch 'upstream/master' 2025-05-29 23:36:32 +08:00
LmeSzinc
f5a201a793 Fix: Handle slow popups from last retirement when entering dock filter 2025-05-29 23:06:07 +08:00
LmeSzinc
dcc86a8b02 Fix: EQUIP_CONFIRM_2 may be detected as popup confirm
causing early stop of _retirement_confirm()
2025-05-29 23:05:13 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
POLARme
7a959dc1f3 Merge remote-tracking branch 'upstream/master' 2025-05-27 00:19:55 +08:00
LmeSzinc
03dd7b6a65 Fix: retirement confirm should end with EQUIP_CONFIRM_2 2025-05-25 20:10:36 +08:00
LmeSzinc
23d4bd308e Merge branch 'master' into dev 2025-05-22 14:23:40 +08:00
POLARme
13fbddfd7b Merge remote-tracking branch 'upstream/master' 2025-05-22 09:50:28 +08:00
LmeSzinc
242b964981 Upd: [JP] BOX assets (#4814) 2025-05-21 23:44:58 +08:00
LmeSzinc
c226228d98 Upd: [EN] EQUIP_CONFIRM_2 2025-05-21 23:22:23 +08:00
POLARme
b47e239707 Merge remote-tracking branch 'upstream/master' 2025-05-21 10:54:49 +08:00
LmeSzinc
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM
to be reused in retirement and enhancement
2025-05-21 02:25:28 +08:00
POLARme
c24847fdd6 Merge remote-tracking branch 'upstream/master' 2025-05-19 03:55:10 +08:00
LmeSzinc
79d72c4fa0 Merge branch 'master' into dev
# Conflicts:
#	module/device/method/pool.py
2025-05-18 03:15:41 +08:00
LmeSzinc
7f54ae8234 Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND 2025-05-18 03:12:30 +08:00
LmeSzinc
be30dfcfc6 Fix: Handle EQUIP_CONFIRM without black-blurred background 2025-05-15 18:05:20 +08:00
LmeSzinc
eebfc81251 Fix: Handle dock filter without black-blurred background 2025-05-12 19:58:03 +08:00
POLARme
2e4f7f5111 Merge remote-tracking branch 'upstream/master' 2025-05-11 22:24:51 +08:00
LmeSzinc
b4930d486e Upd: [EN] ENHANCE_CONFIRM ENHANCE_RECOMMEND 2025-05-11 00:12:00 +08:00
POLAR me
4d97665f03 Merge remote-tracking branch 'upstream/master' 2025-04-25 23:48:37 +08:00
dragonheart107
fe4ba13af0 Upd: Dockfilter 2025-04-25 04:30:19 +08:00
LmeSzinc
9c6a7bff9a Fix: Wait SHIP_CONFIRM_2 appear on large dock (#4663) 2025-04-25 00:44:55 +08:00
POLAR me
3d98811716 Merge remote-tracking branch 'upstream/master' 2025-04-11 02:32:39 +08:00
LmeSzinc
ea4a73ff24 Fix: Skip NPC character when entering first ship in dock (#4725, #3678) 2025-04-11 01:46:06 +08:00
LmeSzinc
bf141d37ce Opt: Quick exit handle_dock_cards_loading if dock is empty 2025-04-09 23:32:26 +08:00
POLAR me
cd5ddf34c6 Merge remote-tracking branch 'upstream/master' 2025-03-11 15:39:20 +08:00
guoh064
edb8bcb5c7
Fix: vanguard_change logic (#4636)
* Add: support list types limitations in Ship class

* Opt: get_common_rarity_dd logic

get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
POLARme
d938870bcb
Merge pull request #75 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-03-06 09:25:41 +08:00
guoh064
a08e346609
Opt: search for common CV at retirement from bottom to top (#4638) 2025-03-04 12:42:17 +08:00
W1NDes
9abdfd862b fix(retire): 调整装备确认按钮的偏移值
- 减小 EQUIP_CONFIRM_2 按钮的点击偏移量,防止在唯一保护窗口陷入三按钮点击死循环
2025-02-19 00:44:59 +08:00
LmeSzinc
93957382e8 Opt: Quick exit if there's only a few CV to retire 2025-01-04 05:24:10 +08:00
LmeSzinc
b9be029b72 Chore: Update comments in dock_filter_set 2025-01-04 03:05:26 +08:00
LmeSzinc
4a2eb4470c Opt: Combine dock filter operations to skip waiting dock loaded 2025-01-04 00:02:29 +08:00
LmeSzinc
bc3c602ecc Fix: Re-order retire popup handles by display hierarchy 2024-12-20 12:43:46 +08:00
LmeSzinc
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +08:00