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

9115 Commits

Author SHA1 Message Date
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
sui-feng-cb
107c6b966a Upd: campaign bonus strategy check 2025-11-23 22:00:52 +08:00
sui-feng-cb
daad61684c Upd: gui text of coalition 20251120 2025-11-23 21:41:10 +08:00
sui-feng-cb
1a44e793f2 Fix: island project complete 2025-11-23 21:06:17 +08:00
guoh064
5b5c549d30 Fix: trigger_stop_condition for coalition_20251120 2025-11-23 02:15:30 +08:00
guoh064
ba594e769a Tmp: event pt ocr for coalition_20251120 2025-11-23 02:11:05 +08:00
guoh064
58ddb01976 Tmp: general config modification for coalition_20251120 2025-11-23 01:56:21 +08:00
guoh064
a07c99fe85 Add: [JP] coalition_20251120 2025-11-23 01:42:38 +08:00
guoh064
c04f9ce964 Add: config for coalition_20251120 2025-11-23 00:33:39 +08:00
sui-feng-cb
2951a021ef Del: GUI Hospital Event 2025-11-22 18:59:51 +08:00
sui-feng-cb
ad2c9ef5ec Fix: triggered_stop_condition in coalition 2025-11-22 18:41:23 +08:00
sui-feng-cb
aec9b71254 Upd: coalition 20251120 2025-11-22 01:21:07 +08:00
sui-feng-cb
29656b8350 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-11-21 08:36:35 +08:00
LmeSzinc
3f9b5be0bf
Merge pull request #5330 from LmeSzinc/dev
Bug fix
2025-11-21 03:34:11 +08:00
LmeSzinc
eac6ed2cf0 Upd: [TW] Rondo at Rainbow's End Rerun (fixed #5326) 2025-11-21 03:32:21 +08:00
LmeSzinc
261440be65 Fix: Random background hits EXP_INFO_B (fixed #5318) 2025-11-21 03:12:03 +08:00
whjhs1010203
5c8fe18a57
Upd: guildshop assets (#5308)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-21 03:06:10 +08:00
whjhs1010203
a36d36c0d9
Upd: [TW]private_quarters update new_jersey (#5329)
* Upd: [TW] PRIVATE_QUARTERS update

* Upd: [TW] PRIVATE_QUARTERS update i18n

---------

Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-21 03:04:07 +08:00
sui-feng-cb
4b2f494881 Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript 2025-11-20 16:46:00 +08:00
sui-feng-cb
a0ee26d1c8 Upd: clear exercise every Thursday 2025-11-20 16:36:18 +08:00
sui-feng-cb
65455dfb8b Upd: config of coalition 20251120 2025-11-20 16:09:30 +08:00
sui-feng-cb
12db573f18 Upd: campaign bonus 2025-11-18 02:10:59 +08:00
whjhs1010203
9563e149dc
Upd: [TW] PRIVATE_QUARTERS_CHECK (#5317)
Co-authored-by: whjhs1010203 <26708256+whjhs1010203@users.noreply.github.com>
2025-11-16 00:21:42 +08:00
GH Action - Upstream Sync
31248c68f6 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2025-11-13 10:26:48 +00:00
LmeSzinc
19e580b78e
Merge pull request #5316 from LmeSzinc/dev
Bug fix
2025-11-13 17:53:58 +08:00
ArecaSapling
51934ff3f6
Upd: Effulgence Before Eclipse Rerun (event_20230914_cn) (#5315) 2025-11-13 17:53:06 +08:00
whjhs1010203
a680c07706 Upd: [tw] PRIVATE_QUARTERS i18n help 2025-11-13 17:52:00 +08:00
whjhs1010203
df6bc4b69c Upd: [tw] PRIVATE_QUARTERS 2025-11-13 17:52:00 +08:00
guoh064
1a29d642a0
Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303) 2025-11-13 17:50:50 +08:00
sui-feng-cb
67f8994cd1 Upd: Effulgence Before Eclipse Rerun (event_20230914_cn) 2025-11-13 01:24:13 +08:00
sui-feng-cb
b0e0833c25 Upd: campaign bonus only in drop statistics 2025-11-12 22:09:22 +08:00
sui-feng-cb
6e29d6d63d Upd: campaign bonus statistics 2025-11-11 20:14:13 +08:00
sui-feng-cb
c1344df3bf Fix: product select and confirm 2025-11-09 18:19:13 +08:00
sui-feng-cb
eb41ec572f Fix: ensure management page when quitting product page 2025-11-09 01:12:56 +08:00
sui-feng-cb
fe9e76736b Fix: handle island project name ocr error 2025-11-08 02:25:26 +08:00
sui-feng-cb
385c54d6ed Fix: handle island ui additional 2025-11-08 01:48:45 +08:00