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
LmeSzinc
164db6f4da
Chore: Rename "threshold" in template matching to "similarity"
...
to be differ from the "threshold" in color matching
2024-12-09 15:37:25 +08:00
xhqss
fad84bb0fa
Merge branch 'master_lme'
2024-11-15 17:14:11 +08:00
guoh064
08a9326e84
upd: [JP] EmotionDigit pre_process
2024-10-30 12:18:09 +08:00
LA_DI_DA
a2e6986dcd
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/campaign/campaign_status.py
# module/exercise/combat.py
# module/retire/dock.py
# module/retire/enhancement.py
2024-10-25 12:01:29 +08:00
guoh064
65304fee2e
upd: [JP] LevelOcr and EmotionDigit
2024-10-20 21:58:34 +08:00
guoh064
d1052df932
Revert "tmp: [JP] LevelOcr"
...
This reverts commit a24a7fcfd1
2024-10-20 21:58:34 +08:00
guoh064
17a6da533e
upd: [JP] OCR_DOCK_AMOUNT
2024-10-20 21:58:34 +08:00
guoh064
d13e852b92
upd: [JP] retire assets
2024-10-20 21:58:34 +08:00
guoh064
a24a7fcfd1
tmp: [JP] LevelOcr
2024-10-16 12:48:21 +08:00
LmeSzinc
ce4de6b4e9
Fix: Limit trials on _retire_select_one()
2024-10-13 17:44:56 +08:00
yulu901107
2bd90c8b4b
Fix: Avoid too_many_click exception caused by enhancement failure on in-battle ships ( #4217 )
2024-09-29 12:13:50 +08:00
guoh064
4852d66be0
Upd: [JP] asset TEMPLATE_IN_COMMISSION ( #4211 )
2024-09-20 22:35:00 +08:00
LA_DI_DA
a9afa5487a
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/webui/app.py
2024-09-13 23:09:32 +08:00
LmeSzinc
4b07f5068c
Fix: Reset map_cat_attack_timer after handling retirement
2024-09-10 01:14:18 +08:00
LmeSzinc
f5fa5b6901
Fix: Limit swipe times in retirement_get_common_rarity_cv ( #4116 )
2024-09-09 23:38:34 +08:00
LA_DI_DA
89be3580ec
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/ui/page.py
2024-08-17 21:48:52 +08:00
LmeSzinc
e23e88748f
Fix: Reset map_cat_attack_timer after clicking RETIRE_APPEAR_1 ( #4055 )
2024-08-04 09:57:04 +08:00
Zuosizhu
1d85336ba4
Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
...
# Conflicts:
# module/device/method/adb.py
# module/device/screenshot.py
2024-07-26 08:04:44 +08:00
LmeSzinc
7644a4b7ef
Opt: Skip waiting info_bar after _retirement_confirm() for faster
2024-07-26 02:47:01 +08:00
Zuosizhu
185af2808f
Merge Lme/Master into dev
2024-07-22 16:45:29 +08:00
guoh064
11e3580c61
Opt: always keep common cv at retirement if GemsFarming enabled
2024-07-19 12:33:50 +08:00
guoh064
a2ebcbef1b
Add: scroll retire comfirm page to find more common cv
2024-07-19 12:33:50 +08:00
Zuosizhu
cac07d48ab
Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors
2024-07-18 08:58:55 +08:00
LA_DI_DA
5ab8cfdee5
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# README.md
2024-07-06 19:17:11 +08:00
LmeSzinc
6105801737
Upd: [EN][JP] RETIRE_SETTING_*
2024-07-06 02:07:05 +08:00
LmeSzinc
78600a323d
Opt: Skip wait_loading at the last dock_filter_set
2024-07-03 23:14:26 +08:00
LmeSzinc
c3d20e9366
Opt: Retire once since game client retire all at one time
2024-07-03 23:11:40 +08:00
LmeSzinc
095c51d2f8
Upd: [CN] RETIRE_SETTING_*
2024-07-03 22:55:10 +08:00
LA_DI_DA
573210af2b
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# alas.py
# module/os/fleet.py
2024-06-22 20:31:35 +08:00
LmeSzinc
8925abaa46
Fix: Reset map_cat_attack_timer after clicking enhance button ( #3877 )
2024-06-12 00:05:52 +08:00
LmeSzinc
58202c6a40
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +08:00
LA_DI_DA
7970d5b3a3
Merge branch 'refs/heads/smallkai' into smallkai-dev
2024-05-25 19:45:50 +08:00
LA_DI_DA
219bcc2d76
Merge remote-tracking branch 'origin/smallkai' into smallkai
2024-05-25 19:45:31 +08:00
LA_DI_DA
6627c387fb
Fix: retire flagship when gemsfarming and use change ship at the same time
2024-05-25 19:21:53 +08:00
LA_DI_DA
4cb76e1e04
Fix: redirect OpsiAshBeacon to inherit old version of Dock
2024-05-25 15:01:43 +08:00
