diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index 2cccd25a..e8cec25c 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -29,9 +29,6 @@ import { DataManager, DataId } from "../../chat18x/data/DataManager"; import { LoginData } from "../../chat18x/data/LoginData"; import { PlayerData } from "../../chat18x/data/PlayerData"; import { WalletData } from "../../chat18x/data/WalletData"; -import { AccountData } from "../../chat18x/data/AccountData"; -import { MetaData } from "../../chat18x/data/MetaData"; -import { NetTimeData } from "../../chat18x/data/NetTimeData"; import { ConfigManager } from "../../chat18x/manager/ConfigManager"; import { AppConfig } from "db://assets/Scripts/chat18x/config/env/appConfig"; import DeviceIdService from "db://assets/Scripts/chat18x/foundation/identity/DeviceIdService"; diff --git a/assets/Scripts/chat18x/config/GirlConfig.ts b/assets/Scripts/chat18x/config/GirlConfig.ts index 5ddc3a02..bc97c76a 100644 --- a/assets/Scripts/chat18x/config/GirlConfig.ts +++ b/assets/Scripts/chat18x/config/GirlConfig.ts @@ -25,6 +25,20 @@ export class GirlConfig extends BaseConfig { return ConfigManager.tables.TbGirls; } + /** + * 获取所有配置 id,如果存在 + */ + public getAllId(): any | null { + let allData = this.getAllConfig(); + if (!allData) return null; + const dataArr = allData.getDataList(); + let allId = []; + for (let oneData of dataArr) { + allId.push(oneData.id); + } + return allId; + } + /** * 获取配置,根据 id */ diff --git a/assets/Scripts/chat18x/data/DataManager.ts b/assets/Scripts/chat18x/data/DataManager.ts index 3ed67a4b..0cec46ed 100644 --- a/assets/Scripts/chat18x/data/DataManager.ts +++ b/assets/Scripts/chat18x/data/DataManager.ts @@ -12,6 +12,7 @@ import { ThemeData } from "./ThemeData"; import { WalletData } from "./WalletData"; import { ShopData } from "./ShopData"; import { OrderData } from "./OrderData"; +import { GirlData } from "./GirlData"; /** * 集中定义数据ID,避免写错字符串 @@ -26,6 +27,7 @@ export enum DataId { Wallet = "wallet", // 钱包数据 Shop = "shop", // 商城数据 Order = "order", // 订单数据 + Girl = "girl", // 技师数据 } /** 构造器类型 */ @@ -67,6 +69,7 @@ export class DataManager { this.register(DataId.Wallet, WalletData); this.register(DataId.Shop, ShopData); this.register(DataId.Order, OrderData); + this.register(DataId.Girl, GirlData); } /** diff --git a/assets/Scripts/chat18x/data/GirlData.ts b/assets/Scripts/chat18x/data/GirlData.ts index e90fa454..368c147c 100644 --- a/assets/Scripts/chat18x/data/GirlData.ts +++ b/assets/Scripts/chat18x/data/GirlData.ts @@ -309,6 +309,7 @@ export class GirlData extends BaseData { public setDailyRecommend(res: proto.cs.ICSDailyRecommendRes): void { this.mergeBriefs(DAILY_BUCKET, res.girls); this._dailyRecommendIds = res.girls.map(g => g.id ?? 0); + console.log("保存每日推荐: ", this._dailyRecommendIds); } /** 获取每日推荐的简要信息 */ @@ -319,10 +320,24 @@ export class GirlData extends BaseData { return b.briefs.get(b.girlIds[index]) ?? null; } + /** 获取 id */ + public getRecommendGrilId(index: number): number { + let oneData = this.getRecommendGrilBrief(DAILY_BUCKET, index); + if (!oneData) return 0; + return oneData.id; + } + /** 获取名字 */ public getRecommendGrilName(index: number): string { let oneData = this.getRecommendGrilBrief(DAILY_BUCKET, index); if (!oneData) return ""; return oneData.name; } + + /** 获取头像 */ + public getRecommendGrilAvatar(index: number): string { + let oneData = this.getRecommendGrilBrief(DAILY_BUCKET, index); + if (!oneData) return ""; + return oneData.avatar; + } } diff --git a/assets/Scripts/chat18x/network/services/GirlService.ts b/assets/Scripts/chat18x/network/services/GirlService.ts index 0f9880dd..f948fd28 100644 --- a/assets/Scripts/chat18x/network/services/GirlService.ts +++ b/assets/Scripts/chat18x/network/services/GirlService.ts @@ -5,7 +5,7 @@ import type { ApiResponse } from "../client/types"; import proto from "db://assets/Scripts/proto/proto.pb.js"; // 模拟开关 -const USE_MOCK = false; +const USE_MOCK = true; export class GirlService implements IGirlService { private static _I: GirlService | null = null; diff --git a/assets/Scripts/chat18x/network/services/MockGirlService.ts b/assets/Scripts/chat18x/network/services/MockGirlService.ts index b04c4953..97ea9b67 100644 --- a/assets/Scripts/chat18x/network/services/MockGirlService.ts +++ b/assets/Scripts/chat18x/network/services/MockGirlService.ts @@ -1,6 +1,8 @@ import type { ApiResponse } from "../client/types"; import proto from "db://assets/Scripts/proto/proto.pb.js"; import type { IGirlService } from "./IGirlService"; +import { ConfigManager, ConfigId } from "../../manager/ConfigManager"; +import { GirlConfig } from "../../config/GirlConfig"; export class MockGirlService implements IGirlService { private delay(ms = 180) { return new Promise(r => setTimeout(r, ms)); } @@ -8,23 +10,22 @@ export class MockGirlService implements IGirlService { private pick(arr: T[]) { return arr[this.randInt(0, arr.length - 1)]; } private ok(data: T): ApiResponse { - return ({ ok: true, data } as unknown) as ApiResponse; + return ({ code: proto.cs.EnmRetCode.SUCCESS, data } as unknown) as ApiResponse; } private err(message = "mock error"): ApiResponse { - return ({ ok: false, error: { message } } as unknown) as ApiResponse; + return ({ code: 100, error: { message } } as unknown) as ApiResponse; } - private genBrief(id: number): proto.cs.IGirlBrief { - const tags = ["cute", "cool", "elegant", "sporty", "sweet"]; + private genBrief(id: number, name: string, age: number, tagKey: string, priceType: number, price: number, avatar: string, star: number): proto.cs.IGirlBrief { return { id, - name: `Girl-${id}`, - age: this.randInt(18, 28), - tagKey: this.pick(tags), - priceType: (id % 2) + 1, - price: 50 + (id % 6) * 10, - avatar: `https://dummy.local/avatar/${id}.png`, - star: (id % 5) + 1, + name, + age, + tagKey, + priceType, + price, + avatar, + star, }; } @@ -34,14 +35,27 @@ export class MockGirlService implements IGirlService { private genDetail(id: number): proto.cs.IGirlDetail { const photos = Array.from({ length: 4 }, (_, i) => this.genPhoto(id * 10 + i)); - return { brief: this.genBrief(id), desc: `Mock detail for ${id}`, photos, isRelease: Math.random() < 0.4, chatCount: this.randInt(0, 5) }; + return { brief: this.genBrief(id, "", 1, "", 2, 3, "", 4), desc: `Mock detail for ${id}`, photos, isRelease: Math.random() < 0.4, chatCount: this.randInt(0, 5) }; } // 每日推荐 async reqDailyRecommend(_req: proto.cs.ICSDailyRecommendReq): Promise> { + // 延时 await this.delay(180); - const count = this.randInt(4, 8); - const girls = Array.from({ length: count }, (_, i) => this.genBrief(100 + i)); + + const configData = ConfigManager.I.getDataById(ConfigId.Girl); + const allId = configData.getAllId(); + const recId = allId[0]; + let name = configData.getNameById(recId); + let age = Number(configData.getAgeById(recId)); + let tagKey = configData.getTagKeyById(recId); + let priceType = configData.getPriceTypeById(recId); + let price = 9.9; + let avatar = configData.getAvatarPathById(recId); + let star = 3; + let oneData = this.genBrief(recId, name, age, tagKey, priceType, price, avatar, star); + // 返回数据 + const girls = [oneData]; return this.ok({ girls }); } @@ -50,7 +64,7 @@ export class MockGirlService implements IGirlService { await this.delay(200); const base = (req?.category ?? 0) * 1000 + (req?.page ?? 1) * 100; const limit = Math.max(1, Math.min(req?.limit ?? 10, 50)); - const girls = Array.from({ length: limit }, (_, i) => this.genBrief(base + i)); + const girls = Array.from({ length: limit }, (_, i) => this.genBrief(base + i, "", 1, "", 2, 3, "", 4)); return this.ok({ girls }); } diff --git a/assets/Scripts/chat18x/network/services/MockThemeService.ts b/assets/Scripts/chat18x/network/services/MockThemeService.ts index 5075b23a..c3da3317 100644 --- a/assets/Scripts/chat18x/network/services/MockThemeService.ts +++ b/assets/Scripts/chat18x/network/services/MockThemeService.ts @@ -38,6 +38,7 @@ export class MockThemeService implements IThemeService { let oneData = this.makeTheme(oneId, key, name, category, isRelease, path); themes.push(oneData); } + // 返回数据 const res: proto.cs.ICSHallThemeRes = { themes }; return this.ok(res); } diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 24468b99..0e5e8092 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -14,13 +14,14 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import { ThemeItem } from "../../uiitems/ThemeItem"; import { NavigationManager } from "../../manager/NavigationManager"; import { GirlListItem } from "../../uiitems/GirlListItem"; -import { ConfigManager } from "../../manager/ConfigManager"; import LanguageUtils from "../../../Main/Common/LanguageUtils"; import { ViewManager } from "../../../Main/Manager/ViewManager"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService"; +import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; import { DataManager, DataId } from "../../data/DataManager"; import { ThemeData } from "../../data/ThemeData"; +import { GirlData } from "../../data/GirlData"; const { ccclass, property } = _decorator; @@ -81,14 +82,23 @@ export class ThemePanel extends li_BaseView { this.cache.push(item); this.content.addChild(newNode); } - const rectInfo = ConfigManager.tables.TbGirls.get(10001); - this.recId = rectInfo.id; - this.rectNameKey = rectInfo.nameKey; + + // 请求每日推荐 + const reqData2 = { + + }; + let res2 = await GirlService.I.reqDailyRecommend(reqData2); + const girlData = DataManager.I.getDataById(DataId.Girl); + girlData.setDailyRecommend(res2.data); + // 根据数据,构建界面显示 + this.recId = girlData.getRecommendGrilId(0); + this.rectNameKey = girlData.getRecommendGrilName(0); + let avatarPath = girlData.getRecommendGrilAvatar(0); //this.recName.string = LanguageUtils.getText(this.rectNameKey); ResManager.I.changeBundleSpriteFrame( this.recSprite, - rectInfo.avatarPath, + avatarPath, "Chat18x", () => { let sizeTran = this.recSprite.node.parent.getComponent(UITransform);