6518 Commits

Author SHA1 Message Date
W1NDes
7610d42dbf Add(tactical): 适配具备4技能角色的战术学院升级 2025-12-27 05:53:45 +08:00
W1NDes
b2d3f09dbf Update(smallEvent): 采用更通用的入口方式 2025-12-27 05:51:35 +08:00
W1NDes
10821bb649 Update(page): 补充新更改的回忆按钮素材 2025-12-26 20:04:16 +08:00
W1NDes
a4b5d153bd Upd(Event): 添加开荒初始关卡的重置 2025-12-19 14:14:55 +08:00
W1NDes
3f8edc2da8 Upd(event): event config regularly update 2025-12-19 12:14:18 +08:00
W1NDes
086ddfd02c Merge branch 'pr-5395' into dev 2025-12-19 12:01:59 +08:00
W1NDes
7f577a9dcc Merge remote-tracking branch 'upstream/master' into dev 2025-12-19 11:59:58 +08:00
iceynano
04d9a758fc event_20251218_cn 2025-12-19 10:17:21 +08:00
LmeSzinc
63a2d7388f Upd: crop fleet clear assets to avoid collision with info_bar 2025-12-19 03:54:21 +08:00
LmeSzinc
eb30860260 Opt: Faster fleet set by setting fleet 2 and submarine together 2025-12-19 03:44:02 +08:00
LmeSzinc
c9478cb542 Add: chapter A 2025-12-19 02:50:13 +08:00
LmeSzinc
c36586f8c5 Upd: TEMPLATE_COMBAT_LOADING 2025-12-19 02:48:11 +08:00
LmeSzinc
4a21f2e4e7 Fix: fallback interval set if is_combat_loading() not detected 2025-12-19 02:37:12 +08:00
LmeSzinc
7e42f0ea6c Add: Event entrance of A Note Through the Firmament (event_20251218_cn) 2025-12-19 01:21:03 +08:00
LmeSzinc
90e438e75e Fix: [ALAS] Add retry on first nemuipc connect 2025-12-19 00:20:12 +08:00
W1NDes
7b0c8e6d11 Upd(smallEvent): 采取更通用的处理活动界面的七天小任务 2025-12-16 04:08:50 +08:00
W1NDes
1a63ed223d Merge remote-tracking branch 'upstream/master' into dev 2025-12-16 00:45:43 +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
W1NDes
5db1b8b8ff Merge remote-tracking branch 'upstream/master' into dev 2025-12-11 16:35:04 +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
fda137f62b
Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365) 2025-12-09 12:19:50 +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
W1NDes
761616006e Merge remote-tracking branch 'upstream/master' into dev 2025-12-01 04:46:35 +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
guoh064
83f103daa2
Add: [EN] assets for coalition_20251120 (#5347) 2025-11-27 02:08:42 +08:00
LmeSzinc
98c513baff Tmp: Move date a live collab event entrance upwards 2025-11-26 14:31:28 +08:00
W1NDes
b6e756dc85 Upd(buyFurniture): change the CHECK_INTERVAL to 1 day 2025-11-25 21:59:42 +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
W1NDes
8c2cb3ab21 Fix(combat): add story kip during combat 2025-11-24 00:53:26 +08:00
guoh064
be012c843d Upd: [CN] assets for coalition_20251120 2025-11-23 22:54:11 +08:00
W1NDes
c13dcef46a Upd(Coalition): upd stage increase 2025-11-23 21:14:29 +08:00
W1NDes
bc2bbb72cc Upd(coalition): Update coalition CN assets 2025-11-23 20:17:26 +08:00
W1NDes
7ffad70b4a Merge branch 'pr-5338' into dev 2025-11-23 20:10:42 +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