515 Commits

Author	SHA1	Message	Date
W1NDes	b41f85556b	Merge remote-tracking branch 'upstream/master' into dev	2026-04-24 21:58:58 +08:00
LmeSzinc	32ad98a79f	Upd: [EN] EVENT_LIST_CHECK (#5623)	2026-04-24 18:48:40 +08:00
W1NDes	b4f08afa3b	Merge remote-tracking branch 'upstream/master' into dev	2026-04-18 23:38:12 +08:00
LmeSzinc	8ce450a42b	Add: MAP_CHAPTER_SWITCH_20241219_SPEX	2026-04-18 00:57:22 +08:00
W1NDes	42ca63c840	Merge remote-tracking branch 'upstream/master' into dev	2026-02-14 17:33:29 +08:00
LmeSzinc	11405cf0c3	Fix: [EN] check other buttons for page_academy	2026-02-14 03:00:01 +08:00
sui-feng-cb	9fd62b7840	Add: [CN] Spring Auction Adventure (raid_20260212)	2026-02-12 18:39:59 +08:00
sui-feng-cb	7e6b87bee8	Add: [CN] Spring Auction Adventure (raid_20260212)	2026-02-12 16:44:24 +08:00
W1NDes	ad1c8ad311	Merge remote-tracking branch 'upstream/master' into dev	2026-02-07 01:44:52 +08:00
sui-feng-cb	7e1a2322a6	Fix: use _raid_has_oil_icon for new UI design	2026-02-05 21:44:55 +08:00
W1NDes	1884f0e434	Fix: 修复merge中的重构问题	2026-01-29 23:07:29 +08:00
W1NDes	063c06e950	Merge remote-tracking branch 'upstream/master' into dev	2026-01-29 20:51:12 +08:00
LmeSzinc	f552360951	Fix: Startup at coalition fleet preparation	2026-01-23 17:43:04 +08:00
LmeSzinc	b65a951ce4	Add: FASHION Coalition assets	2026-01-23 02:40:22 +08:00
sui-feng-cb	6450cc5cda	Upd(Coalition): merge coalition 20260122 from suifeng	2026-01-22 22:54:00 +08:00
W1NDes	10821bb649	Update(page): 补充新更改的回忆按钮素材	2025-12-26 20:04:16 +08:00
W1NDes	1a63ed223d	Merge remote-tracking branch 'upstream/master' into dev	2025-12-16 00:45:43 +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	761616006e	Merge remote-tracking branch 'upstream/master' into dev	2025-12-01 04:46:35 +08:00
guoh064	369a12abfb	Fix: ui misclick in coalition_20251120	2025-11-25 12:53:26 +08:00
W1NDes	7ffad70b4a	Merge branch 'pr-5338' into dev	2025-11-23 20:10:42 +08:00
guoh064	58ddb01976	Tmp: general config modification for coalition_20251120	2025-11-23 01:56:21 +08:00
W1NDes	eccddf5ec9	Merge remote-tracking branch 'upstream/master' into dev	2025-11-21 03:35:19 +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	418211223f	Merge remote-tracking branch 'upstream/master' into dev	2025-11-08 19:17:30 +08:00
LmeSzinc	cd18378ad4	Fix: Avoid clicking GET_SHIP after entering page_meowfficer	2025-11-04 23:06:01 +08:00
W1NDes	84180c679b	Merge remote-tracking branch 'upstream/master' into dev	2025-10-24 01:32:49 +08:00
W1NDes	6e1357f056	Merge remote-tracking branch 'upstream/master' into dev	2025-10-21 04:15:57 +08:00
whjhs1010203	ae9224f79e	Upd: [TW] BATTLE_PASS assets	2025-10-20 22:20:58 +08:00
whjhs1010203	bd4852a356	Upd: [TW] supply_pack	2025-10-20 10:42:03 +08:00
whjhs1010203	cac507229f	Upd: [TW] shop assets	2025-10-19 17:05:55 +08:00
W1NDes	66ef786ff2	Merge remote-tracking branch 'upstream/master' into dev	2025-10-18 02:33:40 +08:00
dragonheart107	f9c25961bb	Fix: EN commission + mission reward (#5230) ... * Revert "Tmp: [EN] Temp fix for bugged UI" This reverts commit c06773e586004c30c969ade48457630234bb566f. * Fix: EN post maintenance UI bugs * duplicate removal	2025-10-18 02:25:24 +08:00
W1NDes	ab7b31fb2e	Merge remote-tracking branch 'upstream/master' into dev	2025-10-18 01:37:45 +08:00
LmeSzinc	c06773e586	Tmp: [EN] Temp fix for bugged UI	2025-10-17 04:13:16 +08:00
W1NDes	739001d953	Merge remote-tracking branch 'upstream/master' into dev	2025-10-16 00:20:58 +08:00
LmeSzinc	d0159db710	Upd: [JP] SUPPLY_PACK_CHECK	2025-10-14 22:05:26 +08:00
Compeador	20f4f64708	fix: shop MUNITIONS_CHECK (#5210)	2025-10-14 19:07:21 +08:00
W1NDes	084fd0f1d2	Merge remote-tracking branch 'upstream/master' into dev	2025-10-11 19:06:34 +08:00
nEEtdo0d	a61e93942d	Upd: [EN] UI, ShopUI, Freebies assets (#5202)	2025-10-10 21:20:18 +08:00
W1NDes	5e5412b85b	Merge remote-tracking branch 'upstream/master' into dev	2025-10-09 22:32:38 +08:00
LmeSzinc	f5b92dae34	Upd: [CN] MUNITIONS_CHECK	2025-10-09 19:17:06 +08:00
LmeSzinc	e1b5ff7ba2	Upd: [CN] SUPPLY_PACK_CHECK	2025-10-09 18:33:35 +08:00
W1NDes	71e9f332ef	Merge remote-tracking branch 'upstream/master' into dev	2025-10-01 21:24:10 +08:00
weeswelai	1f909110a5	Upd: Update shop UI, supply pack for server TW	2025-10-01 02:42:22 +08:00
W1NDes	40617b55f2	Upd(SmallEvent): 新增签到功能	2025-09-16 23:41:57 +08:00
W1NDes	b521ea1055	Merge remote-tracking branch 'upstream/master' into dev	2025-09-13 23:14:40 +08:00
LmeSzinc	4b5039fabf	Chore: Expose Switch timers	2025-09-13 20:34:22 +08:00
W1NDes	d11c32a8be	Fix(SmallEvent): 添加新的入口和领取界面，同时修复任务延迟逻辑以避免超过24小时限制。	2025-09-13 04:20:13 +08:00
W1NDes	5ceed7d4aa	Upd(7Dtask): 支持活动准备界面的7日小任务领取以及自动完成任务修复	2025-09-06 04:00:38 +08:00