LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 18:29:25 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

135 Commits

Author SHA1 Message Date
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
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LA-DI-DA
511334ed84 Merge branch 'lme-alas/master' into wait 2023-07-02 17:28:05 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
LA-DI-DA
a97bbe228a Fix:Equipment change when in cloud 2023-05-03 23:42:36 +08:00
LA-DI-DA
f85522f66d Add device sleep in EquipmentChange 2023-05-01 20:48:24 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
de351f308e Fix: equip_enter with long_click=False (#2453) 2023-04-04 21:21:47 +08:00
LmeSzinc
f6f306f4e7 Fix: Entered dock when changing equipment 2023-04-04 01:31:27 +08:00
Zuosizhu
7d1f48878e Fix: Log word fix 2023-02-28 02:24:08 +08:00
LmeSzinc
623bf51980 Fix: Equip take on and off, on slow emulators 2023-02-25 22:41:24 +08:00
LmeSzinc
d39ab8da1d Fix: Wrong EQUIP_CONFIRM imported (#2201) 2023-02-04 17:03:05 +08:00
LmeSzinc
2f1ac3eaeb Fix: Catch EQUIP_CONFIRM in _equip_view_swipe() (#2201) 2023-02-03 00:29:22 +08:00
LmeSzinc
e5b06b3726 Upd: [EN] EQUIP_CONFIRM in equipment module 2022-12-12 18:00:44 +08:00
LmeSzinc
d6151b4ce1 Fix: Handle EQUIP_CONFIRM popup when scanning equipment list 2022-11-27 23:55:21 +08:00
nEEtdo0d
167d2d4b92 Add: [EN] TEMPLATE_SWIRLING_CHERRY_BLOSSOMS (#1780) 
Upd: [EN] EQUIP_[1-3]; position changed with addition of augment slot
 2022-10-28 10:45:30 -04:00