487 Commits

Author	SHA1	Message	Date
W1NDes	6e1357f056	Merge remote-tracking branch 'upstream/master' into dev	2025-10-21 04:15:57 +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
W1NDes	478b5b19a6	Merge remote-tracking branch 'upstream/master' into dev	2025-08-30 10:48:27 +08:00
nEEtdo0d	3d947fc72e	Fix: [EN] shop task; grid now uniform with other servers (#5081) ... Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>	2025-08-29 21:36:37 +08:00
W1NDes	bce600ed99	Merge remote-tracking branch 'upstream/master'	2025-08-28 07:47:26 +08:00
nEEtdo0d	5a9a227ff8	Fix: [EN] shop and supply pack tasks	2025-08-26 21:23:14 -04:00
W1NDes	06c7998a7b	Merge remote-tracking branch 'upstream/master'	2025-08-26 11:41:29 +08:00
weeswelai	87257e65a8	Upd: Update new UI 20250814 for server JP, update CN assets	2025-08-21 23:59:59 +08:00
weeswelai	7562c8287c	Upd: Update server JP supply pack	2025-08-21 23:59:59 +08:00
weeswelai	b2f94c1685	Upd: Update server CN assets SUPPLY_PACK_CHECK	2025-08-21 23:59:59 +08:00
weeswelai	bb7d12c3cc	Upd: Update server TW assets	2025-08-21 23:59:59 +08:00
weeswelai	0f14b7693d	Upd: Update server CN 2025-08-14 new shop UI	2025-08-21 23:59:59 +08:00
W1NDes	aee5fe823d	Upd(7Dtask): 添加小任务中关于退役的处理	2025-07-29 21:11:25 +08:00
W1NDes	f6a47c3e44	Merge remote-tracking branch 'upstream/master'	2025-07-26 03:30:17 +08:00
nEEtdo0d	a05403efda	Opt: Private Quarters refactor ... Fix: addresses stale roses sold out reported bug (#4943) Fix: limited retry ocr read on daily count (#4969) Add: capability to purchase cake through config toggle	2025-07-26 03:27:10 +08:00
sui_feng	eef5249d18	Fix: [CN] PRIVATE_QUARTERS_INTERACT button (#4964)	2025-07-17 22:42:33 +08:00
W1NDes	a6103cb02b	Feat(ShipIr): 在alas中添加图鉴识别功能	2025-07-13 04:57:23 +08:00
W1NDes	f827167b34	Feat(shipIR): 添加图鉴识别功能 ... - 添加进入图鉴的相关图片 - 添加了两类船名识别的方法 - 添加了图鉴内筛选功能	2025-07-13 03:41:44 +08:00
W1NDes	63f89eb830	Merge remote-tracking branch 'upstream/master'	2025-07-11 22:20:58 +08:00
dragonheart107	4c016a7830	Fix: PQ home button moved (#4942) ... Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>	2025-07-11 21:49:37 +08:00
guoh064	a94dee218a	Merge pull request #4945 from guoh064/private_quarters ... Add: [JP] assets for private quarters	2025-07-11 21:48:03 +08:00
W1NDes	5abd9ecc3e	Merge remote-tracking branch 'upstream/master'	2025-07-11 02:08:11 +08:00
ChthoIly	9e91543a14	Add: [CN] Private Quarters localization (#4933) ... * Upd: [CN] Private Quarters localization Add: Add CN server asset for Private Quarters Fix: Stuck in Private Quarters Shop when not enough gold coins Changed DigitCounter OCR parameters for CN server to fix unexpected ocr result when reading daily intimacy count * re-compress asset images using `image_fixup()` from #4849 (comment)	2025-07-11 00:04:28 +08:00
nEEtdo0d	b85b47d67c	Merge branch 'master' into dev	2025-06-28 16:11:37 -04:00
W1NDes	3befa5862c	Merge remote-tracking branch 'upstream/master'	2025-06-28 20:21:05 +08:00
LmeSzinc	9e256ce249	Fix: NEONCITY UI back and home	2025-06-28 19:36:07 +08:00
W1NDes	474bdc3681	Merge remote-tracking branch 'upstream/master'	2025-06-27 00:57:54 +08:00
LmeSzinc	f6f7b7779d	Upd: UI page switching	2025-06-27 00:10:44 +08:00
LmeSzinc	aa3f4338fe	Chore: [ALAS] Reuse Switch.get() in Switch.appear()	2025-06-26 23:31:55 +08:00
nEEtdo0d	64c5b5e30f	Merge branch 'master' into dev	2025-06-15 16:59:21 -04:00