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

9050 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
5a25d1a06f Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-12-18 16:35:20 +00:00
LmeSzinc
4012541412
Bug fix (#5394)
* Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING (#5393)

* Fix: [ALAS] Add retry on first nemuipc connect

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2025-12-19 00:21:17 +08:00
LmeSzinc
90e438e75e Fix: [ALAS] Add retry on first nemuipc connect 2025-12-19 00:20:12 +08:00
guoh064
f3509c0de4
Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING (#5393) 2025-12-19 00:19:52 +08:00
sui-feng-cb
5129f239f6 Upd: clear mode for event_20251218_cn 2025-12-18 17:29:28 +08:00
sui-feng-cb
4891e75728 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-12-15 03:22:47 +08:00
LmeSzinc
8d9e54b4de
Bug fix (#5384)
* Upd:[tw] research E (#5382)

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>

* Upd:[TW]event 20251023 update (#5383)

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>

* Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END

* Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)

---------

Co-authored-by: whjhs1010203 <r2682233@gmail.com>
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-12-12 19:29:42 +08:00
LmeSzinc
2dca300d2c Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381) 2025-12-12 19:24:41 +08:00
LmeSzinc
c376d36c24 Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END 2025-12-12 19:24:41 +08:00
whjhs1010203
c02c11d725
Upd:[TW]event 20251023 update (#5383)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-12-12 19:23:05 +08:00
whjhs1010203
9261630f77
Upd:[tw] research E (#5382)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-12-12 19:22:49 +08:00
sui-feng-cb
45c1b50605 Upd: resize image in campaign bonus 2025-12-12 01:48:16 +08:00
sui-feng-cb
2dc14708f1 Upd: move error images for drop_statistics 2025-12-10 16:05:26 +08:00
sui-feng-cb
b0fa9955cb Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-12-10 14:07:47 +08:00
LmeSzinc
7ab1865ebe
Merge pull request #5378 from LmeSzinc/dev
Bug fix
2025-12-10 12:11:57 +08:00
LmeSzinc
32d36cd06d Fix: No submarine in hard campaign if team not prepared 2025-12-09 12:40:52 +08:00
LmeSzinc
fbb936f081 Del: Remove ship equipment change as lack of maintenance 2025-12-09 12:39:28 +08:00
LmeSzinc
b4ba9e5fd0 Fix: fleet_selector.get() might return 0 2025-12-09 12:28:43 +08:00
LmeSzinc
1b3d690176
Merge pull request #5366 from guoh064/opsi_view_reset
Opt: reset opsi fleet view when current view is bad
2025-12-09 12:25:21 +08:00
MikuSoft
1297908d89
Add:[CN] assets combat ui ShadowPuppetry (#5377) 2025-12-09 12:24:33 +08:00
guoh064
f52789fbad
Refactor: LuaLoader._load_file() (#5374) 2025-12-09 12:24:23 +08:00
guoh064
fda137f62b
Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365) 2025-12-09 12:19:50 +08:00
sui-feng-cb
7bd0413610 Upd: threshold for predict_valid in campaign_bonus 2025-12-04 23:30:00 +08:00
guoh064
5bde6242f9 Opt: reset opsi fleet view when cannot find current fleet in current view in OSFleet.question_goto() 2025-12-03 20:26:39 +08:00
guoh064
21c92d95e3 Opt: reset opsi fleet view when homo_loca stuck in OSFleet.question_goto() 2025-12-03 20:21:59 +08:00
sui-feng-cb
fa44b728bc Upd: resize and change similarity for 1920x1080 images in campaign
bonus
2025-12-03 13:46:26 +08:00
sui-feng-cb
49085b3e35 Upd: set server for campaign bonus 2025-12-02 09:53:25 +08:00
sui-feng-cb
ee870fb693 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-12-01 13:11:18 +08:00
sui-feng-cb
5911a131c6 Upd: [tw] campaign bonus assets 2025-12-01 13:06:18 +08:00
LmeSzinc
b9ed5b134e
Bug fix (#5358)
* Fix: handle get ship in coalition_20251120 (#5350)

* Add: [EN] assets for coalition_20251120 (#5347)

* Fix: handle get ship in coalition_20251120

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>

* Add: [TW] assets for coalition_20251127 (#5354)

* Add: [EN] assets for coalition_20251120 (#5347)

* Add: [TW] assets for coalition_20251127

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>

* Upd: Config update

* Add: [ALAS] Syntactic sugar for state machine with timeout

* Fix: Retry on default coalition PT 999999

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
Co-authored-by: xzjjasper <67013667+xzjjasper@users.noreply.github.com>
2025-12-01 01:24:37 +08:00
LmeSzinc
b7301482c7 Fix: Retry on default coalition PT 999999 2025-12-01 01:07:21 +08:00
LmeSzinc
265e33b93c Add: [ALAS] Syntactic sugar for state machine with timeout 2025-12-01 01:00:41 +08:00
LmeSzinc
ed154c1920 Upd: Config update 2025-12-01 00:33:02 +08:00
xzjjasper
d11dce42cc
Add: [TW] assets for coalition_20251127 (#5354)
* Add: [EN] assets for coalition_20251120 (#5347)

* Add: [TW] assets for coalition_20251127

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2025-12-01 00:29:57 +08:00
guoh064
fa55a850fe
Fix: handle get ship in coalition_20251120 (#5350)
* Add: [EN] assets for coalition_20251120 (#5347)

* Fix: handle get ship in coalition_20251120

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-12-01 00:26:52 +08:00
GH Action - Upstream Sync
d5543d346f Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-11-26 18:30:45 +00:00
guoh064
83f103daa2
Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
sui-feng-cb
2a30dea456 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-11-26 15:15:31 +08:00
sui-feng-cb
6413d7f46b Revert "Upd: coalition 20251120"
This reverts commit aec9b71254.
2025-11-26 15:11:08 +08:00
sui-feng-cb
d2f0ceef81 Revert "Fix: triggered_stop_condition in coalition"
This reverts commit ad2c9ef5ec.
2025-11-26 15:10:51 +08:00
sui-feng-cb
36a9ca3315 Revert "Upd: gui text of coalition 20251120"
This reverts commit daad61684c.
2025-11-26 15:10:25 +08:00
LmeSzinc
7503cf2111
Merge pull request #5345 from LmeSzinc/dev
Dev
2025-11-26 14:32:54 +08:00
LmeSzinc
98c513baff Tmp: Move date a live collab event entrance upwards 2025-11-26 14:31:28 +08:00
LmeSzinc
45183a10d5 Fix: Enemy spawn point in A1 C1 (#5332) 2025-11-26 14:19:03 +08:00
LmeSzinc
ead86cdfc2
Merge pull request #5338 from guoh064/coalition_20251120_cn
Add: Coalition 20251120
2025-11-26 13:53:05 +08:00
guoh064
369a12abfb Fix: ui misclick in coalition_20251120 2025-11-25 12:53:26 +08:00
guoh064
ae9d64c81f Del: redundant config redirect 2025-11-24 20:58:12 +08:00
sui-feng-cb
abfa0d45c7 Upd: island assets 2025-11-24 03:25:58 +08:00
sui-feng-cb
ec8efc5a82 Upd: drop statistics 2025-11-24 03:18:25 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00