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

6041 Commits

Author SHA1 Message Date
sui_feng
d0857c549d
Merge pull request #5069 from sui-feng-cb/medal_shop_fix
Fix: class name MedalShop2_250814 for getattr
2025-08-26 00:39:49 +08:00
LmeSzinc
0c92002bc0 Tmp: Limit shop to CN/TW before other server confirm working 2025-08-25 13:08:53 +08:00
LmeSzinc
48ac9d825c Chore: Format code 2025-08-25 13:08:03 +08:00
LmeSzinc
7c922b05ca
Merge pull request #5047 from weeswelai/shop_ui_update_250814
Upd: Update 250814 shop UI for server CN
2025-08-25 10:41:26 +08:00
weeswelai
9d544ae0e8 Upd: Update ShopItem_250814 method predict_valid, use np.max 2025-08-24 16:14:57 +08:00
dragonheart107
4cd166212b Upd: GUI text 2025-08-23 20:29:41 +02:00
LmeSzinc
bb4eec062c Upd: [TW] Abyssal Refrain Rerun 2025-08-23 23:40:08 +08:00
LmeSzinc
596babb1d3 Fix: OS_CHECK may get detected while handling stories 2025-08-23 23:04:56 +08:00
guoh064
f7d1eeab1b
Fix: ocr after_process for SKILL_EXP (#5056) 2025-08-23 22:30:13 +08:00
dragonheart107
6d3acaaddb
Fix: Exercise item during battle (#5059)
* Fix: event log

* Fix: random artefacts during exercise mistaken as Items

* Fix: small tweak
2025-08-23 22:26:48 +08:00
weeswelai
2ccd1036d6 Upd: Update new shop UI goto supply pack page 2025-08-21 23:59:59 +08:00
weeswelai
87257e65a8 Upd: Update new UI 20250814 for server JP, update CN assets 2025-08-21 23:59:59 +08:00
weeswelai
ef22869306 Fix: Update func predict_valid, distinguish the selling status 2025-08-21 23:59:59 +08:00
weeswelai
55c37475f1 Upd: Add MedalShop_250814 cost_area 2025-08-21 23:59:59 +08:00
weeswelai
7562c8287c Upd: Update server JP supply pack 2025-08-21 23:59:59 +08:00
weeswelai
b2f94c1685 Upd: Update server CN assets SUPPLY_PACK_CHECK 2025-08-21 23:59:59 +08:00
weeswelai
11f5c78e8e Upd: Update comments 2025-08-21 23:59:59 +08:00
weeswelai
bb7d12c3cc Upd: Update server TW assets 2025-08-21 23:59:59 +08:00
weeswelai
0f14b7693d Upd: Update server CN 2025-08-14 new shop UI 2025-08-21 23:59:59 +08:00
weeswelai
ba2a07c256 Upd: Update new UI 20250814 for server CN, update shop buy supply pack 2025-08-21 23:59:59 +08:00
Air111
e32de1bfe2
Opt: clear interval of DOCK_SELECTED for faster ship changing (#5048) 2025-08-21 19:00:29 +08:00
dragonheart107
b45d5e1fcf
Upd: REWARD_GOT JP + EN asset (#5037) 2025-08-16 03:27:13 +08:00
LmeSzinc
bcc5c52bbb Fix: Handle popup after all story finished 2025-08-16 01:18:51 +08:00
LmeSzinc
ad6caeacc7 Fix: Event story ended at REWARD_GOT
- TODO: [EN][JP][TW] update REWARD_GOT
2025-08-16 01:12:28 +08:00
LmeSzinc
0ac0c99dfa Upd: Event story handler 2025-08-16 01:00:32 +08:00
LmeSzinc
05c95c551f Opt: Show enemy_genre without name prefix 2025-08-15 23:27:11 +08:00
LmeSzinc
9fe7a79213 Add: Chapter T 2025-08-15 23:25:53 +08:00
LmeSzinc
5fb2e0a1dd Upd: Event entrance of Secrets of the Abyss (event_20250814_cn) 2025-08-15 22:26:44 +08:00
LmeSzinc
29d988d5c0 Fix: Handle slow get items popup after disassemble (#5015) 2025-08-15 19:32:27 +08:00
LmeSzinc
034f69e98e Tmp: Disable supply pack for now 2025-08-15 11:58:07 +08:00
Compeador
e8811c36d9 fix: pq stuck when unknown ui 2025-08-15 11:23:25 +08:00
LmeSzinc
9b0e5156de Tmp: disable shop before update 2025-08-14 18:36:17 +08:00
zhenghan123
145b4991d8
Merge pull request #5022 from zhenghan123/master
修改提醒,每周蛋糕礼盒消耗的是钻石而不是物资
2025-08-14 18:34:20 +08:00
LmeSzinc
c5f3afbf9a Fix: [ALAS] Handle copy-pasted serial 5555,16384 to be fool-proof 2025-08-11 12:45:07 +08:00
LmeSzinc
9f721033a8 Fix: [ALAS] Handle upside-down emulator in ldopengl screenshot 2025-08-11 12:37:59 +08:00
LmeSzinc
b23a7d6ea1 Upd: [TW] ALCHEMIST_MATERIAL_CONFIRM 2025-08-10 18:01:55 +08:00
dragonheart107
a8f1110bbf
Fix: nemu_ipc for global MuMu
Fix: nemu_ipc for global MuMu
2025-08-10 17:47:04 +08:00
LmeSzinc
23fcfc0641 Upd: [TW] Alchemist collab and rerun (#5007) 2025-08-07 21:22:21 +08:00
guoh064
f714e2b575 Fix: Include GEMS_FARMINGS in event time limit task list 2025-08-07 17:29:41 +08:00
dragonheart107
4fb37da861 Fix: EN-retire assets 2025-08-07 17:27:36 +08:00
LmeSzinc
f6cfe110bd Fix: Expand GET_ITEMS_1_RYZA to handle multiple drop rows 2025-08-03 03:05:41 +08:00
nEEtdo0d
b4cceb7f8e Upd: [EN] event current and rerun check icons; other button_extract output 2025-08-02 13:32:52 -04:00
guoh064
d8bc97fa2e Upd: event_20221124_cn rerun entrance 2025-08-02 01:16:47 +08:00
guoh064
8b784616ae Add: config_updater for concurrent events 2025-08-02 01:16:17 +08:00
guoh064
4c8ecff046 Add: ui_goto_event for event 20221124 cn and event 20250724 cn 2025-07-29 17:31:37 +08:00
nEEtdo0d
a05403efda Opt: Private Quarters refactor
Fix: addresses stale roses sold out reported bug (#4943)
Fix: limited retry ocr read on daily count (#4969)
Add: capability to purchase cake through config toggle
2025-07-26 03:27:10 +08:00
LmeSzinc
f793b47008 Upd: [JP] ALCHEMIST_MATERIAL_CONFIRM 2025-07-26 02:39:53 +08:00
LmeSzinc
77f362f8bd Upd: [EN] ALCHEMIST_MATERIAL_CONFIRM 2025-07-25 02:01:42 +08:00
LmeSzinc
4bd51e41f8 Upd: button extract (fixed #4975) 2025-07-25 01:54:40 +08:00
LmeSzinc
d415492eba
Merge pull request #4974 from LmeSzinc/dev
Bug fix
2025-07-25 01:26:04 +08:00
LmeSzinc
becf0ec1d9 Fix: Able to do stage loop TS 2025-07-25 01:09:15 +08:00
LmeSzinc
7e6487487b
Merge pull request #4973 from LmeSzinc/dev
Add: The Alchemist and the Tower of Horizons (event_20250724_cn)
2025-07-25 00:50:17 +08:00
LmeSzinc
0d38332185 Fix: loop stage TS 2025-07-25 00:49:49 +08:00
LmeSzinc
8bde7017d3 Upd: Handle event stories in event_20250724_cn 2025-07-25 00:41:53 +08:00
LmeSzinc
b13e92694b Add: Chapter TS 2025-07-25 00:17:30 +08:00
LmeSzinc
6188bd069c Add: Chapter SP 2025-07-24 23:41:15 +08:00
LmeSzinc
021cc4e26d Add: Chapter T 2025-07-24 23:35:47 +08:00
LmeSzinc
ada6e09798 Upd: Event entrance of The Alchemist and the Tower of Horizons (event_20250724_cn) 2025-07-24 21:52:16 +08:00
LmeSzinc
726f61b10a Upd: Move coalition back after event 2025-07-24 21:48:01 +08:00
LmeSzinc
f061f518b3 Upd: [CN] channel server com.bilibili.blhx.honor 2025-07-24 21:45:20 +08:00
LmeSzinc
3560c8debe Upd: [TW] Event Substellar Crepuscule (event_20241219_cn) (#4970) 2025-07-24 21:39:24 +08:00
6b49b92185 Add: war_archives_20220428_cn 2025-07-24 21:31:08 +08:00
LmeSzinc
310ccbae81
Bug fix (#4965)
* Fix: handle get items in research queue quit

* Fix: missing interval

* Opt: Awaken Favourite Ships Only (#4957)

* Feature: Add 121 strategy for 15-4 | 给15-4添加121策略 (#4946)

* Add 15-4 121 strategy

* Assign a different CampaignMap::name so load_campaign can differentiate 15-4 and 15-4(121)

* Fix campaign map name again to prevent unnecessary reloading

* Inherit map

* Fix: [ALAS] remove warnings from multiscreen devices

* Fix: [ALAS] Worker might graceful exited after killing

it cleaned up itself, so main thread can't delete it

* Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964)

---------

Co-authored-by: sui_feng <115386623+sui-feng-cb@users.noreply.github.com>
Co-authored-by: MetricVoid <21335640+Metric-Void@users.noreply.github.com>
2025-07-17 22:45:02 +08:00
HexatomicRing
4f0f2a2c87
Fix: Emulator no respond (#4947)
* Fix Leidian Emulator no respond

* [fix] assets name

* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +08:00
sui_feng
eef5249d18
Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964) 2025-07-17 22:42:33 +08:00
LmeSzinc
09a3727166 Fix: [ALAS] Worker might graceful exited after killing
it cleaned up itself, so main thread can't delete it
2025-07-17 22:38:27 +08:00
LmeSzinc
bd73e038cf Fix: [ALAS] remove warnings from multiscreen devices 2025-07-17 22:38:17 +08:00
sui_feng
64070437f0
Opt: Awaken Favourite Ships Only (#4957) 2025-07-16 12:24:08 +08:00
LmeSzinc
ca5f8a0d1b Fix: missing interval 2025-07-14 00:12:43 +08:00
LmeSzinc
75ed59c318 Fix: handle get items in research queue quit 2025-07-14 00:10:50 +08:00
LmeSzinc
77569a4532 Fix: find_emulator_instance may return None 2025-07-11 22:05:37 +08:00
dragonheart107
4c016a7830
Fix: PQ home button moved (#4942)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-07-11 21:49:37 +08:00
guoh064
a94dee218a
Merge pull request #4945 from guoh064/private_quarters
Add: [JP] assets for private quarters
2025-07-11 21:48:03 +08:00
LmeSzinc
cbba8f024a Fix: Missing series in FILTER_REGEX 2025-07-11 00:37:33 +08:00
LmeSzinc
ba3a9a9e1e Chore: format code 2025-07-11 00:14:47 +08:00
LmeSzinc
532e4c2eee Merge branch 'bug_fix' into dev 2025-07-11 00:14:29 +08:00
ChthoIly
9e91543a14
Add: [CN] Private Quarters localization (#4933)
* Upd: [CN] Private Quarters localization
Add: Add CN server asset for Private Quarters
Fix: Stuck in Private Quarters Shop when not enough gold coins
Changed DigitCounter OCR parameters for CN server to fix unexpected ocr result when reading daily intimacy count

* re-compress asset images using `image_fixup()` from #4849 (comment)
2025-07-11 00:04:28 +08:00
LmeSzinc
da837c391e Upd: Research S8 series assets 2025-07-11 00:02:48 +08:00
LmeSzinc
75d802fdef Upd: Research S8 projects and regex 2025-07-10 23:17:04 +08:00
LmeSzinc
d28ace6294 Upd: Research S8 configs and presets 2025-07-10 22:42:17 +08:00
guoh064
7c7c568ca3
Fix: missing HiddenZoneDataLogger in regex (#4939) 2025-07-10 22:41:57 +08:00
LmeSzinc
f016e7a2d6 Upd: patch mimetype 2025-07-10 03:03:52 +08:00
LmeSzinc
6a80e8c190 Upd: [TW] assets for _reward_wait_mission_list 2025-07-10 02:41:31 +08:00
3001ae011a Add: war_archives_20220728_cn 2025-07-07 18:00:53 +08:00
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
LmeSzinc
98501877ee Pref: [ALAS] Avoid global importing lz4 2025-07-04 20:34:21 +08:00
LmeSzinc
1764aef553 Fix: [ALAS] nemuipc lib might be None 2025-07-04 19:51:32 +08:00
LmeSzinc
0ab6d50656 Upd: [TW] Event Toward Tulipa’s Seas (#4922) 2025-07-03 22:59:22 +08:00
LmeSzinc
ee6f360901 Fix: [ALAS] Handle JobTimeout at the nemu ipc connection trials 2025-07-03 22:59:22 +08:00
nEEtdo0d
4af6852f70 Upd: restrict private quarters task to EN for master merge; other servers should review and capture own assets to support task 2025-06-28 16:20:26 -04:00
nEEtdo0d
b85b47d67c Merge branch 'master' into dev 2025-06-28 16:11:37 -04:00
LmeSzinc
9e256ce249 Fix: NEONCITY UI back and home 2025-06-28 19:36:07 +08:00
dragonheart107
9b63eaee7c Fix: assets for EN and JP 2025-06-27 22:18:08 +02:00
LmeSzinc
f000dd0997 Fix: Close coalition preparation before switching task 2025-06-27 04:57:12 +08:00
LmeSzinc
7a773a4c02 Fix: Check empty fleets in coalition 2025-06-27 00:32:14 +08:00
LmeSzinc
cd86ef82ec Fix: Swapped switch states 2025-06-27 00:24:56 +08:00
LmeSzinc
f6f7b7779d Upd: UI page switching 2025-06-27 00:10:44 +08:00
LmeSzinc
37ad6c9d12 Upd: stage convert 2025-06-27 00:08:42 +08:00
LmeSzinc
118d80f61a Add: Assets for coalition NEONCITY 2025-06-26 23:49:31 +08:00
LmeSzinc
373cf7e919 Add: Event entrance of Neon City Investigator (coalition_20250626) 2025-06-26 23:46:41 +08:00
LmeSzinc
aa3f4338fe Chore: [ALAS] Reuse Switch.get() in Switch.appear() 2025-06-26 23:31:55 +08:00
LmeSzinc
d4f1a44d20 Pref: no copy of scrcpy screenshots 2025-06-26 01:09:56 +08:00
LmeSzinc
b65932b404 Fix: Mute handle_exp_info in META combat 2025-06-26 01:03:18 +08:00
LmeSzinc
3f49aa47ad Fix: [ALAS] ascreencap returns read-only images 2025-06-24 23:29:18 +08:00
LmeSzinc
0934746701 Upd: Event entrance of Confluence of Nothingness 2025-06-19 22:51:39 +08:00
dragonheart107
0757f0aef8
Merge pull request #4890 from dragonheart107/assets
Fix: Meta sync tap
2025-06-18 18:26:29 +08:00
nEEtdo0d
f77aec689e Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact 2025-06-15 17:09:52 -04:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
LmeSzinc
73a5ce7f02 Upd: [TW] Remove switches of storage disassemble, all server synced now 2025-06-14 01:31:44 +08:00
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08:00
LmeSzinc
3b4ac53d6c Fix: [ALAS] Ignore errors in brute force connect 2025-06-14 01:16:09 +08:00
LmeSzinc
b2724dca64 Fix: [ALAS] Add notice to disable network bridging 2025-06-14 01:10:22 +08:00
LmeSzinc
c15bce0ab5 Pref: [ALAS] Replace ThreadPoolExecutor with alas threadpool 2025-06-14 00:44:57 +08:00
LmeSzinc
eb084ed591 Fix: [ALAS] Match 7555 in vbox config with MuMu instance_id 2025-06-14 00:18:56 +08:00
LmeSzinc
ac3ce726a5 Add: [ALAS] Support MuMuPlayer12 5.0 2025-06-14 00:18:56 +08:00
LmeSzinc
9014b9640b Upd: [TW] Event A Rose on the High Tower (event_20250520_cn) 2025-06-13 22:45:12 +08:00
dragonheart107
86eaac9375
Merge pull request #4866 from dragonheart107/assets
Fix: Meta-sync asset change for EN
2025-06-10 17:56:24 +08:00
LmeSzinc
25c81f08f4 Fix: [ALAS] close pillow Image object 2025-06-09 13:06:52 +08:00
guoh064
3b65dfe6f0 Add: check manjuu loading in os_mission_overview_accept 2025-06-06 01:57:43 +08:00
LmeSzinc
938d98a243 Fix: handle insufficient fund in guild operation 2025-06-06 01:39:18 +08:00
LmeSzinc
2247d72bf7 ix: Handle TACTICAL_CHECK without black-blurred background (#4861) 2025-06-06 01:18:31 +08:00
LmeSzinc
d7d729e198 Fix: handle empty rows from "ldconsole.exe list2" (#4846) 2025-06-05 16:20:45 +08:00
dragonheart107
4172356a9a
Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
guoh064
bea88a6280
tmp: [JP] asset SUPPLY_PACK_CHECK (#4849) 2025-05-30 22:04:16 +08:00
LmeSzinc
4e7e2444d5 Fix: handle appear animation of AUTO_SEARCH after enabling clear mode 2025-05-29 23:28:38 +08:00
LmeSzinc
f5a201a793 Fix: Handle slow popups from last retirement when entering dock filter 2025-05-29 23:06:07 +08:00
LmeSzinc
dcc86a8b02 Fix: EQUIP_CONFIRM_2 may be detected as popup confirm
causing early stop of _retirement_confirm()
2025-05-29 23:05:13 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
LmeSzinc
14be031a32 Fix: expand search area of BOX_USE to handle box amount < 5 2025-05-28 02:12:00 +08:00
LmeSzinc
498c5db8ca Fix: disassemble should end with DISASSEMBLE_POPUP_CONFIRM clicked 2025-05-28 02:09:40 +08:00
LmeSzinc
8426330813 Fix: [TW] Keep disassemble as before 2025-05-27 00:00:53 +08:00
nEEtdo0d
2c75614af6 Opt: pq_interact remove click_iteration dependency, split into smaller screen state loop checks
Upd: extra logs for back tracing
2025-05-25 11:30:35 -04:00
LmeSzinc
03dd7b6a65 Fix: retirement confirm should end with EQUIP_CONFIRM_2 2025-05-25 20:10:36 +08:00
LmeSzinc
532a9f3ef8 Fix: disassemble no longer shows GET_ITEMS 2025-05-25 20:09:41 +08:00
LmeSzinc
7b2bee4ba7 Fix: [TW] handle clue popup with text only (#4819) 2025-05-24 23:36:12 +08:00
LmeSzinc
4a625e8990 Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets 2025-05-24 23:12:01 +08:00
LmeSzinc
8d61802fd1 Fix: continuously check rotation on unknown UI (#4729) 2025-05-24 00:42:13 +08:00
travellerse
56a010366c Add: [CN] Server 冬月计划 长弓计划 2025-05-24 00:34:21 +08:00
LmeSzinc
1bbd26c2b4 Fix: Inconsistent map_allow_submarine after choosing fleet_2 (#4824) 2025-05-24 00:29:03 +08:00
LmeSzinc
c893762a39 Fix: GET_SHIP should ruled by click_timer in commission_receive 2025-05-24 00:21:42 +08:00
LmeSzinc
0abb1fdff7 Fix: Avoid clicking GET_SHIP after dismiss MEOWFFICER_BUY 2025-05-24 00:17:52 +08:00
LmeSzinc
a136b7d229 Fix: sync check function to ZONEMODE_REPEAT and MERCHANT_STOP (#4810) 2025-05-24 00:03:18 +08:00
LmeSzinc
c4189ee9e1 Upd: [TW] hospital assets (#4819) 2025-05-23 20:57:31 +08:00
LmeSzinc
d955267ded Pref: Exit use box loop before checking scroll at_bottom 2025-05-23 15:43:45 +08:00
LmeSzinc
a42235e3ad Fix: equipment disassemble should endswith EQUIP_CONFIRM_2 clicked 2025-05-23 15:37:06 +08:00
LmeSzinc
ad5de4e2ed Fix: handle StorageFull when using box 2025-05-23 15:24:21 +08:00
LmeSzinc
23d4bd308e Merge branch 'master' into dev 2025-05-22 14:23:40 +08:00
LmeSzinc
f6e0a0bba2 Fix: skip first ocr in _handle_use_box_amount 2025-05-22 14:21:05 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00