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

58 Commits

Author SHA1 Message Date
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
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
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
8974c229a3 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-04 18:22:15 +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
LmeSzinc
76107e8682 Fix: Handle RETIRE_EQUIP_CONFIRM during _equip_view_swipe() 2023-07-18 23:22:12 +08:00
LA-DI-DA
a97bbe228a Fix:Equipment change when in cloud 2023-05-03 23:42:36 +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
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
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
bookbug666
dd8d7f0ec5 Fix: Delete unused ui action; Rename button 2022-08-06 16:40:47 +08:00
bookbug666
a54d5e299f Upt: Assets of Equipment_change 2022-08-04 22:49:45 +08:00
nEEtdo0d
e22f3a3523 Fix: can get stuck with default offset = 0; utilize same offset as latter condition 2022-05-29 15:14:41 -04:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
nEEtdo0d
60677a922b Fix: DETAIL_SIDE_NAVBAR bump up threshold for NavBar get_info 2021-08-22 13:10:09 -04:00
Cyunmi
aa4a2d8ef6 Merge branch 'master' into gems_farming 2021-08-09 17:08:25 +08:00
nEEtdo0d
dc8a2862e3 Fix: module shop missing dict items, module build assets, and etc. 
Add: module shipyard support for daily buy of discounted bps; interface, config, integrate into reward, and etc.

Fix: Resolve merge conflict
 2021-07-31 23:28:40 -04:00
nEEtdo0d
29ef242183 Fix: equipment and guild module imports 2021-07-31 23:13:09 -04:00
nEEtdo0d
f30b3676d9 Fix: Guild side bar and equipment side bar 
Reverted to the original ones, they are different from page_build
 2021-07-25 19:36:56 -04:00
LmeSzinc
5aa75a95a9 Fix: Guild side bar and equipment side bar 
Reverted to the original ones, they are different from page_build
 2021-07-25 01:21:24 +08:00
nEEtdo0d
166b486fc7 Add: Navbar module 
Opt: Replace sidebar mechanism to Navbar for equipment and guild modules
 2021-07-10 22:58:11 -04:00
RuaBQ
350e3c33f3 delete redundancy assert 
add Switch(equipping_set)
 2021-07-05 03:09:53 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
nEEtdo0d
0eb22e16f6 Fix: [EN] enhance stuck due to asset altered via wait_until_stable / load_color 2021-05-09 08:54:41 -04:00
nEEtdo0d
b9a9d46174 Fix: Inheritance of InfoGuild in Combat introduced 
method signature override issues, separate the two
_view_swipe based on their module
 2021-01-14 23:39:39 -05:00
nEEtdo0d
25098f2f82 Fix: On first round, often same ship is detected as new ship 
Disabling ensure_template repairs this behavior and retains
if new ship is actually detected
 2020-12-27 13:51:56 -05:00
nEEtdo0d
23f46879ff Fix: Enhance process able to get trapped in loop if current screenshot doesn't match any condition. If detected, will perform a force check/swipe if applicable. Applied similar concept to both versions of _enhance_choose*. 
Update: Swipe process with additional internal delay and wait_until_stable to ensure image is screen captured at approriate time.

Update: Keep sidebar click index positive otherwise can click back button. Add PRY condition with sidebar only having 3 buttons, disable clicking the Research button as not supported. Maybe in the future.
 2020-08-19 19:29:11 -04:00
nEEtdo0d
1dc84b3280 potential fix for infinite while loop entering and added leeway for dock filter images due to poor cut 2020-08-13 12:56:27 -04:00
nEEtdo0d
8c5a5bdc28 Fix: Fewer tries on swipe to shorten duration 
Added: Implementation of _enhance_choose_simple, simplified version of _enhance_choose, specifically enabled only if enhance_order_string is populated
Updated: help info for enhance_order_string with example input, removed subtext header info.
 2020-08-09 23:16:24 -04:00
nEEtdo0d
f201336031 Modify equipment swipe implementation to allow exit on same ship (Only 1 card is on grid so cannot swipe). Also used bool return values to indicate whether successful. 
Modify enhanacement to use swipe bool mechanic to exit in case of infinite swipe attempts. Never reaching the 'material exhausted' conditional.

Added get_hp() to fleet switch due to possibility of fleet acquiring emergency repair. However in most cases has full HP but the current HP in program belongs to fleet before switch. Thus is parsing an incorrect HP set when deciding to use repair.
 2020-08-06 22:01:02 -04:00
LmeSzinc
3c2698b64e Fix: Research popup in page_main 2020-07-12 03:11:22 +08:00
LmeSzinc
58bd5b7e2b Del: Deprecate equip_quit 
- Fix double click on BACK_ARROW when quit equipment on potato pc
 2020-06-29 01:41:48 +08:00
LmeSzinc
5202a0cbaa Fix: Swipes now join infinite clicking check 2020-06-23 01:09:56 +08:00
LmeSzinc
26ce4d896d Fix: Timer for potato pc 
- Timer for retreat
- Timer for equip swipe
- Fix error when already in map
- Better code appearance for B3/D3 in event_20200611_en
 2020-06-19 17:19:03 +08:00