From 556194f24aa888a87381ce2243d50246296ab084 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Mon, 22 Sep 2025 19:31:50 +0800 Subject: [PATCH] update PastGirlListPanel.prefab --- assets/Scripts/Main/Common/Utils.ts | 4 +- .../chat18x/ui/panels/GirlListPopupPanel.ts | 5 +- .../chat18x/ui/panels/PastGirlListPanel.ts | 32 +- .../chat18x/uiitems/PastGirlListItem.ts | 34 +- .../bundles/Chat18x/PastGirlListPanel.prefab | 763 ++++++++++++------ assets/bundles/DataTable/tblanguage.bin | Bin 33013 -> 33280 bytes .../ui/girls_list/矩形 13 拷贝.png.meta | 4 +- xchat_cfg | 2 +- 8 files changed, 560 insertions(+), 284 deletions(-) diff --git a/assets/Scripts/Main/Common/Utils.ts b/assets/Scripts/Main/Common/Utils.ts index c486e084..0f21a195 100644 --- a/assets/Scripts/Main/Common/Utils.ts +++ b/assets/Scripts/Main/Common/Utils.ts @@ -416,7 +416,7 @@ export default class Utils { */ public static formatChatTime(timestamp: number | null): string { if (!timestamp) { - return "暂无聊天记录"; + return LanguageUtils.getText("pastgirllistpanel.nomemory"); } const now = new Date(); @@ -431,7 +431,7 @@ export default class Utils { return `${hours}:${minutes}`; } else if (diffDays < 7) { // 一周内：显示x天前 - return `${diffDays}${LanguageUtils.getText("purchasepanel.day")}}`; + return `${diffDays}${LanguageUtils.getText("purchasepanel.day")}`; } else if (diffDays < 30) { // 一个月内：显示x周前 const weeks = Math.floor(diffDays / 7); diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index 4e1a2187..dbc6f50b 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -27,6 +27,7 @@ import { TipsPanel } from "./TipsPanel"; import ResManager from "../../../Main/Manager/ResManager"; import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; +import { GirlDetailPanel } from "./GirlDetailPanel"; const { ccclass, property } = _decorator; @@ -41,7 +42,7 @@ export class GirlListPopupPanel extends li_BaseView { private girlTag: Label; private balanceCount: Label; - base: GirlListItem; + base: GirlDetailPanel; img: Sprite; uitransform: UITransform; openUIDataCT(data) { @@ -119,7 +120,7 @@ export class GirlListPopupPanel extends li_BaseView { walletData.balance = Number(resData.balance); walletData.vipExpire = Number(resData.vipExpire); // 刷新界面 - this.base.refreshBuy(true); + this.base.refresh(); this.close(); TipsPanel.show("Buy Succeed"); } else { diff --git a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts index 9ce0b30b..abab4942 100644 --- a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts @@ -68,17 +68,21 @@ export class PastGirlListPanel extends li_BaseView { item.reset(); } } - + protected onEnable(): void { + this.refresh(); + } // TODO: 实现获取已解锁女孩列表的逻辑 // 这个方法需要遍历所有分类，找出 isRelease === true 的女孩 - private getUnlockedGirls(): number[] { + private async getUnlockedGirls(): Promise { + await this.reqCanChatGirlData(); + const GirlData = DataManager.I.getDataById(DataId.Girl); - const allids = GirlData.getAllReleaseGirlIds(); + const allids = GirlData.getAllCanChatGirlIds(); logger.log(allids); return allids; } - refresh() { + async refresh() { // 回收当前显示的节点到缓存池 if (this.cache) { for (let i = this.cache.length - 1; i >= 0; i--) { @@ -89,24 +93,12 @@ export class PastGirlListPanel extends li_BaseView { } // 获取已解锁女孩列表 - const ids = this.getUnlockedGirls(); - - // 创建带时间戳的数组用于排序 - const girlsWithTime: { id: number; lastTime: number }[] = []; - - // 收集每个女孩的最后聊天时间 - for (let id of ids) { - const lastTime = ChatHistoryManager.Instance.getLastChatTime(id) || 0; - girlsWithTime.push({ id, lastTime }); - } - - // 按最后聊天时间降序排序（最近的在前） - girlsWithTime.sort((a, b) => b.lastTime - a.lastTime); + const ids = await this.getUnlockedGirls(); // 根据排序后的数据刷新界面 - for (let girlData of girlsWithTime) { + for (let id of ids) { let item = this.getItemFromPool(); - item.refreshData(girlData.id, this.node); + item.refreshData(id, this.node); item.node.active = true; this.cache.push(item); @@ -142,7 +134,7 @@ export class PastGirlListPanel extends li_BaseView { const girlData = DataManager.I.getDataById(DataId.Girl); girlData.setCanChatGirlData(resData); } - } + } onDestroy() { // 清理缓存池，销毁所有缓存的节点 diff --git a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts index bc5487bb..8e82d9e5 100644 --- a/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/PastGirlListItem.ts @@ -13,6 +13,7 @@ import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; import { EnvData } from "../data/EnvData"; import { ChatHistoryManager } from "../manager/ChatHistoryManager"; +import { ThemeData } from "../data/ThemeData"; const { ccclass, property } = _decorator; @@ -29,6 +30,15 @@ export class PastGirlListItem extends Component { @property(Node) starParent: Node; + + @property(Node) + freeTag: Node; + + @property(UITransform) + categoryBg: UITransform; + @property(Label) + categoryTxt: Label; + @property(Node) loading: Node; stars: Sprite[]; @@ -83,6 +93,10 @@ export class PastGirlListItem extends Component { this.girlName.string = LanguageUtils.getText(this.nameKey); this.tagKey = girlData.getGrilTagKey(this.category.toString(), this.id); + this.freeTag.active = girlData.isGirlFreeType( + this.category.toString(), + this.id + ); // 标签显示 let desc = ""; const tags = LanguageUtils.getText(this.tagKey).split("|"); @@ -121,12 +135,28 @@ export class PastGirlListItem extends Component { } } + const themeData = DataManager.I.getDataById(DataId.Theme); + const cat = girlData.getGrilCategoryById(this.id); + let key = themeData.getLanKeyById(1001 + cat); + this.categoryTxt.string = LanguageUtils.getText(key); + this.scheduleOnce(() => { + const size = this.categoryTxt.getComponent(UITransform).contentSize; + this.categoryBg.setContentSize( + size.x + 60, + this.categoryBg.contentSize.y + ); + }, 0); + // 显示最近聊天时间 return this.updateLastChatTime(); } private getLastChatTime(id: number): number | null { - return ChatHistoryManager.Instance.getLastChatTime(id); + const GirlData = DataManager.I.getDataById(DataId.Girl); + return GirlData.getLatestChatRecordTimestamp( + this.category.toString(), + this.id + ); } // 更新最近聊天时间显示 @@ -174,7 +204,7 @@ export class PastGirlListItem extends Component { NavigationManager.Instance.setSelectedGirlId(this.id); // 通过openSubPanel打开ChatPanel作为子面板 - const chatData = { girlId: this.id }; + const chatData = { base: this.baseNode }; NavigationManager.Instance.openSubPanel( "ChatPanel", this.baseNode, diff --git a/assets/bundles/Chat18x/PastGirlListPanel.prefab b/assets/bundles/Chat18x/PastGirlListPanel.prefab index 7ca50892..770a8641 100644 --- a/assets/bundles/Chat18x/PastGirlListPanel.prefab +++ b/assets/bundles/Chat18x/PastGirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 237 + "__id__": 247 }, { - "__id__": 239 + "__id__": 249 }, { - "__id__": 241 + "__id__": 251 }, { - "__id__": 243 + "__id__": 253 } ], "_prefab": { - "__id__": 245 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,23 +82,23 @@ "__id__": 3 }, { - "__id__": 198 + "__id__": 208 } ], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 240 }, { - "__id__": 232 + "__id__": 242 }, { - "__id__": 234 + "__id__": 244 } ], "_prefab": { - "__id__": 236 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", @@ -145,20 +145,20 @@ "_active": true, "_components": [ { - "__id__": 189 + "__id__": 199 }, { - "__id__": 191 + "__id__": 201 }, { - "__id__": 193 + "__id__": 203 }, { - "__id__": 195 + "__id__": 205 } ], "_prefab": { - "__id__": 197 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -202,26 +202,26 @@ "__id__": 5 }, { - "__id__": 162 + "__id__": 172 } ], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 190 }, { - "__id__": 182 + "__id__": 192 }, { - "__id__": 184 + "__id__": 194 }, { - "__id__": 186 + "__id__": 196 } ], "_prefab": { - "__id__": 188 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -265,26 +265,26 @@ "__id__": 6 }, { - "__id__": 144 + "__id__": 154 } ], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 162 }, { - "__id__": 154 + "__id__": 164 }, { - "__id__": 156 + "__id__": 166 }, { - "__id__": 159 + "__id__": 169 } ], "_prefab": { - "__id__": 161 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -337,31 +337,31 @@ "__id__": 61 }, { - "__id__": 129 + "__id__": 139 } ], "_active": true, "_components": [ { - "__id__": 135 + "__id__": 145 }, { - "__id__": 137 + "__id__": 147 }, { - "__id__": 139 + "__id__": 149 }, { - "__id__": 141 + "__id__": 151 } ], "_prefab": { - "__id__": 143 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -14.944999999999936, "z": 0 }, "_lrot": { @@ -1559,26 +1559,29 @@ "__id__": 70 }, { - "__id__": 76 + "__id__": 78 }, { - "__id__": 84 + "__id__": 86 + }, + { + "__id__": 94 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 132 }, { - "__id__": 124 + "__id__": 134 }, { - "__id__": 126 + "__id__": 136 } ], "_prefab": { - "__id__": 128 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -1636,7 +1639,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 82.84500000000003, + "y": 86.73300000000017, "z": 0 }, "_lrot": { @@ -1826,15 +1829,18 @@ }, { "__id__": 73 + }, + { + "__id__": 75 } ], "_prefab": { - "__id__": 75 + "__id__": 77 }, "_lpos": { "__type__": "cc.Vec3", - "x": 165.699, - "y": 83.36500000000001, + "x": 1.9379999999999882, + "y": -29.40000000000009, "z": 0 }, "_lrot": { @@ -1874,7 +1880,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87, + "width": 158.994141, "height": 46 }, "_anchorPoint": { @@ -1914,9 +1920,9 @@ "__uuid__": "864139dc-174a-4005-848d-824583910814@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1933,6 +1939,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c3caKEmG9ArL3Tl/Z1sRW1" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": { + "__id__": 76 + }, + "_alignFlags": 8, + "_target": null, + "_left": 1.9379999999999882, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 8, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "759nZo6sFKmI/yiAIbI25n" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1946,7 +1988,7 @@ }, { "__type__": "cc.Node", - "_name": "desc", + "_name": "categoryTxt", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1955,23 +1997,23 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 77 - }, { "__id__": 79 }, { "__id__": 81 + }, + { + "__id__": 83 } ], "_prefab": { - "__id__": 83 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", - "x": 1.0709999999999695, - "y": 15.307000000000016, + "x": 30.216999999999985, + "y": -27.21900000000005, "z": 0 }, "_lrot": { @@ -2003,12 +2045,210 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 78 }, "_enabled": true, "__prefab": { + "__id__": 80 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 162.36328125, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3cVc6L1R1Oobv4XFnhzcTd" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { "__id__": 78 }, + "_enabled": true, + "__prefab": { + "__id__": 82 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "label303030asdas", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9dZTBVGARFLJyLkbnOGjz4" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 78 + }, + "_enabled": true, + "__prefab": { + "__id__": 84 + }, + "_alignFlags": 8, + "_target": null, + "_left": 30.216999999999985, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 8, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5fkjgTLOFF/JmDmIsLa+e7" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "25ixA4/NZIrrQ/2MxTj7cu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "desc", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 61 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + } + ], + "_prefab": { + "__id__": 93 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.0709999999999695, + "y": 29.565000000000055, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 86 + }, + "_enabled": true, + "__prefab": { + "__id__": 88 + }, "_contentSize": { "__type__": "cc.Size", "width": 327.596094, @@ -2031,11 +2271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2099,18 +2339,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 92 }, "_alignFlags": 13, "_target": null, "_left": 1.0709999999999695, "_right": -138.69309400000003, - "_top": 109.82899999999998, - "_bottom": 140.443, + "_top": 95.57099999999994, + "_bottom": 154.70100000000005, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2138,6 +2378,8 @@ "__id__": 0 }, "fileId": "5ch8N9B29DTZ6wqMEnxh6E", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2150,35 +2392,35 @@ }, "_children": [ { - "__id__": 85 + "__id__": 95 }, { - "__id__": 91 + "__id__": 101 }, { - "__id__": 97 + "__id__": 107 }, { - "__id__": 103 - }, - { - "__id__": 109 - } - ], - "_active": true, - "_components": [ - { - "__id__": 115 - }, - { - "__id__": 117 + "__id__": 113 }, { "__id__": 119 } ], + "_active": true, + "_components": [ + { + "__id__": 125 + }, + { + "__id__": 127 + }, + { + "__id__": 129 + } + ], "_prefab": { - "__id__": 121 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2215,20 +2457,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 96 }, { - "__id__": 88 + "__id__": 98 } ], "_prefab": { - "__id__": 90 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", @@ -2265,11 +2507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -2293,11 +2535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 99 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2351,20 +2593,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 102 }, { - "__id__": 94 + "__id__": 104 } ], "_prefab": { - "__id__": 96 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -2401,11 +2643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -2429,11 +2671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2487,20 +2729,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 108 }, { - "__id__": 100 + "__id__": 110 } ], "_prefab": { - "__id__": 102 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -2537,11 +2779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2565,11 +2807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2623,20 +2865,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 114 }, { - "__id__": 106 + "__id__": 116 } ], "_prefab": { - "__id__": 108 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -2673,11 +2915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -2701,11 +2943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2759,20 +3001,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 120 }, { - "__id__": 112 + "__id__": 122 } ], "_prefab": { - "__id__": 114 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -2809,11 +3051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -2837,11 +3079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2895,11 +3137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -2923,11 +3165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 128 }, "_alignFlags": 12, "_target": null, @@ -2959,11 +3201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 94 }, "_enabled": false, "__prefab": { - "__id__": 120 + "__id__": 130 }, "_resizeMode": 1, "_layoutType": 1, @@ -3014,7 +3256,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -3042,7 +3284,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 135 }, "_alignFlags": 13, "_target": null, @@ -3078,7 +3320,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 127 + "__id__": 137 }, "_resizeMode": 0, "_layoutType": 2, @@ -3131,14 +3373,14 @@ "_active": true, "_components": [ { - "__id__": 130 + "__id__": 140 }, { - "__id__": 132 + "__id__": 142 } ], "_prefab": { - "__id__": 134 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -3175,15 +3417,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 141 }, "_contentSize": { "__type__": "cc.Size", - "width": 235.513281, + "width": 199.913281, "height": 50.4 }, "_anchorPoint": { @@ -3203,11 +3445,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 143 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3291,7 +3533,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 146 }, "_contentSize": { "__type__": "cc.Size", @@ -3319,7 +3561,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 148 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3362,9 +3604,9 @@ "node": { "__id__": 6 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 140 + "__id__": 150 }, "_alignFlags": 45, "_target": null, @@ -3383,7 +3625,7 @@ "_originalWidth": 1170, "_originalHeight": 283.8, "_alignMode": 2, - "_lockFlags": 45, + "_lockFlags": 0, "_id": "" }, { @@ -3400,7 +3642,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 152 }, "_type": 3, "_inverted": false, @@ -3437,22 +3679,22 @@ "_active": true, "_components": [ { - "__id__": 145 + "__id__": 155 }, { - "__id__": 147 + "__id__": 157 }, { - "__id__": 149 + "__id__": 159 } ], "_prefab": { - "__id__": 151 + "__id__": 161 }, "_lpos": { "__type__": "cc.Vec3", "x": -100.38499999999999, - "y": 140.07500000000005, + "y": 125.13000000000011, "z": 0 }, "_lrot": { @@ -3484,11 +3726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 156 }, "_contentSize": { "__type__": "cc.Size", @@ -3512,11 +3754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 154 }, "_enabled": false, "__prefab": { - "__id__": 148 + "__id__": 158 }, "_alignFlags": 18, "_target": null, @@ -3548,11 +3790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3610,12 +3852,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 163 }, "_contentSize": { "__type__": "cc.Size", "width": 966, - "height": 300 + "height": 322.2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3638,7 +3880,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 165 }, "_alignFlags": 16, "_target": null, @@ -3674,11 +3916,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 167 }, "clickEvents": [ { - "__id__": 158 + "__id__": 168 } ], "_interactable": true, @@ -3717,7 +3959,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.9, - "_target": null, + "_target": { + "__id__": 5 + }, "_id": "" }, { @@ -3730,8 +3974,8 @@ "__id__": 5 }, "component": "", - "_componentId": "6d3e03kLy5EwLqOppF+UTV7", - "handler": "onClickDetail", + "_componentId": "b311cIw2jdCBYIUM4o6Mobn", + "handler": "onClickGirl", "customEventData": "" }, { @@ -3744,7 +3988,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 170 }, "avatar": { "__id__": 19 @@ -3753,13 +3997,22 @@ "__id__": 65 }, "tags": { - "__id__": 79 + "__id__": 89 }, "lastChatTime": { - "__id__": 132 + "__id__": 142 }, "starParent": { - "__id__": 84 + "__id__": 94 + }, + "freeTag": { + "__id__": 154 + }, + "categoryBg": { + "__id__": 71 + }, + "categoryTxt": { + "__id__": 81 }, "loading": { "__id__": 22 @@ -3793,26 +4046,26 @@ }, "_children": [ { - "__id__": 163 + "__id__": 173 } ], "_active": true, "_components": [ { - "__id__": 171 + "__id__": 181 }, { - "__id__": 173 + "__id__": 183 }, { - "__id__": 175 + "__id__": 185 }, { - "__id__": 177 + "__id__": 187 } ], "_prefab": { - "__id__": 179 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -3849,23 +4102,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 162 + "__id__": 172 }, "_children": [], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 174 }, { - "__id__": 166 + "__id__": 176 }, { - "__id__": 168 + "__id__": 178 } ], "_prefab": { - "__id__": 170 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -3902,16 +4155,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": -30 + "height": -20 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3930,11 +4183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_resizeMode": 1, "_layoutType": 2, @@ -3949,7 +4202,7 @@ "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 0, - "_spacingY": 30, + "_spacingY": 20, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -3968,11 +4221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 179 }, "_alignFlags": 40, "_target": null, @@ -4017,11 +4270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -4045,11 +4298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 184 }, "_type": 0, "_inverted": false, @@ -4067,11 +4320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 186 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4113,11 +4366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 188 }, "_alignFlags": 45, "_target": null, @@ -4166,7 +4419,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -4194,7 +4447,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 183 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4239,7 +4492,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 195 }, "bounceDuration": 0.23, "brake": 0.75, @@ -4250,7 +4503,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 163 + "__id__": 173 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -4270,7 +4523,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 197 }, "_alignFlags": 45, "_target": null, @@ -4319,7 +4572,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -4347,7 +4600,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 202 }, "_alignFlags": 45, "_target": null, @@ -4383,7 +4636,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 204 }, "_type": 0, "_inverted": false, @@ -4405,7 +4658,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4464,26 +4717,26 @@ }, "_children": [ { - "__id__": 199 + "__id__": 209 }, { - "__id__": 213 + "__id__": 223 } ], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 233 }, { - "__id__": 225 + "__id__": 235 }, { - "__id__": 227 + "__id__": 237 } ], "_prefab": { - "__id__": 229 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", @@ -4520,27 +4773,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 208 }, "_children": [ { - "__id__": 200 + "__id__": 210 } ], "_active": false, "_components": [ { - "__id__": 206 + "__id__": 216 }, { - "__id__": 208 + "__id__": 218 }, { - "__id__": 210 + "__id__": 220 } ], "_prefab": { - "__id__": 212 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -4577,20 +4830,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 199 + "__id__": 209 }, "_children": [], "_active": true, "_components": [ { - "__id__": 201 + "__id__": 211 }, { - "__id__": 203 + "__id__": 213 } ], "_prefab": { - "__id__": 205 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", @@ -4627,11 +4880,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", @@ -4655,11 +4908,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 214 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4713,11 +4966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -4741,11 +4994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 219 }, "clickEvents": [], "_interactable": true, @@ -4785,7 +5038,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 199 + "__id__": 209 }, "_id": "" }, @@ -4799,11 +5052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 221 }, "_alignFlags": 10, "_target": null, @@ -4848,26 +5101,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 224 }, { - "__id__": 216 + "__id__": 226 }, { - "__id__": 218 + "__id__": 228 }, { - "__id__": 220 + "__id__": 230 } ], "_prefab": { - "__id__": 222 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -4904,11 +5157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4932,11 +5185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5003,11 +5256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 229 }, "_alignFlags": 18, "_target": null, @@ -5039,13 +5292,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 231 }, - "languageKey": "girllistpanel.title", + "languageKey": "pastgirllistpanel.title", "defaultText": "", "autoUpdate": true, "_id": "" @@ -5073,11 +5326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -5101,11 +5354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5146,11 +5399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 238 }, "_alignFlags": 41, "_target": null, @@ -5199,7 +5452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -5227,7 +5480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 243 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5272,7 +5525,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 245 }, "_alignFlags": 45, "_target": null, @@ -5321,7 +5574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -5349,7 +5602,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 250 }, "_alignFlags": 45, "_target": null, @@ -5385,7 +5638,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 252 }, "_id": "" }, @@ -5403,7 +5656,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 254 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 4f7841c981993a8fa32b7e13c1dce66fda1ecf75..94f10c01d6e19a17ede706d55d0c9bc353e5de47 100644 GIT binary patch delta 279 zcmey`$kfon#MH2HBhyCSdhvq9;*#{tqMV$};*x^Iywn`MlFX8vR55p;m_lM%VrEWa zQckKuNxnjIMq&xi(|xTk8oQqF>wCI%v-5)`YaT4w_h8AA2TNu>SlR$&C_Gp)^}*71 zAhqeilKl^s^aEK-9xUy6uw*@0