diff --git a/assets/Scripts/chat18x/core/ChatController.ts b/assets/Scripts/chat18x/core/ChatController.ts index 4836b912..2a6e5b7e 100644 --- a/assets/Scripts/chat18x/core/ChatController.ts +++ b/assets/Scripts/chat18x/core/ChatController.ts @@ -194,13 +194,6 @@ export class ChatController { TipsPanel.show(LanguageUtils.getText("chat_error_code_1004")); } - // 添加用户消息到模型 - this.chatModel.addDialog(true, message); - - // 更新对话显示 - 用户消息 - this.dialogManager?.updateDialog(true, message, true); - this.callback?.onDialogUpdated(true); - // 通知界面消息发送开始 this.callback?.onMessageSent(message); @@ -215,12 +208,14 @@ export class ChatController { ); if (response) { - // 移除加载中的对话 - //this.dialogManager?.removeLoadingDialog(); + // 添加用户消息到模型 + this.chatModel.addDialog(true, message); + // 更新对话显示 - 用户消息 + this.dialogManager?.updateDialog(true, message, true); + this.callback?.onDialogUpdated(true); // 添加AI回复到模型 (保持完整消息) this.chatModel.addDialog(false, response); - // 更新对话显示 - AI回复 (使用分段显示) this.dialogManager?.updateDialogWithSegments(false, response); this.callback?.onDialogUpdated(false); diff --git a/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts b/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts index aa7efa78..39a555c8 100644 --- a/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts +++ b/assets/Scripts/chat18x/ui/components/ChatContentsLayout.ts @@ -30,7 +30,7 @@ export class ChatContentsLayout extends Component { // 缓存池 private cachedBubbles: DialogBubble[] = []; // 等待回复气泡的引用 - private waitingBubble: DialogBubble = null; + //private waitingBubble: DialogBubble = null; // 延时任务ID数组 private delayedTasks: number[] = []; // ScrollView组件引用 @@ -52,13 +52,22 @@ export class ChatContentsLayout extends Component { this.fixMaxWidth = 730; // 获取或添加UIOpacity组件到content节点 - this.contentOpacity = this.node.getComponent(UIOpacity) || this.node.addComponent(UIOpacity); + this.contentOpacity = + this.node.getComponent(UIOpacity) || this.node.addComponent(UIOpacity); // 注册触摸事件 if (this.scrollView && this.scrollView.node) { - this.scrollView.node.on(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.scrollView.node.on( + NodeEventType.TOUCH_START, + this.onTouchStart, + this + ); this.scrollView.node.on(NodeEventType.TOUCH_END, this.onTouchEnd, this); - this.scrollView.node.on(NodeEventType.TOUCH_CANCEL, this.onTouchEnd, this); + this.scrollView.node.on( + NodeEventType.TOUCH_CANCEL, + this.onTouchEnd, + this + ); } } @@ -85,11 +94,11 @@ export class ChatContentsLayout extends Component { this.bubbles.push(playerBubble); // 创建等待回复气泡（插入到首位，显示在玩家消息上面） - this.waitingBubble = this.createOrGetBubble(false); - this.waitingBubble.node.active = true; - this.waitingBubble.updateBubbleContent("...", false, undefined, true); - this.waitingBubble.node.setSiblingIndex(0); - this.bubbles.push(this.waitingBubble); + // this.waitingBubble = this.createOrGetBubble(false); + // this.waitingBubble.node.active = true; + // this.waitingBubble.updateBubbleContent("...", false, undefined, true); + // this.waitingBubble.node.setSiblingIndex(0); + // this.bubbles.push(this.waitingBubble); this.node.position = Vec3.ZERO; // 滚动到底部（等待下一帧Layout更新完成） this.scheduleOnce(() => { @@ -102,9 +111,9 @@ export class ChatContentsLayout extends Component { */ updateAIDialogs(dialogs: Dialog[]): void { // 清除等待回复气泡 - if (this.waitingBubble) { - this.removeWaitingBubble(); - } + // if (this.waitingBubble) { + // this.removeWaitingBubble(); + // } // 清理之前的延时任务 this.clearDelayedTasks(); @@ -124,7 +133,7 @@ export class ChatContentsLayout extends Component { } } this.bubbles = []; - this.waitingBubble = null; + //this.waitingBubble = null; // 清理多余的缓存气泡 this.cleanupExcessCachedBubbles(); @@ -164,19 +173,19 @@ export class ChatContentsLayout extends Component { /** * 移除等待回复气泡 */ - private removeWaitingBubble(): void { - if (this.waitingBubble && this.waitingBubble.node) { - this.waitingBubble.node.active = false; - this.cachedBubbles.push(this.waitingBubble); + // private removeWaitingBubble(): void { + // if (this.waitingBubble && this.waitingBubble.node) { + // this.waitingBubble.node.active = false; + // this.cachedBubbles.push(this.waitingBubble); - // 从当前气泡列表中移除 - const index = this.bubbles.indexOf(this.waitingBubble); - if (index > -1) { - this.bubbles.splice(index, 1); - } - } - this.waitingBubble = null; - } + // // 从当前气泡列表中移除 + // const index = this.bubbles.indexOf(this.waitingBubble); + // if (index > -1) { + // this.bubbles.splice(index, 1); + // } + // } + // this.waitingBubble = null; + // } /** * 带延时地添加AI对话 @@ -316,9 +325,17 @@ export class ChatContentsLayout extends Component { protected onDestroy(): void { // 清理事件监听 if (this.scrollView && this.scrollView.node) { - this.scrollView.node.off(NodeEventType.TOUCH_START, this.onTouchStart, this); + this.scrollView.node.off( + NodeEventType.TOUCH_START, + this.onTouchStart, + this + ); this.scrollView.node.off(NodeEventType.TOUCH_END, this.onTouchEnd, this); - this.scrollView.node.off(NodeEventType.TOUCH_CANCEL, this.onTouchEnd, this); + this.scrollView.node.off( + NodeEventType.TOUCH_CANCEL, + this.onTouchEnd, + this + ); } // 清理计时器 diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts index bdcabb36..b305dd37 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPanel.ts @@ -3,13 +3,10 @@ import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import Utils from "db://assets/Scripts/Main/Common/Utils"; import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { GirlListItem } from "../../uiitems/GirlListItem"; -import { ConfigManager } from "../../manager/ConfigManager"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; import { DataManager, DataId } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import proto from "db://assets/Scripts/proto/proto.pb.js"; -import GameRootUI from "../../../Main/Common/GameRootUI"; -import { UITransitionHelper } from "../../utils/UITransitionHelper"; import { NavigationManager, PanelType } from "../../manager/NavigationManager"; const { ccclass, property } = _decorator; @@ -28,7 +25,6 @@ export class GirlListPanel extends li_BaseView { private maxPoolSize: number = 20; category: number; - private parentPanelName: string = null; onLoadCT() { Utils.parseNode(this.node, this._nodeTab); diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 4e62bcb3..17dcdc88 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -319,11 +319,18 @@ export class ThemePanel extends li_BaseView { NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); } else { //未解锁 - ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { + + NavigationManager.Instance.openSubPanel("GirlListPopupPanel", this.node, { base: this, category: girlData.getGrilCategoryById(this.recId), id: this.recId, }); + + // ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { + // base: this, + // category: girlData.getGrilCategoryById(this.recId), + // id: this.recId, + // }); } } diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index c8d8603c..909602d9 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -19,6 +19,7 @@ import { DataManager, DataId } from "../data/DataManager"; import { GirlData } from "../data/GirlData"; import { EnvData } from "../data/EnvData"; import { TipsPanel } from "../ui/panels/TipsPanel"; +import { NavigationManager } from "../manager/NavigationManager"; const { ccclass, property } = _decorator; @@ -72,13 +73,25 @@ export class DetailImageItem extends Component { this.base.setVideEnable(false); } } else { - ViewManager.I.openBundlesView("PopupGirlDetailPanel", { - category: this.category, - resId: this.resId, - girlId: this.girlId, - base: this, - type: this.type, - }); + NavigationManager.Instance.openSubPanel( + "PopupGirlDetailPanel", + this.base.node, + { + category: this.category, + resId: this.resId, + girlId: this.girlId, + base: this, + type: this.type, + } + ); + + // ViewManager.I.openBundlesView("PopupGirlDetailPanel", { + // category: this.category, + // resId: this.resId, + // girlId: this.girlId, + // base: this, + // type: this.type, + // }); } // if (!this.isImage) { // //判断是否已经解锁此资源 @@ -238,13 +251,13 @@ export class DetailImageItem extends Component { this.resId = 0; this.type = null; this.isVisible = false; - + this.question.active = true; this.video.enabled = false; this.priceFrame.active = false; this.loading.active = false; this.videoPrice.string = ""; - + if (this.img && this.img.spriteFrame) { this.img.spriteFrame = null; } diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index 09634fa0..4b537a25 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -216,11 +216,16 @@ export class GirlListItem extends Component { NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); } else { //未解锁 - ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { + NavigationManager.Instance.openSubPanel("GirlListPopupPanel", this.baseNode, { base: this, category: this.category, id: this.id, }); + // ViewManager.I.openBundlesPopupView("GirlListPopupPanel", { + // base: this, + // category: this.category, + // id: this.id, + // }); } } } diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 29c3653e..fd07ce14 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,7 +22,7 @@ "__id__": 2 }, { - "__id__": 293 + "__id__": 303 }, { "__id__": 74 @@ -31,23 +31,23 @@ "__id__": 114 }, { - "__id__": 379 + "__id__": 389 } ], "_active": true, "_components": [ { - "__id__": 409 + "__id__": 419 }, { - "__id__": 411 + "__id__": 421 }, { - "__id__": 413 + "__id__": 423 } ], "_prefab": { - "__id__": 415 + "__id__": 425 }, "_lpos": { "__type__": "cc.Vec3", @@ -109,17 +109,17 @@ "_active": true, "_components": [ { - "__id__": 286 + "__id__": 296 }, { - "__id__": 288 + "__id__": 298 }, { - "__id__": 290 + "__id__": 300 } ], "_prefab": { - "__id__": 292 + "__id__": 302 }, "_lpos": { "__type__": "cc.Vec3", @@ -4165,17 +4165,17 @@ "_active": true, "_components": [ { - "__id__": 279 + "__id__": 289 }, { - "__id__": 281 + "__id__": 291 }, { - "__id__": 283 + "__id__": 293 } ], "_prefab": { - "__id__": 285 + "__id__": 295 }, "_lpos": { "__type__": "cc.Vec3", @@ -4234,17 +4234,17 @@ "_active": true, "_components": [ { - "__id__": 272 + "__id__": 282 }, { - "__id__": 274 + "__id__": 284 }, { - "__id__": 276 + "__id__": 286 } ], "_prefab": { - "__id__": 278 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -5574,28 +5574,25 @@ }, { "__id__": 251 - }, - { - "__id__": 257 } ], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 273 }, { - "__id__": 265 + "__id__": 275 }, { - "__id__": 267 + "__id__": 277 }, { - "__id__": 269 + "__id__": 279 } ], "_prefab": { - "__id__": 271 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -5628,7 +5625,7 @@ }, { "__type__": "cc.Node", - "_name": "dot", + "_name": "Sprite", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -5649,7 +5646,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -262.563, + "x": 0, "y": 0, "z": 0 }, @@ -5688,6 +5685,199 @@ "__prefab": { "__id__": 247 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 622, + "height": 125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cc8htQZKVH6rF6/0ac5e1j" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 245 + }, + "_enabled": true, + "__prefab": { + "__id__": 249 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 206 + }, + "_spriteFrame": { + "__uuid__": "cc5e58e3-3d6f-4ca7-b02f-8c47634b5b21@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5ftcuw6jJKCqT+XMQAcXgR" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "67ydKFQp1Ee5vS4Up5xJr0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 244 + }, + "_children": [ + { + "__id__": 252 + }, + { + "__id__": 258 + }, + { + "__id__": 264 + } + ], + "_active": true, + "_components": [ + { + "__id__": 270 + } + ], + "_prefab": { + "__id__": 272 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 39.230999999999995, + "y": 0, + "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.Node", + "_name": "dot", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 251 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 253 + }, + { + "__id__": 255 + } + ], + "_prefab": { + "__id__": 257 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -262.563, + "y": 0, + "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__": 252 + }, + "_enabled": true, + "__prefab": { + "__id__": 254 + }, "_contentSize": { "__type__": "cc.Size", "width": 20, @@ -5710,11 +5900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 256 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5724,7 +5914,7 @@ "r": 255, "g": 255, "b": 255, - "a": 91 + "a": 204 }, "_spriteFrame": { "__uuid__": "4cef8664-eeed-4be5-b33b-1bb74a6019cb@f9941", @@ -5768,24 +5958,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 244 + "__id__": 251 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 259 }, { - "__id__": 254 + "__id__": 261 } ], "_prefab": { - "__id__": 256 + "__id__": 263 }, "_lpos": { "__type__": "cc.Vec3", - "x": -262.563, + "x": -231.11, "y": 0, "z": 0 }, @@ -5818,11 +6008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", @@ -5846,11 +6036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5860,7 +6050,7 @@ "r": 255, "g": 255, "b": 255, - "a": 91 + "a": 204 }, "_spriteFrame": { "__uuid__": "4cef8664-eeed-4be5-b33b-1bb74a6019cb@f9941", @@ -5904,24 +6094,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 244 + "__id__": 251 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 265 }, { - "__id__": 260 + "__id__": 267 } ], "_prefab": { - "__id__": 262 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", - "x": -262.563, + "x": -197.761, "y": 0, "z": 0 }, @@ -5954,11 +6144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", @@ -5982,11 +6172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5996,7 +6186,7 @@ "r": 255, "g": 255, "b": 255, - "a": 91 + "a": 204 }, "_spriteFrame": { "__uuid__": "4cef8664-eeed-4be5-b33b-1bb74a6019cb@f9941", @@ -6034,6 +6224,45 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 251 + }, + "_enabled": true, + "__prefab": { + "__id__": 271 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 622, + "height": 125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c08Kf/5tBKSZanHtPBfPoN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "62v7vq63lHA58MuVNEke4K", + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -6044,7 +6273,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -6070,18 +6299,18 @@ "node": { "__id__": 244 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 266 + "__id__": 276 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -6117,9 +6346,9 @@ }, "_enabled": false, "__prefab": { - "__id__": 268 + "__id__": 278 }, - "_alignFlags": 40, + "_alignFlags": 42, "_target": null, "_left": 42.65499999999997, "_right": 415.345, @@ -6153,7 +6382,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 280 }, "playOnLoad": true, "_clips": [ @@ -6181,8 +6410,6 @@ "__id__": 0 }, "fileId": "ac8s2fO3xFpatPN9NIfLey", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6195,7 +6422,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -6223,7 +6450,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6268,7 +6495,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 287 }, "_alignFlags": 40, "_target": null, @@ -6317,7 +6544,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -6345,7 +6572,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 282 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6390,7 +6617,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 294 }, "_alignFlags": 44, "_target": null, @@ -6439,7 +6666,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 297 }, "_contentSize": { "__type__": "cc.Size", @@ -6467,7 +6694,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 289 + "__id__": 299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6509,7 +6736,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 301 }, "_alignFlags": 45, "_target": null, @@ -6558,35 +6785,35 @@ }, "_children": [ { - "__id__": 294 + "__id__": 304 }, { - "__id__": 302 + "__id__": 312 }, { - "__id__": 310 + "__id__": 320 }, { - "__id__": 339 + "__id__": 349 } ], "_active": true, "_components": [ { - "__id__": 370 + "__id__": 380 }, { - "__id__": 372 + "__id__": 382 }, { - "__id__": 374 + "__id__": 384 }, { - "__id__": 376 + "__id__": 386 } ], "_prefab": { - "__id__": 378 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -6623,23 +6850,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 293 + "__id__": 303 }, "_children": [], "_active": true, "_components": [ { - "__id__": 295 + "__id__": 305 }, { - "__id__": 297 + "__id__": 307 }, { - "__id__": 299 + "__id__": 309 } ], "_prefab": { - "__id__": 301 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -6676,11 +6903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -6704,11 +6931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 308 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6749,11 +6976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 310 }, "_alignFlags": 45, "_target": null, @@ -6798,23 +7025,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 293 + "__id__": 303 }, "_children": [], "_active": true, "_components": [ { - "__id__": 303 + "__id__": 313 }, { - "__id__": 305 + "__id__": 315 }, { - "__id__": 307 + "__id__": 317 } ], "_prefab": { - "__id__": 309 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -6851,11 +7078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -6879,11 +7106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 316 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6947,11 +7174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 318 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -6981,36 +7208,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 293 + "__id__": 303 }, "_children": [ { - "__id__": 311 + "__id__": 321 }, { - "__id__": 317 + "__id__": 327 }, { - "__id__": 323 + "__id__": 333 } ], "_active": true, "_components": [ { - "__id__": 329 + "__id__": 339 }, { - "__id__": 331 + "__id__": 341 }, { - "__id__": 333 + "__id__": 343 }, { - "__id__": 336 + "__id__": 346 } ], "_prefab": { - "__id__": 338 + "__id__": 348 }, "_lpos": { "__type__": "cc.Vec3", @@ -7047,20 +7274,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 310 + "__id__": 320 }, "_children": [], "_active": true, "_components": [ { - "__id__": 312 + "__id__": 322 }, { - "__id__": 314 + "__id__": 324 } ], "_prefab": { - "__id__": 316 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -7097,11 +7324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 311 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7125,11 +7352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 311 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7209,20 +7436,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 310 + "__id__": 320 }, "_children": [], "_active": true, "_components": [ { - "__id__": 318 + "__id__": 328 }, { - "__id__": 320 + "__id__": 330 } ], "_prefab": { - "__id__": 322 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -7259,11 +7486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -7287,11 +7514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 331 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7345,20 +7572,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 310 + "__id__": 320 }, "_children": [], "_active": true, "_components": [ { - "__id__": 324 + "__id__": 334 }, { - "__id__": 326 + "__id__": 336 } ], "_prefab": { - "__id__": 328 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -7395,11 +7622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -7423,11 +7650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7507,11 +7734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 340 }, "_contentSize": { "__type__": "cc.Size", @@ -7535,11 +7762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 342 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7580,15 +7807,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 344 }, "clickEvents": [ { - "__id__": 335 + "__id__": 345 } ], "_interactable": true, @@ -7628,7 +7855,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 310 + "__id__": 320 }, "_id": "" }, @@ -7639,7 +7866,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 293 + "__id__": 303 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -7652,11 +7879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 310 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 347 }, "_alignFlags": 16, "_target": null, @@ -7701,36 +7928,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 293 + "__id__": 303 }, "_children": [ { - "__id__": 340 + "__id__": 350 }, { - "__id__": 346 + "__id__": 356 }, { - "__id__": 352 + "__id__": 362 } ], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 370 }, { - "__id__": 362 + "__id__": 372 }, { - "__id__": 364 + "__id__": 374 }, { - "__id__": 367 + "__id__": 377 } ], "_prefab": { - "__id__": 369 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -7767,20 +7994,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 349 }, "_children": [], "_active": true, "_components": [ { - "__id__": 341 + "__id__": 351 }, { - "__id__": 343 + "__id__": 353 } ], "_prefab": { - "__id__": 345 + "__id__": 355 }, "_lpos": { "__type__": "cc.Vec3", @@ -7817,11 +8044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 352 }, "_contentSize": { "__type__": "cc.Size", @@ -7845,11 +8072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 354 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7929,20 +8156,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 349 }, "_children": [], "_active": true, "_components": [ { - "__id__": 347 + "__id__": 357 }, { - "__id__": 349 + "__id__": 359 } ], "_prefab": { - "__id__": 351 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -7979,11 +8206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 358 }, "_contentSize": { "__type__": "cc.Size", @@ -8007,11 +8234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 360 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8065,23 +8292,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 349 }, "_children": [], "_active": true, "_components": [ { - "__id__": 353 + "__id__": 363 }, { - "__id__": 355 + "__id__": 365 }, { - "__id__": 357 + "__id__": 367 } ], "_prefab": { - "__id__": 359 + "__id__": 369 }, "_lpos": { "__type__": "cc.Vec3", @@ -8118,11 +8345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 364 }, "_contentSize": { "__type__": "cc.Size", @@ -8146,11 +8373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 366 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8217,11 +8444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 362 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 368 }, "languageKey": "chatpanel.buyvip", "defaultText": "", @@ -8251,11 +8478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 371 }, "_contentSize": { "__type__": "cc.Size", @@ -8279,11 +8506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8324,15 +8551,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 375 }, "clickEvents": [ { - "__id__": 366 + "__id__": 376 } ], "_interactable": true, @@ -8372,7 +8599,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 339 + "__id__": 349 }, "_id": "" }, @@ -8383,7 +8610,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 293 + "__id__": 303 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -8396,11 +8623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 378 }, "_alignFlags": 16, "_target": null, @@ -8445,11 +8672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -8473,11 +8700,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 383 }, "_alignFlags": 40, "_target": null, @@ -8509,23 +8736,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 385 }, "timeLabel": { - "__id__": 314 + "__id__": 324 }, "timeBtnLabel": { - "__id__": 326 + "__id__": 336 }, "vipLabel": { - "__id__": 343 + "__id__": 353 }, "vipBtnLabel": { - "__id__": 355 + "__id__": 365 }, "_id": "" }, @@ -8539,11 +8766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 387 }, "_opacity": 255, "_id": "" @@ -8575,20 +8802,20 @@ }, "_children": [ { - "__id__": 380 + "__id__": 390 } ], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 414 }, { - "__id__": 406 + "__id__": 416 } ], "_prefab": { - "__id__": 408 + "__id__": 418 }, "_lpos": { "__type__": "cc.Vec3", @@ -8625,24 +8852,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 379 + "__id__": 389 }, "_children": [ { - "__id__": 381 + "__id__": 391 } ], "_active": true, "_components": [ { - "__id__": 399 + "__id__": 409 }, { - "__id__": 401 + "__id__": 411 } ], "_prefab": { - "__id__": 403 + "__id__": 413 }, "_lpos": { "__type__": "cc.Vec3", @@ -8679,27 +8906,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 390 }, "_children": [ { - "__id__": 382 + "__id__": 392 } ], "_active": true, "_components": [ { - "__id__": 392 + "__id__": 402 }, { - "__id__": 394 + "__id__": 404 }, { - "__id__": 396 + "__id__": 406 } ], "_prefab": { - "__id__": 398 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", @@ -8736,26 +8963,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 381 + "__id__": 391 }, "_children": [], "_active": true, "_components": [ { - "__id__": 383 + "__id__": 393 }, { - "__id__": 385 + "__id__": 395 }, { - "__id__": 387 + "__id__": 397 }, { - "__id__": 389 + "__id__": 399 } ], "_prefab": { - "__id__": 391 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -8792,11 +9019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 394 }, "_contentSize": { "__type__": "cc.Size", @@ -8820,11 +9047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 396 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8862,11 +9089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 398 }, "_alignFlags": 12, "_target": null, @@ -8898,11 +9125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 400 }, "clickEvents": [], "_interactable": true, @@ -8967,11 +9194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 403 }, "_contentSize": { "__type__": "cc.Size", @@ -8995,11 +9222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 405 }, "_type": 3, "_inverted": false, @@ -9017,11 +9244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 391 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 407 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9075,11 +9302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 410 }, "_contentSize": { "__type__": "cc.Size", @@ -9103,11 +9330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 412 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9161,11 +9388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -9189,14 +9416,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 417 }, "image": { - "__id__": 385 + "__id__": 395 }, "_id": "" }, @@ -9227,7 +9454,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 420 }, "_contentSize": { "__type__": "cc.Size", @@ -9255,7 +9482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 422 }, "_alignFlags": 45, "_target": null, @@ -9291,11 +9518,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 424 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 374 + "__id__": 384 }, "editBox": { "__id__": 215 @@ -9310,7 +9537,7 @@ "__id__": 71 }, "popUpImage": { - "__id__": 406 + "__id__": 416 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index 2f46cd58..76b57f80 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -1624,7 +1624,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 200.56799999999996, + "x": 212.63599999999997, "y": 109.65699999999993, "z": 0 }, @@ -1707,7 +1707,7 @@ "_actualFontSize": 51, "_fontSize": 50, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 51.7, "_overflow": 2, "_enableWrapText": true, "_font": { @@ -1765,7 +1765,7 @@ "_alignFlags": 33, "_target": null, "_left": 553.9668125000001, - "_right": 37.06381250000004, + "_right": 24.9958125, "_top": 25.737000000000087, "_bottom": 0, "_horizontalCenter": 0,