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

447 Commits

Author SHA1 Message Date
Tipsy Fisher
f30c265a62
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-17 16:00:25 +08:00
xzjjasper
c892b3be22 Fix: [TW] SHOP_CHECK 2023-07-16 16:23:58 +08:00
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
Tipsy Fisher
a962b13343
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +08:00
LmeSzinc
85bea51b60 Upd: Assets for entering supply pack 2023-07-14 00:31:52 +08:00
yypsybs
28cae91564 Opt: minigame
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
2023-07-11 18:00:03 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
LmeSzinc
e045d14d3d Fix: Navigating to Odin in shipyard (#2611) 2023-07-02 16:56:05 +08:00
LmeSzinc
945598f552 Add: [ALAS] Returns in Scroll.set() 2023-07-02 15:28:39 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class
Path findings in page class
2023-07-02 15:24:40 +08:00
Bookbug
e3d902a650
Add: [JP] Raid assets of Reflections of the Oasis (#2822) 2023-07-01 14:47:52 +08:00
LmeSzinc
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
LmeSzinc
f71d6d0a69 Upd: [EN] ACADEMY_CHECK 2023-06-10 02:41:03 +08:00
LmeSzinc
ccb26acd99 Fix: Comment links of page_raid temporarily
since this event shares the same title with raid
2023-05-28 19:56:07 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
guoh064
c85e69f0ce
Fix: Change LOGIN_ANNOUNCE to MAINTENANCE_ANNOUNCE in ui_additional (#2509)
* Add: Handle LOGIN_ANNOUNCE in ui_additional

* Fix: Handle MAINTENANCE_ANNOUNCE in ui_additioal
2023-04-21 00:50:59 +08:00
guoh064
d86e8907a2
Add: Handle LOGIN_ANNOUNCE in ui_additional (#2494) 2023-04-14 23:14:44 +08:00
LmeSzinc
61c45028b1 Fix: Handle 2 rows of items at login 2023-04-04 03:41:43 +08:00
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
b2de4b83d7 Merge branch 'master' into dev
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
2023-03-24 05:11:15 +08:00
LmeSzinc
ebb28c056d Fix: Handle MEOWFFICER_BUY in ui switching 2023-03-24 03:17:05 +08:00
LmeSzinc
ff3f76897a Fix: Handle COALITION_FLEET_PREPARATION in ui switching 2023-03-24 03:14:16 +08:00
xzjjasper
802bb6c26e Upd: [TW] raid assets 2023-03-23 21:52:41 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +08:00
Alexanded
26885555e1 Upd: [EN] FLEET_CHECK 2023-03-10 00:08:18 +03:00
LmeSzinc
a18baea780 Fix: Prevent clicking GET_SHIP when switching from page_main (#2320) 2023-03-07 23:39:49 +08:00
LmeSzinc
2d2d605bbf Fix: Prevent clicking GET_SHIP after MAIN_GOTO_REWARD (#2320) 2023-03-03 18:51:48 +08:00
LmeSzinc
cca3de7e77 Fix: Handle EXERCISE_PREPARATION in ui switches 2023-02-26 17:20:37 +08:00
LmeSzinc
7908aa397e Fix: Increase unknown ui timeout
GET_SHIP interval is 5s, timeout should longer than it
2023-02-25 22:40:19 +08:00
LmeSzinc
0884cc40c5 Upd: [CN] CAMPAIGN_MENU_NO_EVENT 2023-01-30 16:05:18 +08:00
LmeSzinc
674331e2d1 Merge branch 'master' into dev 2023-01-29 23:56:31 +08:00
LmeSzinc
2472ccbdc2
Merge pull request #2096 from bookbug666/event_checker
Add: Auto disable event task when no event (#1396)
2023-01-29 14:42:58 +08:00
LmeSzinc
98e59763d8 Opt: Scroll swipe outside of screen (#2180) 2023-01-29 02:30:35 +08:00
LmeSzinc
847c1a476e Fix: Over-swipe a Scroll when it's going to reach the edge 2023-01-28 17:25:30 +08:00
LmeSzinc
64b39e83a9 Upd: [JP] PLAYER_CHECK (fixed #1882) 2023-01-28 16:16:51 +08:00
bookbug666
faa4d3ef19 Remove unused import in ui.py 2023-01-27 11:30:45 +08:00
bookbug666
83c3b8da9e Move ui_goto_* into campaign_event.py 2023-01-25 01:47:44 +08:00
bookbug666
76ed84264f Merge branch 'dev' into event_checker 2023-01-25 00:53:07 +08:00
xzjjasper
a7cbb3faa6
Upd: [TW] Mystery Investigation Assets (#2155) 2023-01-20 14:03:33 +08:00
LmeSzinc
0f4a9ca485 Upd: [EN] KUYBYSHEY raid assets 2023-01-19 00:37:55 +08:00
LmeSzinc
75e5da996f Upd: [JP] RAID_CHECK 2023-01-19 00:23:58 +08:00
bookbug666
8862dda1b5 Replace ui_ensure with ui_goto 2023-01-17 09:05:39 +08:00
bookbug666
793b3be5ca Reuse disable_tasks in CampaignEvent 2023-01-13 23:16:18 +08:00
LmeSzinc
752ab062aa Refactor: No bored sleep in Scroll 2023-01-13 21:26:49 +08:00
bookbug666
0df4d10bdf Upd: [JP] Assets of CAMPAIGN_MENU_NO_EVENT 2023-01-12 17:26:29 +08:00
bookbug666
8a9dc00a34 Opt: Use multi_set 2023-01-12 12:06:07 +08:00
bookbug666
a155a8e9f8 Disable all event tasks when triggered 2023-01-12 10:12:33 +08:00
bookbug666
1e8f0052b3 Merge branch 'dev' into event_checker 2023-01-12 09:23:52 +08:00
bookbug666
1a963adfa3 Add offsets when checking events;Replace all temp assets with EN version. 2023-01-12 09:23:37 +08:00
bookbug666
c03f8b86ee Reform function into ui_goto_* 2023-01-10 11:20:27 +08:00
LmeSzinc
e750c44c18 Upd: [TW] SKILL_CONFIRM 2023-01-09 21:01:45 +08:00
bookbug666
a290d9d902 Add:Changing temporality asset to simulate ongoing event 2023-01-09 13:15:50 +08:00
LmeSzinc
0249927d3e Fix: Use retry interval instead of bare sleep 2023-01-09 01:10:48 +08:00
LmeSzinc
05f8c102d3 Upd: [TW] META_CHECK 2023-01-09 00:40:51 +08:00
bookbug666
033d7486df Add:Check event availability before event tasks, using temporality asset. 2023-01-07 12:01:57 +08:00
LmeSzinc
1b5d3b0beb Fix: NavBar failed on random pure black screenshot 2023-01-05 20:46:02 +08:00
LmeSzinc
09f69f5938 Upd: BACK_ARROW for template matching 2022-12-29 18:04:30 +08:00
LmeSzinc
3691fd95cd Fix: Setting retrying on slow devices 2022-12-28 17:59:10 +08:00
bookbug666
941da49fc2 Merge branch 'dev' into storage_jp 2022-12-20 10:05:42 +08:00
LmeSzinc
98c2e980d5 Fix: Subtracting None in NavBar.get_total() 2022-12-15 01:52:07 +08:00
bookbug666
3c1a03b61c Upd:[JP]Assets of storage module, missing STORAGE_CHECK.png fixed 2022-12-10 19:47:09 +08:00
LmeSzinc
bab2cb1df1 Fix: GET_SHIP being clicked after MEOWFFICER_INFO 2022-12-07 20:14:04 +08:00
SarContDeli
1b47e69496 Upd: Refactored part of hazard 1 leveling 2022-11-15 17:23:34 +08:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
LmeSzinc
2edde3b50e Upd: [EN] RAID_CHECK 2022-10-28 03:19:44 +08:00
LmeSzinc
bb61f2f9b6
Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
LmeSzinc
95738436b7 Fix: Handle GET_ITEMS when switching from guild lobby to logistics 2022-10-15 23:55:20 +08:00
LmeSzinc
2b16698d57 Fix: Missing argument in _shop_obstruct_handle() 2022-10-09 00:18:23 +08:00
LmeSzinc
8c93437829
Merge pull request #1714 from LmeSzinc/bug_fix
Bug fix
2022-10-09 00:02:59 +08:00
LmeSzinc
b2533c19b2 Merge branch 'master' into dev 2022-10-07 01:23:22 +08:00
nEEtdo0d
02e696937f Fix: handle possible stuck pages during shop operations; buy bulin > 1 for example 2022-10-06 12:45:48 -04:00
LmeSzinc
9474034210 Upd: [JP] DORM_FEED_ENTER (#1707) 2022-10-06 17:06:31 +08:00
LmeSzinc
775717d77e Fix: Starting ALAS at AUTO_SEARCH_REWARD 2022-10-06 14:15:03 +08:00
LmeSzinc
7fb8092950 Refactor: Reuse ui_page_main_popups in LoginHandler 2022-10-02 21:29:56 +08:00
LmeSzinc
8653f07e1c Fix: Conflict interval of GET_MISSION in ui switching 2022-09-30 11:27:10 +08:00
LmeSzinc
b1d08b1325 Opt: Try user settings first in quick retire setting fallback 2022-09-25 17:26:50 +08:00
LmeSzinc
cc922d798e Fix: [EN] Unable to detect META skill list 2022-09-25 02:39:45 +08:00
LmeSzinc
e8dcdeaf65 Add: Quick retire options fallback to avoid user mistakes 2022-09-10 18:11:07 +08:00
LmeSzinc
056bfb4a1c Merge branch 'master' into dev 2022-09-10 01:08:40 +08:00
LmeSzinc
7c7121cb78 Upd: [TW] EVENT_LIST_CHECK (fixed #1617) 2022-09-09 23:26:54 +08:00
LmeSzinc
67e7eb04a5 Refactor: Abstract filter_set to Setting class 2022-09-08 12:27:50 +08:00
nEEtdo0d
b7c9443ee1 Add: [EN] storage assets
Fix: [EN] storage OCR position differs, exclude ':' on read
2022-09-01 21:07:41 -04:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev
# Conflicts:
#	module/device/emulator.py
2022-09-02 00:13:11 +08:00
LmeSzinc
6641aa8200 Upd: [JP] MAIN_GOTO_CAMPAIGN
following the new assets requirements
2022-08-28 23:21:51 +08:00
LmeSzinc
038e2096d0 Add: Provide wrapped methods to handle StorageFull in storage
- Faster UI switching in storage
- More logs in storage
2022-08-22 21:07:30 +08:00
freesrz93
faf5a74e56 Add: Use tech box & Disassemble equipments
Opt: check GET_ITEMS_CONTINUE to disassemble faster

Fix: material_enter may enter disassemble
Fix: can't select equipments with info bar

Opt: no need to use OCR

Opt: Use less templates

Refactor: StorageHandler

Fix: threshold too low
2022-08-21 08:56:49 +08:00
LmeSzinc
d3f46c843d Upd: [CN][TW] REWARD_* assets
just in case they change it in the future
2022-08-19 00:21:18 +08:00
LmeSzinc
bad3c2b180 Upd: [JP] REWARD_* assets 2022-08-19 00:14:32 +08:00
LmeSzinc
f0426236c8 Upd: [EN] REWARD_* assets 2022-08-19 00:09:44 +08:00
LmeSzinc
e8bfd08eba Merge branch 'bug_fix' into dev
# Conflicts:
#	module/config/config_generated.py
2022-08-04 21:18:04 +08:00
Zorachristine
e2a55e1b58 Fix: [TW] DORM_INFO 2022-08-04 20:01:23 +08:00
LmeSzinc
a4cfe89476 Fix: Handle skin and item expired (fixed #1309) 2022-08-01 00:39:27 +08:00
LmeSzinc
e7b9615f10 Fix: Handle battle pass PURCHASE_POPUP at main page 2022-08-01 00:30:53 +08:00
LmeSzinc
f7d50a5306 Fix: Shinano event may be detected as raid 2022-07-17 01:20:25 +08:00
LmeSzinc
1205b716c2 Upd: OS_CHECK for all servers 2022-07-14 18:53:11 +08:00
LmeSzinc
96e4e75854 Fix: Ignore swipe distance check in SOS
fix when sos maps haven't fully unlocked
2022-07-09 13:19:06 +08:00
LmeSzinc
e4904c977f Fix: Mis-detect GET_SHIP after clicking MAIN_GOTO_CAMPAIGN (fixed #1231) 2022-07-09 13:03:48 +08:00
LmeSzinc
c58e7a8359 Fix: [JP] EXCHANGE_CHECK is detected when goto page_supply_pack 2022-07-02 16:16:25 +08:00
LmeSzinc
1f1141a1f5 Fix: Clicked GET_SHIP when exiting page_meowfficer (#1273)
- Rename MEOWFFICER_GOTO_DORM to MEOWFFICER_GOTO_DORMMENU for clarity
2022-07-02 16:06:24 +08:00
chpkq
91ce67cf23 Upd: [TW] shipyard daily 2022-07-02 01:53:25 +08:00
LmeSzinc
d9b5392b58 Upd: [EN][JP] RAID_CHECK 2022-07-01 03:02:29 +08:00
LmeSzinc
858be97b2e
Merge pull request #1271 from Zorachristine/master
Fix: [TW] raid_check assets
2022-06-30 22:28:42 +08:00
LmeSzinc
c6a4c13038 Add: Support PT limit in Raid
- Fix: Disable RAID_FLEET_PREPARATION at startup
- TODO: EN and JP need to update IRIS_OCR_PT
2022-06-30 22:26:54 +08:00
Zorachristine
7794e2ad74 Fix: [TW] raid_check assets 2022-06-30 22:20:10 +08:00
LmeSzinc
a1d1e0695d Fix: Check rotation if ui unrecognised 2022-06-13 01:24:04 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +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
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
LmeSzinc
6d18798f2c Opt: Add UI switch details in log 2022-05-16 22:33:03 +08:00
Zorachristine
98de926afc Fix:[TW] RAID_CHECK assets 2022-05-05 22:01:30 +08:00
LmeSzinc
b3a85f9ba5 Fix: Handle popups after exiting from page_tactical to page_reward (#1018) 2022-04-17 19:52:21 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Egor Nats
1101d01a0d Fix: [EN] Fixed Dorm stuck after XP screen 2022-04-14 13:33:28 -03:00
LmeSzinc
a21fce7788 Fix: Lower the threshold of DORM_INFO to 0.75 2022-04-14 00:46:36 +08:00
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
2022-04-12 22:55:49 -04:00
Egor Nats
2166bf9066 Fix: [EN] Fix Tactical Class and Dorm Feature. 2022-04-12 13:21:08 -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
LmeSzinc
987b7b7b4e Fix: Handle game freeze at the first retreat after client start 2022-04-12 18:17:48 +08:00
nEEtdo0d
6f7699b0d5 Upd: gem farming module assets (#1003) 2022-04-10 17:34:40 -04:00
LmeSzinc
c7f62b8b19 Fix: Increase UI search range to 30px 2022-04-11 02:31:20 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
7779bc7672 Upd: [EN] remaining post major update assets
Upd: [EN] adopt same style as other servers for MAIN_GOTO*

TODO: other uncommon assets updated when available; debug tactical class, stuck frequently
2022-04-08 19:09:08 -04:00
Zorachristine
4b0ade4801 Upd: [TW] MAIN_GOTO_* assets 2022-04-08 19:30:57 +08:00
Zorachristine
ebdf4fa6a3 Upd: [TW] TACTICAL_CLASS_CANCEL & DORM_INFO 2022-04-08 19:05:13 +08:00
LmeSzinc
1e13eaba08 Del: Redundant assets WAR_ARCHIVES_GOTO_CAMPAIGN 2022-04-08 17:37:15 +08:00
LmeSzinc
c3c0ba4443 Upd: [CN] CAMPAIGN_MENU_GOTO_CAMPAIGN to handle random shifting (#993) 2022-04-08 17:31:56 +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
71e325e1a2 Upd: [JP] DORM_INFO 2022-04-07 20:46:28 +08:00
LmeSzinc
9720cec0c6 Fix: Exit from OpSi exchange shop 2022-04-01 00:09:18 +08:00
LmeSzinc
8d25e709c3 Fix: Handle battle pass notice 2022-03-31 21:32:34 +08:00
LmeSzinc
7979d8e7c7 Opt: handle OpSi monthly reset for quality of life 2022-03-31 21:32:34 +08:00
LmeSzinc
af3e402c49 Fix: Handle monthly pass notice 2022-03-31 21:32:17 +08:00
LmeSzinc
095eec9a92 Fix: Handle login at startup (#976) 2022-03-20 16:34:31 +08:00
LmeSzinc
40396b21fe Fix: [EN] Move MEOWFFICER_CHECK to upper-left to be compatible with meow_menu_close() 2022-03-20 16:25:34 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
526d85bf14 Merge branch 'dev' 2022-03-07 20:32:55 +08:00
railzy
16c4a72f90 Upd: [JP] assets for meta reward 2022-03-07 11:57:58 +08:00
LmeSzinc
7e0cd13410 Opt: Increase speed in meowfficer module by reusing screenshots
- Fix: Page transaction and ui_additional() run at the same time in ui_goto()
2022-03-06 20:47:29 +08:00
LmeSzinc
3bfa8d00ed Fix: Scroll disappear when trying to drag it
A random issue in commission scanning
2022-03-01 23:20:24 +08:00
Zorachristine
12badf6c35 Upd: [TW] supply_pack assets 2022-02-21 21:28:08 +08:00
nEEtdo0d
6e82e6800e Add: [EN] meta_reward assets 2022-02-15 19:31:23 -05:00
LmeSzinc
9266f3b3fc Add: Receive META rewards (#863) 2022-02-12 23:05:23 +08:00
LmeSzinc
f891689bee Fix: Increase interval of GET_SHIP to stagger clicks 2022-02-07 23:28:36 +08:00
LmeSzinc
ef173788a5 Merge branch 'dev'
# Conflicts:
#	module/meowfficer/assets.py
2022-02-06 12:31:54 +08:00
Zorachristine
20aee8fdf7 Fix: [TW] BATTLE_PASS_CHECK & OCR_GUILD_EXCHANGE_LIMIT assets 2022-02-05 10:11:08 +08:00
LmeSzinc
893dc62afb Opt: [CN] Handle user agreement in pure image detection
- Add image_color_button()
- Remove unused assets in login
2022-02-02 19:44:58 +08:00