Commit Graph

5190 Commits

Author SHA1 Message Date
LmeSzinc
0fb6a96691 Refactor: Make MaaTouch inputs synchronous 2024-04-30 17:42:52 +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
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 8d357abe5b.

* 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
LmeSzinc
3e585ab8e7 Fix: Mark nemu_ipc unavailable if emulator instance not found 2024-04-14 01:06:04 +08:00
LmeSzinc
d67874ca68 Fix: Filter emulator instances by the running emulator path 2024-04-14 01:01:05 +08:00