Zuosizhu
de303b492e
Merge branch 'master_lme' into brocore_dev
...
# Conflicts:
# module/config/argument/override.yaml
# module/research/selector.py
# module/ui/ui.py
# module/webui/app.py
2025-07-11 23:03:05 +08:00
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
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
0O0o0oOoO00
45ac6bdf45
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/retire/assets.py
# module/retire/dock.py
2025-06-05 23:53:43 +08:00
dragonheart107
4172356a9a
Upd: [EN] DOCK_SELECTED ( #4850 )
2025-05-30 22:09:46 +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
LmeSzinc
03dd7b6a65
Fix: retirement confirm should end with EQUIP_CONFIRM_2
2025-05-25 20:10:36 +08:00
ZuoSiZhu
5f3f9ddf81
opt: make enhancing ships steps independent to reduce frequency of crack calls
2025-05-23 01:29:39 +08:00
xhqss
791f4bfd5a
Merge branch 'master' into dev
2025-05-23 00:03:44 +08:00
0O0o0oOoO00
6d46a747d3
del: remove do_crack_op in handle_retirement to avoid high-frequency function switches
2025-05-22 22:44:36 +08:00
LmeSzinc
23d4bd308e
Merge branch 'master' into dev
2025-05-22 14:23:40 +08:00
ZuoSiZhu
6959896d37
Revert "fix: disable global ship properties and factor of hook for retirement handler"
...
This reverts commit 5d7a2d3c58
2025-05-22 01:58:23 +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
0O0o0oOoO00
5d7a2d3c58
fix: disable global ship properties and factor of hook for retirement handler
2025-05-21 21:03:59 +08:00
ZuoSiZhu
9b14a26dae
fix: Dock merge error
2025-05-21 11:58:47 +08:00
ZuoSiZhu
dee0c1484f
Merge branch 'master_lme' into dev
...
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# module/config/argument/args.json
# 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/handler/login.py
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
ZuoSiZhu
a54650be0a
opt: switch position of DockNew and DockOld for easier merge
2025-05-21 03:55:42 +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
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
LmeSzinc
b4930d486e
Upd: [EN] ENHANCE_CONFIRM ENHANCE_RECOMMEND
2025-05-11 00:12:00 +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
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
ZuoSiZhu
58a217d98f
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/webui/app.py
# module/webui/config.py
2025-03-28 00:23:16 +08:00
LA_DI_DA
3db1c13f36
add: close the modification attribute before enhancement, and open it after enhancement
2025-03-27 19:34:28 +08:00
ZuoSiZhu
b82b79988d
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# module/config/argument/override.yaml
2025-03-14 00:57:23 +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
guoh064
a08e346609
Opt: search for common CV at retirement from bottom to top ( #4638 )
2025-03-04 12:42:17 +08:00
LA_DI_DA
845cca6447
fix: incorrect func redirection of Dock.dock_sort_method_dsc_set
2025-02-16 16:30:36 +08:00
LA_DI_DA
ba5b7dba26
fix: diamond inheritance of FleetEquipment, EquipmentChange, Equipment, Dock
2025-02-14 18:38:30 +08:00
LA_DI_DA
67df34aab2
compatibility: FleetEquipment, EquipmentChange, Equipment, Dock
2025-02-14 18:15:14 +08:00
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +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
xhqss
e7f93d8efe
Merge branch 'master_lme'
...
# Conflicts:
# module/equipment/equipment.py
2024-12-20 23:51:48 +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
LmeSzinc
26943697cb
Fix: Wait disappearing scroll in retirement_get_common_rarity_cv()
2024-12-09 23:25:45 +08:00
LmeSzinc
ba5b853cb9
Refactor: Standardize the use of match_template_color()
2024-12-09 16:09:34 +08:00
