LA_DI_DA
9fc3556a28
Merge branch 'smallkai' into smallkai-dev
2024-04-28 23:21:45 +08:00
LA_DI_DA
928b61978d
Add: more setting for click record check
2024-04-28 23:06:32 +08:00
LA_DI_DA
860bcf5760
Del: screenshot interval limit
2024-04-28 22:19:09 +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
LA_DI_DA
02587d5f16
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
2024-04-27 15:45:38 +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
4fcb955168
Revert "Fix: rename equip_enter"
...
This reverts commit cddfea680d
2024-04-27 12:57:37 +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
Zuosizhu
7e75b7fdd7
Revert "Fix: scan ships in correct fleet"
...
This reverts commit 0eee91a891
2024-04-27 12:57:29 +08:00
Zuosizhu
d43b218a0f
Revert "Fix: lower SIM_VALUE in ship matching of GemsFarming"
...
This reverts commit 194ec3e234
2024-04-27 12:57:26 +08:00
Zuosizhu
8ab056b5f6
Revert "Fix: rename equipment functions ( #3665 )"
...
This reverts commit 250cf4e1a2
2024-04-27 12:57: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
Zuosizhu
055720dd52
Merge branch 'master_lme'
...
# Conflicts:
# deploy/config.py
2024-04-26 03:18:16 +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
Zuosizhu
79b4a6deb9
Merge branch 'LmeSzinc:master' into 20230309
2024-04-22 13:20:05 +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
Zuosizhu
bdc7d43c97
Merge branch 'dev-revert-gemsfarming'
...
# Conflicts:
# assets/cn/handler/MOB_MOVE_CANCEL.png
# module/device/method/utils.py
# module/handler/fast_forward.py
2024-04-20 15:16:09 +08:00
Zuosizhu
e9bca563fb
Revert "Upd: Flagship changing ( #3556 )"
...
This reverts commit 2507b0fa6b
2024-04-20 15:14:04 +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
Zuosizhu
0b2f9ed81c
Merge branch 'dev'
...
# Conflicts:
# campaign/campaign_main/campaign_15_1.py
# campaign/campaign_main/campaign_15_2.py
# campaign/campaign_main/campaign_15_3.py
# campaign/campaign_main/campaign_15_4.py
2024-04-19 02:17:51 +08:00
LmeSzinc
54ff40588c
Fix: [ALAS] Touch builders have no retries if called directly
2024-04-19 01:54:03 +08:00
