LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:49:25 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

150 Commits

Author SHA1 Message Date
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
 2025-10-12 11:28:13 +08:00
LmeSzinc
dbff1d9efb Fix: handle both blue (folded) and orange (expanded) EQUIPMENT_OPEN 2025-09-26 23:23:46 +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
LmeSzinc
ea4a73ff24 Fix: Skip NPC character when entering first ship in dock (#4725, #3678) 2025-04-11 01:46:06 +08:00
LmeSzinc
6c88930b43 Fix: Handle NPC popup in _ship_view_swipe (#3678) 2025-04-11 01:00:55 +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
46b1abfdff Fix: Handle game tips in ship_info_enter() 2025-01-04 22:48:17 +08:00
xhqss
72b3584f96 fix error in equipment.py 2024-12-20 23:54:22 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
63c091ba94 Fix: Double clicking EQUIP_OFF after popup confirm on slow devices 2024-12-20 13:39:06 +08:00
LmeSzinc
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +08:00
Zuosizhu
6ab4666492 Fix: shit in Daily 2024-07-20 15:30:59 +08:00
Zuosizhu
5096d7b702 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-20 15:30:44 +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
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
64e8c32c7b Fix: Equipment inherit redirection 2024-05-26 00:43:34 +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
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
3169912ec5 Fix: adaptation mistake 2024-05-23 21:27:18 +08:00
LA_DI_DA
8d8fc78735 add: add log for switching assets 2024-05-22 20:19:48 +08:00
LA_DI_DA
945f7d49cf fix: get global when redirect inherit 2024-05-20 23:38: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
LA_DI_DA
85e4f8e15e Merge branch 'refs/heads/lme-alas/master' into smallkai 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
 2024-05-17 18:38:32 +08:00
LA_DI_DA
4481519a82 Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai 2024-05-17 18:09:32 +08:00
Air111
6107ce024e Upd: rename equipment buttons 2024-05-06 00:50:08 +08:00
Air111
5e77b8d6e9 Fix: check EQUIPMENT_OPEN using template matching 2024-05-06 00:50:08 +08:00
Zuosizhu
a3e1d994bb Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 19:58:18 +08:00
LmeSzinc
a5948df800 Fix: ship_info_enter with template matching check 2024-05-03 16:42:31 +08:00
Air111
b303d2279a Fix: equipment image record in fast PC (#3700) 2024-04-29 00:43:39 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
Zuosizhu
e99c8ad341 Revert "Upd: Flagship changing (#3556)" 
This reverts commit 2507b0fa
 2024-04-27 12:58:56 +08:00
Zuosizhu
f4245fef77 Revert "Fix: update [CN/JP/TW] asset EQUIPPING_ON to handle cat claw" 
This reverts commit 932cd6c370.
 2024-04-27 12:57:34 +08:00
guoh064
6f030373f6 Upd: asset FLEET_DETAIL_CHECK (#3674) 2024-04-24 09:03:49 +08:00
Air111
932cd6c370 Fix: update [CN/JP/TW] asset EQUIPPING_ON to handle cat claw 2024-04-19 17:55:56 +08:00
Air111
2507b0fa6b Upd: Flagship changing (#3556) 
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
 2024-04-19 01:40:40 +08:00
LA-DI-DA
153dbdd79e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
 2023-10-27 19:28:33 +08:00
Zuosizhu
2720da3995 Merge branch 'LmeSzinc:master' into 20230309 2023-10-27 18:21:25 +08:00
alexan-ded
7eb02e1ed9 Upd: [EN] EQUIPMENT_OPEN 2023-10-27 07:35:19 +08:00
LA-DI-DA
8974c229a3 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-04 18:22:15 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
7e225c2acd Fix: _equip_take_off_one() on slow device (#2946) 2023-08-01 23:56:57 +08:00
LA-DI-DA
877660eb1b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-07-21 18:58:28 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
76107e8682 Fix: Handle RETIRE_EQUIP_CONFIRM during _equip_view_swipe() 2023-07-18 23:22:12 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
 2023-07-17 18:45:43 +08:00