LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 02:59:30 +08:00
Code Activity
9,611 Commits 12 Branches 0 Tags
bff32b75e7eb316b48ea7f05a0ee8cf00a2b3ca5
Commit Graph

82 Commits

Author SHA1 Message Date
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
LmeSzinc
f5a201a793 Fix: Handle slow popups from last retirement when entering dock filter 2025-05-29 23:06:07 +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
eebfc81251 Fix: Handle dock filter without black-blurred background 2025-05-12 19:58:03 +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
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
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
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +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
a24a7fcfd1 tmp: [JP] LevelOcr 2024-10-16 12:48:21 +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
78600a323d Opt: Skip wait_loading at the last dock_filter_set 2024-07-03 23:14:26 +08:00
LA_DI_DA
4cb76e1e04 Fix: redirect OpsiAshBeacon to inherit old version of Dock 2024-05-25 15:01:43 +08:00
LA_DI_DA
0f80364ed3 Fix: save global to a single file for cross-module use 2024-05-25 11:16:00 +08:00
LA_DI_DA
ea6ad05290 Fix: let all main and event class to inherit old class 2024-05-24 20:59:47 +08:00
LA_DI_DA
a168a0ed54 Add: add log for inherit redirection 2024-05-24 16:25:19 +08:00
LA_DI_DA
7289238d0b Revert "Add: add log for inherit redirection" 
This reverts commit c4665071db.
 2024-05-23 23:56:57 +08:00
LA_DI_DA
c4665071db Add: add log for inherit redirection 2024-05-23 23:29:12 +08:00
LA_DI_DA
551d10cdb8 fix: Adapt to new APIs in retire, exercise, hard 
# module/retire/dock.py
# module/exercise/equipment.py
# module/hard/equipment.py
 2024-05-22 10:33:49 +08:00
LA_DI_DA
0101eaf3e3 fix: Adapt to new APIs from upstream 
# fuck LmeSzinc/AzurLaneAutoScript#3556
# fuck @Air111
 2024-05-19 19:59:03 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00
LmeSzinc
ca3581a715 Upd: Dock filter grids 2023-02-16 22:06:56 +08:00
LmeSzinc
9fa06ffc28 Fix: [EN] Temp fix on dock_selected, EN has no selected info in dock 2022-12-10 23:28:32 +08:00
LmeSzinc
98fc87e57a Fix: [EN] Missing DOCK_CHECK offset 2022-12-09 21:42:14 +08:00
LmeSzinc
a56a45de65 Opt: Add retry when getting dock_selected 2022-11-13 02:12:17 +08:00
Horizon101011
12e04ebaab Merge branch 'dev' into dockScanner 2022-10-10 23:06:27 +08:00
Horizon101011
b2712d81d2 Refator: Abstract scanner class; Bind properties to scanners 2022-10-10 23:03:11 +08:00
LmeSzinc
cc922d798e Fix: [EN] Unable to detect META skill list 2022-09-25 02:39:45 +08:00
Horizon101011
e1f50c64cb Merge branch 'dev' into dockScanner 2022-09-14 10:32:54 +08:00
Horizon101011
5541308bfd Fix: GemsFarming flagships cause 'No ship retired' 2022-09-13 10:39:18 +08:00
Horizon101011
bee28c5321 [Refactor] Using template matching instead of feature matching 2022-09-13 09:31:01 +08:00
LmeSzinc
67e7eb04a5 Refactor: Abstract filter_set to Setting class 2022-09-08 12:27:50 +08:00
Horizon101011
21f5b51ac2 Upd: Modify annotation 2022-09-07 08:46:01 +08:00
Horizon101011
04eb4a794f Fix: Wrong fleet limitation 2022-09-07 08:39:00 +08:00
Horizon101011
2369581794 Upd: Add support for commission status 2022-09-06 21:36:35 +08:00
LmeSzinc
f6848817b5 Fix: filter_set_execute on slow PCs 2022-09-04 23:30:53 +08:00
LmeSzinc
59b94395c9 Fix: Handle dock full when taking off equipments 
- Opt: Remove sleep in dock filter set, just meaningless
 2022-08-31 14:12:13 +08:00
Horizon101011
8887993b74 Opt: Add support for choosing certain CV 2022-08-30 00:08:26 +08:00
Horizon101011
81e84d1259 Add: DockScanner 2022-08-29 12:56:01 +08:00