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

2051 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
40432e75eb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-07-10 16:30:31 +00: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
GH Action - Upstream Sync
81d80335ae Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-07-10 04:35:19 +00:00
LmeSzinc
6a80e8c190 Upd: [TW] assets for _reward_wait_mission_list 2025-07-10 02:41:31 +08:00
e580efccfe Add: Storage box disassemble 2025-07-08 00:01:42 +08:00
3001ae011a Add: war_archives_20220728_cn 2025-07-07 18:00:53 +08:00
GH Action - Upstream Sync
d32727b639 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-07-04 16:28:15 +00:00
LmeSzinc
ad10cd4c72 Upd: Battle UI Star 2025-07-04 23:41:29 +08:00
65df2c848c Fix: urgent commission undetected and HazardLevel 2 for OpsiMeowfficerFarming 2025-07-04 04:27:31 +08:00
nEEtdo0d
b85b47d67c Merge branch 'master' into dev 2025-06-28 16:11:37 -04:00
GH Action - Upstream Sync
af2ac8afa7 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-06-28 12:42:27 +00: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
1626bfdd6f Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-06-27 03:31:07 +08:00
LmeSzinc
7a773a4c02 Fix: Check empty fleets in coalition 2025-06-27 00:32:14 +08:00
LmeSzinc
f6f7b7779d Upd: UI page switching 2025-06-27 00:10:44 +08:00
LmeSzinc
118d80f61a Add: Assets for coalition NEONCITY 2025-06-26 23:49:31 +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
0bb728d68c Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-06-14 03:46:03 +08:00
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08:00
GH Action - Upstream Sync
3c79418beb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-06-10 13:35:24 +00: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
47cfceb63a Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-06-07 09:45:16 +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
0488cc3407 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-31 02:19:36 +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
f6fa5683d3 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-30 09:58:56 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
GH Action - Upstream Sync
88bbd62ff3 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-26 16:27:02 +00:00
LmeSzinc
98f14f41fe Upd: [TW] Add BOX_USE
assets already update in previous commit
2025-05-27 00:16:39 +08:00
LmeSzinc
8426330813 Fix: [TW] Keep disassemble as before 2025-05-27 00:00:53 +08:00
GH Action - Upstream Sync
712e7e0553 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-24 16:25:35 +00: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
9acdac8089 Chore: cleanup unused assets 2025-05-24 23:08:43 +08:00
GH Action - Upstream Sync
a6b270a1a3 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-23 13:31:54 +00:00
LmeSzinc
c4189ee9e1 Upd: [TW] hospital assets (#4819) 2025-05-23 20:57:31 +08:00
LmeSzinc
23d4bd308e Merge branch 'master' into dev 2025-05-22 14:23:40 +08:00
GH Action - Upstream Sync
c3c681146b Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-21 16:55:41 +00:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00
LmeSzinc
242b964981 Upd: [JP] BOX assets (#4814) 2025-05-21 23:44:58 +08:00
LmeSzinc
c226228d98 Upd: [EN] EQUIP_CONFIRM_2 2025-05-21 23:22:23 +08:00
3981a04407 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-21 10:18:37 +08:00
LmeSzinc
91b8bf856d Upd: [EN] BUILD_CHECK, it reverts back again (#4811) 2025-05-21 03:15:15 +08:00
LmeSzinc
8a52877333 Add: chapter SP 2025-05-21 03:02:53 +08:00
LmeSzinc
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM
to be reused in retirement and enhancement
2025-05-21 02:25:28 +08:00
LmeSzinc
4bacd2b1f1 Fix: Equipments now get auto disassembled when you use boxes
- TODO: [EN][JP][TW] update box assets
2025-05-21 01:41:06 +08:00
LmeSzinc
fe1606bb0d Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH 2025-05-20 23:55:12 +08:00
GH Action - Upstream Sync
6ca128b26e Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-18 20:23:05 +00:00
LmeSzinc
3879b1546b Fix: Wait until mission list fully loaded 2025-05-19 02:52:34 +08:00
LmeSzinc
fad7c027a3 Fix: enter minigame ended at minigame menu (#4758) 2025-05-19 01:48:29 +08:00
090128c26b Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-18 16:29:37 +08:00
LmeSzinc
ef61702057 Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798) 2025-05-18 16:16:05 +08:00
LmeSzinc
79d72c4fa0 Merge branch 'master' into dev
# Conflicts:
#	module/device/method/pool.py
2025-05-18 03:15:41 +08:00
LmeSzinc
7f54ae8234 Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND 2025-05-18 03:12:30 +08:00
GH Action - Upstream Sync
9645f3cf91 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-05-10 18:27:13 +00:00
LmeSzinc
535a6ad243 Fix: More IDLE buttons to handle 2025-05-11 01:34:10 +08:00
LmeSzinc
b4930d486e Upd: [EN] ENHANCE_CONFIRM ENHANCE_RECOMMEND 2025-05-11 00:12:00 +08:00
LmeSzinc
5611f6a726 Upd: [EN] BUILD_CHECK 2025-05-11 00:00:15 +08:00
c50f97ba5b Fix: use EQUIPMENT_CODE_EQUIP_5_LOCKED to identify 2025-05-10 15:54:08 +08:00
nEEtdo0d
3eb37033a1 Opt: Private Quarters white click safe area, reduces asset file size
Opt: ui_click toggle to skip_first_screenshot=True
Opt: extra condition to ensure interact sequence finished and can be exited under normal circumstances
2025-05-02 16:58:46 -04:00
nEEtdo0d
01a17d7677 Add: [CN][JP][TW] Private Quarters placeholder assets; replace as needed 2025-04-27 13:12:52 -04:00
nEEtdo0d
09caf9704f Add: [EN] Private Quarters support 2025-04-27 13:12:08 -04:00
b8c3772376 Dev: coin_statistics 2025-04-25 20:41:40 +08:00
4b2cb5a1e1 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-04-25 12:11:03 +08:00
sui_feng
978167218d
Merge pull request #4750 from sui-feng-cb/war_archives_update
Add: war_archives_20220526_cn
2025-04-25 00:00:02 +08:00
GH Action - Upstream Sync
517fa690b8 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-04-21 17:19:58 +00:00
LmeSzinc
e50c984211 Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing 2025-04-21 12:35:05 +08:00
31d0cb6718 Upd: frostfall assets 2025-04-19 04:12:27 +08:00
067ba88761 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-04-19 04:07:05 +08:00
LmeSzinc
1a0b027db3 Fix: [EN][JP] Rename Frostfall assets 2025-04-18 23:24:04 +08:00
LmeSzinc
15cf552963 Upd: Swap FROSTFALL_TC2 too 2025-04-18 19:47:00 +08:00
LmeSzinc
62d260db02 Upd: FROSTFALL_TC3 and FROSTFALL_SP are swapped 2025-04-17 22:27:13 +08:00
7c4c974d5c Upd: coalition_20230323 assets [CN] 2025-04-17 16:29:30 +08:00
236f548a29 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-04-13 10:07:06 +08:00
LmeSzinc
ea4a73ff24 Fix: Skip NPC character when entering first ship in dock (#4725, #3678) 2025-04-11 01:46:06 +08:00
GH Action - Upstream Sync
8d5debb9cc Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-04-09 16:27:52 +00:00
LmeSzinc
18c7480e58 Upd: Battle UI Devil 2025-04-09 22:51:08 +08:00
GH Action - Upstream Sync
55ad377a2a Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-31 17:18:28 +00:00
iceynano
3133eaa2f7
Add: Event Reaction (#4706)
* Add: Event Reaction

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py
2025-04-01 00:56:05 +08:00
GH Action - Upstream Sync
2d5094b849 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-29 17:17:10 +00:00
LmeSzinc
3a1e851cad Fix: [EN] Smaller invest button
EN has 2 kinds of button, first and second button have smaller text and third button has normal size text
2025-03-30 00:22:42 +08:00
GH Action - Upstream Sync
e8d78ab8b6 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-28 17:18:44 +00:00
sui_feng
4768c9e46c
Add: War Archives 20220324 (#4698) 2025-03-29 01:11:26 +08:00
LmeSzinc
c4013aaea9 Upd: [TW] QUIT_New 2025-03-29 01:09:54 +08:00
LmeSzinc
2f81c226e9 Upd: [EN] use the "vesti" word as TEMPLATE_INVEST
because word "Start" may have a tick icon over it
2025-03-29 01:01:41 +08:00
LmeSzinc
eaf008f555 Upd: Battle UI Nurse 2025-03-29 00:47:51 +08:00
LmeSzinc
eb350ffb87 Upd: [EN] use the "Start" word as TEMPLATE_INVEST
because bugged game client get "Investigation" overflowed
2025-03-29 00:32:45 +08:00
9eff61e86a Add: task HospitalEvent to scheduler 2025-03-28 22:00:52 +08:00
760d4aa70c Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-28 07:51:28 +08:00
LmeSzinc
7e1f9d0c3e Upd: [JP] Hospital assets 2025-03-28 03:56:16 +08:00
LmeSzinc
d6d0f1b705 Add: Iter invest in character tab 2025-03-28 03:49:04 +08:00
LmeSzinc
38218ab5c4 Add: Receive hospital daily reward 2025-03-28 03:01:52 +08:00
LmeSzinc
02b84dfb02 Upd: [EN] Hospital assets 2025-03-28 02:06:35 +08:00
LmeSzinc
6c4739fb60 Fix: Click GET_CLUE faster and safer 2025-03-28 01:43:09 +08:00
LmeSzinc
b0bf81daa3 Add: Basic hospital event 2025-03-28 00:22:21 +08:00
b6604a2b5a Add: custom common dd filter 2025-03-23 18:34:23 +08:00
GH Action - Upstream Sync
e92810658d Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-16 16:23:27 +00:00
LmeSzinc
b151c4292b Upd: [JP] SYNC_ENTER 2025-03-16 11:40:46 +08:00
dragonheart107
2a02cb4aa2
Merge pull request #4662 from dragonheart107/Fix--Submarine-asset-en
Upd: Submarine EN assets
2025-03-15 21:27:28 +08:00
GH Action - Upstream Sync
780de342b4 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-13 10:22:21 +00:00
LmeSzinc
817cdc50db Fix: [CN] SYNC_ENTER should be enter button not receive button 2025-03-13 18:03:59 +08:00
GH Action - Upstream Sync
ac8debecb1 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-03-05 17:18:33 +00:00
dragonheart107
1a43d7d08f
Revert commit ca0f483 for en only (#4629)
* Add files via upload

* asset
2025-03-02 15:42:08 +08:00
d94e3f3cdc Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-28 10:41:03 +08:00
LmeSzinc
86ce8f8c47 Upd: Battle UI Pharaoh
- TODO: [EN][JP][TW] Add Quit_Pharaoh
2025-02-28 00:22:02 +08:00
LmeSzinc
b7e5bcf49c Add: Chapter B 2025-02-27 23:03:27 +08:00
GH Action - Upstream Sync
42f9b79229 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-23 14:17:30 +00:00
LmeSzinc
054a218574 Upd: [JP] Assets for Meta sync 2025-02-23 01:29:16 +08:00
dragonheart107
a89608ff3f
Meta sync en assets (#4598)
* Upd: En asset meta sync

* add en to available servers for meta sync

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-02-23 01:18:25 +08:00
GH Action - Upstream Sync
9e50297bed Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-20 11:16:27 +00:00
LmeSzinc
b52e33e2b9 Add: Meta sync receive
- TODO: [EN][JP][TW] Update SYNC_ENTER SYNC_TAP
2025-02-19 01:29:40 +08:00
GH Action - Upstream Sync
024ebe0bd8 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-18 17:17:43 +00:00
LmeSzinc
9ddbe2eadf Fix: Leave page_channel during ui switching 2025-02-19 00:16:09 +08:00
GH Action - Upstream Sync
84a297bf91 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-11 18:26:27 +00:00
LmeSzinc
ca0f483487 Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)
- TODO: [EN][JP][TW] Update OCR_GUILD_OPERATIONS_PROGRESS
2025-02-12 01:53:08 +08:00
4a5f43e7cb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-07 00:32:54 +08:00
guoh064
136100c7fd Fix: asset name of PAUSE_HolyLight 2025-02-06 23:38:18 +08:00
LmeSzinc
655b2fb361 Upd: Assets for battle UI Holy Light 2025-02-06 23:01:04 +08:00
GH Action - Upstream Sync
d9b4eaf2f5 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-02-03 16:24:34 +00:00
guoh064
09b6bc179b
Upd: [JP] ash_collect_status (#4554) 2025-02-03 22:53:24 +08:00
GH Action - Upstream Sync
8bb40eff6e Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-27 10:21:15 +00:00
hephooey
419f2ed6d5
[TW] Event: Spring Fashion Festa (#4539) 2025-01-27 17:56:45 +08:00
GH Action - Upstream Sync
2fdffee117 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-18 20:18:45 +00:00
LmeSzinc
4582cb516b Upd: [JP][TW] Awaken assets 2025-01-19 03:19:28 +08:00
GH Action - Upstream Sync
28e2a54767 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-17 06:26:46 +00:00
LmeSzinc
35fbc03212 Upd: UI switches from page_main_white to page_raid 2025-01-17 13:29:46 +08:00
LmeSzinc
372c3e74db Add: [EN][JP] Assets in raid_20250416 2025-01-17 13:25:59 +08:00
LmeSzinc
ee76c8925b Add: Assets in raid_20250416 2025-01-17 13:06:06 +08:00
LmeSzinc
53572f9aeb Fix: Reduce background of SHIP_LEVEL_CHECK (#4513) 2025-01-16 19:03:08 +08:00
LmeSzinc
2bf1894ca7 Upd: [TW] Battle pass assets 2025-01-16 18:30:19 +08:00
dragonheart107
44742e3757
Updated EN assets for 2x book (#4516) 2025-01-16 00:08:29 +08:00
dragonheart107
40961382f9
remove outdated EN -Mail assets, enable EN AUTO-Dossier (#4478)
* Add files via upload

* Delete assets/cn/freebies/assets.py

* Delete assets/cn/freebies/campaign_14_4.py

* Add files via upload

* Add files via upload

* fix mail

* replaced/removed old EN Mail assets; add EN for AUTO-Dossier; need assets for JP (maybe TW?)

* Better differentiation between META_AUTO-ATTACK_START and META_AUTO-ATTACKING for EN

* revert 14-4 changes due to further testing needed

* Add missing picture for the new UI py function

* updated button extract

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-01-15 23:28:41 +08:00
sui_feng
1053d490cf
Add: War Archives 20220224 (#4512) 2025-01-15 23:24:48 +08:00
6eb413595d Upd: delete gg_handler 2025-01-14 02:54:10 +08:00
GH Action - Upstream Sync
e0638f311b Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-10 05:18:53 +00:00
LmeSzinc
3995010ce6 Upd: Enemy templates in event 20221222 to select weaker enemy 2025-01-10 13:10:11 +08:00
ad8b0dee97 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-07 16:09:08 +08:00
guoh064
ab9f2892dc
Upd: [JP] Opsi assets (#4492) 2025-01-06 18:31:52 +08:00
guoh064
e60ea81095
Add: [JP] asset GUILD_MISSION_NEW (#4493) 2025-01-06 18:31:26 +08:00
b2628f920d Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-01-06 13:13:22 +08:00
LmeSzinc
cc5b26e477 Upd: [EN] Awaken assets 2025-01-05 03:15:51 +08:00
LmeSzinc
b72095e39f Upd: [TW] Raid assets of raid_20240130 2025-01-04 22:33:31 +08:00
LmeSzinc
c8bf55b4ad Upd: [EN] MEOWFFICER_BUY_ENTER 2025-01-04 21:21:35 +08:00