1129 Commits

Author	SHA1	Message	Date
W1NDes	b41f85556b	Merge remote-tracking branch 'upstream/master' into dev	2026-04-24 21:58:58 +08:00
guoh064	f6b44d6582	Add: event entrance for dual event 20201126/20260417	2026-04-24 14:52:43 +08:00
W1NDes	b4f08afa3b	Merge remote-tracking branch 'upstream/master' into dev	2026-04-18 23:38:12 +08:00
LmeSzinc	45faa7c46d	Add: Chapter SP	2026-04-18 02:54:46 +08:00
W1NDes	bb5997bb9e	Merge remote-tracking branch 'upstream/master' into dev	2026-04-04 22:19:42 +08:00
heipen	5cf249c8e7	Merge pull request #5595 from Heipen/ui_update ... Upd: Battle UI ElvenVine	2026-04-03 22:44:37 +08:00
LmeSzinc	032b2c1931	Fix: Limit match area of SHOP_REFRESH ... to handle spamming bulin character at bottom-right of shop page, at April 1st	2026-04-01 01:17:12 +08:00
W1NDes	96cbcba71d	Merge remote-tracking branch 'upstream/master' into dev	2026-03-31 12:53:48 +08:00
LmeSzinc	33e812adb8	Merge pull request #5455 from guoh064/campaign_16_main ... Add: W16 preparations	2026-03-29 19:26:04 +08:00
W1NDes	f5e99ba472	Merge remote-tracking branch 'upstream/master' into dev	2026-03-13 00:31:23 +08:00
guoh064	3f9e7edf4e	Add: hide_in_upper_left option for combat manual	2026-03-12 18:46:50 +08:00
guoh064	5611dce94b	Upd: asset COMBAT_AUTO	2026-03-12 18:46:50 +08:00
W1NDes	b6585b1fe8	Merge remote-tracking branch 'upstream/master' into dev	2026-03-06 02:39:38 +08:00
heipen	dbc5fe42e8	Upd: Battle UI SpringInn (#5541)	2026-03-04 12:32:12 +08:00
W1NDes	42ca63c840	Merge remote-tracking branch 'upstream/master' into dev	2026-02-14 17:33:29 +08:00
W1NDes	01f54171bd	Upd(smallevent): 添加任务打卡	2026-02-14 03:05:26 +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
LmeSzinc	7d9e77e4fd	Upd: Battle UI Ancient	2026-02-09 23:31:47 +08:00
ArecaSapling	5a32d9444c	Merge pull request #5500 from sui-feng-cb/event_update ... Fix: raid_20240328 ex	2026-02-09 23:23:20 +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
guoh064	eb33bdd747	Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) (#5487)	2026-02-04 18:26:41 +08:00
W1NDes	803a4068aa	Merge remote-tracking branch 'upstream/master' into dev	2026-01-30 20:41:51 +08:00
ArecaSapling	52444569a4	Add: war_archives_20230223_cn (#5479)	2026-01-30 10:56:16 +08:00
W1NDes	dc33f42332	Fix(coalition): 修复一些合并错误	2026-01-29 21:14:07 +08:00
W1NDes	063c06e950	Merge remote-tracking branch 'upstream/master' into dev	2026-01-29 20:51:12 +08:00
guoh064	d8bba0331f	Upd: [CN] asset AIR_STRIKE_*	2026-01-23 16:12:50 +08:00
LmeSzinc	b65a951ce4	Add: FASHION Coalition assets	2026-01-23 02:40:22 +08:00
LmeSzinc	c37a52bf9c	Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM	2026-01-23 02:09:08 +08:00
W1NDes	fd04498c61	Upd(assets): update recommand button and fix oil check	2026-01-22 23:44:15 +08:00
sui-feng-cb	6450cc5cda	Upd(Coalition): merge coalition 20260122 from suifeng	2026-01-22 22:54:00 +08:00
guoh064	1158a0535a	Add: W16 preparations	2026-01-18 21:27:25 +08:00
Compeador	ad651eca4c	feat: pq add aegir (#5423)	2026-01-16 17:08:24 +08:00
W1NDes	5c3d0c73d1	Merge remote-tracking branch 'upstream/master' into dev	2026-01-08 01:01:33 +08:00
LmeSzinc	99de5e0d34	Upd: Battle UI MaidCafe	2026-01-01 23:36:25 +08:00
sui-feng-cb	14c70afe65	Add: war_archives_20221222_cn	2025-12-29 19:04:08 +08:00
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	552d383ac2	Merge remote-tracking branch 'upstream/master' into dev	2025-12-20 22:48:30 +08:00
LmeSzinc	3fb7c54908	Add: Chapter B	2025-12-20 19:10:39 +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	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
guoh064	f3509c0de4	Upd: [CN, EN, JP] TEMPLATE_COMBAT_LOADING (#5393)	2025-12-19 00:19:52 +08:00
W1NDes	afab0a8f6a	Fix(combat): update the combat loading template picture	2025-12-18 21:56:25 +08:00