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

6384 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
e39758c3fb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-30 15:19:02 +00:00
LmeSzinc
b911e53d3e Fix: War archive shouldn't have option_bold 2025-08-30 22:18:53 +08:00
LmeSzinc
719f225316 Gui: Show event as stored to prevent someone trying to select it 2025-08-30 22:15:53 +08:00
guoh064
9ccf678ef3
Fix: OSDaemon.combat_status() should accept end 'no_searching' (#5066) 2025-08-30 22:06:27 +08:00
guoh064
e1a4a06be7 Upd: [JP] color of SHOP_OCR_BALANCE 2025-08-30 00:42:23 +08:00
guoh064
1feec35e4c Upd: [JP] shop_tab_250814 2025-08-30 00:28:57 +08:00
guoh064
ceb49fcb14 Upd: [JP] digit ocr '1' mistaken as 'L' 2025-08-30 00:28:22 +08:00
sui-feng-cb
1839f83ed6 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-29 23:25:41 +08:00
LmeSzinc
653260f431 Tmp: [TW] Disable shop before it confirm working 2025-08-29 21:53:46 +08:00
LmeSzinc
7f1021c79f I18n: Simplify Campaign.Name help text 2025-08-29 21:49:22 +08:00
dragonheart107
0e7eaf6fae
Fix: MetaReward undefined category defaults to beacon (#5063) 2025-08-29 21:41:54 +08:00
nEEtdo0d
3d947fc72e
Fix: [EN] shop task; grid now uniform with other servers (#5081)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-08-29 21:36:37 +08:00
下面我簡單喵兩句
fcbc77c887
Upd:[TW]Event:Secrets of the Abyss (#5087)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-08-29 21:34:09 +08:00
nEEtdo0d
f014c92316
Merge pull request #5065 from dragonheart107/GUI
Upd: GUI text
2025-08-27 14:22:23 -04:00
sui-feng-cb
8db0af6489 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-28 00:07:14 +08:00
LmeSzinc
a9bf935f41 Opt: Early stop medal shop if having any item soldout 2025-08-27 23:26:44 +08:00
sui_feng
cab42068de
Fix: _get_num in campaign_status 2025-08-27 11:16:31 +08:00
sui-feng-cb
4b0959bc96 Upd: OCR_COIN in campaign_status 2025-08-27 10:30:05 +08:00
sui-feng-cb
122c743746 Upd: handle ActionPointLimit in os_daily_clear_all_mission_zones 2025-08-27 10:08:33 +08:00
nEEtdo0d
5a9a227ff8 Fix: [EN] shop and supply pack tasks 2025-08-26 21:23:14 -04:00
nEEtdo0d
a6e3706ae4 Opt: reduce downtime on select new ship for tactical lesson 2025-08-26 19:42:21 -04:00
nEEtdo0d
ee36113697 Fix: voucher shop revert, still old ui arrangement 2025-08-26 19:41:04 -04:00
nEEtdo0d
7112cba4b8 Fix: Shipyard should not reuse coin ocr in shop 2025-08-26 18:31:15 -04:00
sui-feng-cb
6c0ca9596d Fix: gacha coin ocr 2025-08-26 09:03:35 +08:00
sui-feng-cb
cdfebcb50c Fix: voucher shop should use old ui 2025-08-26 01:37:03 +08:00
sui-feng-cb
29737f772d Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-26 00:53:12 +08:00
LmeSzinc
721a5a00cf Fix: Gacha should not reuse coin ocr in shop 2025-08-26 00:48:01 +08:00
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
sui-feng-cb
adc861c575 Fix: class name MedalShop2_250814 for getattr 2025-08-26 00:25:22 +08:00
GH Action - Upstream Sync
372c86ed60 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-25 11:19:11 +00: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
sui-feng-cb
400d55d9fb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-24 03:35:37 +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
sui-feng-cb
510a175baa Fix: storage ship select timeout 2025-08-21 01:17:47 +08:00
sui-feng-cb
4b893a0a68 Fix: incorrect fleet died timer reset 2025-08-19 20:37:39 +08:00
sui-feng-cb
9075dcd34d Upd: emotion record in gemsfarming 2025-08-19 19:59:13 +08:00
sui-feng-cb
604222d100 Tmp: emotion digit 2025-08-19 16:16:44 +08:00
sui-feng-cb
c279a3f02d Fix: check task OpsiAshBeacon enabled before task_call 2025-08-19 01:33:42 +08:00
sui-feng-cb
d3cf986367 Opt: check MAP_CLEAR_ALL_THIS_TIME for emotion reduce before enter map 2025-08-18 11:11:55 +08:00
sui-feng-cb
e0c84923ac Fix: handle meowfficer searching in stronghold 2025-08-18 03:05:34 +08:00
sui-feng-cb
65479113ad Fix: hp_has_ship for incomplete fleet 2025-08-18 02:39:58 +08:00
sui-feng-cb
921c2f8599 Opt: use LoggerUnlock in storage 2025-08-17 14:32:19 +08:00
sui-feng-cb
605db5e05f Opt: check mission complete and meowfficer searching at the same time 2025-08-17 01:01:55 +08:00
sui-feng-cb
7de31590f6 Fix: lower in_map_timer in interrupt_auto_search 2025-08-17 00:13:56 +08:00
sui-feng-cb
ab0b4f5a22 Upd: delete notify for GameNotRunningError 2025-08-16 10:09:31 +08:00
sui-feng-cb
306d3412dc Tmp: sleep in eventstory restart 2025-08-16 09:37:37 +08:00
sui-feng-cb
f7596bf39b Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-16 09:24:21 +08:00
sui-feng-cb
df85218ae5 Revert "Tmp: clear mode for event_20250814_cn"
This reverts commit 6de6efb765.
2025-08-16 09:21:49 +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
GH Action - Upstream Sync
5610616008 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-15 04:20:06 +00: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
GH Action - Upstream Sync
b585f39d11 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-14 11:20:38 +00: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
sui-feng-cb
6de6efb765 Tmp: clear mode for event_20250814_cn 2025-08-14 17:22:59 +08:00
sui-feng-cb
6a6321b026 Fix: handle multiple meowfficer searching 2025-08-14 09:01:06 +08:00
sui-feng-cb
9bb75467dc Fix: KeepMissionZone is only supported in server CN 2025-08-14 03:08:52 +08:00
sui-feng-cb
4370f30e7a Upd: translation of RepairPackThreshold 2025-08-14 02:51:20 +08:00
sui-feng-cb
cb26fa3033 Opt: keep mission zone for OpsiDaily 2025-08-14 02:35:01 +08:00
sui-feng-cb
7765432995 Upd: interrupt auto search 2025-08-13 21:01:08 +08:00
sui-feng-cb
0c69d69405 Upd: event entrance for event_20250814_cn 2025-08-13 00:49:09 +08:00
sui-feng-cb
03586c49bf Fix: check repair pack at bottom page 2025-08-13 00:41:17 +08:00
sui-feng-cb
3a97c36930 Opt: use repair packs to repair ships 2025-08-12 19:54:07 +08:00
sui-feng-cb
63aadb2c07 Fix: no image copy on obscure hazard 2 template match 2025-08-12 10:24:37 +08:00
sui-feng-cb
cf1317a90c Fix: skip task when there are only hazard 2 obscure loggers 2025-08-11 22:57:47 +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
sui-feng-cb
c299f4fd2c Fix: goto port first before handle_fleet_repair 2025-08-11 04:22:22 +08:00
sui-feng-cb
af69859c5b Opt: use handle_fleet_repair for OpsiStronghold SubmarineEveryCombat 2025-08-11 04:11:03 +08:00
sui-feng-cb
7d70a25a25 Opt: use submarine every combat in OpsiStronghold 2025-08-11 03:55:58 +08:00
GH Action - Upstream Sync
6e9660d7d0 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-08-10 10:24:16 +00: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
sui-feng-cb
d53464f7a8 Opt: OpsiObscure SkipHazard2Obscure 2025-08-10 14:27:00 +08:00