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
6,059 Commits 9 Branches 0 Tags 274 MiB
518eb95c54
Commit Graph

4375 Commits

Author SHA1 Message Date
bookbug666
033d7486df Add:Check event availability before event tasks, using temporality asset. 2023-01-07 12:01:57 +08:00
LmeSzinc
81106a4dda Fix: Resolution check for scrcpy 2023-01-07 02:43:52 +08:00
LmeSzinc
fa5dd91696 Upd: [EN] Assets of OpSi monthly bosses (#2032) 2023-01-06 20:46:23 +08:00
LmeSzinc
6c768de2a5 Fix: Different return of command not found (#2088) 2023-01-06 20:38:11 +08:00
LmeSzinc
86c07bcd18 Add: [TW] Event entrance of The Way Home in the Night Rerun (event_20210610_tw) 2023-01-06 01:29:09 +08:00
Little_C
41d67ebc48 添加了类型判断，Onepush中某些中间件并不会返回Response而是返回NoneType(比如Discord) 
Signed-off-by: Little_C <zxc7895531@outlook.com>
 2023-01-06 00:44:10 +08:00
Little_C
bcc027f788
修复了推送未处理Go-cqhttp状态码的错误 (#2081) 
* 修复了关于Go-cqhttp的推送错误

* 除开SMTP由于不返回Response，需要单独处理，其他的都可以套用

Signed-off-by: Little_C <zxc7895531@outlook.com>

* 将access_token转为token处理

Signed-off-by: Little_C <zxc7895531@outlook.com>

* 将所有判断provider_name的地方取消大小写敏感

Signed-off-by: Little_C <zxc7895531@outlook.com>

Signed-off-by: Little_C <zxc7895531@outlook.com>
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-01-05 21:34:33 +08:00
LmeSzinc
3e1a223dc5 Opt: Auto choose event or main chapters from GemsFarming 2023-01-05 21:27:35 +08:00
LmeSzinc
56f95f52cb Add: Event entrance of Khorovod of Dawns Rime Rerun (event_20230105_cn) 2023-01-05 20:53:19 +08:00
LmeSzinc
1b5d3b0beb Fix: NavBar failed on random pure black screenshot 2023-01-05 20:46:02 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
93d75ed8f9 Fix: Handle port not found in port_goto() 2023-01-04 20:30:52 +08:00
LmeSzinc
9963f4f4e2 Fix: Missing retry_sleep import in DroidCast 2023-01-04 17:33:29 +08:00
LmeSzinc
c22dede8d8 Upd: Lock OpsiMonthBoss from EN/TW before assets update 2023-01-03 23:38:27 +08:00
LmeSzinc
c59de88938 Upd: Remove Hermit click test 
It's useless now
 2023-01-03 23:31:37 +08:00
LmeSzinc
4dc37ef4ca Merge branch 'master' into dev 2023-01-03 23:27:17 +08:00
LmeSzinc
44f6e35fac
Merge pull request #2066 from LmeSzinc/bug_fix 
Bug fix
 2023-01-03 23:18:53 +08:00
LmeSzinc
f0da5fcf76 Fix: Netcat loopback on BlueStacks Pie 2023-01-03 22:55:40 +08:00
LmeSzinc
73615f5309 Fix: Double swipe at handle_zone_pinned() 2023-01-03 22:54:42 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
b727752e45 Fix: Set timeout on socket objects 2023-01-03 03:18:58 +08:00
LmeSzinc
9efc45ed32 Opt: Change Mumu X screenshot tips to scrcpy 2023-01-03 02:47:18 +08:00
LmeSzinc
1c0425aa7b Fix: Handle AUTO_SEARCH_REWARD in action_point_enter() 2023-01-03 02:35:47 +08:00
LmeSzinc
178b679256 Fix: Recheck HP after fleet died, battle status may have false detection 2023-01-03 02:35:15 +08:00
LmeSzinc
db7199f730 Fix: [TW] MAP_NAME, it should as long as CN 2023-01-03 02:33:45 +08:00
LmeSzinc
332f6b87d3 Merge branch 'master' into dev 2023-01-01 17:17:53 +08:00
LmeSzinc
82917619e9 Fix: Typo in 63ad648f 2023-01-01 17:16:56 +08:00
LmeSzinc
951592b9f2 Upd: [EN] Another MAIL_EMPTY 2023-01-01 17:04:39 +08:00
LmeSzinc
7ef2a823bd Fix: area_cross_area() (#1954, #1978) 2023-01-01 16:48:33 +08:00
LmeSzinc
63ad648ff6 Fix: Disable u2 float window (#2059) 2023-01-01 15:32:53 +08:00
LmeSzinc
335bd3a563 Fix: Ignore global proxy in server checker 2023-01-01 14:54:33 +08:00
LmeSzinc
37e0d70e0d Opt: Stop scrcpy server during wait 2023-01-01 02:36:28 +08:00
LmeSzinc
49606b7868 Merge branch 'master' into dev 2023-01-01 02:15:13 +08:00
LmeSzinc
afd1c4c5e8 Fix: Cross month dailies may not refresh immediately 2023-01-01 02:08:20 +08:00
LmeSzinc
40f132badf Fix: CL1 farming calls meowfficer farming before OpsiExplore finished 2023-01-01 01:48:36 +08:00
LmeSzinc
981d52bbf7 Fix: Page scrolling in voucher shop 2023-01-01 01:47:20 +08:00
LmeSzinc
c8818e3fb5 Merge branch 'bug_fix' into dev 2022-12-31 22:56:18 +08:00
LmeSzinc
b8bddfeb47 Fix: Handle guild commander change mails 2022-12-31 22:49:04 +08:00
LmeSzinc
def197fe93 Fix: Ticket detect area in voucher shop 2022-12-31 22:38:17 +08:00
LmeSzinc
68a4eca4e8 Refactor: Do OCR on YUV color space to handle poor image quality 2022-12-31 01:30:15 +08:00
LmeSzinc
815dde4a5c Dev: Add SHOP_EXTRACT_TEMPLATE to collect new item templates 2022-12-31 01:27:57 +08:00
LmeSzinc
33384d4685 Fix: Ticket detect area in voucher shop 2022-12-30 23:58:08 +08:00
LmeSzinc
f9aefead2d Fix: info_bar_count() reduce 2022-12-30 19:58:18 +08:00
LmeSzinc
0e97e27562 Fix: info_bar_count() find_peaks parameters 2022-12-30 02:32:52 +08:00
LmeSzinc
e07e319ab2 Fix: Missing offset from ONE_CLICK_RETIREMENT 2022-12-29 22:26:34 +08:00
LmeSzinc
1b918f1785 Fix: Research status parsing on low quality image 2022-12-29 22:17:17 +08:00
LmeSzinc
40d443433b Fix: [CN] FleetSelector.get() failed to detect fleet 2 due to poor image quality 2022-12-29 21:11:03 +08:00
LmeSzinc
dc54220dbc Fix: Skip moving down when switching from auto to manual 2022-12-29 21:11:03 +08:00
LmeSzinc
ed25ce48ae Fix: Add support to 150% scaling combat joystick 2022-12-29 20:56:36 +08:00
LmeSzinc
ed390eadf7 Fix: Missing offset of IN_RETIREMENT_CHECK 2022-12-29 20:28:34 +08:00
LmeSzinc
2285b716cf Refactor: Faster device retrying 2022-12-29 19:22:55 +08:00
LmeSzinc
1d96582c1f Fix: Catch _scrcpy_stream_loop_thread died 2022-12-29 18:57:04 +08:00
LmeSzinc
b3d8fd4f1a Fix: Locking scrcpy screenshot and control 2022-12-29 18:20:09 +08:00
LmeSzinc
89af9a60a8 Fix: More accurate action_point_safe_get() condition 2022-12-29 18:17:16 +08:00
LmeSzinc
09f69f5938 Upd: BACK_ARROW for template matching 2022-12-29 18:04:30 +08:00
LmeSzinc
ffbac284dd Refactor: info_bar_count() for poor image quality 2022-12-29 17:50:49 +08:00
LmeSzinc
0bcad85825 Fix: Ignore global proxies in AzurStats upload 2022-12-29 13:38:19 +08:00
LmeSzinc
d18b13d760 Fix: Catch av import error 2022-12-29 13:37:49 +08:00
LmeSzinc
a3604d8100 Add: Screenshot method scrcpy 
Control via scrcpy is supported but not exposed because swipes ended at the middle
 2022-12-29 12:49:11 +08:00
LmeSzinc
5d7b70c9a4 Opt: Move setting OpsiMonthBoss.Mode to top 2022-12-28 18:31:11 +08:00
LmeSzinc
a820633129 Merge branch 'master' into dev 2022-12-28 18:24:53 +08:00
LmeSzinc
8b0964ebfd Fix: CampaignEnd error when battle function exhausted 2022-12-28 18:09:55 +08:00
LmeSzinc
3691fd95cd Fix: Setting retrying on slow devices 2022-12-28 17:59:10 +08:00
LmeSzinc
39c4043593 Opt: Show exceptions on server update failures 2022-12-28 17:11:34 +08:00
LmeSzinc
6e0f53bd6d Fix: Handle get items in action_point_enter 
Remove unused argument `quit` in handle_os_auto_search_map_option
 2022-12-28 16:58:46 +08:00
LmeSzinc
ebba35b7c9 Opt: Move cube presets before the chip ones 2022-12-28 00:55:00 +08:00
LmeSzinc
811fae8ae3 Fix: Help text of ActionPointPreserve to be consistent with code 2022-12-28 00:53:35 +08:00
LmeSzinc
6552938e22 Merge branch 'master' into dev 
# Conflicts:
#	module/config/argument/argument.yaml
 2022-12-25 23:02:31 +08:00
LmeSzinc
4072dbbbb8
Merge pull request #2041 from LmeSzinc/bug_fix 
Bug fix
 2022-12-25 17:49:16 +08:00
LmeSzinc
1f8d32de06 Opt: Add reminder for submarine mode 2022-12-25 17:46:08 +08:00
LmeSzinc
de4b32f69e Opt: Set default screenshot method to ADB_nc 2022-12-24 17:48:32 +08:00
Bookbug
e8c45c584f
Add:[JP] Assets upadte for OpSi monthly boss (#2034) 2022-12-23 22:25:29 +08:00
Bookbug
aefdb57f7a
Add:[JP] MISSION_POPUP_* assets (#2033) 2022-12-23 22:24:55 +08:00
LmeSzinc
ea730f1fca Opt: Standardize difficulties to normal/hard 2022-12-23 20:59:11 +08:00
LmeSzinc
8baf402b1f Upd: OS_ADAPTABILITY_* for all servers 2022-12-23 20:24:14 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
LmeSzinc
687079290a Add: Basic platform interfaces 2022-12-23 17:16:15 +08:00
LmeSzinc
b7e8c67cab Merge branch 'master' into dev 2022-12-23 17:07:33 +08:00
LmeSzinc
45cbcf56b9 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	module/config/argument/argument.yaml
 2022-12-23 17:07:10 +08:00
LmeSzinc
24121f3cbf Opt: Force enable DoRandomMapEvent in CL1 farming 2022-12-23 16:52:53 +08:00
LmeSzinc
151442f241
Merge pull request #1976 from bookbug666/storage_jp 
Add:[JP]Assets update for the storage module
 2022-12-23 16:42:22 +08:00
LmeSzinc
0a598247ab Add: Siren templates 2022-12-23 16:12:58 +08:00
LmeSzinc
40d1325510 Add: [TW] Tower of Transcendence (event_20211229_cn) 2022-12-22 17:48:23 +08:00
LmeSzinc
8bfd0a576d Add: Event entrance of Parallel Superimposition (event_20221222_cn) 2022-12-22 16:54:06 +08:00
YJGeng-Iriy
9499a73eeb optimize en-US.json 2022-12-21 00:35:40 +08:00
YJGeng-Iriy
67d039c188 optimize en-US.json 2022-12-21 00:22:19 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
LmeSzinc
5436287550 Fix: Disconnect offline device before connecting 2022-12-20 22:07:11 +08:00
LmeSzinc
d7e3aba68a
Merge pull request #2016 from SaiCateDoan/log 
Fix: Wrong log when delay across task
 2022-12-20 21:52:10 +08:00
SarContDeli
6c47514d78 Opt: Set action point limit in meowfficer farming with cl1 enabled 2022-12-20 19:53:39 +08:00
LmeSzinc
f2e016a60f Upd: [TW] STRATEGIC_SEARCH_TAB_SECURED 2022-12-20 19:25:18 +08:00
SarContDeli
6f063713df Fix: Wrong log when delay across task 2022-12-20 18:05:38 +08:00
bookbug666
941da49fc2 Merge branch 'dev' into storage_jp 2022-12-20 10:05:42 +08:00
LmeSzinc
f93473ee4d Add: Emulator data on GUI 2022-12-20 00:03:59 +08:00
LmeSzinc
1ef1bac26f Fix: Disconnect offline device before connecting 2022-12-20 00:03:59 +08:00
VirtualTowel
1faffbbf96 Fix: Some adjustment 2022-12-18 22:35:50 +08:00
VirtualTowel
4f2ff1a164 Fix: Reduce action points waste 2022-12-18 22:00:11 +08:00
LmeSzinc
32e065ad9c Merge branch 'master' into bug_fix 
# Conflicts:
#	module/os_handler/strategic.py
 2022-12-18 17:13:44 +08:00
LmeSzinc
385fff216f Fix: Missing interval on STRATEGIC_SEARCH_MAP_OPTION_OFF 2022-12-18 16:37:43 +08:00
LmeSzinc
c72f2f598a Fix: Missing interval on STRATEGIC_SEARCH_MAP_OPTION_OFF 2022-12-18 02:49:38 +08:00
LmeSzinc
cacf51784e Upd: [EN] OpSi auto search buttons 2022-12-18 02:01:38 +08:00
YJGeng-Iriy
525ed082b3 optimize the code of opsi_month_boss 2022-12-17 17:10:35 +08:00
LmeSzinc
a2e6c401da Fix: Different interval of BATTLE_PREPARATION in ash attack (#2005) 2022-12-16 22:55:01 +08:00
LmeSzinc
235a9b9d93 Opt: Less RAM use in app.py by not importing numpy and zerorpc 2022-12-16 22:24:32 +08:00
LmeSzinc
79aba4dc50 Opt: Less pre-loads in gui.py by not importing config_updater 2022-12-16 22:15:32 +08:00
LmeSzinc
12c2d4e53e Fix: [EN] Update FLEET_* in OpSi 2022-12-16 21:42:36 +08:00
LmeSzinc
f4c2138460 Fix: [EN] Wrong OCR result: Sate Zone 2022-12-15 01:58:31 +08:00
LmeSzinc
98c2e980d5 Fix: Subtracting None in NavBar.get_total() 2022-12-15 01:52:07 +08:00
LmeSzinc
b37666416c Fix: Empty array of action point amount in action_point_update() 2022-12-15 01:50:44 +08:00
LmeSzinc
70c51ac802 Add: Auto task switching between CL1 farming and meowfficer farming 2022-12-14 00:59:52 +08:00
YJGeng-Iriy
504b66c7a5 add month_boss_goto_additional 2022-12-13 21:49:23 +08:00
YJGeng-Iriy
207ff9d586 Merge branch 'opsi_month_boss' of https://github.com/YJGeng-Iriy/AzurLaneAutoScript into opsi_month_boss 2022-12-13 21:39:42 +08:00
YJGeng-Iriy
9eab7f35b4 Monthly boss code optimization 2022-12-13 21:37:28 +08:00
YJGeng-Iriy
757fc88f7e
Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +08:00
LmeSzinc
9bca3ef32a Opt: Limit situations to buy AP when running CL1 2022-12-12 18:07:30 +08:00
LmeSzinc
e5b06b3726 Upd: [EN] EQUIP_CONFIRM in equipment module 2022-12-12 18:00:44 +08:00
SarContDeli
9532a9f39c
Fix: Handle in_globe in interrupt_auto_search caused by bug (#1994) 2022-12-12 17:47:40 +08:00
nEEtdo0d
f1e01b3b69 Upd: opsi_task_delay; Opsi archive supports submarine calls 2022-12-11 23:57:14 -05:00
nEEtdo0d
4be37e3596 Add: [EN] asset update for strategic search (#1948) 2022-12-11 23:53:52 -05:00
LmeSzinc
d621a48ebc
Merge pull request #1992 from LmeSzinc/bug_fix 
Add: OpSi Archive Zones
 2022-12-12 00:04:34 +08:00
LmeSzinc
b1881cc5b7 Add: [CN][TW] GUI translation for OpSi Archive Zones 2022-12-11 23:44:34 +08:00
LmeSzinc
ab702bd6e4 Opt: Save AP for tomorrow's dailies 2022-12-11 23:25:44 +08:00
SarContDeli
495915eae7
Opt: Adjusted logic of strategic search (#1986) 2022-12-11 22:31:19 +08:00
YJGeng-Iriy
97607798ed opsi month boss init 2022-12-11 22:15:26 +08:00
bookbug666
1be4cbd8a0 Revert partial selector.py 2022-12-11 21:41:50 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
下面我簡單喵兩句
da7efd102c
Add: [TW] asset support for voucher shop (#1982) 2022-12-11 14:52:19 +08:00
SarContDeli
704e049675
Merge pull request #1983 from SaiCateDoan/maa 
Fix: Unable to create new config from existing mod config
 2022-12-11 14:51:32 +08:00
SarContDeli
b48b754de7 Fix: Unable to create new config from existing mod config 2022-12-11 14:49:51 +08:00
LmeSzinc
28977ac95b
Merge pull request #1980 from nEEtdo0d/voucher_shop 
Add: re-instate Opsi Archive task
 2022-12-11 14:22:46 +08:00
下面我簡單喵兩句
873a6da0e2
Add: [TW]Assets update for strategic search (#1981) 2022-12-11 13:49:28 +08:00
xzjjasper
ae7bf32da2
Upd: [TW] Mail collect (#1975) 2022-12-11 13:47:37 +08:00
nEEtdo0d
e646007345 Add: voucher shop new item asset logger unlock; not buy-able yet 2022-12-10 20:49:15 -05:00
nEEtdo0d
72339a5093 Add: re-instate Opsi archive task, runs weekly as AL devs seemingly add new logger archives after a random scheduled maintenance 2022-12-10 20:26:28 -05:00
nEEtdo0d
7bd96aad50 Upd: [EN] rework 'AddNewStudent' help info 2022-12-10 20:02:49 -05:00
YJGeng-Iriy
8ed08f17f6 opsi_month_boss init 2022-12-11 01:40:42 +08:00
YJGeng-Iriy
726dc243c3 opsi_month_boss init 2022-12-10 23:57:09 +08:00
LmeSzinc
9fa06ffc28 Fix: [EN] Temp fix on dock_selected, EN has no selected info in dock 2022-12-10 23:28:32 +08:00
LmeSzinc
82e26fd592 Opt: Add trace log when switching storage tabs 2022-12-10 23:06:31 +08:00
LmeSzinc
8e71e6d274 Fix: Use action_point_safe_get in action_point_use 2022-12-10 23:05:23 +08:00
LmeSzinc
5edaab21a2
Merge pull request #1972 from bookbug666/opsi_one 
Add: [JP]Assets update for strategic search
 2022-12-10 20:35:37 +08:00
SarContDeli
0db8fe1bf4
Opt: Improve robustness of strategic search (#1973) 2022-12-10 20:30:13 +08:00
bookbug666
e389b2c68a Upd: Replace MATERIAL_CHECK.png with different version 2022-12-10 19:51:43 +08:00
bookbug666
3c1a03b61c Upd:[JP]Assets of storage module, missing STORAGE_CHECK.png fixed 2022-12-10 19:47:09 +08:00
bookbug666
a78d1380c1 Fix: STRATEGIC_SEARCH_MERCHANT detection 2022-12-10 05:52:56 +08:00
bookbug666
37ea94b809 Remove server checker before testing 2022-12-09 23:22:54 +08:00
bookbug666
310cd4a7c7 Add:[JP]Assets update for strategic search(not tested) 2022-12-09 23:20:45 +08:00
LmeSzinc
901830e35c
Merge pull request #1971 from LmeSzinc/bug_fix 
Bug fix
 2022-12-09 23:03:28 +08:00
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
LmeSzinc
98fc87e57a Fix: [EN] Missing DOCK_CHECK offset 2022-12-09 21:42:14 +08:00