1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

3383 Commits

Author SHA1 Message Date
LmeSzinc
c69de7594b Revert "Upd: [JP] DOCK_SELECTED" cause AL revert the changes
This reverts commit 802dd160
2022-06-19 21:27:26 +08:00
LmeSzinc
d683db6647 Fix: Close auto search menu if map achievement is set 2022-06-19 16:33:38 +08:00
LmeSzinc
c6e28b3daf Merge branch 'master' into dev
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
#	module/config/i18n/zh-TW.json
2022-06-16 21:10:53 +08:00
Zorachristine
5a7a9e7151 Add: [TW] Scherzo of Iron and Blood Rerun 2022-06-16 21:02:25 +08:00
LmeSzinc
c177c23697 Fix: Use adb reverse on BlueStacks hyper-v 2022-06-16 21:00:11 +08:00
LmeSzinc
217b705c4d Add: Sundered Blue Rerun (event_20220616_cn) 2022-06-16 20:52:35 +08:00
LmeSzinc
b5be6454e6 Fix: [JP] Temp fix for game bug on research remain tab (#1227)
Research tab cannot expand after game patch.
Revert this commit when game dev fix it
2022-06-16 20:30:41 +08:00
LmeSzinc
43a7bd378b
Merge pull request #1220 from LmeSzinc/dev
Bug fix
2022-06-14 01:31:43 +08:00
LmeSzinc
c562a20540 Fix: [JP] Research series detection 2022-06-13 23:07:26 +08:00
LmeSzinc
9bf224ded2 Fix: Typo in get_server_next_update() 2022-06-13 23:47:16 +09:00
LmeSzinc
a1d1e0695d Fix: Check rotation if ui unrecognised 2022-06-13 01:24:04 +08:00
LmeSzinc
61b9f6cb3d
Merge pull request #1215 from LmeSzinc/dev
Bug fix
2022-06-13 00:10:56 +08:00
LmeSzinc
a4bc79302d Fix: Cannot detect remain data key at auto search menu 2022-06-12 18:06:37 +08:00
LmeSzinc
802dd16029 Upd: [JP] DOCK_SELECTED 2022-06-12 01:13:17 +08:00
LmeSzinc
96012c4333 Fix: *_nc methods on virtual network (#1202) 2022-06-12 01:05:45 +08:00
LmeSzinc
8ddd2fc1de Fix: Timezone calculation at non-integer timezones (#1187) 2022-06-12 01:03:32 +08:00
LmeSzinc
52a6e44d53 Fix: Handle popups in OpSi map detection 2022-06-11 23:14:59 +08:00
LmeSzinc
412f6385e1 Fix: Device auto detection on LDPlayer 2022-06-11 23:10:25 +08:00
cangular
53910a728c
Add: adb restart (#1167)
* Add files via upload

* some addition on one device and muti

* Update connection.py

remove some redundant

* name change

* more name change

* no need to de serial check

* some rollback

* add adb restart gui and some minor update

* make adb gui independent from game manager

* pep 8

* add detect device

* remove ds_store

* add to alas-emulator

add to alas-emulator

* rm DS_Store

* Delete .DS_Store

* some add on
2022-06-11 23:09:47 +08:00
LmeSzinc
1a0dd81adf Fix: Remove exp correction since the game have already corrected it
after game patch in 20220609
2022-06-11 11:18:48 +08:00
LmeSzinc
1bd88230a3
Merge pull request #1211 from LmeSzinc/dev
Bug fix
2022-06-11 00:03:51 +08:00
LmeSzinc
badb3c7758 Fix: EXP detection in tactical class 2022-06-10 23:44:43 +08:00
LmeSzinc
ea9b586f9b Fix: dock_select_one() failed to select ship on slow PCs 2022-06-10 20:20:27 +08:00
LmeSzinc
2ab04cefdb
Merge pull request #1207 from LmeSzinc/dev
Fix: Detection of beacon data collected today
2022-06-10 02:10:40 +08:00
LmeSzinc
64120abd02 Fix: Do not preserve enemies when prioritizing large enemies 2022-06-10 02:07:06 +08:00
LmeSzinc
9e6028685f Fix: Detection of beacon data collected today 2022-06-10 01:58:24 +08:00
LmeSzinc
e38768bde4
Merge pull request #1206 from LmeSzinc/dev
Add: Support daily Module Development
2022-06-10 00:01:05 +08:00
LmeSzinc
af4cb88ff5 Add: Support daily Module Development 2022-06-09 23:59:03 +08:00
18870
f1a42832fd Fix: Convert CheckUpdateInterval type (fixed #1203)
Fix: Update datetime regex
2022-06-09 23:47:28 +08:00
LmeSzinc
65d964b65e Fix: map_is_2x_book is in emotion calculation before map_get_info() 2022-06-09 23:24:51 +08:00
LmeSzinc
b296d6a27f Fix: TooManyClickError on REWARD_RECEIVE_SP 2022-06-09 21:09:54 +08:00
LmeSzinc
5e0f3872b5 Fix: Unable to exit gacha_flush_queue() when pulling wishing_well 2022-06-09 21:01:46 +08:00
LmeSzinc
e6132750a9
Merge pull request #1195 from LmeSzinc/dev
Bug fix
2022-06-07 23:17:43 +08:00
LmeSzinc
27212529c0 Opt: Log unexpected ascreencap screenshots 2022-06-07 23:02:12 +08:00
LmeSzinc
7df0fd3f11 Fix: Offset of SHIP_CONFIRM in dock_select_confirm() 2022-06-07 23:01:25 +08:00
LmeSzinc
26f1e0854a
Merge pull request #1192 from LmeSzinc/dev
Add: New medal shop support and bug fixes
2022-06-07 19:30:55 +08:00
LmeSzinc
db58202263 Fix: Cleanup after subprocess.Popen.communicate() 2022-06-07 01:35:53 +08:00
LmeSzinc
ebd6872358 Fix: Convert stage name to string 2022-06-07 00:58:07 +08:00
LmeSzinc
405d349519 Fix: Missing attribute _shop_gold_coins in RewardShipyard and RewardGacha 2022-06-07 00:34:50 +08:00
LmeSzinc
ec32260455 Fix: Confirm dock select (fixed #1048) 2022-06-06 23:43:35 +08:00
LmeSzinc
3a0b5d5536 Opt: Reduce config writes 2022-06-06 23:42:24 +08:00
18870
151ab28fae Fix: Convert password to string 2022-06-06 12:49:58 +08:00
appleapple802
38ecf03642 Fix: TW server meowfficer buy 2022-06-06 12:25:46 +08:00
LmeSzinc
1ad5e9eaa8 Opt: Disallow modifying emotion record time on GUI, they can be auto updated now 2022-06-06 00:26:03 +08:00
LmeSzinc
ca4f7de2d0 Upd: Reset medal shop filter 2022-06-06 00:05:05 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +08:00
LmeSzinc
950051c293 Upd: [CN][TW] Medal shop translation 2022-06-05 15:59:19 +08:00
LmeSzinc
4ab0a6189a
Merge pull request #1185 from nEEtdo0d/shop_refactor
Fix: shop module refactor; medal shop adjustment
2022-06-05 15:34:52 +08:00
LmeSzinc
b67556af86
Merge pull request #1163 from SaiCateDoan/tech2
Opt: Enforce research when get a low-quality project Ver2
2022-06-05 13:08:35 +08:00
LmeSzinc
3aafd4a5f2 Opt: Watch user config changes while waiting for new tasks (resolve #1176) 2022-06-05 11:51:01 +08:00
nEEtdo0d
78e15ccdd2 Fix: shop_general currency retry mechanism; no longer at fixed known position 2022-06-04 22:07:59 -04:00
LmeSzinc
6b1a6b051e Fix: Confirm dock select (fixed #1048) 2022-06-05 09:38:12 +08:00
LmeSzinc
20fd6fb1df Upd: Remove dorm zoom-out and minitouch force call (fixed #981) 2022-06-05 09:27:59 +08:00
nEEtdo0d
ffc7fadb11 Fix: merge master into branch 2022-06-04 21:13:53 -04:00
nEEtdo0d
6ec480f949 Add: configurations for shop_medals buy scheme for retrofit and plate items
Upd: shop filter regexp to identify wild plate types; unique to shop_medal
Add: shop_medal new item assets
2022-06-04 21:06:21 -04:00
nEEtdo0d
cf8adaff38 Fix: shop_medal refactor UI and route for base functionality 2022-06-04 20:59:06 -04:00
LmeSzinc
7b407a8d4e Upd: [TW] MEOWFFICER_CANCEL (fixed #1164) 2022-06-05 08:52:42 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
LmeSzinc
7382ced0d9 Fix: Leftmost research series covered by battle pass info (fixed #1037) 2022-06-05 08:27:11 +08:00
LmeSzinc
f3a683de76 Add: Show detailed commit history in updater 2022-06-05 07:27:03 +08:00
LmeSzinc
25a4162d27 Fix: Add LDPlayer serial auto switching
- Opt: Show help text for wrong serial
2022-06-05 06:38:43 +08:00
LmeSzinc
210fc5bded Fix: *_nc screenshot method failed because of bugs in adb reverse
https://issuetracker.google.com/issues/37066218
2022-06-05 02:15:16 +08:00
18870
9412dda352
Merge pull request #1180 from Horizon101011/emotion
Opt: Update Emotion Record if Emotion Value is changed
2022-06-04 17:55:55 +08:00
18870
50bbba5672 Fix: Option to disable reloader
Fix: Require password when password is null
2022-06-04 17:40:26 +08:00
Horizon101011
697cd88231 Opt: update record time immediately 2022-06-04 16:02:54 +08:00
LmeSzinc
664ef64a87
Merge pull request #1182 from LmeSzinc/dev
Opt: Refactor deploy config
2022-06-04 15:51:43 +08:00
nEEtdo0d
b65c729380 Opt: re-factor shop module; move buy select and amount operations to baseline classes, common currency variable as all shop variants are created independently 2022-06-04 00:40:10 -04:00
Cola
6207ce03c3 Upd: [JP] shop module *_SWIPE_END assets 2022-06-04 10:47:06 +08:00
Horizon101011
0c87c605ac Opt: Update Emotion Record if Emotion Value is changed 2022-06-04 09:54:45 +08:00
18870
62a42c73c6 Fix: Close discord RPC will close current event loop
Fix: Initial RPC outside of init function
2022-06-04 02:03:15 +08:00
18870
3e91ca7fcc Opt: Refactor discord rpc 2022-06-03 23:00:54 +08:00
18870
5fa62d8144 Opt: Refactor deploy config 2022-06-03 21:28:44 +08:00
LmeSzinc
d7d440a29e
Merge pull request #1178 from hgjazhgj/dev
Fix: Utf-8 in BlueStacks Hyper-V connection
2022-06-03 16:31:02 +08:00
18870
349a51ec4f Opt: Clear old reloader codes 2022-06-03 16:24:04 +08:00
hgjazhgj
07bb32e587 Merge branch 'dev' of github.com:hgjazhgj/AzurLaneAutoScript into dev 2022-06-03 16:21:34 +08:00
hgjazhgj
2c961f6dab Fix: Utf-8 in BlueStacks Hyper-V connection 2022-06-03 16:19:57 +08:00
18870
9c7f21b2ac Opt: Replace uvicorn reloader with custom one
Fix: "True" in logs doesn't highlights properly
2022-06-03 16:00:33 +08:00
nEEtdo0d
ac73afb23d Upd: [EN] *_SWIPE_END assets; allow shop module to run 2022-06-03 01:00:40 -04:00
LmeSzinc
159e4ac755 Upd: [CN] SHOP_MEDAL_SWIPE_END, SHOP_MERIT_SWIPE_END 2022-06-03 03:20:56 +08:00
LmeSzinc
d51fc8f3eb Fix: Shop module quick fix except the new medal shop
- Fix: Cannot detect AMOUNT_MAX in core shop
- Todo: All servers need to update SHOP_MEDAL_SWIPE_END and SHOP_MERIT_SWIPE_END
2022-06-03 03:20:55 +08:00
LmeSzinc
3dbd38049a Fix: Handle AUTO_SEARCH_REWARD in os_map_goto_globe 2022-06-03 02:23:03 +08:00
LmeSzinc
2555588740 Opt: Show unexpected screenshot in ascreencap 2022-06-03 01:29:38 +08:00
LmeSzinc
515beddde5 Fix: Fleet Mechanism detection
- Fix: Special whether on opsi map are detected as fleet mechanism
2022-06-03 00:27:49 +08:00
hgjazhgj
bc8d5caf05 Opt: BlueStacks Hyper-V connection improvement 2022-06-02 16:14:49 +08:00
LmeSzinc
32d8492c89 Fix: Catch ConnectionResetError in iter_device() 2022-06-02 01:58:41 +08:00
LmeSzinc
0a04f2919b Add: [CN] Meizu channel server 2022-06-02 01:58:41 +08:00
LmeSzinc
01fd16c8bf Fix: More edge cases in OpSi detection
Fix: Retry after handle_retirement() in OpSi
Fix: Stuck after getting OS auto search reward
Fix: Handle AUTO_SEARCH_REWARD at map detection
Set all offset of AUTO_SEARCH_REWARD to (50, 50)
Fix: Accidentally entered globe map in wait_until_walk_stable()
2022-06-02 01:57:32 +08:00
SarContDeli
8f1f7ddd60 Opt: Enforce research when get low-quality research projects 2022-05-30 20:09:20 +08:00
SarContDeli
ee0eb05373 Opt: Optimized composition of filter preset 2022-05-30 19:41:43 +08:00
SarContDeli
793092e3a7 Opt: Use the cube optimized filter when forcing research 2022-05-30 19:40:29 +08:00
nEEtdo0d
f1e5420cc8 Fix: [EN] move os monthly reset check to top; clashes with reset ticket popup confirm
Add: explicit return bool for ui_page_main_popups
2022-05-29 15:49:28 -04:00
nEEtdo0d
c43b73ba36 Fix: shop can also encounter dock full; re-base to Retirement, UI is ancestor 2022-05-29 15:20:30 -04: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
nEEtdo0d
3be54837d4 Upd: [EN] *_PASS_NOTICE assets
Fix: [EN] DOCK_AMOUNT area too wide; re-crop
Fix: [EN] MAP_ARCHIVES text intersects into area; re-crop
Upd: [EN] clarify enhance config description
2022-05-29 15:10:45 -04:00
LmeSzinc
83c3a9658c Fix: Handle story in fleet set 2022-05-28 16:11:50 +08:00
LmeSzinc
796fa77065
Merge pull request #1159 from railannad/railannad
Add: more research preset
2022-05-28 11:24:39 +08:00
LmeSzinc
a13a0ad68a Opt: Run task Reward more frequently 2022-05-28 00:56:29 +08:00
LmeSzinc
16f699754c Fix: Missing usage of MAP_ENEMY_GENRE_SIMILARITY 2022-05-28 00:31:31 +08:00
railannad
8ccf02c33b Add: more research preset 2022-05-27 23:45:45 +08:00
LmeSzinc
f9b673705f Add: Pledge of the Radiant Court chapter SP 2022-05-27 22:57:51 +08:00