From da9c6683d780e76f13dec193ac70b6693a363d12 Mon Sep 17 00:00:00 2001 From: chen wei bo <1025839511@qq.com> Date: Fri, 19 Sep 2025 23:25:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Global=E6=95=B0=E6=8D=AE=E7=9A=84=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scripts/chat18x/config/GlobalConfig.ts | 4 ++-- assets/Scripts/chat18x/data/GlobalData.ts | 23 ++++++------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/assets/Scripts/chat18x/config/GlobalConfig.ts b/assets/Scripts/chat18x/config/GlobalConfig.ts index 42baeef3..c5afc4f0 100644 --- a/assets/Scripts/chat18x/config/GlobalConfig.ts +++ b/assets/Scripts/chat18x/config/GlobalConfig.ts @@ -96,10 +96,10 @@ export class GlobalConfig extends BaseConfig { } /** 情绪评分机器人system_prompt，需拼接角色prompt */ - public getEmotionRating(): string | null { + public getEmotionBasePrompt(): string | null { let oneData = this.getAllConfig(); if (!oneData) return null; - return oneData.EmotionRating; + return oneData.EmotionBasePrompt; } /** ai机器人基础规则 */ diff --git a/assets/Scripts/chat18x/data/GlobalData.ts b/assets/Scripts/chat18x/data/GlobalData.ts index bc91b79e..9b9e1d1c 100644 --- a/assets/Scripts/chat18x/data/GlobalData.ts +++ b/assets/Scripts/chat18x/data/GlobalData.ts @@ -26,11 +26,9 @@ export class GlobalData extends BaseData { // 游戏名 private _gameName: string = ""; // 情绪评分机器人system_prompt，需拼接角色prompt - private _emotionRating: string = ""; + private _emotionBasePrompt: string = ""; // ai机器人基础规则 private _girlBasePrompt: string = ""; - // emotion基础规则 - private _emotionBasePrompt: string = ""; public reset(): void { this._apiKey = ""; @@ -43,9 +41,8 @@ export class GlobalData extends BaseData { this._onceChatAddScore = 0; this._scoreExchangeStarLevel = 0; this._gameName = ""; - this._emotionRating = ""; - this._girlBasePrompt = ""; this._emotionBasePrompt = ""; + this._girlBasePrompt = ""; } public clear(): void { @@ -59,9 +56,8 @@ export class GlobalData extends BaseData { this._onceChatAddScore = 0; this._scoreExchangeStarLevel = 0; this._gameName = ""; - this._emotionRating = ""; - this._girlBasePrompt = ""; this._emotionBasePrompt = ""; + this._girlBasePrompt = ""; } public destroy(): void { @@ -76,9 +72,8 @@ export class GlobalData extends BaseData { this._onceChatAddScore = null; this._scoreExchangeStarLevel = null; this._gameName = null; - this._emotionRating = null; - this._girlBasePrompt = null; this._emotionBasePrompt = null; + this._girlBasePrompt = null; } /** 设置全局数据 */ @@ -96,9 +91,8 @@ export class GlobalData extends BaseData { this._onceChatAddScore = obj.OnceChatAddScore; this._scoreExchangeStarLevel = obj.ScoreExchangeStarLevel; this._gameName = obj.GameName; - this._emotionRating = obj.EmotionRating; - this._girlBasePrompt = obj.girlBasePrompt; this._emotionBasePrompt = obj.EmotionBasePrompt; + this._girlBasePrompt = obj.girlBasePrompt; console.log("设置全局数据: ", this._gameName); } } @@ -154,15 +148,12 @@ export class GlobalData extends BaseData { } /** 情绪评分机器人system_prompt，需拼接角色prompt */ - public getEmotionRating(): string { - return this._emotionRating; + public getEmotionBasePrompt(): string { + return this._emotionBasePrompt; } /** ai机器人基础规则 */ public getGirlBasePrompt(): string { return this._girlBasePrompt; } - public getEmotionBasePrompt(): string { - return this._emotionBasePrompt; - } } From 5ee4aba2965721b96f46e07a88b70680cc522876 Mon Sep 17 00:00:00 2001 From: chen wei bo <1025839511@qq.com> Date: Sat, 20 Sep 2025 10:12:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/bundles/DataTable/tblanguage.bin | Bin 22987 -> 24677 bytes xchat_cfg | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index ec91d710aa330de088fa2e3d55a68b591ec6324f..2a020b067d8ff4386cfafe3b8b0197cccaf6994d 100644 GIT binary patch delta 2434 zcmd5;&u<$=7*)?Cbq#4NOI0;D4j>e#O`#k>v_dH5K&7Nb;!>@>pPdz(*)Y2sK`xsZ zrFGO=r2-3zQlf-0HKC0|q9%>hrbs#RPt2iq?Eiu{v$6B5LR^r1uslC@zwgaA@4avT zUOQI*>)6Uq*H4`s;sFV6xy&aqL4uJGp7{Rm=cl4UC7&v}qADdNpJ2e0ys2bCNvT)m z3nj}~l4c)IO)EK%)zrsAP$-yV;u5pNIC3a6x-r<_pY9vt zewfQS*~lRtu#DweJWD+%a8al> zG|DTjAMQ76wYN;-VmsBcs!W+O=wcnNOy6#0fMZ;T+^zztm zFPyyUlI0T<5#=3U6D8*eKj>-JHtI9Q##*(0^UjA*i>iEUXsZc}+W~=bd8=S+Jb|+2 z41daoPQPN+j5M1IXRlM}xGqgH`%Nq337buLp|1&@6^@|PB_{|dVv`{uGZO}ga7gSU zbj;^>Pha+U&dGwxTlL~fYo@gGeE9=|cvi`(q0}ErJ~N{K zQKQqCpsOk{R`oG7?F%eYa@jnyiW8;|=7ApwFPyM4E}i-GAOdJGV0p>`#1XjfB}Y7u zjamE~9O|o({J>A3u8ltnb-C19ytlJC{kD>i42J2k*Z^P-4-E|MPnh5UFeiY%jg91p z@WvT5sKae91>`5c2-$=~F0qezPFVRP7%p}w*By*Y_jigC{fDajFGWeGO;M8F(>l@v zoonh6XGotr(I#)iz+LFkf4wnZY1S4Sj~38FnlEnE<D)7-L04VC0CRM= zJI15nRKH=qPx(fF#lFkl7^G?%ZAa~?OAu{Dt{d_^8#c$~tC-=yTV R6Fk5D%nh78zBEk2e*o>g$sYg! delta 716 zcmaEQfbsNZ#tk#VSeO%&k|(bV6RQU?V3R;%s z-~Mc4)6*rZUM`yWd}kvb4VEA|kiP5{Im`bdnhTupe5Lkxb$ReZ&97&TC! diff --git a/xchat_cfg b/xchat_cfg index 0896a853..c4248540 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 0896a8533b90e2fb6937c42197f5bac362310d8d +Subproject commit c424854022eb9985c37132afc33483f03f63aa1d From b947a7c97deb7ca61aace683e31a06747567e936 Mon Sep 17 00:00:00 2001 From: chen wei bo <1025839511@qq.com> Date: Sat, 20 Sep 2025 11:29:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9F=90=E4=B8=80=E7=A7=8D=E8=AF=AD=E8=A8=80=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scripts/Main/Common/LanguageUtils.ts | 5 ----- assets/Scripts/chat18x/payment/WebUsdFlow.ts | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/assets/Scripts/Main/Common/LanguageUtils.ts b/assets/Scripts/Main/Common/LanguageUtils.ts index ffda9190..54d839cd 100644 --- a/assets/Scripts/Main/Common/LanguageUtils.ts +++ b/assets/Scripts/Main/Common/LanguageUtils.ts @@ -146,10 +146,6 @@ export default class LanguageUtils { return defaultText; } - if (this.languageCache.has(key)) { - return this.languageCache.get(key); - } - if (!ConfigManager.tables || !ConfigManager.tables.TbLanguage) { console.warn("Language table not loaded yet"); return defaultText || key; @@ -180,7 +176,6 @@ export default class LanguageUtils { text = languageData.languageEn || defaultText || key; } - this.languageCache.set(key, text); return text; } diff --git a/assets/Scripts/chat18x/payment/WebUsdFlow.ts b/assets/Scripts/chat18x/payment/WebUsdFlow.ts index a11b7fec..4ef82927 100644 --- a/assets/Scripts/chat18x/payment/WebUsdFlow.ts +++ b/assets/Scripts/chat18x/payment/WebUsdFlow.ts @@ -32,8 +32,8 @@ export class WebUsdFlow implements PaymentFlow { private async pollOrder(orderId: string) { const poller = new PaymentPoller(); return poller.poll(orderId, { - maxDurationMs: 2 * 60 * 1000, - startIntervalMs: 2000, + maxDurationMs: 10 * 60 * 1000, + startIntervalMs: 5000, maxIntervalMs: 10000, jitter: true, }, (d) => console.log()); From a4bd709355c4343bd3c237e32ab417d4faeb352b Mon Sep 17 00:00:00 2001 From: chen wei bo <1025839511@qq.com> Date: Sat, 20 Sep 2025 12:20:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AFVIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scripts/chat18x/data/WalletData.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/Scripts/chat18x/data/WalletData.ts b/assets/Scripts/chat18x/data/WalletData.ts index cba3c715..be752c51 100644 --- a/assets/Scripts/chat18x/data/WalletData.ts +++ b/assets/Scripts/chat18x/data/WalletData.ts @@ -55,4 +55,10 @@ export class WalletData extends BaseData { public get vipExpire(): number { return this._vipExpire; } + + /** 判断用户是否是VIP */ + public get isVip(): boolean { + const now = Math.floor(Date.now() / 1000); // 当前时间戳（秒） + return this._vipExpire > now; + } }