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
8,477 Commits 9 Branches 0 Tags 274 MiB
c376d36c24
Commit Graph

903 Commits

Author SHA1 Message Date
nEEtdo0d
ac14857d32 Upd: [EN] shipyard fate assets 2023-01-22 22:33:57 -05:00
LmeSzinc
29512403f0 Upd: [EN] BATTLE_PREPARATION adding another "Sortie" 2023-01-19 17:01:03 +08:00
LmeSzinc
9305de5f20 Upd: [EN] BATTLE_PREPARATION adding "Sortie" 2023-01-19 03:02:31 +08:00
LmeSzinc
d6d6d70570 Upd: [EN] Temp fix on BATTLE_PREPARATION due to poor i18n 2023-01-19 02:23:46 +08:00
LmeSzinc
0f4a9ca485 Upd: [EN] KUYBYSHEY raid assets 2023-01-19 00:37:55 +08:00
LmeSzinc
186e3305ad Upd: [JP] BATTLE_PREPARATION 
cause JP has a bad localization, they dont know the difference between 击 and 擊
 2023-01-18 23:17:49 +08:00
LmeSzinc
55020f2752 Upd: BEACON_REWARD to handle poor english on buttons (#2109) 2023-01-13 23:45:41 +08:00
bookbug666
4332fbee7c Merge branch 'dev' into event_checker 2023-01-13 23:05:03 +08:00
nEEtdo0d
87179d6c09 Upd: [EN] QUIT_* assets; post maintenance font change 2023-01-12 22:57:14 -05: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
LmeSzinc
fa5dd91696 Upd: [EN] Assets of OpSi monthly bosses (#2032) 2023-01-06 20:46:23 +08:00
LmeSzinc
332f6b87d3 Merge branch 'master' into dev 2023-01-01 17:17:53 +08:00
LmeSzinc
951592b9f2 Upd: [EN] Another MAIL_EMPTY 2023-01-01 17:04:39 +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
ed25ce48ae Fix: Add support to 150% scaling combat joystick 2022-12-29 20:56:36 +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
8baf402b1f Upd: OS_ADAPTABILITY_* for all servers 2022-12-23 20:24:14 +08:00
LmeSzinc
0a598247ab Add: Siren templates 2022-12-23 16:12:58 +08:00
LmeSzinc
cacf51784e Upd: [EN] OpSi auto search buttons 2022-12-18 02:01:38 +08:00
LmeSzinc
12c2d4e53e Fix: [EN] Update FLEET_* in OpSi 2022-12-16 21:42:36 +08:00
LmeSzinc
e5b06b3726 Upd: [EN] EQUIP_CONFIRM in equipment module 2022-12-12 18:00:44 +08:00
nEEtdo0d
4be37e3596 Add: [EN] asset update for strategic search (#1948) 2022-12-11 23:53:52 -05:00
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
LmeSzinc
cb2abd107f Merge branch 'master' into dev 2022-12-07 01:50:32 +08:00
LmeSzinc
2168329e07 Fix: [EN] Confirm button in SOS signal search list 
- Re-arrange SOS templates
 2022-12-07 01:38:57 +08:00
nEEtdo0d
96cb4aa4e1 Upd: handle_popup_* signature with custom offset; refactor dirty patches 
Upd: SHOP_BUY_CONFIRM_VOUCHER to handle_popup_confirm for server transparency
 2022-12-02 16:32:39 -05:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
LmeSzinc
b86e244039 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 05:01:48 +08:00
LmeSzinc
1687133d46 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 04:27:56 +08:00
LmeSzinc
e0feea2366 Add: The Alchemist and the Archipelago of Secrets chapter T 2022-11-24 22:24:20 +08:00
nEEtdo0d
9a2d16a3d2 Add: [EN] MAIL_EMPTY (#1774) 2022-11-14 15:06:07 -05:00
nEEtdo0d
3b37e4afa0 Add: shop module support voucher shop (os supply / exchange) 2022-11-14 12:00:13 -05:00
nEEtdo0d
19e3e8d111 Fix: [EN] SWITCH_1_NORMAL asset change on game update 2022-11-14 10:11:13 -05:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
nEEtdo0d
6f61f1e828 Upd: [EN] asset update for ship scan (#1776) 2022-10-30 11:59:32 -04:00
nEEtdo0d
167d2d4b92 Add: [EN] TEMPLATE_SWIRLING_CHERRY_BLOSSOMS (#1780) 
Upd: [EN] EQUIP_[1-3]; position changed with addition of augment slot
 2022-10-28 10:45:30 -04:00
LmeSzinc
b81b6d809c Upd: [EN] ALBION_RAID_HARD 2022-10-28 20:00:54 +08:00
LmeSzinc
2edde3b50e Upd: [EN] RAID_CHECK 2022-10-28 03:19:44 +08:00
LmeSzinc
e847f76256 Merge branch 'master' into dev 
# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
 2022-10-28 03:09:41 +08:00
LmeSzinc
ff99d80b5a Upd: [EN] ALBION raid assets 2022-10-28 02:54:09 +08:00
nEEtdo0d
27fabf7b9f Add: [EN] asset support for ship scan (#1776) 2022-10-27 01:13:39 -04:00
LmeSzinc
bb61f2f9b6
Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
LmeSzinc
2960bf068f Merge branch 'master' into dev 2022-10-23 16:56:53 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
nEEtdo0d
50e831fa3a Mov: reward mail support to separate module 
Del: MAIL_CLICK_SAFE_AREA, MAIL_COLLECT sufficient as substitute
 2022-10-16 01:01:15 -04:00
LmeSzinc
7c2238ba1f Upd: [EN] USE_DATA_KEY 2022-10-15 23:55:27 +08:00
LmeSzinc
6968e77cc7 Upd: [EN] ASH_POPUP_CHECK 2022-10-14 12:25:05 +08:00
nEEtdo0d
590145616f Upd: mail delete steps now optional; default does not delete 
Add: MAIL_CLICK_SAFE_AREA, MAIL_ENTER for all servers
 2022-10-12 22:37:33 -04:00
nEEtdo0d
72de603826 Add: reward module routine collect mail items; filter based on displayed icon 2022-10-08 16:56:39 -04:00
nEEtdo0d
109e8645d9 Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527) 2022-10-04 00:25:42 -04:00
nEEtdo0d
c153b23663 Fix: is_in_map detect for stronghold visual fog (#1527) 
Fix: os_globe_goto_map handle visual fog globe button (#1527)

TODO: [CN, TW, JP] equivalent *_FOG asset; enter stronghold and step on swamp / poison-looking tile to trigger fog state
 2022-10-03 00:48:46 -04:00
LmeSzinc
b8d022ab53 Fix: Collect exploration rewards that are ignored by auto search 2022-10-02 17:10:38 +08:00
LmeSzinc
73a3bf4220 Upd: [CN][EN] BEACON_LIST 2022-09-25 18:01:35 +08:00
LmeSzinc
cc922d798e Fix: [EN] Unable to detect META skill list 2022-09-25 02:39:45 +08:00
LmeSzinc
81fd195560 Upd: [EN] INFO_BAR_* 2022-09-23 01:22:57 +08:00
LmeSzinc
ef15adbd32 Upd: [EN] RAPID_TRAINING (#1648) 2022-09-20 01:56:20 +08:00
LmeSzinc
7b2e8636fc Add: Siren templates in chapter BD 2022-09-16 22:06:13 +08:00
LmeSzinc
dd7e5fd961 Add: Siren templates in chapter AC 2022-09-16 00:31:17 +08:00
zhou525
5c6e97957a Fix: [EN]dossier begin fail 2022-09-13 22:19:33 +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
LmeSzinc
e8dcdeaf65 Add: Quick retire options fallback to avoid user mistakes 2022-09-10 18:11:07 +08:00
nEEtdo0d
e982795216 Fix: [EN] os monthly ticket asset shifted post maintenance 2022-09-09 10:39:48 -04:00
nEEtdo0d
c58b13a551 Add: [EN] ash meta/dossier assets (#1606) 2022-09-09 10:37:59 -04:00
LmeSzinc
ba984ceddf Merge branch 'master' into dev 2022-09-07 00:10:06 +08:00
LmeSzinc
d48e633f9b
Merge pull request #1574 from zhou525/dev_1375_pr 
Dossier Beacon and OneHitMode
 2022-09-07 00:08:32 +08:00
zhou525
9085ac0b8b Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode 2022-09-06 23:58:37 +08:00
LmeSzinc
5c95717474 Upd: AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2022-09-06 22:46:24 +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
Bookbug
b26b6c97d1
Add: TaskBalancer (#1509) 
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
 2022-08-24 23:44:49 +08:00
LmeSzinc
11aea6d4d9 Fix: Cancel researches with unsatisfied requirements 
Avoid to add into queue
- Refactor: Split out ResearchSelector
 2022-08-23 02:47:44 +08:00
LmeSzinc
fa32962de6 Upd: Copy static storage assets to all servers 2022-08-23 01:14:44 +08:00
LmeSzinc
d54d42f0f9 Merge branch 'master' into dev 2022-08-22 12:07:34 +08:00
nEEtdo0d
87430d53e2 Upd: [EN] reward bubble assets; post maintenance change 2022-08-20 21:30:50 -04: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
ea28a0cb65 Upd: AUTOMATION_CONFIRM 2022-08-20 23:28:15 +08:00
LmeSzinc
f0426236c8 Upd: [EN] REWARD_* assets 2022-08-19 00:09:44 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
nEEtdo0d
0b235ac3e8 Add: [EN] study new skill assets 2022-08-17 22:52:31 -04:00
nEEtdo0d
d05b5cb625 Fix: [EN] adjust OCR parameters; additional string replace hot fixes (#1479) 
Upd: [EN] map name asset; font/size changes post maintenance
 2022-08-14 12:44:33 -04:00
nEEtdo0d
a042aa8615 Upd: [EN] auto search option assets; placement change post maintenance 
Upd: info output to match func parameters
 2022-08-14 12:40:59 -04:00
Horizon101011
07a14849d9 Upd: More accurate asset for enhancement 2022-08-13 19:43:27 +08:00
LmeSzinc
d936a60c65
Merge pull request #1485 from bookbug666/dev_0804 
Upt: Assets of equipment_change
 2022-08-07 15:25:17 +08:00
freesrz93
b68e8abb6a Fix: Wrong OCR result for build ticket count 
Fix: Wrong OCR result for build ticket count

Fix: Wrong OCR result for build ticket count (1)
 2022-08-06 19:39:57 +08:00
bookbug666
dd8d7f0ec5 Fix: Delete unused ui action; Rename button 2022-08-06 16:40:47 +08:00
bookbug666
5a82aa0db0 Upt: [EN]Assets of Equipment_change 2022-08-05 01:18:40 +08:00
bookbug666
fc8bc2efed Upt: [EN]Assets of Equipment_change 2022-08-05 01:16:24 +08:00
LmeSzinc
af2606dd89 Add: Aquilifers Ballade chapter BD and SP 2022-07-29 22:43:43 +08:00
LmeSzinc
5424c93af3 Add: Handle normal enemy transformed to Vestal randomly 2022-07-28 23:08:39 +08:00
LmeSzinc
51df1c4790 Add: Extract additional sirens after auto search 2022-07-28 21:44:46 +08:00
LmeSzinc
5caaacaff7 Upd: TEMPLATE_FORMATION_* 2022-07-28 20:17:10 +08:00
Horizon101011
070f280821 Upd: Retire assets for all servers 2022-07-28 16:57:09 +08:00
LmeSzinc
76881d68d5 Upd: Popup assets for all servers 2022-07-28 14:58:36 +08:00
LmeSzinc
0e7374bf8e Fix: Another COMBAT_AUTO assets 2022-07-27 01:17:29 +08:00
nEEtdo0d
0d66b25f21
Merge pull request #1408 from LmeSzinc/dev 
Fix: [EN] post maintenance fixes + research project string clause update
 2022-07-23 14:48:56 -04:00
nEEtdo0d
07dbb1c5c5 Fix: x origin shop medal grid adjusted point maintenance 
Upd: [EN] *SWIPE_END assets location move
 2022-07-23 12:36:41 -04:00
nEEtdo0d
08e3707570 Add: [EN] ASHEN_SIMULCRUM search template for entrance 2022-07-23 12:27:13 -04:00
LmeSzinc
0af931b28c Upd: [EN] RESEARCH_UNAVAILABLE 2022-07-22 01:12:00 +08:00
nEEtdo0d
deb09b96e5 Upd: [EN] clone BUILD_TICKET_COUNT, confirmed same area for OCR 2022-07-19 10:31:53 -04:00
nEEtdo0d
93b2fb9178 Fix: [EN] post update RESEARCH_QUEUE_ADD text change (#1373) 2022-07-19 10:14:47 -04:00
nEEtdo0d
77cc057603 Add: [EN] research queue support TEMPLATE_* assets 
Fix: [EN] enlarge search area for status; EN assets on the bigger side
 2022-07-18 00:18:18 -04:00
LmeSzinc
ae1f4b2c6c Fix: Move RESEARCH_GOTO_QUEUE because status icons can't be clicked 2022-07-17 23:07:15 +08:00
LmeSzinc
d99b70d4f5 Add: Handle the 6th research project 2022-07-17 22:58:29 +08:00
nEEtdo0d
544fe252ed Upd: [EN] research queue support assets; QUEUE_REMAIN slight upper position; others text or font changes 2022-07-16 18:03:10 -04:00
LmeSzinc
f0a2d7c02d Opt: Reduce swipes when getting only 2 rows of items 2022-07-17 03:03:33 +08:00
LmeSzinc
91c39c8515 Add: Research queue support 2022-07-17 02:56:08 +08:00
LmeSzinc
4c1afd5ea4 Add: Adding projects into research queue 2022-07-17 01:47:26 +08:00
LmeSzinc
ccf1827995 Upd: Update assets for PR5 2022-07-17 01:31:12 +08:00
nEEtdo0d
d70697e303 Upd: [EN] war archives search templates 2022-07-16 12:28:17 -04:00
nEEtdo0d
05af963397 Upd: [EN] EQUIP* assets; augment module update shifted UI 2022-07-16 11:50:41 -04:00
LmeSzinc
0180e6e286 Merge branch 'master' into dev 2022-07-16 00:24:38 +08:00
nEEtdo0d
02e1aaade6 Fix: PR5 support for series select grid 
Fix: [EN] SHIPYARD_SERIES_SELECT_CHECK
 2022-07-15 06:59:55 -04: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
3e9187e770 Upd: [EN] ASH_SHOWDOWN 2022-07-15 00:18:00 +08:00
LmeSzinc
1205b716c2 Upd: OS_CHECK for all servers 2022-07-14 18:53:11 +08:00
LmeSzinc
7b7bcbeee4 Revert "Fix: [JP] Temp fix for game bug on research remain tab (#1227)" 
This reverts commit b5be6454
 2022-07-12 18:47:34 +08:00
nEEtdo0d
074489f52f Fix: Cannot enter buy interface if ship development is in progress 
Add: SHIPYARD_RESEARCH_IN_PROGRESS for new clause

TODO: [CN, TW, JP] icon should be same across servers but if not will need to update
 2022-07-05 23:31:44 -04:00
LmeSzinc
ed69d7b006 Fix: Use the old ORDER_CHECK as its button (#1290) 2022-07-05 21:53:57 +08:00
LmeSzinc
e36db6d5c7 Fix: Move ORDER_CHECK to the info button (#1290) 2022-07-04 23:06:48 +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
LmeSzinc
d9b5392b58 Upd: [EN][JP] RAID_CHECK 2022-07-01 03:02:29 +08:00
LmeSzinc
bb3cbae499 Upd: [EN] Angel of Iris assets 2022-07-01 00:04:49 +08:00
nEEtdo0d
0abe5befca Fix: re-factor meowfficer box count read; prior methodology cannot 100% accurately read, https://imgur.com/a/N6KUIxe 2022-06-26 14:21:47 -04:00
nEEtdo0d
2b217012f6 Fix: re-factor shipyard ui checking (#1251); [EN] asset re-name/adjust 
TODO: [CN, JP, TW] may want to adjust; otherwise using re-named same asset
 2022-06-26 12:23:04 -04:00
nEEtdo0d
99f41e02e0 Add: [EN] Close next skill popup 2022-06-26 12:16:59 -04:00
nEEtdo0d
e0d770b581 Upd: [EN] MEOWFFICER_GET_CHECK from clipboard to share button; verified _check_popup_exit fix allows for consistent behavior for collection, screen shift and not 2022-06-22 22:38:28 -04: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
badb3c7758 Fix: EXP detection in tactical class 2022-06-10 23:44:43 +08:00
LmeSzinc
9e6028685f Fix: Detection of beacon data collected today 2022-06-10 01:58:24 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +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
20fd6fb1df Upd: Remove dorm zoom-out and minitouch force call (fixed #981) 2022-06-05 09:27:59 +08:00
nEEtdo0d
cf8adaff38 Fix: shop_medal refactor UI and route for base functionality 2022-06-04 20:59:06 -04:00
nEEtdo0d
ac73afb23d Upd: [EN] *_SWIPE_END assets; allow shop module to run 2022-06-03 01:00:40 -04: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
515beddde5 Fix: Fleet Mechanism detection 
- Fix: Special whether on opsi map are detected as fleet mechanism
 2022-06-03 00:27:49 +08: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
f9b673705f Add: Pledge of the Radiant Court chapter SP 2022-05-27 22:57:51 +08:00
LmeSzinc
adbf2885be Add: Pledge of the Radiant Court chapter BD 2022-05-27 21:07:16 +08:00
nEEtdo0d
e154484562 Opt: ui_ensure_index approach ocr center number instead of price; prevent overbuying circumstances (#1133) 
Fix: handle game bug stock limit on screen may differ from known wiki values; fallback if read fail (#990)
 2022-05-26 23:46:09 -04:00
LmeSzinc
38f9a0843f Fix: Wrong OCR_MEOWFFICER_CAPACITY result if user has a capacity of 200 (fixed #1141) 2022-05-24 23:04:31 +08:00
LmeSzinc
1fbfe450ca Fix: Revert "Upd: Move PAUSE assets 5px left" except CN 
This reverts commit 913cc8e9
 2022-05-19 22:08:17 +08:00
LmeSzinc
34f326ae38
Merge pull request #1130 from LmeSzinc/dev 
Add: OpsiGeneral.DoRandomMapEvent
 2022-05-19 21:06:28 +08:00
LmeSzinc
7ff8205a7a
Merge pull request #1123 from MrGuoRanDuo/dev 
feat: meowfficer talent screenshot & upload
 2022-05-19 20:05:48 +08:00
LmeSzinc
913cc8e9bd Upd: Move PAUSE assets 5px left 2022-05-19 15:55:20 +08:00
MrGuoRanDuo
dc3825ee40 feat: meowfficer talent screenshot & upload 2022-05-17 22:14:30 +08:00
LmeSzinc
ffaafa997e Merge branch 'master' into dev 2022-05-16 23:03:27 +08:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
LmeSzinc
39f720718c
Merge pull request #1117 from Horizon101011/dev 
Opt: Retire next time if material is too little
 2022-05-16 13:23:04 +08:00
LmeSzinc
d1a2f53ac9 Upd: [TW] ESSEX_OCR_REMAIN_* (#1111) 2022-05-15 22:11:12 +08:00
LmeSzinc
9f2df3c2c5 Add: Do random map events in OpSi 
- Opt: Select the second story option from the bottom in OpSi
- Fix: ui_mask_homo_stroke in OpSi
- Dev: Fix relative_crop.py
 2022-05-15 00:03:33 +08:00
Horizon101011
771c9167d8 Opt: Use OCR to improve accuracy 2022-05-14 11:02:26 +08:00
LmeSzinc
49bceedf40 Fix: Avoid clicking SWITCH_OVER in EXP_INFO_* (#1066) 2022-05-13 22:58:15 +08:00
Horizon101011
f9a15be768 Merge branch 'dev' of https://github.com/Horizon101011/AzurLaneAutoScript into dev 2022-05-12 03:39:21 +08:00
Horizon101011
36ae64be9f Opt: Retire next time if material is too little 
1、Add a material counter. In attempt stage of enhancement, if available material is less than 3, counter += 1, else counter += 3. This process will run only once during an enhancement. After an enhancement process, check this counter. If it is less than 3, ALAS will retire next time when calling retirement module to avoid frequent enhancement while enhancement material is too little.
2、Moving assets to corresponding position.
 2022-05-12 03:38:29 +08:00
nEEtdo0d
be292d87fc Fix: [EN] guild raid assets 2022-05-07 19:26:22 -04:00
LmeSzinc
8231b6a294 Add: Rondo at Rainbow's End chapter SP 
- Fix: Clear mode switching in SP
 2022-04-29 21:50:24 +08:00
LmeSzinc
09ff10cd93 Add: Rondo at Rainbow's End chapter BD 2022-04-29 19:35:38 +08:00
LmeSzinc
08aa64580d Add: Rondo at Rainbow's End chapter AC 
- Fix: swipe route out of target box
- Fix: Re-add handle_combat_weapon_release()
 2022-04-28 23:22:05 +08:00
LmeSzinc
b6a5982db9 Opt: Enhancement clean up 2022-04-23 16:05:03 +08:00
LmeSzinc
f9e9ea856a
Merge branch 'dev' into Iss777 2022-04-23 15:48:33 +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
565c805c32 Fix: [EN] fixed daily skip button 2022-04-15 05:19:36 -03:00
Egor Nats
1101d01a0d Fix: [EN] Fixed Dorm stuck after XP screen 2022-04-14 13:33:28 -03:00
Egor Nats
fa395d8a26 Fix: [EN] Fix commission "flashing bug" 2022-04-14 13:22:25 -03:00
LmeSzinc
38f610e981 Add: Aurora Noctis map files 
- Fix typo of U522
 2022-04-14 19:56:13 +08:00
nEEtdo0d
272093e258 Upd: [EN] remove alpha channel in assets 2022-04-12 22:59:48 -04: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
23148dde70 Fix: [EN] fixed Tactical class START and CANCEL button 2022-04-12 19:45:48 -03: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
nEEtdo0d
6f7699b0d5 Upd: gem farming module assets (#1003) 2022-04-10 17:34:40 -04:00
LmeSzinc
df6e93854d Upd: BOOKS_GRID and fix skill exp detection 2022-04-09 14:17:05 +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
LmeSzinc
1e13eaba08 Del: Redundant assets WAR_ARCHIVES_GOTO_CAMPAIGN 2022-04-08 17:37:15 +08:00
nEEtdo0d
1cc28f524f Upd: [EN] post major app update bulk assets; WIP part 3 2022-04-08 01:28:25 -04: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
ea8a200fbc Opt: Faster stage detection 
Time cost reduced from 200ms to 40ms
 2022-04-06 19:29:46 +08:00
LmeSzinc
9b3544e1ac Fix: Handle EMP debuff in opsi that limits fleet steps 2022-04-01 18:38:12 +08:00
nEEtdo0d
f0cdb96cb6 Upd: [EN] monthly os reset assets 2022-03-31 22:06:16 -04:00
nEEtdo0d
86b2709a7b Undo: [EN] 73ae47e; share text detected even when greyed/non-focused, throws off collect process 2022-03-28 21:35:26 -04:00
nEEtdo0d
73ae47e285 Upd: [EN] MEOWFFICER_GET_CHECK; share button appearance 2022-03-26 10:08:36 -04: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
Horizon101011
2f5b19949e Opt: Refactor module enhancement 2022-03-12 01:22:31 +08:00
nEEtdo0d
25b18df6ef Upd: re-cut meowfficer lock assets; both detected as same previously, using text differentiates better 
Upd: swap from standard check loop to switch class

TODO: [CN, JP, TW] lock asset may need to be a precise cut due to random shift during acquisition; refer to _meow_detect_shift
 2022-03-04 19:26:09 -05:00
nEEtdo0d
84f66a76e8 Add: meowfficer configurations RetainTalented* 
Upd: rename SR_CHECK to GOLD_CHECK
Upd: [CN] moved SR_CHECK to PURPLE_CHECK; server rarity tier scale difference

TODO: [CN] SSR image for GOLD_CHECK
 2022-03-04 13:05:58 -05:00
LmeSzinc
fe6e8160c8 Merge branch 'master' into dev 2022-03-03 10:49:44 +08:00
LmeSzinc
1bb2f48b0a Fix: Move MAP_CAT_ATTACK_MIRROR to map buff icons 
because EN has a different fleet position on the left
 2022-03-01 23:19:03 +08:00
nEEtdo0d
3fc5dea783 Add: [EN] OpSi archive zone assets 2022-02-25 10:41:11 -05:00
LmeSzinc
f1253aa3d6 Merge branch 'master' into dev 2022-02-25 23:38:54 +08:00
LmeSzinc
61058c1cf9 Add: Abyssal Refrain chapter BD and SP 2022-02-25 20:30:45 +08:00
LmeSzinc
7c90e4120a Fix: Handle the animation of being attacked by siren submarine in map 2022-02-25 19:13:02 +08:00
Horizon101011
6ba0a755db Opt: Refactoring logic of ship enhancement 
Using a new judgement logic similar to the state machine. Judge the state according to the appearance and disappearance of enhancement material after some operations, instead of only depending on info_bar. The new logic is more robust, even in poor equipment (simulating by delaying 5s)
 2022-02-23 00:06:11 +08:00
nEEtdo0d
9e5d42a85b Add: [EN] submarine handler assets 2022-02-15 19:41:01 -05:00
nEEtdo0d
a1f9b38478 Add: [EN] OS_GAME_TIPS 2022-02-15 19:33:22 -05:00
nEEtdo0d
6e82e6800e Add: [EN] meta_reward assets 2022-02-15 19:31:23 -05:00
nEEtdo0d
cca678903a Fix: resolve merge conflicts 2022-02-13 14:41:30 -05:00
LmeSzinc
e47e613638 Add: Event PT and time limit 
- Fix: Auto update events in GemsFarming
 2022-02-11 22:52:36 +08:00
LmeSzinc
888d281733 Fix: Siren CA/CV/BB detection in Northern Overture Rerun 2022-02-10 22:43:08 +08:00
nEEtdo0d
83caabe172 Del: MEOWFFICER_STATUS; replaced by MEOWFFICER_GET_CHECK 
Add: meowfficer enhance, queue, and sr get related assets
 2022-02-06 19:37:47 -05: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
LmeSzinc
d591334c76 Fix: Handle locked zones in OpsiExplore, no need to move to NY manually now 2022-02-02 04:02:07 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
32911bb7ff Upd: [EN] GET_ADAPTABILITY 2022-01-28 01:51:10 +08:00
LmeSzinc
e037b2040b Upd: [EN] Joint Battle Mystery Investigation assets 2022-01-28 01:47:51 +08:00
nEEtdo0d
433391bf3b
Merge pull request #891 from nEEtdo0d/shop_revamp_clean 
Opt: shop revamp final; shift to generic alias, no longer passing in unique strings across funcs; redirect shop filter config from old to new format
 2022-01-23 10:41:39 -05:00
lonelyzerg
cf5292211a Add assets 2022-01-21 07:48:41 -06:00
nEEtdo0d
b96113631b Fix: reduce hit area; conflict with gacha page, may enter build 2022-01-19 22:18:06 -05:00
LmeSzinc
0caf4ba990 Fix: Handle popup to use 2x book (#880) 2022-01-18 22:06:38 +08:00
LmeSzinc
153b153899 Fix: Maritime escort assets of EN mistakenly replace the CNs 2022-01-16 01:19:20 +08:00
LmeSzinc
897d179bbd Add: Maritime escort 2022-01-15 22:17:34 +08:00
LmeSzinc
52dca3db20 Upd: [EN] MISSION_OVERVIEW_* assets 2022-01-14 00:48:09 +08:00
LmeSzinc
c5a04c55dc Add: Submarine move in map (#864) 2022-01-09 19:26:49 +08:00
nEEtdo0d
6395528ad0 Merge remote-tracking branch 'origin/master' into shop_core_v2 2021-12-31 22:48:36 -05:00
LmeSzinc
e89d07da12 Add: Tower of Transcendence chapter BD 
- Fix: BATTLE_STATUS_B was clicked after EXP_INFO
- Fix: STORY_SKIP offset
- Fix: One-time stages in stage auto increase
 2021-12-30 17:46:30 +08:00
nEEtdo0d
87a4137859 Fix: Resolve merge conflicts; migrate equip skin box price check to appropriate custom_check_item variant 2021-12-29 20:55:46 -05:00
LmeSzinc
29d4e69fde Add: Tower of Transcendence Chapter AC 2021-12-30 00:01:44 +08:00
nEEtdo0d
26c4dabc0a Fix: Re-work purchase amount adjust through max button click 2021-12-24 13:56:47 -05:00
nEEtdo0d
0872634740 Add: shop_core assets and implementation 2021-12-24 11:52:56 -05:00
nEEtdo0d
33b923277a Upd: [EN] meowfficer ui bug resolved; update assets 2021-12-23 18:14:56 -05:00
LmeSzinc
9ee2ddc68f Upd: TEMPLATE_STORAGE_LOGGER for various loggers 2021-12-24 01:17:04 +08:00
nEEtdo0d
c25710a595 Upd: [EN] meowfficer assets minimum; subsequent updates may follow 2021-12-23 11:05:54 -05:00
LmeSzinc
d314cc76fd Upd: Meowfficer buy assets 2021-12-23 18:37:44 +08:00
MrGuoRanDuo
ff45193f5c Fix: Refresh the shop may using gems 2021-12-22 00:46:39 +08:00
nEEtdo0d
b31b15d507 Fix: [EN] MEOWFFICER_CONFIRM text change; may convert to gif if change frequent 2021-12-16 09:39:15 -05:00
nEEtdo0d
b99a29ecd1 Add: [EN] MISSION_MONTHLY_BOSS 'biter' 2021-12-11 17:18:49 -05:00
LmeSzinc
dfd334736f Add: OpSi abyssal and handle battle status C/D in auto search 2021-12-11 00:27:04 +08:00
nEEtdo0d
9c25107918 Upd: [EN] ZONE_SWITCH change after game update 2021-12-09 19:38:59 -05:00
nEEtdo0d
4d80279545 Upd: [EN] ASH_POPUP_CHECK text change after update 2021-12-09 14:27:01 -05:00
LmeSzinc
fbcb8029ee Upd: Create fleet lock assets for opsi 
- Fix: Expand search area of opsi auto search and fleet lock
 2021-12-10 00:57:55 +08:00
LmeSzinc
de40e856f3 Upd: [EN] AUTO_SEARCH_OS_MAP_OPTION_* 2021-12-10 00:55:11 +08:00
LmeSzinc
ed1806f354 Upd: [EN] Assets for OpSi fleet selector 2021-12-10 00:34:11 +08:00
LmeSzinc
d1767fb012 Upd: ASH_POPUP_CHECK, because it no longer shows red letters 
- TODO: [JP] Update ASH_POPUP_CHECK
 2021-12-09 23:00:14 +08:00
LmeSzinc
dc2d4c1c12 Fix: Unable to call submarine because of unknown inner shadow on button 
- Fix: Still delaying tasks if map orders haven't been executed successfully
 2021-12-09 01:08:42 +08:00
LmeSzinc
bf4ff28c6e Add: Clear one abyssal coordinate 
- Fix: Divided by 0 in limit_walk()
- Fix: Taking drop screenshots in abyssal battles
 2021-12-07 00:00:40 +08:00
LmeSzinc
4a392407a0 Opt: Uniform the name of zone types in OpSi 
obscured to obscure
siren logger to abyssal
 2021-12-06 23:41:23 +08:00
LmeSzinc
d40931e58f Fix: [CN][EN] Battle pass SP reward 
- TODO: [JP][TW] add assets for the battle_pass module
 2021-12-06 00:29:56 +08:00
LmeSzinc
9653735b67 Opt: Better detection of GUILD_REPORT_AVAILABLE 2021-12-05 15:42:27 +08:00
nEEtdo0d
052b334b87 Upd: [CN, EN, JP, TW] all servers used same guild asset; recut as icon has shifted since last game update 2021-12-03 22:42:02 -05:00
nEEtdo0d
03458d4e04 Fix: [EN] redo statistics assets; not all black except for target 2021-12-03 17:05:41 -05:00
nEEtdo0d
63c772263a Add: [EN] statistics assets 2021-12-03 09:47:00 -05:00
nEEtdo0d
04e89faa08 Add: [EN] battle pass assets 2021-12-03 09:46:27 -05:00
nEEtdo0d
426799a1fd Revert: [EN] shipyard asset sync with JP in commit 1623613 2021-12-02 08:32:23 -05:00
LmeSzinc
16236134ab Fix: Handle with and without MAX button in shipyard (#788) 
Tested on image, haven't test on game
- Sync SHIPYARD assets from JP to all
 2021-12-01 17:51:41 +08:00
nEEtdo0d
32e24814b6 Add: [EN] assets to support weekly free supply pack purchasing 2021-11-29 22:46:28 -05:00
LmeSzinc
e8de1bcefb Merge branch 'master' into dev 2021-11-28 19:43:46 +08:00
nEEtdo0d
3fae4714ef Add: [EN] GUILD_OPERATIONS_* to support monthly operations reset 
TODO: [EN] GUILD_MISSION_* to support weekly mission reset
 2021-11-27 22:53:46 -05:00
nEEtdo0d
dcbab10a96 Fix: [CN, EN, TW] SHIPYARD_TOTAL_DEV; before update every server match before so making same assumption. May alter if not the case 
Fix: bump up interval; ocr may acquire incorrect value
 2021-11-27 13:15:19 -05:00
nEEtdo0d
a3c43ad08d Fix: [EN] re-cut new templates for enhancement; different word and honed down 2021-11-26 11:11:00 -05:00
nEEtdo0d
cdefbebd4e Upd: [EN] asset update to search for war archives entrance 2021-11-26 10:46:34 -05:00
nEEtdo0d
daa6475f8f Fix: [CN, EN, TW] SHIPYARD_(MINUS|PLUS)_DEV; before update every server matched before so making same assumption. May alter if not the case. 2021-11-26 10:38:43 -05:00
LmeSzinc
8ac6e59f2a Upd: Update World-spanning Arclight 
- Fix: Varies map mode switches
- Fix: Handle stories in map detection
- Upd: GAME_TIPS
 2021-11-26 01:17:49 +08:00
julystone
ebdcae9ed6 Add: WarArchives add Crimson Echoes 2021-11-19 14:40:30 +08:00
LmeSzinc
29e356c6f1 Fix: Handle shop items not loaded (#741) 
- Opt: Faster ui switch and purchase in shop
 2021-11-15 01:04:38 +08:00
nEEtdo0d
2eca1a6f85 Upd: [EN] DOCK_FILTER_CONFIRM asset 2021-11-13 13:33:12 -05:00
LmeSzinc
5e2d5d7444 Upd: [EN] CAMPAIGN_CHECK.gif 
Use "hapter" instead of "Chapter", because letter "C" may be outside
 2021-11-13 17:31:51 +08:00
nEEtdo0d
f7035922fc Fix: [EN] IN_MAP not detected 2021-11-11 19:09:10 -05:00
nEEtdo0d
6be2ef519f Upd: [EN, JP, TW] OCR_SKILL_EXP copy 2021-11-10 19:46:01 -05:00
nEEtdo0d
c902549ad0 Fix: [EN] Use asset button gif support for POPUP_CONFIRM and POPUP_CANCEL 
TODO: [JP] can make gif equivalents for same assets and adjust retirement to use handle_popup_confirm
 2021-11-10 19:42:56 -05:00
LmeSzinc
593855f629 Upd: [EN] CAMPAIGN_CHECK.gif for W14 2021-11-09 00:14:08 +08:00
nEEtdo0d
1914f0af58 Upd: [EN] AUTO_SEARCH_SET_SUB assets 2021-11-06 11:01:32 -04:00
nEEtdo0d
62a950c539 Fix: [EN] re-cut to not overlap with BUILD_SUBMIT_ORDERS 2021-11-06 11:00:40 -04:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
nEEtdo0d
c9d774c3b8 Upd: [EN] RESEARCH_RUNNING 2021-11-01 16:26:55 -04:00
nEEtdo0d
6fc50cafff Upd: [EN] RESEARCH_LAB 2021-10-31 22:17:39 -04:00
LmeSzinc
3813bdd750
Merge pull request #688 from railzy/research_remain 
Fix: get research duration remain from page_reward
 2021-10-29 14:26:52 +08:00
Ray
441bf072f8 Fix: remove asset DURATION_REMAIN 2021-10-29 07:41:53 +08:00
LmeSzinc
eb9c1844f8 Upd: Convert siren templates in Skybound Oratorio to gif 
- In order to match mirrored enemies
 2021-10-28 18:44:47 +08:00
LmeSzinc
dd7b389797 Add: Semi-auto, Opsi semi-auto and benchmark 
- Add: dependency prettytable
- Fix: Running an Alas module directly
- Del: Remove all assets in daemon module, because it's redundant
 2021-10-25 18:49:56 +08:00
LmeSzinc
2794505bc5 Merge branch 'master' into app 2021-10-22 02:46:06 +08:00
LmeSzinc
eea937845d Upd: SHOP_SELECT_PR1 copied to all servers 2021-10-22 02:45:21 +08:00
nEEtdo0d
4f09c65868 Merge remote-tracking branch 'origin/master' into app 
# [EN] equipment assets update
# sync _dorm_receive update across branches
 2021-10-16 20:00:35 -04:00
nEEtdo0d
7a89e26f87 Upd: [EN] equipment assets 2021-10-16 19:26:05 -04:00
nEEtdo0d
3a89c62af2 Mov: data_key into own folder same as other reward tasks 2021-10-16 09:05:07 -04:00
LmeSzinc
b01e042c04 Merge branch 'master' into app 2021-10-15 02:48:16 +08:00
LmeSzinc
53482ab6d4 Upd: [EN][JP] Auto search assets 2021-10-15 02:43:06 +08:00
nEEtdo0d
4cb52b66a7 Merge branch 'master' into app 
# Updates EN VOTE_CANCEL
# Mitigates multi-click for submit-gacha in case of slow transition
 2021-10-14 11:41:21 -04:00
nEEtdo0d
bc8536f492 Fix: [EN] VOTE_CANCEL asset 2021-10-14 11:23:32 -04:00
LmeSzinc
01d49bb752 Merge branch 'master' into app 2021-10-14 17:48:12 +08:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
LmeSzinc
85101590b7 Merge branch 'master' into app 
# Conflicts:
#	module/config/event.py
 2021-10-11 12:58:52 +08:00
LmeSzinc
63a8821112 Fix: OS low hp detection (#634) 2021-10-11 12:58:25 +08:00
LmeSzinc
c88a2af85e Merge branch 'master' into app 
# Conflicts:
#	module/reward/assets.py
#	module/sos/sos.py
 2021-10-08 01:40:11 +08:00
nEEtdo0d
ce65c9e133 Fix: re-cut OIL asset to seclude into reward area, depending on secretary can blend and falsely detect and exit reward window unintentionally 2021-10-06 12:14:59 -04:00
LmeSzinc
0ad1daf412 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-10-02 18:06:22 +08:00
nEEtdo0d
c977a8d5ce Upd: [EN] coin and exp assets for reward receive 2021-10-01 23:45:17 -04:00
LmeSzinc
38f55a3a26 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-09-30 21:26:25 +08:00
LmeSzinc
00481e4de5
Merge pull request #632 from nEEtdo0d/gacha_reward_final 
Add: Daily Gacha Reward
 2021-09-30 20:20:45 +08:00
LmeSzinc
98f1657476 Upd: REWARD_GOTO_MAIN 2021-09-30 20:06:56 +08:00
LmeSzinc
b0f6798596 Merge branch 'master' into app 
# Conflicts:
#	module/reward/assets.py
 2021-09-30 16:09:42 +08:00
LmeSzinc
e01b2d49e8 Upd: Reward assets for all servers and add EXP 2021-09-30 16:05:04 +08:00
LmeSzinc
a99214e2d0 Merge branch 'master' into app 2021-09-27 15:02:41 +08:00
nEEtdo0d
03a88919b8 Add: new gacha assets for reward gacha 2021-09-26 21:33:19 -04:00
nEEtdo0d
4ddc509b8a Add: [EN] shipyard level not enough assets 2021-09-26 19:05:13 -04:00