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

151 Commits

Author SHA1 Message Date
LmeSzinc
5320df9f79 Fix: Beacon data reached the limit to hold but daily limit is not 2022-09-25 19:36:59 +08:00
LmeSzinc
73a3bf4220 Upd: [CN][EN] BEACON_LIST 2022-09-25 18:01:35 +08:00
LmeSzinc
4ba42f85c0 Fix: OpSi radar and buttons slide out from the right 2022-09-25 01:48:34 +08:00
LmeSzinc
7c502672ce Fix: Missing letter '1' in meta ocr 2022-09-20 01:27:51 +08:00
LmeSzinc
8c98592609
Merge pull request #1656 from LmeSzinc/dev
Add: Violet Tempest Blooming Lycoris (event_20220915_cn) chapter BD and SP
2022-09-16 23:32:10 +08:00
LmeSzinc
98ebf5716a Fix: Redirected to page_reward by game after meta cleared (#1649) 2022-09-16 23:21:43 +08:00
LmeSzinc
2dc423a445 Fix: Handle wrong ocr result '00/200' 2022-09-16 12:36:00 +08:00
LmeSzinc
bfa854d899
Merge pull request #1650 from ddmugicha/bug_fix
Fix: [JP]Meta begin entrance asset
2022-09-16 12:02:06 +08:00
Cola
72600c3e4e Fix: [JP]Meta begin entrance asset 2022-09-16 11:41:10 +08:00
LmeSzinc
5afe0b8fa3
Merge pull request #1643 from railzy/master
Add: [JP] ash meta/dossier assets (#1606)
2022-09-15 18:23:05 +08:00
railzy
38a3a24e5a Add: [JP] ash meta/dossier assets (#1606) 2022-09-15 13:45:29 +08:00
zhou525
7cf8dec329 Fix: [TW]meta_beacon end 2022-09-15 11:09:35 +08:00
LmeSzinc
9b4ba2ca21 Opt: Call meta reward if cleared a meta 2022-09-14 01:16:08 +08:00
LmeSzinc
c6786059ce
Merge pull request #1637 from zhou525/meta_bugfix
Fix: [EN/TW]Meta bug
2022-09-13 23:11:27 +08:00
zhou525
5c6e97957a Fix: [EN]dossier begin fail 2022-09-13 22:19:33 +08:00
zhou525
c52df56c0c Fix: [TW]can not into meta page 2022-09-13 22:17:50 +08:00
LmeSzinc
10c9336c75 Opt: Add missing MetaReward call after task OpsiAshBeacon 2022-09-13 14:09:01 +08:00
LmeSzinc
0ec10c0c26 Fix: Handle meta assist being redirected to BATTLE_PREPARATION 2022-09-12 14:53:53 +08:00
LmeSzinc
0bd2cf389b
Merge pull request #1615 from zhou525/pr_1574_bugfix
Fix: OneHitMode and call AshBeaconTask time conflicts
2022-09-11 22:02:15 +08:00
zhou525
fa1e5190e0 Fix OneHitMode and call AshBeaconTask time conflicts 2022-09-11 20:46:48 +08:00
nEEtdo0d
c58b13a551 Add: [EN] ash meta/dossier assets (#1606) 2022-09-09 10:37:59 -04:00
zhou525
9085ac0b8b Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode 2022-09-06 23:58:37 +08:00
LmeSzinc
0b5b6f5da8
Merge pull request #1360 from LmeSzinc/dev
PR5 and research queue support
2022-07-18 12:47:14 +08:00
Cola
b705fad494 Fix: [JP] BEACON_EMPTY 2022-07-17 23:49:00 +08:00
LmeSzinc
e98e9d42ef Merge branch 'master' into bug_fix
# Conflicts:
#	module/os_ash/assets.py
2022-07-17 01:27:26 +08:00
chpkq
0ce3916f5d Fix: [TW] BEACON_ENTER, BEACON_EMPTY 2022-07-17 01:05:02 +08:00
railzy
a78713f6e6 Upd: [JP] BEACON_ENTER 2022-07-17 00:15:04 +08:00
nEEtdo0d
ac93ac9487 Fix: potato pc may spam click ash exit and end up in ASH_SHOWDOWN 2022-07-16 11:52:29 -04:00
LmeSzinc
ffed947dd2 Upd: [TW] BEACON_EMPTY abd BEACON_ENTER (#1335) 2022-07-15 21:11:19 +08:00
LmeSzinc
87a4905a67 Upd: [JP] ASH_SHOWDOWN (#1335) 2022-07-15 21:11:18 +08:00
LmeSzinc
9958c96107 Upd: BEACON_REMAIN for all servers 2022-07-15 02:03:14 +08:00
LmeSzinc
37220a7104 Upd: [EN] BEACON_ENTER 2022-07-15 01:11:32 +08:00
LmeSzinc
22385235f0 Upd: [CN] BEACON_EMPTY 2022-07-15 00:39:42 +08:00
LmeSzinc
3e9187e770 Upd: [EN] ASH_SHOWDOWN 2022-07-15 00:18:00 +08:00
LmeSzinc
88af4cf33a Fix: Larger BEACON_ENTER search range 2022-07-14 21:52:02 +08:00
LmeSzinc
fe0e7072e6 Fix: Redirected to ASH_SELECT after ash battle 2022-07-14 21:23:41 +08:00
LmeSzinc
1e11665ce6 Fix: Handle additional transaction page ASH_SELECT 2022-07-14 19:34:39 +08:00
LmeSzinc
9808240328 Fix: Cannot detect ash collect status if it's grayed out
Ash status grays out when data fully collected today
2022-07-01 01:46:02 +08:00
LmeSzinc
93b04443bf Fix: Enter ash help accidentally after ash combat 2022-06-21 02:17:05 +08:00
LmeSzinc
9e6028685f Fix: Detection of beacon data collected today 2022-06-10 01:58:24 +08:00
LmeSzinc
b9cc634d11 Upd: [JP] BATTLE_STATUS 2022-05-14 01:15:09 +08:00
LmeSzinc
9b8d47af86 Upd: [TW] BEACON_ENTER (#1111) 2022-05-10 00:52:56 +08:00
nEEtdo0d
f04a35b078 Upd: [EN] LOGIN_GAME_UPDATE, BATTLE_STATUS; text size/thickness changed
Fix: [EN] restore commit df6e9385; skill exp detection read incorrectly
2022-04-15 14:35:31 -04:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets
- Tactical class and Dorm feature still broken, please disable until fix.
2022-04-12 11:20:34 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
c473510592 Upd: [JP] BEACON_ENTER 2022-03-11 01:54:14 +08:00
LmeSzinc
4bcd207877 Upd: [TW] BEACON_ENTER 2022-02-12 21:40:47 +08:00
LmeSzinc
f8800d2567 Fix: Increase retry interval of buying Akashi's shop and MAP_GOTO_GLOBE for potato PCs 2022-02-12 17:14:55 +08:00
LmeSzinc
b3da663f2a Fix: Ash beacon reward has been collected during battle preparation 2022-02-11 23:41:23 +08:00
LmeSzinc
4b2a1c0371 Fix: Handle popups when exiting from ash to map
Also renamed some methods
2022-01-05 20:41:40 +08:00
LmeSzinc
45097dd408 Opt: Move ash beacon to a standalone setting group 2021-12-09 18:13:34 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
205d2d16bd Fix: Handle random map events in _ash_enter_from_map (#787) 2021-12-01 17:52:45 +08:00
Zorachristine
bfdc902045 Fix: [TW] guild, os assets 2021-11-24 20:48:46 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
LmeSzinc
97bd059d00 Fix: Missing ASH_START in ash beacon assist
Forgot to delete in "Move ASH_START clicking to ash combat preparation"
2021-10-23 00:05:10 +08:00
LmeSzinc
7aea818c8b Opt: Move ASH_START clicking to ash combat preparation
which is capable to handle unexpected page switching
2021-10-18 01:27:24 +08:00
LmeSzinc
8aa7a1cfaa Fix: Endless ash beacon assist 2021-10-03 03:07:04 +08:00
LmeSzinc
976ea5d3dc Fix: Missing offset in ash combat status 2021-09-30 01:34:26 +08:00
LmeSzinc
a99214e2d0 Merge branch 'master' into app 2021-09-27 15:02:41 +08:00
LmeSzinc
c0a7d38019 Fix: Game re-enter combat preparation automatically after an ash battle 2021-09-27 14:37:16 +08:00
LmeSzinc
a52826594e Refactor: OS module
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
2021-09-26 17:40:38 +08:00
LmeSzinc
495242cbc2 Refactor: Ash beacon assist 2021-09-25 00:38:53 +08:00
nEEtdo0d
c576e7fffd Fix: typo in condition, args state greater than or equal to configured tier 2021-09-14 18:56:35 -04:00
Ray
afa1b4708b Fix: outdated ash beacon logger 2021-09-10 23:16:41 +08:00
Ray
0cf75fa518 Fix: handle ash beacon outdate in preparation page 2021-09-10 19:55:35 +08:00
nEEtdo0d
039b09c1d2 Fix: [EN] ASH_ENTRANCE asset update 2021-06-10 23:53:24 -04:00
Ray
f6e019596f Fix: [JP] ASH_ENTRANCE assets 2021-06-10 21:15:45 +08:00
LmeSzinc
a6fe1eb4e9 Fix: ASH_ENTRANCE and expand its click area 2021-06-10 16:20:33 +08:00
LmeSzinc
4ab49833e3 Fix: Force to terminate meowfficer searching when going to ash 2021-04-30 23:08:15 +08:00
LmeSzinc
af6c976a26 Fix: Daily mission at current zone
- Fix: ASH_ENTER_CONFIRM button moving
2021-04-22 21:05:39 +08:00
LmeSzinc
4f4f296e44 Merge branch 'master' into dev
# Conflicts:
#	module/os/assets.py
2021-04-16 17:51:18 +08:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed
Many assets with words need fixes after the font changed. This commit is not complete yet.
2021-04-16 02:47:31 +09:00
LmeSzinc
9990825b8c Fix: Page transition after OS auto search update 2021-04-13 17:50:48 +08:00
LmeSzinc
498681f616 Fix: [CN] OS ash assist assets
- Fix: Handle ash reward when entering ash (#403)
2021-04-13 15:53:56 +08:00
nEEtdo0d
8af89f44d7 Del: Out of date method 2021-04-09 10:47:30 -04:00
nEEtdo0d
244dbcefe1 Fix: Use normal asset instead of template 2021-04-09 10:46:42 -04:00
nEEtdo0d
8571c0e8f9 Fix: Alter to use while implementation for page transition rather than ui_click 2021-04-09 10:28:35 -04:00
nEEtdo0d
fb1bf1165e Fix: OS Ash Daily Assist page transitions 2021-04-09 01:16:37 -04:00
LmeSzinc
38fa6b4183 Fix: BATTLE_STATUS detection in os ash combat 2021-03-31 16:35:40 +08:00
LmeSzinc
54832ce5a9 Fix: Handle automation confirm in ash combat (#387) 2021-03-20 19:19:06 +08:00
LmeSzinc
63d7f57ad3 Fix: Set click interval in ash combat 2021-02-27 00:11:16 +08:00
LmeSzinc
a00616cd98 Fix: Handle reward of last beacon when entering ash beacon 2021-02-26 21:12:08 +08:00
LmeSzinc
d4633bf600 Fix: Ash assistant if last beacon not completed
- Handle ash combat mis-click ASH_START
2021-02-26 01:11:43 +08:00
noname94
d37041ee6e Add: [JP] assets for guild and OS
GUILD_BOSS_ENTER and GUILD_OPERATIONS_JOIN still missing.
Also fixed map name detection in OS and _fleet_sidebar of auto search.
2021-02-10 18:38:20 +09:00
nEEtdo0d
07bc5ca85a Opt: Utilize offset for altered location of IN_MAP asset due to zones
Del: Unneeded IN_MAP_OBSCURED
2021-02-06 09:44:35 -05:00
nEEtdo0d
a028c1ba43 Merge remote-tracking branch 'origin/master' into operation_siren 2021-02-06 02:29:14 -05:00
nEEtdo0d
53e8923e48 Add: [EN] IN_MAP_OBSCURED for os_semi_auto obscured zones
Updates affected files/modules that used IN_MAP

TODO: [CN, JP, TW] will need to replace
2021-02-06 01:41:20 -05:00
nEEtdo0d
860789078e Add: [EN] OS Ash, Map, and various Assets
Opt: [JP, TW] Common OS and other assets
2021-02-06 00:08:52 -05:00
LmeSzinc
e1fbfc7d9e Fix: Ash beacon status covered by mission popups
- Opt remove unnecessary check in OS
2021-02-06 11:56:08 +08:00
LmeSzinc
7b69aaf320 Add: Do ash beacon attack in os_clear_map 2021-01-31 18:12:34 +08:00
nEEtdo0d
e6549510f5 Fix: Move switch action into loop to ensure able to select beacon 2021-01-26 13:48:38 -05:00
Ray
b089097d30 update assets of jp os_ash 2021-01-26 11:02:12 +08:00
LmeSzinc
e7bbcb9e56 Fix: Reduce detection area of ASH_ENTRANCE in os ash assistant
ASH_ENTRANCE may have red dot, and will change according to the development of ash ship
2021-01-24 01:47:36 +08:00
nEEtdo0d
b2b4e6d3ee Add: [EN] Daily OS ash beacon asset
TODO: [TW, JP] placeholder assets, replace when able
2021-01-17 21:13:22 -05:00
LmeSzinc
5a6542dee9 Opt: Comments for Ash beacon entrance difference 2021-01-15 22:06:10 +08:00
LmeSzinc
f4d8c107e0 Fix: Ash beacon entrance difference (#305)
- If the main story in OS is not cleared, entrance is the first button counted from bottom right. If cleared, the second one.
2021-01-15 19:15:30 +08:00