sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
7,763 Commits 9 Branches 0 Tags 274 MiB
5db4cbaeef
Commit Graph

5592 Commits

Author SHA1 Message Date
LmeSzinc
c5fa19dbb1 Fix: Goto page_rpg_stage from page_campaign_menu 2024-08-02 02:56:33 +08:00
LmeSzinc
342f444164 Fix: [ALAS] Catch Permission Denial on am start 2024-08-02 02:44:11 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
LmeSzinc
d79859e6ed Upd: [TW] rpg page definition 2024-08-01 23:33:47 +08:00
LmeSzinc
debbbdae96 Refactor: [ALAS] Launch app with activity name 2024-08-01 23:26:56 +08:00
LmeSzinc
4d76a4341d Del: Remove AzurStats upload 
(cherry picked from commit 41e9f19780)
 2024-08-01 22:36:23 +08:00
LmeSzinc
9b135b17ad Fix: Keep B-397-RF (fixed #4042) 2024-08-01 19:11:23 +08:00
guoh064
5ef353a507
Fix: unrecognized ui page after empty mail receive (#4039) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Fix: unrecognized ui page after empty mail receive

* Upd: [JP] Asset MAIL_CHECK

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-07-28 13:32:03 +08:00
guoh064
fe0e687dcb
Add: [TW] event entrance of raid_20240328 (#4038) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Add: [TW] event entrance of raid_20240328

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-07-28 13:31:36 +08:00
LmeSzinc
7d4b21b4fc Upd: [CN] New server 暴雨行动 (#4025) 2024-07-27 01:54:57 +08:00
LmeSzinc
a15e18c75e Fix: Select all mails to delete 2024-07-27 01:35:13 +08:00
LmeSzinc
9cc9835e27 Fix: Add another frame of TEMPLATE_STAGE_CLEAR_20240725 (#4033) 2024-07-27 01:13:54 +08:00
LmeSzinc
34265d966d Upd: [JP] Mail assets 2024-07-26 03:01:04 +08:00
LmeSzinc
4a000745cc Upd: [JP] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-26 02:53:15 +08:00
LmeSzinc
7644a4b7ef Opt: Skip waiting info_bar after _retirement_confirm() for faster 2024-07-26 02:47:01 +08:00
LmeSzinc
19ba250bd4 Add: Chapter SP 2024-07-26 02:46:17 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
96647e6300 Add: Chapter T 2024-07-26 02:20:15 +08:00
LmeSzinc
2da2d58297 Fix: Handle yet another CLEAR icon 2024-07-26 02:20:05 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
LmeSzinc
bec185c855 Add: Event entrance of Interlude of Illusions (event_20240725_cn) 2024-07-25 23:37:48 +08:00
LmeSzinc
32649283ff Opt: Lower default screenshot interval on ldopengl 2024-07-25 12:18:28 +08:00
LmeSzinc
ff3971b023 Fix: ctypes.WINFUNCTYPE is called on non-Windows 2024-07-25 12:14:49 +08:00
LmeSzinc
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +08:00
LmeSzinc
200a5116ce Fix: Keep IScreenShotClass_Cap referenced 2024-07-25 02:16:38 +08:00
LmeSzinc
acbd5536bb Fix: FileNotFoundError wasn't handled 2024-07-25 02:16:38 +08:00
LmeSzinc
733bb89b2d Add: [ALAS] Add ldopengl setting 2024-07-25 02:16:34 +08:00
LmeSzinc
b285beed2b Add: [ALAS] Add screenshot method ldopengl 2024-07-25 00:12:50 +08:00
LmeSzinc
13fed12ff6 Fix: [ALAS] Handle dynamic mumu serial in serial_to_id 2024-07-24 23:18:01 +08:00
LmeSzinc
dce6f5c150 Opt: [ALAS] Skip nemud_app_keep_alive check on non-mumu 2024-07-24 23:18:01 +08:00
LmeSzinc
70db762421 Fix: [ALAS] use ldconsole.exe 2024-07-24 23:17:56 +08:00
LmeSzinc
1375eba095 Fix: [ALAS] Release cache after adb_restart() 
(cherry picked from commit 8d9e39fe5b9f359702c527e012eb03a04901b575)
 2024-07-24 00:34:54 +08:00
LmeSzinc
8da1848a4b Fix: [ALAS] Trying to handle MuMu12 port switches 
(cherry picked from commit 73a84d10d2e2cfcec1e48900c352ef50fbecc186)
 2024-07-24 00:34:54 +08:00
LmeSzinc
790fee8aa7 Fix: [ALAS] _maatouch_builder wasn't removed after adb_disconnect() 
(cherry picked from commit e10087aaf108f629ed689224e80e45f76905cfac)
 2024-07-24 00:34:54 +08:00
LmeSzinc
44b623c06c Fix: [ALAS] Trying to handle AdbError: unknown host service 
(cherry picked from commit 59ad8bd6fcd4b63ab9a557b1bd11aa92fb071e13)
 2024-07-24 00:34:50 +08:00
LmeSzinc
59cef0fa9f Fix: [ALAS] Device.__init__() was never called if EmulatorNotRunningError handled 
(cherry picked from commit 37d45af63f65ed851c48116d4a9872b43dd2f5c9)
 2024-07-24 00:28:27 +08:00
LmeSzinc
26fe3dda1d Fix: Detected as mail empty if MAIL_MANAGE click missed 2024-07-21 02:28:43 +08:00
LmeSzinc
39fceddb52 Upd: [EN] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE 2024-07-21 02:27:04 +08:00
LmeSzinc
0fe1479a27 Fix: Handle empty mail list (#4011) 2024-07-20 05:40:00 +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
LmeSzinc
eeb516146c Revert "Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6" 
This reverts commit 9a920233
 2024-07-19 12:27:34 +08:00
LmeSzinc
e66b2a84b0 Add: Claim mails in task freebies 
- TODO: [JP][TW] Update mail assets
 2024-07-18 22:48:40 +08:00
LmeSzinc
06143434a8 Add: Claim mail rewards 2024-07-18 22:20:50 +08:00
LmeSzinc
ccd19417ec Fix: Auto-fill emulator info on Windows only 2024-07-18 21:59:24 +08:00
LmeSzinc
ff6307b09d Fix: Allow Hermit on VMOS only 2024-07-18 21:56:48 +08:00
霞飛
820eea8550
fix: SHOP_BUY_CONFIRM_AMOUNT behavior on slower devices (#3998) 
* fix: SHOP_BUY_CONFIRM_AMOUNT behavior on slower devices

* fix: set interval and reset flag
 2024-07-18 21:39:03 +08:00
梦念逍遥
6a0466d842
Add: Event Pledge of the Radiant Court Rerun (#4001) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-07-18 21:38:27 +08:00
LmeSzinc
4a16b0c5ac Revert "Del: Remove AzurStats upload" 
This reverts commit 41e9f197
 2024-07-17 12:59:55 +08:00
LmeSzinc
e1a469fcee Add: [ALAS] Add interval on dump_hierarchy() 
(cherry picked from commit 00f3bf749542c6db1aee77d2cc08081e1c3f5189)
 2024-07-17 12:58:39 +08:00
LmeSzinc
c05e5f9d72 Fix: [JP] Invalid resolution on REWARD_*_WHITE 2024-07-12 21:17:30 +08:00
Jose Suarez
746e511f82
Fix BlueStacks_nxt emulator auto-run (#3987) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-07-12 18:49:03 +08:00
LmeSzinc
9a92023308 Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6 2024-07-12 12:48:30 +08:00
LmeSzinc
4135210550 Fix: brute_force_connect is called on non-windows 2024-07-12 12:42:14 +08:00
LmeSzinc
834ef85cdb Fix: is_mumu_over_version_356 is True on mumu mac 2024-07-12 02:08:02 +08:00
LmeSzinc
b6fd913b56 Add: [ALAS] set_cached_property 2024-07-12 01:45:26 +08:00
LmeSzinc
6064457620 Chore: [ALAS] Abstract platform condition 2024-07-12 01:05:58 +08:00
LmeSzinc
d161fc8cbf Upd: Series selecting page in shipyard 2024-07-12 00:31:34 +08:00
LmeSzinc
5ee7f9118e Add: Series 7 filter 2024-07-12 00:24:36 +08:00
LmeSzinc
41e9f19780 Del: Remove AzurStats upload 2024-07-12 00:17:10 +08:00
LmeSzinc
aeab621087 Upd: Detect research series 7 2024-07-12 00:07:25 +08:00
LmeSzinc
4bfcd2ace3 Upd: Research data for series 7 2024-07-11 23:57:33 +08:00
LmeSzinc
87cd4a5dd1 Upd: [TW] BATTLE_STATUS_CF (#3975) 2024-07-11 23:00:16 +08:00
霞飛
e9179258b2
fix: opsi amount handler and counter ocr (#3974) 
* fix: bugs

* fix
 2024-07-11 22:22:07 +08:00
RilyLC
ec1ae2cb3e
Upd:[TW]Event:Tower of Transcendence Rerun (#3981) 
* docs: update game configs

* Upd:[TW]Event:Tower of Transcendence Rerun

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: 霞飛 <saarchaffee@qq.com>
 2024-07-11 22:11:37 +08:00
LmeSzinc
6105801737 Upd: [EN][JP] RETIRE_SETTING_* 2024-07-06 02:07:05 +08:00
LmeSzinc
6edb1dbe7b Opt: [ALAS] Dynamic nemu_ipc timeout to fit screenshot interval 
(cherry picked from commit 8e10b9989f260ad60a6813b027f168233512ac15)
 2024-07-06 01:55:00 +08:00
LmeSzinc
bf03385d6a Opt: Cache yellow_coins_preserve 2024-07-06 00:52:25 +08:00
LmeSzinc
2bc712fa69 Opt: Remove debug code 2024-07-06 00:38:14 +08:00
LmeSzinc
019a35a64c Fix: Reset interval of GET_SHIP after entering page_dorm 2024-07-03 23:24:18 +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
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +08:00
LmeSzinc
1bda94335a Fix: Handle popup confirm in opsi shop buy 2024-07-03 22:27:53 +08:00
zuak110
4333b97d36
Add: Quick collection of coins and loves in the Dorm. (#3837) 
* Add: Quick collection of coins and loves in the Dorm.

* Upd: dorm coins and loves quick collect.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

* Upd: Changed the End method of the dorm collection function.

---------

Co-authored-by: Yoshino <zuak.8235790@gmail.com>
 2024-07-03 22:27:22 +08:00
LmeSzinc
a6cc863c01 Fix: No fleet mode in coalition_20240627 easy 2024-07-01 17:02:22 +08:00
LmeSzinc
2995c5408d Fix: Add Coalition as task requires balance (#3941) 2024-07-01 17:00:20 +08:00
霞飛
cb9114c7bd
Fix: none cost (#3947) 
* fix: none cost

* upd: assets
 2024-07-01 13:45:21 +08:00
LmeSzinc
674f79ef4d fix: handle gulid popup (#3950) 2024-07-01 13:39:04 +08:00
霞飛
79edef015f
fix: handle sidebar disappear (#3930) 
* fix: handle OpsiShop disappear

* docs: add a condition to OpsiShop

* ref: remove useless loop

* fix: exception

* feat: skip to the next month if the new shop do not unlock
 2024-06-28 12:18:08 +08:00
guoh064
3f0a6908c6 Upd: [JP] Assets for page_coalition 2024-06-28 12:16:25 +08:00
guoh064
ee8e2ff57f Add: [JP] Assets for coalition_20240627 2024-06-28 12:16:25 +08:00
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
LmeSzinc
12bd302deb Reverts test code in commit ea68f68d 2024-06-28 03:23:28 +08:00
LmeSzinc
c45c80c147 Add: [EN] Assets for coalition_20240627 2024-06-28 03:00:47 +08:00
LmeSzinc
7fba50035c Upd: [EN] Assets for page_coalition 2024-06-28 02:42:38 +08:00
LmeSzinc
38874e2982 Fix: No pt check in combat preparation 2024-06-28 02:00:06 +08:00
LmeSzinc
9bdfdb6447 Fix: Override mode in CoalitionSp 2024-06-28 01:54:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
752d4ea043 Add: UI switches to page_coalition 2024-06-28 00:28:03 +08:00
LmeSzinc
6bdfbc3dcd Add: Event entrance of coalition_20240627 2024-06-27 23:34:39 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
LmeSzinc
ea68f68dc9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917) 2024-06-27 22:20:09 +08:00
RilyLC
d1b16a99c2
Upd:[TW]Event:Tempesta and the Fountain of Youth (#3933) 
* Fix: Skip first screenshot in tools

since you cannot run benchmark before benckmarked

* Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn

to fit maps in 2024

* Fix: Random background of chapter A hits EXP_INFO_B

* Upd:[TW]Event:Tempesta and the Fountain of Youth

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-06-27 19:59:16 +08:00
LmeSzinc
1159263550 Fix: Expand search area of MISSION_MULTI and MISSION_SINGLE 2024-06-26 19:02:36 +08:00
LmeSzinc
1f62f2c81b Opt: Skip first screenshot in _reward_mission_collect 2024-06-26 18:35:41 +08:00
PPPlatelet
a2312c5498
Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support. (#3867) 
* Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support.

* Upd: fixed.

* fix

* Upd: Bug fix.

* Upd: fix

* Upd: Add single_to_console method.

* Upd: fix texts.

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-06-26 12:41:38 +08:00
LmeSzinc
b9730d4cd2 Opt: Add default filter in OpsiShop 2024-06-23 18:09:19 +08:00
LmeSzinc
ee334e4cb9 Fix: Enlarge drag threshold of OS_SHOP_SCROLL 2024-06-23 18:06:45 +08:00
霞飛
1d464a912c fix: use Unique instance ID instead 2024-06-22 21:43:55 +08:00
霞飛
ad6cb7fab0 chore: move functions and expand expressions 2024-06-22 21:43:55 +08:00
霞飛
54747a8055 ref: remove functon 2024-06-22 21:43:55 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
LmeSzinc
86d6c36670 Merge branch 'master' into dev 2024-06-21 01:50:05 +08:00
LmeSzinc
dc1aa58a1b Fix: Skip first screenshot in tools 
since you cannot run benchmark before benckmarked
 2024-06-21 00:35:08 +08:00
Air111
473a7b626c
Add: Event Rondo at Rainbow's End Rerun (#3902) 2024-06-20 19:00:11 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
Air111
a70d4c4675
Upd: add CommonDD option (#3786) 
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
 2024-06-14 03:39:20 +08:00
Air111
f3c48d1263
Fix: use ui_ensure to handle FATE(Unknown ui page) (#3885) 2024-06-13 22:32:51 +08:00
RilyLC
f70bb61ee6
Upd:[TW]Event:Sundered Blue Rerun (#3886) 2024-06-13 22:32:35 +08:00
LmeSzinc
a3a6ca3549 Fix: BATTLE_PASS_RED_DOT.load_offset is now working 2024-06-13 22:30:23 +08:00
LmeSzinc
d391e0b68e Fix: POPUP_CONFIRM was mis-detected as BOOK_EMPTY_POPUP 2024-06-12 12:28:25 +08:00
steelonion
502a932ae6
fix exception when tactical book is empty (#3880) 2024-06-12 12:22:41 +08:00
LmeSzinc
79747e86ab Fix: Fleet switch is never watched in auto search (#3866) 2024-06-12 00:14:16 +08:00
LmeSzinc
8925abaa46 Fix: Reset map_cat_attack_timer after clicking enhance button (#3877) 2024-06-12 00:05:52 +08:00
LmeSzinc
b5a9816782 Fix: Re-crop OPSI IN_MAP, leave letters only (#3871) 2024-06-11 23:56:31 +08:00
LmeSzinc
863458a23a Fix: Trying to handle books empty (#3753) 2024-06-11 23:38:43 +08:00
LmeSzinc
4c98442422 Fix: [ALAS] Handle psutil.NoSuchProcess 2024-06-11 19:13:55 +08:00
Air111
5540debf30
Fix: RewardShipyard ocr coin in page_reshmenu (#3860) 2024-06-09 18:28:44 +08:00
LmeSzinc
dad0e0e963 Pref: Try nc command on android phones first 2024-06-07 16:21:14 +08:00
LmeSzinc
91fb329f96 Fix: More fool-proof serial input redirection 2024-06-07 16:12:35 +08:00
LmeSzinc
e4653741dd Fix: Failed to enter boss room due to wrong is_question prediction 2024-06-07 09:56:35 +08:00
LmeSzinc
33cefa9817 Pref: Remove rpg page definition since event was over 2024-06-05 02:55:47 +08:00
LmeSzinc
0e7008a8b1 Fix: Handle random white background at page_main in commission receive 2024-06-05 02:49:17 +08:00
LmeSzinc
a668840ee9 Pref: Faster is_combat_loading() 2024-06-05 02:24:47 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00
LmeSzinc
73c1f914c9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_popup_after_locking() 2024-06-03 02:06:24 +08:00
LmeSzinc
24aa3e00bd Upd: [TW] Shop indexes, all server synced now 2024-06-03 01:56:08 +08:00
LmeSzinc
5b174e5839 Upd: [TW] Shop indexes, all server synced now 2024-06-03 00:52:20 +08:00
Air111
bb3f4964ec
Opt: wait until navbar active is not None (#3832) 2024-06-03 00:05:23 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
rilylc
445e6c61e7 Upd:[TW]dorm assets 2024-05-30 21:45:08 +08:00
LmeSzinc
e373847b1a Fix: Disable mail collect before assets updated 2024-05-30 21:44:34 +08:00
LmeSzinc
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +08:00
Air111
fdf28b2032 Fix: update offset and EN assets of rewards 2024-05-27 00:33:24 +08:00
LmeSzinc
234fd8d00a Upd: MISSION_NOTICE_WHITE 2024-05-24 15:59:56 +08:00
LmeSzinc
c8322b5187 Upd: [TW] Event event_20230525_cn 2024-05-24 03:20:07 +08:00
LmeSzinc
9ba3d2e732 Upd: [TW] Dorm menu assets 2024-05-24 03:02:51 +08:00
LmeSzinc
0bb086c7c7 Upd: [TW] Dock favourite assets 2024-05-24 02:55:32 +08:00
LmeSzinc
d4dec4ed55 Upd: [TW] UI assets 2024-05-24 02:49:39 +08:00
LmeSzinc
b8613b30fb Upd: [JP] UI assets 2024-05-24 02:35:35 +08:00
LmeSzinc
e2bf7e2997 Upd: [EN] UI assets 2024-05-24 02:33:40 +08:00
LmeSzinc
d20886131e Fix: Typo on IDLE.match_luma 2024-05-23 02:15:19 +08:00
LmeSzinc
a448e8f31d Fix: Missing mail assets import 2024-05-23 01:55:43 +08:00
LmeSzinc
66f66c998d Add: Sync get_interval_timer 2024-05-23 01:44:49 +08:00
LmeSzinc
254e9422ed Fix: auto_search_moving ends with is_combat_executing 2024-05-23 01:44:31 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
LmeSzinc
3513daf926 Fix: match_binary in idle page for various background 2024-05-23 01:17:31 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
Air111
608a4059a6 Fix: avoid continuous clicking AUTO_SEARCH_OS_MAP_OPTION_OFF 2024-05-23 01:16:12 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
LmeSzinc
aed4e7b499 Fix: Enlarge search area of rewards 
since they are now floating
 2024-05-21 23:23:48 +08:00
LmeSzinc
b85d646a84 Add: Event entrance of Light of the Martyrium (event_20240521_cn) 2024-05-21 22:53:12 +08:00
LmeSzinc
307c9e75f5 Chore: AdaptiveScroll docstring 2024-05-19 23:10:09 +08:00
LmeSzinc
65fe0c1ebd Fix: center_offset hasn't been calculated if map detection failed 2024-05-19 23:06:52 +08:00
霞飛
034570f157
feat: Add SRC framework 2024-05-15 15:27:53 +08:00
LmeSzinc
382980ca06 Fix: Add PAUSE in stuck record since is_combat_executing() bypassed appear() 2024-05-09 21:40:37 +08:00
rilylc
bbe601b687 Upd:[TW]Event:Upon the Shimmering Blue Rerun 2024-05-09 18:58:41 +08:00
LmeSzinc
5aca54d438 Fix: Add atomic OCR method on client side 2024-05-09 18:51:52 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00
LmeSzinc
6bd10d1a9d Chore: [ALAS] Default image name in image_save 2024-05-09 18:46:53 +08:00
LmeSzinc
28b452164f Pref: Release rpc connection on idle so OCR can be load balanced 2024-05-09 02:57:45 +08:00
LmeSzinc
c47c5b3bd1 Fix: Add atomic OCR method on rpc server 2024-05-09 02:24:28 +08:00
LmeSzinc
dbc80e3d26 Fix: [ALAS] socket timeout on scrcpy server startup 
(cherry picked from commit 6e703ffb666fe9e2c4e7d42eee9fbd69f26451c7)
 2024-05-08 01:04:04 +08:00
Air111
c5073e5917
Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
LmeSzinc
1fedcb6fda Fix: Retry getting stock limit 2024-05-06 00:59:16 +08:00
LmeSzinc
2650bc336a Fix: Retry getting shop item limit 2024-05-06 00:56:42 +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
LmeSzinc
b80f3533a1 Fix: [TW] OCR error on commission name 2024-05-03 16:49:11 +08:00
LmeSzinc
a5948df800 Fix: ship_info_enter with template matching check 2024-05-03 16:42:31 +08:00
LmeSzinc
6e7f92aae3 Fix: Array typo in DroidCast image parse 2024-05-03 16:37:25 +08:00
下面我簡單喵兩句
81b8ae1512
Upd:[TW]research assets (#3721) 2024-05-03 14:49:42 +08:00
LmeSzinc
d7bb28323b
Merge pull request #3716 from LmeSzinc/dev 
Bug fix
 2024-05-02 18:05:51 +08:00
LmeSzinc
91f2d9506c Opt: Improve memory performance in GlobeOperation.find_peaks 2024-05-02 17:41:12 +08:00
LmeSzinc
a59f82225c Opt: [ALAS] Replace cv2.multiply with cv2.convertScaleAbs for faster 2024-05-02 17:41:02 +08:00
LmeSzinc
5be152baf1 Fix: relative_hsv_count was counting pixels in 3 channels 
causing lots of predict_current_fleet() mis-detection
 2024-05-02 16:47:11 +08:00
LmeSzinc
24fa10c509 Opt: Faster DroidCast_raw image parsing 2024-05-02 16:35:34 +08:00
LmeSzinc
e2e431d3b1 Fix: Fleets not sorted if multiple current fleets found 2024-05-02 14:08:20 +08:00
LmeSzinc
e7bc1c94a4 Fix: [ALAS] Log empty command list 2024-05-01 23:59:59 +08:00
LmeSzinc
75333193ea Fix: [ALAS] insert_swipe() may return a length=1 list after deleting nearing points 2024-05-01 23:40:17 +08:00
LmeSzinc
04538c4b1a Fix: MAP_SWIPE_DROP should >= MAP_GRID_CENTER_TOLERANCE 2024-05-01 23:37:53 +08:00
LmeSzinc
11162310d1
Merge pull request #3708 from LmeSzinc/sync_test 
Bug fix
 2024-04-30 18:26:19 +08:00
LmeSzinc
741fc1c247 Chore: Remove debug loggers 2024-04-30 18:13:48 +08:00
LmeSzinc
107f88a275 Merge remote-tracking branch 'origin/dev' into sync_test 2024-04-30 17:43:32 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
LmeSzinc
58922cccb8 Opt: Improve memory performance in map detection 2024-04-30 17:42:56 +08:00
LmeSzinc
44c4ccc240 Opt: [ALAS] Improve memory performance in utils 2024-04-30 17:42:56 +08:00
LmeSzinc
0fb6a96691 Refactor: Make MaaTouch inputs synchronous 2024-04-30 17:42:52 +08:00
LmeSzinc
4d20b7ef20
Merge pull request #3704 from LmeSzinc/dev 
Bug fix
 2024-04-30 00:07:54 +08:00
LmeSzinc
152f5b596a Chore: [ALAS] Patch uiautomator2 loggers so they can be logged in Alas 2024-04-30 00:06:40 +08:00
LmeSzinc
57d42a14ae Chore: [ALAS] Add method uninstall_uiautomator2 2024-04-30 00:06:33 +08:00
LmeSzinc
4cff3e6283 Fix: [ALAS] Patch u2.init.appdir in runtime 2024-04-30 00:06:25 +08:00
LmeSzinc
74d3aa5ad5
Merge pull request #3701 from LmeSzinc/dev 
Bug fix
 2024-04-29 00:46:36 +08:00
LmeSzinc
30d4ffc644 Fix: _reward_mission_collect() calls should have minimum interval 2024-04-29 00:45:40 +08:00
Air111
b303d2279a
Fix: equipment image record in fast PC (#3700) 2024-04-29 00:43:39 +08:00
LmeSzinc
63fd8b63f6 Opt: [ALAS] Lazy import onepush 2024-04-28 17:12:03 +08:00
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00
guoh064
faae3c9f21
Add: jp event entrance 20240425 (#3681) 2024-04-26 18:36:05 +08:00
LmeSzinc
cba28a8aac Fix: Full scan wasn't early stopped cuz mixed use of siren and boss 2024-04-26 13:37:25 +08:00
LmeSzinc
bfb9bd0d61 Fix: Convert stage names in event_20240425_cn 2024-04-26 04:07:31 +08:00
LmeSzinc
0437ae80e6 Fix: Increase MAP_GRID_CENTER_TOLERANCE since short swipes on map no longer be responded to 2024-04-26 04:06:23 +08:00
LmeSzinc
7a45fed67f Fix: Duplicated SheffieldIdol template 2024-04-26 04:01:06 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
LmeSzinc
fbf7bc02c6 Add: Heart-Linking Harmony chapter SP 2024-04-26 02:45:10 +08:00
LmeSzinc
75644f91d0 Add: Event entrance of Heart-Linking Harmony (event_20240425_cn) 2024-04-26 00:00:28 +08:00
LmeSzinc
c5415d15be Fix: [ALAS] Allow removing non-existent forwards and reverses 2024-04-25 19:05:42 +08:00
RilyLC
42271e021d
Upd:[TW]Event:The Fool's Scales (#3677) 2024-04-25 19:01:01 +08:00
guoh064
78ff5f02ef
Opt: sort asset lines before printing to file (#3675) 
* Opt: sort asset lines before printing to file

* Upd: regenerated asset list files
 2024-04-24 09:04:22 +08:00
guoh064
6f030373f6
Upd: asset FLEET_DETAIL_CHECK (#3674) 2024-04-24 09:03:49 +08:00
LmeSzinc
a4f8bde695 Merge branch 'master' into dev 2024-04-23 01:13:02 +08:00
LmeSzinc
55b68d1f12 Fix: [ALAS] Old minitouch conn does not response to inputs after adb restarted 2024-04-23 00:16:29 +08:00
LmeSzinc
cfe187ea57 Fix: [ALAS] Deploy config wasn't redirected after Updater.delay() 2024-04-23 00:13:54 +08:00
LmeSzinc
d64d4b2587 Fix: Handle map events when entering storage 2024-04-23 00:13:31 +08:00
guoh064
41075b4a52
Fix: W15 optimization (#3660) 
* Fix: force battle function choice for 15-1/15-2 when clear all

* Add: battle strategy when missing support fleet in W15

* Opt: open strategy once when checking mob move

* Opt: reuse strategy_get_mob_move_remain()
 2024-04-22 23:16:39 +08:00
Air111
250cf4e1a2
Fix: rename equipment functions (#3665) 2024-04-22 23:11:45 +08:00
LmeSzinc
1ddc7d9365 Fix: [ALAS] _minitouch_client is not default value 2024-04-22 00:15:44 +08:00
LmeSzinc
bf52e6954a Fix: [ALAS] Touch builders have no retries if called directly 2024-04-21 23:36:47 +08:00
LmeSzinc
3757510ecd Fix: [ALAS] Re-init MaaTouch when orientation changed 2024-04-21 23:36:31 +08:00
LmeSzinc
6c09e29aca Fix: [ALAS] Global MuMu 12 id 2024-04-21 23:34:34 +08:00
LmeSzinc
a365f82d2e
Merge pull request #3658 from Air111/fix_equipment 
Fix: bugs in equipment
 2024-04-21 17:45:54 +08:00
LmeSzinc
ba47dcce1a Opt: Use MAIN_GOTO_FLEET instead of MAIN_GOTO_CAMPAIGN for faster switches with info_bar 2024-04-20 03:01:32 +08:00
LmeSzinc
53aef7e992 Opt: Handle GET_ITEMS before info_bar to be one screenshot faster 2024-04-20 02:56:03 +08:00
LmeSzinc
d512c4dadf Opt: Remove meaningless sleep from stone age 2024-04-20 02:50:12 +08:00
LmeSzinc
89aa1ad7dc Fix: W15 optimizations 
- Upd: [CN] MOB_MOVE_CANCEL
- Opt: MAP_SWIPE_MULTIPLY
- Fix: 15-1 did not inherit ConfigBase
 2024-04-20 01:57:27 +08:00
LmeSzinc
76f863ac59 Fix: [ALAS] Global MuMu 12 id 2024-04-19 22:38:49 +08:00
Air111
194ec3e234 Fix: lower SIM_VALUE in ship matching of GemsFarming 2024-04-19 21:48:50 +08:00
Air111
0eee91a891 Fix: scan ships in correct fleet 2024-04-19 21:46:26 +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
cddfea680d Fix: rename equip_enter 2024-04-19 14:13:18 +08:00
LmeSzinc
54ff40588c Fix: [ALAS] Touch builders have no retries if called directly 2024-04-19 01:54:03 +08:00
LmeSzinc
00926388c8 Fix: site-packages detection on manual package builds 2024-04-19 01:52:51 +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
guoh064
27693a6762
Add: 15图开荒/周回 (#3563) 
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
 2024-04-19 01:29:17 +08:00
Air111
a7f9518661
Opt: sort latest events in config update (#3653) 2024-04-18 12:21:55 +08:00
guoh064
9388666d1d
Fix: fall back to all union DDs when not specifying DD (#3648) 2024-04-18 12:14:57 +08:00
LmeSzinc
68b1af661f Merge branch 'src_sync' into dev 2024-04-15 19:21:18 +08:00
LmeSzinc
485c024b44 Fix: Chain call minitouch in dorm 2024-04-15 19:20:52 +08:00
LmeSzinc
8376d62843 Sync: [ALAS] Minitouch multi-finger support 2024-04-15 19:17:18 +08:00
LmeSzinc
4858d55c46 Opt: Patch pkg_resources for faster startup 2024-04-15 18:43:42 +08:00
LmeSzinc
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00
LmeSzinc
16ba4aaad6 Chore: Poorly search mxnet-cu* instead of using pkg_resources 2024-04-15 02:55:06 +08:00
LmeSzinc
502558dbbd Fix: brute_force_connect() was called on linux 2024-04-15 00:57:40 +08:00
LmeSzinc
bbe4bdae8c Merge branch 'master' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-04-14 01:19:21 +08:00