9217 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
W1NDes	8fd6471219	Merge dev branch to master	2025-11-23 21:18:17 +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
guoh064	c04f9ce964	Add: config for coalition_20251120	2025-11-23 00:33:39 +08:00
W1NDes	eccddf5ec9	Merge remote-tracking branch 'upstream/master' into dev	2025-11-21 03:35:19 +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
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
W1NDes	8f3cfe07c7	Merge dev branch to master	2025-11-14 15:28:02 +08:00
W1NDes	5abfef52a9	Fix(Event): 修复了复刻活动图中siren识别	2025-11-14 15:24:08 +08:00
W1NDes	062860370d	Merge remote-tracking branch 'upstream/master' into dev	2025-11-14 14:26:42 +08:00
W1NDes	6f3b5d939c	Merge dev branch to master	2025-11-13 19:03:13 +08:00
W1NDes	6e1bdde7a1	Enhance(SmallEvent): 尝试对新版活动入口进行ocr反馈	2025-11-13 19:02:52 +08: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
W1NDes	c539f3ad32	Merge dev branch to master	2025-11-13 16:38:48 +08:00
W1NDes	2072fb7907	Upd(smallEvent): 更新七天小任务	2025-11-13 16:38:30 +08:00
W1NDes	8e126445c9	Merge dev branch to master	2025-11-13 15:25:04 +08:00
W1NDes	67b4b9fe36	Upd(Event): regular event update	2025-11-13 15:15:30 +08:00
W1NDes	418211223f	Merge remote-tracking branch 'upstream/master' into dev	2025-11-08 19:17:30 +08:00
LmeSzinc	00f8d6d2b0	Merge pull request #5301 from LmeSzinc/dev ... Bug fix	2025-11-07 16:23:51 +08:00
LmeSzinc	c235247eb4	Upd: [TW] Event Paradiso of Shackled Light (fixed #5294)	2025-11-07 16:21:24 +08:00
LmeSzinc	b44e62f973	Fix: [JP] Randomly missing Katakana 'ー' in liverpool (fixed #5295)	2025-11-07 16:12:03 +08:00
ArecaSapling	02b459c6af	Upd: Event Anthem of Remembrance Rerun (event_20230803_cn) (#5297)	2025-11-07 16:07:33 +08:00
LmeSzinc	550f17300f	Merge pull request #5296 from sui-feng-cb/war_archives_update ... Add: war_archives_20220915_cn	2025-11-07 16:07:11 +08:00
W1NDes	cd4b75f0f0	Merge dev branch to master	2025-11-07 10:51:40 +08:00
W1NDes	decc748b4c	Upd(Event): regulaly event update	2025-11-07 10:50:52 +08:00
W1NDes	fb9ed6335b	Upd(Event): switch fork event	2025-11-07 10:45:13 +08:00
sui-feng-cb	b14ab02c97	Upd: [CN] USE_DATA_KEY_NOTIFIED asset	2025-11-06 17:11:57 +08:00
sui-feng-cb	d90390202b	Add: war_archives_20220915_cn	2025-11-06 17:11:47 +08:00
W1NDes	efcbe63633	Merge remote-tracking branch 'upstream/master' into dev	2025-11-04 23:35:10 +08:00
LmeSzinc	cd18378ad4	Fix: Avoid clicking GET_SHIP after entering page_meowfficer	2025-11-04 23:06:01 +08:00
nEEtdo0d	cfe9ec5618	Merge pull request #5291 from LmeSzinc/dev ... Fix: PQ stuck in exit room routine	2025-11-04 09:41:59 -05:00
nEEtdo0d	ed1a430869	Fix: precondition for exit room incomplete, ensure not in interact state also to safely assume in dialogue state	2025-11-04 09:38:58 -05:00
W1NDes	09653a0885	Merge remote-tracking branch 'upstream/master' into dev	2025-11-04 17:12:03 +08:00
LmeSzinc	106a22143e	Fix: shop refresh not available	2025-11-04 14:01:43 +08:00
W1NDes	5e0f00d796	Merge remote-tracking branch 'upstream/master' into dev	2025-11-03 19:38:06 +08:00
LmeSzinc	928ff5f0a9	Merge pull request #5286 from LmeSzinc/dev ... Bug fix	2025-11-03 19:32:59 +08:00
LmeSzinc	8d75bfa848	Merge pull request #5278 from wess09/patch-2 ... FIX:修改了错误的功能帮助	2025-11-03 19:32:10 +08:00