diff --git a/assets/Scripts/chat18x/core/RoleConfigLoader.ts b/assets/Scripts/chat18x/core/RoleConfigLoader.ts index 35fb9019..d6344572 100644 --- a/assets/Scripts/chat18x/core/RoleConfigLoader.ts +++ b/assets/Scripts/chat18x/core/RoleConfigLoader.ts @@ -1,4 +1,4 @@ -import { AiCharacter } from "../../schema/schema"; +import { AiCharacters } from "../../schema/schema"; import { ConfigManager } from "../manager/ConfigManager"; /** @@ -46,7 +46,7 @@ export class RoleConfigLoader { /** * 获取所有配置的角色ID */ - public static getAllRoles(): AiCharacter[] { + public static getAllRoles(): AiCharacters[] { return ConfigManager.tables.TbAiCharacters.getDataList(); } } diff --git a/assets/Scripts/chat18x/data/GirlData.ts b/assets/Scripts/chat18x/data/GirlData.ts index f10e0cd0..24755002 100644 --- a/assets/Scripts/chat18x/data/GirlData.ts +++ b/assets/Scripts/chat18x/data/GirlData.ts @@ -67,11 +67,16 @@ export class GirlData extends BaseData { let allData = this.parseAllGirlBrief(respOrList); if (!allData) return; const bucket = this.ensureBucket(categoryId); + // 用一个临时 Set 保存已有的 id,加速去重 + const existed = new Set(bucket.girlIds); for (const g of allData) { const id = g.id; bucket.briefs.set(id, g); - // TODO,去重 - bucket.girlIds.push(id); + // 去重 + if (!existed.has(id)) { + bucket.girlIds.push(id); + existed.add(id); + } } console.log("保存技师的简要数据: ", bucket); } diff --git a/assets/Scripts/chat18x/payment/PaymentOpener.ts b/assets/Scripts/chat18x/payment/PaymentOpener.ts index efa8adf7..4cdcba68 100644 --- a/assets/Scripts/chat18x/payment/PaymentOpener.ts +++ b/assets/Scripts/chat18x/payment/PaymentOpener.ts @@ -21,8 +21,7 @@ class SystemBrowserOpener implements IPaymentOpener { // 如需内嵌 WebView,可封装一个组件并在 open 里显示;此处给空壳 class InAppWebViewOpener implements IPaymentOpener { async open(url: string) { - // TODO: 实现你的 WebView 弹窗并加载 url;可拦截 redirect_uri 关闭弹窗 - sys.openURL(url); // 临时:用系统浏览器兜底 + sys.openURL(url); // 系统浏览器 } canReturnSignal() { return true; } // 拦截回跳时可立即开始轮询 } diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index f82f19d3..fcd82df0 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -16,7 +16,6 @@ import LanguageUtils from "../../../Main/Common/LanguageUtils"; import Utils from "../../../Main/Common/Utils"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; import { SimpleToggle } from "../components/SimpleToggle"; -import { GirlDetail, purchase } from "../../../schema/schema"; import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index 3eb5c19f..91d87199 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -4,7 +4,6 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { GirlDetailPanel } from "../ui/panels/GirlDetailPanel"; -import { purchase } from "../../schema/schema"; import proto from 'db://assets/Scripts/proto/proto.pb.js'; import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 185f0505..69861e39 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -4,7 +4,7 @@ import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { NavigationManager } from "../manager/NavigationManager"; -import { Girl, PriceType } from "../../schema/schema"; +import { PriceType } from "../../schema/schema"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { DataManager, DataId } from "../data/DataManager"; diff --git a/assets/Scripts/chat18x/uiitems/ThemeItem.ts b/assets/Scripts/chat18x/uiitems/ThemeItem.ts index 98a668a4..d9a212bc 100644 --- a/assets/Scripts/chat18x/uiitems/ThemeItem.ts +++ b/assets/Scripts/chat18x/uiitems/ThemeItem.ts @@ -3,7 +3,6 @@ import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { NavigationManager } from "../manager/NavigationManager"; -import { TbThemes, Theme } from "../../schema/schema"; import LanguageUtils from "../../Main/Common/LanguageUtils"; import { InnerMsgCode } from "../../Main/Config/InnerMsgCode"; import { DataManager, DataId } from "../data/DataManager";