diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index 6c7a5c25..07c86df1 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 24 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 25 + "__id__": 28 }, "_id": "1a23cd3e-e487-4fd1-a415-346c2087464d" }, @@ -78,21 +78,24 @@ }, { "__id__": 17 + }, + { + "__id__": 20 } ], "_active": true, "_components": [ - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, { "__id__": 23 + }, + { + "__id__": 24 + }, + { + "__id__": 25 + }, + { + "__id__": 26 } ], "_prefab": null, @@ -659,6 +662,95 @@ "_lockFlags": 0, "_id": "96K4zn3IlDvoIbb1I7ctPL" }, + { + "__type__": "cc.Node", + "_name": "audio", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 22 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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": "f061eJiSBKN5PguQygisF7" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "9bsrrdIjlNVaLy/kkNM/4Q" + }, + { + "__type__": "cc.AudioSource", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": null, + "_clip": { + "__uuid__": "78e9f81f-ddb9-460d-bbce-74e58e0ce7e4", + "__expectedType__": "cc.AudioClip" + }, + "_loop": true, + "_playOnAwake": true, + "_volume": 1, + "_id": "030kCofjFAmI5HlV2BrAD6" + }, { "__type__": "cc.UITransform", "_name": "", @@ -759,29 +851,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 26 - }, - "shadows": { - "__id__": 27 - }, - "_skybox": { - "__id__": 28 - }, - "fog": { "__id__": 29 }, - "octree": { + "shadows": { "__id__": 30 }, - "skin": { + "_skybox": { "__id__": 31 }, - "lightProbeInfo": { + "fog": { "__id__": 32 }, - "postSettings": { + "octree": { "__id__": 33 }, + "skin": { + "__id__": 34 + }, + "lightProbeInfo": { + "__id__": 35 + }, + "postSettings": { + "__id__": 36 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, diff --git a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts index 55d6dead..7b20bb6e 100644 --- a/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts +++ b/assets/Scripts/Sub/UI/SceneBgVideoLayer.ts @@ -25,6 +25,13 @@ export class SceneBgVideoLayer extends li_BaseView { private isPlaying: boolean = false; private currentVideoData: any = null; + // 待处理的视频配置（用于在视频准备好后应用） + private pendingVideoConfig: { + size?: { width: number; height: number } | Size; + position?: { x: number; y: number; z?: number } | Vec3; + scale?: number | Vec3; + } | null = null; + //----重写父类接口--------------------------------------- onLoadCT() { Utils.parseNode(this.node, this._nodeTab); @@ -93,11 +100,18 @@ export class SceneBgVideoLayer extends li_BaseView { position: options?.position, }; - // 先停止当前视频 + // 先停止当前视频并清理状态 if (this.isPlaying) { - this.pause(); + this.stop(); } + // 存储待处理的配置，在视频准备好后应用 + this.pendingVideoConfig = { + size: config.size, + position: config.position, + scale: options?.scale + }; + // 加载本地视频资源 ResManager.I.changeBundleVideo( this.videoPlayer, @@ -113,138 +127,10 @@ export class SceneBgVideoLayer extends li_BaseView { console.log("SceneBgVideoLayer: 设置视频锚点为 (0.5, 0.5)"); } - // 应用位置设置（先尝试本地坐标，再尝试世界坐标） - if (config.position) { - const pos = config.position; - let targetWorldPos: Vec3; - if (pos instanceof Vec3) { - targetWorldPos = pos; - } else { - targetWorldPos = new Vec3(pos.x, pos.y, pos.z || 0); - } - - // 获取 videoPlayer 的父节点信息 - const parent = this.videoPlayer.node.parent; - if (parent) { - const parentWorldPos = parent.getWorldPosition(); - const parentWorldScale = parent.getWorldScale(); - console.log(`SceneBgVideoLayer: VideoPlayer 父节点世界位置: (${parentWorldPos.x}, ${parentWorldPos.y}, ${parentWorldPos.z})`); - console.log(`SceneBgVideoLayer: VideoPlayer 父节点世界缩放: (${parentWorldScale.x}, ${parentWorldScale.y}, ${parentWorldScale.z})`); - - // 尝试方法1：计算相对于父节点的本地位置 - const localPos = new Vec3(); - localPos.x = (targetWorldPos.x - parentWorldPos.x) / parentWorldScale.x; - localPos.y = (targetWorldPos.y - parentWorldPos.y) / parentWorldScale.y; - localPos.z = (targetWorldPos.z - parentWorldPos.z) / parentWorldScale.z; - - this.videoPlayer.node.setPosition(localPos); - console.log(`SceneBgVideoLayer: 设置本地位置: (${localPos.x.toFixed(2)}, ${localPos.y.toFixed(2)}, ${localPos.z.toFixed(2)})`); - } else { - // 如果没有父节点，直接使用世界坐标 - this.videoPlayer.node.setWorldPosition(targetWorldPos); - console.log(`SceneBgVideoLayer: 无父节点，使用世界坐标: (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); - } - - // 验证位置是否设置正确 - const actualWorldPos = this.videoPlayer.node.getWorldPosition(); - const actualLocalPos = this.videoPlayer.node.getPosition(); - console.log(`SceneBgVideoLayer: 目标世界位置: (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); - console.log(`SceneBgVideoLayer: 实际世界位置: (${actualWorldPos.x}, ${actualWorldPos.y}, ${actualWorldPos.z})`); - console.log(`SceneBgVideoLayer: 实际本地位置: (${actualLocalPos.x.toFixed(2)}, ${actualLocalPos.y.toFixed(2)}, ${actualLocalPos.z.toFixed(2)})`); - } - - // 如果传入了目标尺寸，计算并应用缩放 - if (config.size && uiTransform) { - // 获取视频的原始尺寸 - const videoWidth = uiTransform.contentSize.width; - const videoHeight = uiTransform.contentSize.height; - - if (videoWidth > 0 && videoHeight > 0) { - const targetWidth = - config.size instanceof Size - ? config.size.width - : config.size.width; - const targetHeight = - config.size instanceof Size - ? config.size.height - : config.size.height; - - // 计算缩放比例（填满整个区域） - const scaleX = targetWidth / videoWidth; - const scaleY = targetHeight / videoHeight; - const scale = Math.max(scaleX, scaleY); - - this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - console.log( - `SceneBgVideoLayer: 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}` - ); - console.log( - `SceneBgVideoLayer: 缩放比例 - X: ${scaleX.toFixed(3)}, Y: ${scaleY.toFixed(3)}, 最终: ${scale.toFixed(3)}` - ); - } else { - // 如果视频尺寸还未准备好，延迟重试 - this.scheduleOnce(() => { - if (config.size && uiTransform) { - const videoWidth = uiTransform.contentSize.width; - const videoHeight = uiTransform.contentSize.height; - - if (videoWidth > 0 && videoHeight > 0) { - const targetWidth = - config.size instanceof Size - ? config.size.width - : config.size.width; - const targetHeight = - config.size instanceof Size - ? config.size.height - : config.size.height; - - const scaleX = targetWidth / videoWidth; - const scaleY = targetHeight / videoHeight; - const scale = Math.max(scaleX, scaleY); - - this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - console.log( - `SceneBgVideoLayer: (延迟) 视频原始尺寸: ${videoWidth}x${videoHeight}, 目标尺寸: ${targetWidth}x${targetHeight}` - ); - console.log( - `SceneBgVideoLayer: (延迟) 缩放比例 - X: ${scaleX.toFixed(3)}, Y: ${scaleY.toFixed(3)}, 最终: ${scale.toFixed(3)}` - ); - } - } - }, 0.1); - } - } else { - // 没有指定尺寸，保持原始缩放 - this.videoPlayer.node.setScale(Vec3.ONE); - console.log("SceneBgVideoLayer: 未指定尺寸，保持默认缩放 (1, 1, 1)"); - } - // 如果显式传入了 scale 参数，覆盖自动计算的缩放 - + // 立即开始播放，尺寸和位置将在 READY_TO_PLAY 事件中设置 this.videoPlayer.play(); this.isPlaying = true; - console.log(`SceneBgVideoLayer: 播放视频 ${path}, 配置:`, config); - - // 最终验证：确保视频节点的状态正确 - setTimeout(() => { - const finalWorldPos = this.videoPlayer.node.getWorldPosition(); - const finalLocalPos = this.videoPlayer.node.getPosition(); - const finalScale = this.videoPlayer.node.getScale(); - const finalTransform = this.videoPlayer.node.getComponent(UITransform); - if (finalTransform) { - console.log(`SceneBgVideoLayer: === 最终状态验证 ===`); - console.log(`SceneBgVideoLayer: 最终世界位置: (${finalWorldPos.x.toFixed(2)}, ${finalWorldPos.y.toFixed(2)}, ${finalWorldPos.z.toFixed(2)})`); - console.log(`SceneBgVideoLayer: 最终本地位置: (${finalLocalPos.x.toFixed(2)}, ${finalLocalPos.y.toFixed(2)}, ${finalLocalPos.z.toFixed(2)})`); - console.log(`SceneBgVideoLayer: 最终缩放: (${finalScale.x.toFixed(3)}, ${finalScale.y.toFixed(3)}, ${finalScale.z.toFixed(3)})`); - console.log(`SceneBgVideoLayer: 最终锚点: (${finalTransform.anchorX.toFixed(2)}, ${finalTransform.anchorY.toFixed(2)})`); - console.log(`SceneBgVideoLayer: 最终内容尺寸: ${finalTransform.contentSize.width.toFixed(0)}x${finalTransform.contentSize.height.toFixed(0)}`); - - // 计算实际渲染尺寸（内容尺寸 * 缩放） - const renderWidth = finalTransform.contentSize.width * finalScale.x; - const renderHeight = finalTransform.contentSize.height * finalScale.y; - console.log(`SceneBgVideoLayer: 计算的渲染尺寸: ${renderWidth.toFixed(0)}x${renderHeight.toFixed(0)}`); - console.log(`SceneBgVideoLayer: === 验证结束 ===`); - } - }, 200); + console.log(`SceneBgVideoLayer: 开始加载视频 ${path}, 配置:`, config); } ); } @@ -275,7 +161,7 @@ export class SceneBgVideoLayer extends li_BaseView { stop() { if (this.videoPlayer) { this.videoPlayer.stop(); - this.isPlaying = false; + this.clearVideoState(); console.log("SceneBgVideoLayer: 停止视频"); } } @@ -306,42 +192,92 @@ export class SceneBgVideoLayer extends li_BaseView { adjustToFillArea(targetSize: Size, position?: Vec3) { if (!this.videoPlayer) return; - const tryAdjust = () => { - const uiTransform = this.videoPlayer.node.getComponent(UITransform); - if (!uiTransform) return false; + // 如果视频正在播放，直接应用配置 + if (this.isPlaying && this.videoPlayer.isPlaying) { + this.applyVideoConfiguration({ + size: targetSize, + position: position + }); + } else { + // 如果视频还未准备好，存储配置等待应用 + this.pendingVideoConfig = { + size: targetSize, + position: position + }; + console.log("SceneBgVideoLayer: 视频未准备好，配置已存储等待应用"); + } + } + /** + * 清除视频状态和待处理配置 + */ + private clearVideoState() { + this.isPlaying = false; + this.pendingVideoConfig = null; + this.currentVideoData = null; + } + + //================== 内部辅助方法 ================== + + /** + * 应用视频配置（位置、尺寸、缩放） + * @param config 视频配置对象 + */ + private applyVideoConfiguration(config: { + size?: { width: number; height: number } | Size; + position?: { x: number; y: number; z?: number } | Vec3; + scale?: number | Vec3; + }) { + if (!this.videoPlayer) return; + + const uiTransform = this.videoPlayer.node.getComponent(UITransform); + if (!uiTransform) return; + + // 应用位置设置 + if (config.position) { + const pos = config.position; + let targetWorldPos: Vec3; + if (pos instanceof Vec3) { + targetWorldPos = pos; + } else { + targetWorldPos = new Vec3(pos.x, pos.y, pos.z || 0); + } + this.videoPlayer.node.setWorldPosition(targetWorldPos); + console.log(`SceneBgVideoLayer: 设置视频位置 (${targetWorldPos.x}, ${targetWorldPos.y}, ${targetWorldPos.z})`); + } + + // 应用尺寸和缩放设置 + if (config.size) { + // 获取视频的原始尺寸（此时应该是准确的） const videoSize = uiTransform.contentSize; - + if (videoSize.width > 0 && videoSize.height > 0) { - // 计算宽度和高度的缩放比例 - const scaleX = targetSize.width / videoSize.width; - const scaleY = targetSize.height / videoSize.height; + const targetWidth = config.size instanceof Size ? config.size.width : config.size.width; + const targetHeight = config.size instanceof Size ? config.size.height : config.size.height; - // 选择较大的缩放比例以填满整个区域 + // 计算缩放比例（填满整个区域） + const scaleX = targetWidth / videoSize.width; + const scaleY = targetHeight / videoSize.height; const scale = Math.max(scaleX, scaleY); this.videoPlayer.node.setScale(new Vec3(scale, scale, 1)); - - if (position) { - this.videoPlayer.node.setWorldPosition(position); - } - - console.log(`SceneBgVideoLayer: 自适应填充区域，缩放: ${scale}`); - return true; + console.log(`SceneBgVideoLayer: 设置视频缩放 ${scale} (原始尺寸: ${videoSize.width}x${videoSize.height}, 目标尺寸: ${targetWidth}x${targetHeight})`); + } else { + console.warn("SceneBgVideoLayer: 无法获取视频尺寸，跳过缩放设置"); } - return false; - }; - - // 立即尝试一次 - if (!tryAdjust()) { - // 如果失败，延迟尝试 - this.scheduleOnce(() => { - if (!tryAdjust()) { - this.scheduleOnce(() => { - tryAdjust(); - }, 0.5); - } - }, 0.1); + } else if (config.scale) { + // 如果显式传入了 scale 参数，直接应用 + if (typeof config.scale === "number") { + this.videoPlayer.node.setScale(new Vec3(config.scale, config.scale, 1)); + console.log(`SceneBgVideoLayer: 设置显式缩放 ${config.scale}`); + } else { + this.videoPlayer.node.setScale(config.scale); + console.log(`SceneBgVideoLayer: 设置显式缩放 (${config.scale.x}, ${config.scale.y}, ${config.scale.z})`); + } + } else { + // 没有指定尺寸或缩放，保持原始缩放 + this.videoPlayer.node.setScale(Vec3.ONE); + console.log("SceneBgVideoLayer: 保持默认缩放 (1, 1, 1)"); } } @@ -349,6 +285,14 @@ export class SceneBgVideoLayer extends li_BaseView { private onVideoReadyToPlay = () => { console.log("SceneBgVideoLayer: 视频准备完成"); + + // 应用待处理的视频配置 + if (this.pendingVideoConfig) { + this.applyVideoConfiguration(this.pendingVideoConfig); + // 清空待处理配置 + this.pendingVideoConfig = null; + } + this.onVideoReady(); }; @@ -356,12 +300,12 @@ export class SceneBgVideoLayer extends li_BaseView { switch (eventType) { case "completed": console.log("SceneBgVideoLayer: 视频播放完成"); - this.isPlaying = false; + this.clearVideoState(); this.onVideoEnd(); break; case "error": console.error("SceneBgVideoLayer: 视频播放错误"); - this.isPlaying = false; + this.clearVideoState(); this.onVideoError(); break; } @@ -409,6 +353,7 @@ export class SceneBgVideoLayer extends li_BaseView { */ onDestroy() { if (this.videoPlayer) { + this.videoPlayer.stop(); this.videoPlayer.node.off( VideoPlayer.EventType.READY_TO_PLAY, this.onVideoReadyToPlay, @@ -416,6 +361,7 @@ export class SceneBgVideoLayer extends li_BaseView { ); //this.videoPlayer.node.off(VideoPlayer.EventType.VIDEO_PLAYER_EVENT, this.onVideoEvent, this); } + this.clearVideoState(); SceneBgVideoLayer.handle = null; } } diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts index 7a4232c5..3b2c9ec0 100644 --- a/assets/Scripts/chat18x/manager/NavigationManager.ts +++ b/assets/Scripts/chat18x/manager/NavigationManager.ts @@ -101,25 +101,15 @@ export class NavigationManager { return; } - const extendedNavigationData = { - ...navigationData, - withTransition: true, - transitionType: transitionConfig.incomingTransition, - }; - - ViewManager.I.openBundlesView( - targetPanel, - extendedNavigationData, - (targetNode) => { - this._executeTransition( - targetNode, - currentPanel, - transitionConfig, - duration, - onComplete - ); - } - ); + ViewManager.I.openBundlesView(targetPanel, navigationData, (targetNode) => { + this._executeTransition( + targetNode, + currentPanel, + transitionConfig, + duration, + onComplete + ); + }); } /** @@ -274,7 +264,7 @@ export class NavigationManager { }; this.navigateWithTransition( "GirlListPanel", - navigationData, + themeId, transitionConfig, currentPanel, () => { @@ -370,7 +360,6 @@ export class NavigationManager { const navigationData = { categoryId: categoryId, roleId: roleId, - withSlideTransition: true, }; const transitionConfig: PageTransitionConfig = { diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index 5a75f749..55114eff 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -8,6 +8,7 @@ import { UITransform, VideoPlayer, Size, + Vec3, } from "cc"; // 首先加载 polyfills 以确保兼容性 import "../../utils/polyfills"; @@ -29,6 +30,7 @@ import { PayToTalkSubpanel } from "./PayToTalkSubpanel"; import { DataId, DataManager } from "../../data/DataManager"; import { GirlData } from "../../data/GirlData"; import { SceneBgVideoLayer } from "../../../Sub/UI/SceneBgVideoLayer"; +import { NavigationManager } from "../../manager/NavigationManager"; const { ccclass, property } = _decorator; @ccclass("ChatPanel") @@ -70,7 +72,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { private _nodeTab: any = {}; nameKey: string; - private commercialVideos: purchase.CommercialVideo[] = []; private currentEmotion: VideoEmotion | null = null; private onLanguageChangeCallback = () => { @@ -83,7 +84,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { typeof data === "object" && data.roleId !== undefined ? data.roleId : data; - const withAnimation = typeof data === "object" && data.withSlideTransition; // 检查是否是切换角色 const isRoleSwitch = this.id && this.id !== newRoleId; @@ -91,12 +91,10 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { this.id = newRoleId; this.categoryId = data.categoryId; // 如果标记了需要滑入动画，则执行动画 - if (withAnimation && this.node && this.node.isValid) { - // 延迟一帧执行动画，确保节点已正确加载到场景中 - this.scheduleOnce(() => { - UITransitionHelper.slideInFromRight(this.node, 0.3); - }, 0); - } + // 延迟一帧执行动画，确保节点已正确加载到场景中 + this.scheduleOnce(() => { + UITransitionHelper.slideInFromRight(this.node, 0.3); + }, 0); // 获取ChatController单例并绑定当前Panel this.chatController = ChatController.Instance; @@ -122,10 +120,15 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { } } } - + targetSize; + videoAreaPos; onLoadCT() { Utils.parseNode(this.node, this._nodeTab); + // 获取 videoArea 的尺寸和位置 + this.targetSize = this.videoArea.contentSize; + this.videoAreaPos = new Vec3(540, 1170, 0); + this.register(); this.refresh(); this.payToTalkPanel.node.active = false; @@ -186,15 +189,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { this.onEmotionInitialized ); - // Cleanup video event listeners - if (this.videoLayer && this.videoLayer.node) { - this.videoLayer.node.off( - VideoPlayer.EventType.READY_TO_PLAY, - this.adjustVideoScale, - this - ); - } - // 解绑ChatController（不销毁，因为它是单例） if (this.chatController) { this.chatController.unbindView(); @@ -202,31 +196,10 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { } } refresh() { - //this.id = id; - - // 通过ChatController获取角色数据 - //const roleData = this.chatController.getRoleData(); - //if (!roleData || !roleData.basic) return; - - //const data = roleData.basic; - //const dataDetail = roleData.detail; const girlData = DataManager.I.getDataById(DataId.Girl); this.nameKey = girlData.getGrilName(this.categoryId, this.id); this.girlName.string = LanguageUtils.getText(this.nameKey); - // ResManager.I.changeBundleSpriteFrame( - // this.girlImg, - // data.avatarPath, - // "Girls", - // () => { - // let sizeTran = this.girlImg.node.parent.getComponent(UITransform); - // Utils.adjustBgPixelRatioToSize( - // sizeTran.contentSize, - // this.girlImg.node, - // 2 - // ); - // } - // ); // 通过ChatController获取商业视频数据 const chatModel = this.chatController.getChatModel(); @@ -249,84 +222,35 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { `Loading initial video: ${initialVideo} (emotion: ${VideoEmotion[initialVideo]})` ); - // 获取 videoArea 的尺寸 - const targetSize = this.videoArea - ? new Size(this.videoArea.width, this.videoArea.height) - : new Size(600, 800); - // Set current emotion to the loaded video's emotion this.currentEmotion = this.chatController.getCurrentEmotion(); - // 使用新的统一 playVideo 方法 - const videoAreaPos = this.videoArea - ? this.videoArea.node.getWorldPosition() - : undefined; + // 使用新的统一 playVideo 方法，现在它会自动处理缩放和位置 + this.videoLayer.playVideo(initialVideo, { loop: true, - size: targetSize, - position: videoAreaPos, + size: this.targetSize, + position: this.videoAreaPos, }); - // 延迟调整视频缩放 - this.scheduleOnce(() => { - this.adjustVideoScale(); - }, 0.1); + // 注意：移除了 adjustVideoScale() 调用，因为 playVideo 现在会自动处理缩放和位置 } } else { - this.commercialVideos = []; this.currentEmotion = null; // Reset current emotion when no videos available console.log("No SceneBgVideoLayer available for role", this.id); } } + /** + * @deprecated 此方法已废弃，现在由 SceneBgVideoLayer.playVideo() 自动处理缩放和位置 + * 保留此方法仅为了兼容性，但不再主动调用 + */ adjustVideoScale() { - if (!this.videoLayer || !this.videoArea) { - console.error("ChatPanel: SceneBgVideoLayer 或 videoArea 不可用"); - return; - } - - const tryAdjustScale = () => { - const videoPlayer = this.videoLayer.getVideoPlayer(); - if (!videoPlayer) return false; - - const videoTransform = videoPlayer.node.getComponent(UITransform); - if (videoTransform && videoTransform.height > 0) { - // 计算缩放比例，使视频高度填满 videoArea - const scale = this.videoArea.height / videoTransform.height; - - // 设置视频缩放 - this.videoLayer.setVideoScale(scale); - - // 获取 videoArea 的世界坐标中心点 - const videoAreaWorldPos = this.videoArea.node.getWorldPosition(); - - // 使用新的 playVideo 方法的位置参数，如果需要更新位置 - // 由于视频已经在播放，这里只调整缩放 - // 位置调整已在 playVideo 中处理 - - console.log( - `ChatPanel: 视频缩放到 ${scale}, videoArea高度: ${this.videoArea.height}, 视频高度: ${videoTransform.height}` - ); - console.log( - `ChatPanel: 视频世界位置设置为 (${videoAreaWorldPos.x}, ${videoAreaWorldPos.y})` - ); - return true; - } - return false; - }; - - // 立即尝试一次 - if (!tryAdjustScale()) { - // 如果失败，延迟尝试 - this.scheduleOnce(() => { - if (!tryAdjustScale()) { - // 再次延迟尝试 - this.scheduleOnce(() => { - tryAdjustScale(); - }, 0.5); - } - }, 0.1); - } + console.log( + "ChatPanel: adjustVideoScale() 方法已废弃，缩放和位置由 playVideo() 自动处理" + ); + // 如果确实需要手动调整，可以重新调用 playVideo + // this.videoLayer.playVideo(currentVideo, { size, position }); } onChatCountChange() { const girlData = DataManager.I.getDataById(DataId.Girl); @@ -382,27 +306,16 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { })` ); - // Load the new video with the unified playVideo method - // 获取 videoArea 的尺寸和位置 - const targetSize = this.videoArea - ? new Size(this.videoArea.width, this.videoArea.height) - : new Size(600, 800); - const videoAreaPos = this.videoArea - ? this.videoArea.node.getWorldPosition() - : undefined; - this.videoLayer.playVideo(matchingVideo, { loop: true, - size: targetSize, - position: videoAreaPos, + size: this.targetSize, + position: this.videoAreaPos, // 修复：使用正确的位置而不是 Vec3.ZERO }); - //ResManager.I.changeBundleVideo(this.girlVideo, matchingVideo, "Girls"); // Update current emotion state this.currentEmotion = emotion; - // Adjust scale and enable playback - this.adjustVideoScale(); + // 注意：移除了 adjustVideoScale() 调用，因为 playVideo 现在会自动处理缩放和位置 this.setVideoEnable(true); } else { console.warn( @@ -416,23 +329,16 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { `Loading fallback video: ${fallbackVideo} (emotion: ${VideoEmotion[fallbackVideo]})` ); - // 获取 videoArea 的尺寸和位置 - const targetSize = this.videoArea - ? new Size(this.videoArea.width, this.videoArea.height) - : new Size(600, 800); - const videoAreaPos = this.videoArea - ? this.videoArea.node.getWorldPosition() - : undefined; - this.videoLayer.playVideo(fallbackVideo, { loop: true, - size: targetSize, - position: videoAreaPos, + size: this.targetSize, + position: this.videoAreaPos, }); // Update current emotion state to the fallback video's emotion this.currentEmotion = this.chatController.getCurrentEmotion(); - this.adjustVideoScale(); + + // 注意：移除了 adjustVideoScale() 调用，因为 playVideo 现在会自动处理缩放和位置 this.setVideoEnable(true); } } @@ -558,10 +464,12 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { } returnBtn() { - this.onClose(); - GameRootUI.I.showDefaultView(); - - //ViewManager.I.openBundlesView("GirlListPanel"); + // Navigate back to GirlDetailPanel with current girlId using smooth transition + NavigationManager.Instance.navigateToGirlDetail( + this.id, + NavigationManager.getTransitionPresets().SLIDE_RIGHT_TO_LEFT, + this + ); } onClickRecord() { ViewManager.I.openBundlesView("RecordPanel", this.id); diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 33a53ce3..b782cba1 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -60,6 +60,9 @@ export class GirlDetailPanel extends li_BaseView { @property(Node) chatBtn: Node; + + @property(Node) + descContent: Node; id = 0; @property(DetailImageItem) @@ -75,10 +78,18 @@ export class GirlDetailPanel extends li_BaseView { onLoadCT() { super.onLoadCT(); this.imgItemInst.node.active = false; - this.videoAreaPos = this.videoArea.node.getWorldPosition(); + this.videoAreaPos = new Vec3(540, 1384); - this.node.scale = Vec3.ZERO; - tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); + const pos = new Vec3( + this.descContent.position.x, + this.descContent.position.y, + this.descContent.position.z + ); + this.descContent.position = new Vec3(pos.x, pos.y - 1000, pos.z); + //this.node.scale = Vec3.ZERO; + tween(this.descContent) + .to(0.3, { position: pos }, { easing: "quadOut" }) + .start(); // 检查 SceneBgVideoLayer 是否可用 if (!this.videoLayer) { diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index 74d16741..3da13da6 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -46,7 +46,9 @@ export class GirlListPopupPanel extends li_BaseView { } onLoadCT() { this.node.scale = Vec3.ZERO; - tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); + tween(this.node) + .to(0.2, { scale: Vec3.ONE }, { easing: "quadOut" }) + .start(); Utils.parseNode(this.node, this._nodeTab); this.img = this._nodeTab.img.getComponent(Sprite); diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts index a6b4ed98..580c48f0 100644 --- a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts @@ -46,7 +46,10 @@ export class PopupGirlDetailPanel extends li_BaseView { } onLoadCT() { this.node.scale = Vec3.ZERO; - tween(this.node).to(0.3, { scale: Vec3.ONE }).start(); + tween(this.node) + .to(0.2, { scale: Vec3.ONE }, { easing: "quadOut" }) + .start(); + Utils.parseNode(this.node, this._nodeTab); this.desc = this._nodeTab.content.getComponent(Label); this.uitransform = this._nodeTab.Img_Frame.getComponent(UITransform); diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index 7f598c0a..474911b7 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -211,7 +211,7 @@ export class DetailImageItem extends Component { } ResManager.I.changeBundleSpriteFrame(this.img, imgPath, "Girls", () => { - if (!this.isVisible) this.question.active = false; // 图片加载成功后隐藏问号 + if (!this.isVisible) this.question.active = true; // 图片加载成功后隐藏问号 this.scaleToFillItem(); this.loading.active = false; }); diff --git a/assets/Scripts/chat18x/utils/UITransitionHelper.ts b/assets/Scripts/chat18x/utils/UITransitionHelper.ts index 96bca323..206672e7 100644 --- a/assets/Scripts/chat18x/utils/UITransitionHelper.ts +++ b/assets/Scripts/chat18x/utils/UITransitionHelper.ts @@ -42,9 +42,6 @@ export class UITransitionHelper { { position: originalPosition }, { easing: "linear", - onUpdate: () => { - console.log(node.position); - }, } ) .call(() => { diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 07b20d23..c054e7ff 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 214 + "__id__": 222 }, { - "__id__": 83 + "__id__": 91 }, { - "__id__": 107 + "__id__": 115 }, { - "__id__": 292 + "__id__": 300 } ], "_active": true, "_components": [ { - "__id__": 322 + "__id__": 330 }, { - "__id__": 324 + "__id__": 332 }, { - "__id__": 326 + "__id__": 334 } ], "_prefab": { - "__id__": 328 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -94,32 +94,35 @@ "__id__": 11 }, { - "__id__": 59 + "__id__": 19 }, { - "__id__": 65 + "__id__": 67 }, { - "__id__": 131 + "__id__": 73 }, { - "__id__": 143 + "__id__": 139 + }, + { + "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 215 }, { - "__id__": 209 + "__id__": 217 }, { - "__id__": 211 + "__id__": 219 } ], "_prefab": { - "__id__": 213 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -177,7 +180,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -913.55, + "y": -771.3, "z": 0 }, "_lrot": { @@ -218,12 +221,12 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 512.9 + "height": 316.845 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -293,7 +296,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 398.7, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -321,6 +324,179 @@ "__id__": 0 }, "fileId": "7ayOdn2qlPjpqB019UcUlo", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Sprite-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -1170, + "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__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 413.545 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7e1lrgeRlDcLzmA8U/LBNk" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 24, + "g": 15, + "b": 32, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_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": "b1E6TqSrlPY4uj5Cjge/tM" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_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": 4, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dcI7KBVulBP5s8EvP5rPs6" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ba2gJH/DhFPZ1T//8xO99O", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -335,32 +511,32 @@ }, "_children": [ { - "__id__": 12 + "__id__": 20 }, { - "__id__": 18 - }, - { - "__id__": 33 + "__id__": 26 }, { "__id__": 41 + }, + { + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 60 }, { - "__id__": 54 + "__id__": 62 }, { - "__id__": 56 + "__id__": 64 } ], "_prefab": { - "__id__": 58 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -397,20 +573,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 19 }, "_children": [], "_active": true, "_components": [ { - "__id__": 13 + "__id__": 21 }, { - "__id__": 15 + "__id__": 23 } ], "_prefab": { - "__id__": 17 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -447,11 +623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -475,11 +651,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 24 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -533,31 +709,31 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 19 }, "_children": [ { - "__id__": 19 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 33 }, { - "__id__": 27 + "__id__": 35 }, { - "__id__": 30 + "__id__": 38 } ], "_prefab": { - "__id__": 32 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", - "x": -423, + "x": -454.79999999999995, "y": 0, "z": 0 }, @@ -590,20 +766,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 28 }, { - "__id__": 22 + "__id__": 30 } ], "_prefab": { - "__id__": 24 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -640,11 +816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -668,11 +844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -726,11 +902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -754,15 +930,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 36 }, "clickEvents": [ { - "__id__": 29 + "__id__": 37 } ], "_interactable": true, @@ -802,7 +978,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 18 + "__id__": 26 }, "_id": "" }, @@ -826,15 +1002,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 39 }, "_alignFlags": 9, "_target": null, - "_left": 52, + "_left": 20.2, "_right": 0, "_top": 9.400000000000006, "_bottom": 30, @@ -875,23 +1051,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 19 }, "_children": [], "_active": true, "_components": [ { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 }, { - "__id__": 38 + "__id__": 46 } ], "_prefab": { - "__id__": 40 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -928,11 +1104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 43 }, "_contentSize": { "__type__": "cc.Size", @@ -956,11 +1132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 45 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1027,11 +1203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 47 }, "_alignFlags": 20, "_target": null, @@ -1076,26 +1252,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 19 }, "_children": [], "_active": false, "_components": [ { - "__id__": 42 + "__id__": 50 }, { - "__id__": 44 + "__id__": 52 }, { - "__id__": 46 + "__id__": 54 }, { - "__id__": 49 + "__id__": 57 } ], "_prefab": { - "__id__": 51 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1132,11 +1308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -1160,11 +1336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1205,15 +1381,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 55 }, "clickEvents": [ { - "__id__": 48 + "__id__": 56 } ], "_interactable": true, @@ -1253,7 +1429,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 41 + "__id__": 49 }, "_id": "" }, @@ -1277,11 +1453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 58 }, "_alignFlags": 9, "_target": null, @@ -1326,11 +1502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1354,11 +1530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 19 }, "_enabled": false, "__prefab": { - "__id__": 55 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1399,11 +1575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 65 }, "_alignFlags": 41, "_target": null, @@ -1454,14 +1630,14 @@ "_active": true, "_components": [ { - "__id__": 60 + "__id__": 68 }, { - "__id__": 62 + "__id__": 70 } ], "_prefab": { - "__id__": 64 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -1498,11 +1674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1526,11 +1702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1588,29 +1764,29 @@ }, "_children": [ { - "__id__": 66 + "__id__": 74 } ], "_active": true, "_components": [ - { - "__id__": 72 - }, - { - "__id__": 74 - }, - { - "__id__": 76 - }, - { - "__id__": 78 - }, { "__id__": 80 + }, + { + "__id__": 82 + }, + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 } ], "_prefab": { - "__id__": 130 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", @@ -1647,20 +1823,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 73 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 75 }, { - "__id__": 69 + "__id__": 77 } ], "_prefab": { - "__id__": 71 + "__id__": 79 }, "_lpos": { "__type__": "cc.Vec3", @@ -1697,11 +1873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,11 +1901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 78 }, "_alignFlags": 36, "_target": null, @@ -1774,11 +1950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", @@ -1802,11 +1978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 83 }, "_alignFlags": 45, "_target": null, @@ -1838,11 +2014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 85 }, "_type": 0, "_inverted": false, @@ -1860,11 +2036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1906,20 +2082,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 89 }, "initPos": { - "__id__": 66 + "__id__": 74 }, "lBubble": { - "__id__": 82 + "__id__": 90 }, "rBubble": { - "__id__": 106 + "__id__": 114 }, "_id": "" }, @@ -1933,20 +2109,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 113 }, "bg": { - "__id__": 85 + "__id__": 93 }, "content": { - "__id__": 95 + "__id__": 103 }, "contentT": { - "__id__": 93 + "__id__": 101 }, "_id": "" }, @@ -1960,26 +2136,26 @@ }, "_children": [ { - "__id__": 84 + "__id__": 92 }, { - "__id__": 92 + "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 108 }, { - "__id__": 102 + "__id__": 110 }, { - "__id__": 82 + "__id__": 90 } ], "_prefab": { - "__id__": 104 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -2016,23 +2192,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 83 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 93 }, { - "__id__": 87 + "__id__": 95 }, { - "__id__": 89 + "__id__": 97 } ], "_prefab": { - "__id__": 91 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", @@ -2069,11 +2245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -2097,11 +2273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 96 }, "_alignFlags": 12, "_target": null, @@ -2133,11 +2309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 98 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2191,23 +2367,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 83 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 101 }, { - "__id__": 95 + "__id__": 103 }, { - "__id__": 97 + "__id__": 105 } ], "_prefab": { - "__id__": 99 + "__id__": 107 }, "_lpos": { "__type__": "cc.Vec3", @@ -2244,11 +2420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 102 }, "_contentSize": { "__type__": "cc.Size", @@ -2272,11 +2448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 104 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2340,11 +2516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 106 }, "_alignFlags": 12, "_target": null, @@ -2389,11 +2565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2417,11 +2593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 111 }, "_alignFlags": 8, "_target": null, @@ -2470,20 +2646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 137 }, "bg": { - "__id__": 109 + "__id__": 117 }, "content": { - "__id__": 119 + "__id__": 127 }, "contentT": { - "__id__": 117 + "__id__": 125 }, "_id": "" }, @@ -2497,26 +2673,26 @@ }, "_children": [ { - "__id__": 108 + "__id__": 116 }, { - "__id__": 116 + "__id__": 124 } ], "_active": true, "_components": [ { - "__id__": 124 + "__id__": 132 }, { - "__id__": 126 + "__id__": 134 }, { - "__id__": 106 + "__id__": 114 } ], "_prefab": { - "__id__": 128 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2553,23 +2729,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 117 }, { - "__id__": 111 + "__id__": 119 }, { - "__id__": 113 + "__id__": 121 } ], "_prefab": { - "__id__": 115 + "__id__": 123 }, "_lpos": { "__type__": "cc.Vec3", @@ -2606,11 +2782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2634,11 +2810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 120 }, "_alignFlags": 36, "_target": null, @@ -2670,11 +2846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2728,23 +2904,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 125 }, { - "__id__": 119 + "__id__": 127 }, { - "__id__": 121 + "__id__": 129 } ], "_prefab": { - "__id__": 123 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2781,11 +2957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -2809,11 +2985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2877,11 +3053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 130 }, "_alignFlags": 36, "_target": null, @@ -2926,11 +3102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -2954,11 +3130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 135 }, "_alignFlags": 32, "_target": null, @@ -3024,20 +3200,20 @@ }, "_children": [ { - "__id__": 132 + "__id__": 140 } ], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 146 }, { - "__id__": 140 + "__id__": 148 } ], "_prefab": { - "__id__": 142 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -3074,20 +3250,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 139 }, "_children": [], "_active": false, "_components": [ { - "__id__": 133 + "__id__": 141 }, { - "__id__": 135 + "__id__": 143 } ], "_prefab": { - "__id__": 137 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -3124,11 +3300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3152,11 +3328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 144 }, "_resourceType": 1, "_remoteURL": "", @@ -3195,11 +3371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3223,11 +3399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 149 }, "_alignFlags": 45, "_target": null, @@ -3275,9 +3451,6 @@ "__id__": 2 }, "_children": [ - { - "__id__": 144 - }, { "__id__": 152 }, @@ -3285,23 +3458,26 @@ "__id__": 160 }, { - "__id__": 185 + "__id__": 168 + }, + { + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 208 }, { - "__id__": 202 + "__id__": 210 }, { - "__id__": 204 + "__id__": 212 } ], "_prefab": { - "__id__": 206 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -3338,23 +3514,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 153 }, { - "__id__": 147 + "__id__": 155 }, { - "__id__": 149 + "__id__": 157 } ], "_prefab": { - "__id__": 151 + "__id__": 159 }, "_lpos": { "__type__": "cc.Vec3", @@ -3391,11 +3567,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 154 }, "_contentSize": { "__type__": "cc.Size", @@ -3419,11 +3595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3464,11 +3640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 158 }, "_alignFlags": 40, "_target": null, @@ -3513,23 +3689,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 161 }, { - "__id__": 155 + "__id__": 163 }, { - "__id__": 157 + "__id__": 165 } ], "_prefab": { - "__id__": 159 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", @@ -3566,11 +3742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -3594,11 +3770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3639,11 +3815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 166 }, "_alignFlags": 40, "_target": null, @@ -3688,33 +3864,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 151 }, "_children": [ { - "__id__": 161 + "__id__": 169 }, { - "__id__": 167 + "__id__": 175 } ], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 183 }, { - "__id__": 177 + "__id__": 185 }, { - "__id__": 179 + "__id__": 187 }, { - "__id__": 182 + "__id__": 190 } ], "_prefab": { - "__id__": 184 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3751,20 +3927,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 168 }, "_children": [], "_active": false, "_components": [ { - "__id__": 162 + "__id__": 170 }, { - "__id__": 164 + "__id__": 172 } ], "_prefab": { - "__id__": 166 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -3801,11 +3977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -3829,11 +4005,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3910,23 +4086,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 160 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 176 }, { - "__id__": 170 + "__id__": 178 }, { - "__id__": 172 + "__id__": 180 } ], "_prefab": { - "__id__": 174 + "__id__": 182 }, "_lpos": { "__type__": "cc.Vec3", @@ -3963,11 +4139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -3991,11 +4167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4059,11 +4235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 181 }, "languageKey": "chatpanel.inputplaceholder", "defaultText": "", @@ -4093,11 +4269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", @@ -4121,11 +4297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 168 }, "_enabled": false, "__prefab": { - "__id__": 178 + "__id__": 186 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4166,25 +4342,25 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 188 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [ { - "__id__": 181 + "__id__": 189 } ], "_textLabel": { - "__id__": 164 + "__id__": 172 }, "_placeholderLabel": { - "__id__": 170 + "__id__": 178 }, "_returnType": 0, "_string": "", @@ -4218,11 +4394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 191 }, "_alignFlags": 44, "_target": null, @@ -4267,27 +4443,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 151 }, "_children": [ { - "__id__": 186 + "__id__": 194 } ], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 200 }, { - "__id__": 194 + "__id__": 202 }, { - "__id__": 196 + "__id__": 204 } ], "_prefab": { - "__id__": 199 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -4324,20 +4500,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 185 + "__id__": 193 }, "_children": [], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 195 }, { - "__id__": 189 + "__id__": 197 } ], "_prefab": { - "__id__": 191 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", @@ -4374,11 +4550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 196 }, "_contentSize": { "__type__": "cc.Size", @@ -4402,11 +4578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4486,11 +4662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4514,11 +4690,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 203 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4559,15 +4735,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 205 }, "clickEvents": [ { - "__id__": 198 + "__id__": 206 } ], "_interactable": true, @@ -4619,7 +4795,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 185 + "__id__": 193 }, "_id": "" }, @@ -4656,11 +4832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -4684,11 +4860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 151 }, "_enabled": false, "__prefab": { - "__id__": 203 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4729,11 +4905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 213 }, "_alignFlags": 44, "_target": null, @@ -4782,7 +4958,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 216 }, "_contentSize": { "__type__": "cc.Size", @@ -4810,7 +4986,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 210 + "__id__": 218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4855,7 +5031,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 220 }, "_alignFlags": 45, "_target": null, @@ -4903,36 +5079,36 @@ "__id__": 1 }, "_children": [ - { - "__id__": 215 - }, { "__id__": 223 }, { - "__id__": 252 + "__id__": 231 + }, + { + "__id__": 260 } ], "_active": true, "_components": [ - { - "__id__": 281 - }, - { - "__id__": 283 - }, - { - "__id__": 285 - }, - { - "__id__": 287 - }, { "__id__": 289 + }, + { + "__id__": 291 + }, + { + "__id__": 293 + }, + { + "__id__": 295 + }, + { + "__id__": 297 } ], "_prefab": { - "__id__": 291 + "__id__": 299 }, "_lpos": { "__type__": "cc.Vec3", @@ -4969,23 +5145,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 224 }, { - "__id__": 218 + "__id__": 226 }, { - "__id__": 220 + "__id__": 228 } ], "_prefab": { - "__id__": 222 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -5022,11 +5198,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -5050,11 +5226,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5118,11 +5294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 229 }, "languageKey": "chatpanel.paytotalk.desc", "defaultText": "", @@ -5152,36 +5328,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 222 }, "_children": [ { - "__id__": 224 + "__id__": 232 }, { - "__id__": 230 + "__id__": 238 }, { - "__id__": 236 + "__id__": 244 } ], "_active": true, "_components": [ { - "__id__": 242 + "__id__": 250 }, { - "__id__": 244 + "__id__": 252 }, { - "__id__": 246 + "__id__": 254 }, { - "__id__": 249 + "__id__": 257 } ], "_prefab": { - "__id__": 251 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -5218,20 +5394,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 223 + "__id__": 231 }, "_children": [], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 233 }, { - "__id__": 227 + "__id__": 235 } ], "_prefab": { - "__id__": 229 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -5268,11 +5444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -5296,11 +5472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5380,20 +5556,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 223 + "__id__": 231 }, "_children": [], "_active": true, "_components": [ { - "__id__": 231 + "__id__": 239 }, { - "__id__": 233 + "__id__": 241 } ], "_prefab": { - "__id__": 235 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -5430,11 +5606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 240 }, "_contentSize": { "__type__": "cc.Size", @@ -5458,11 +5634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 242 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5516,20 +5692,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 223 + "__id__": 231 }, "_children": [], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 245 }, { - "__id__": 239 + "__id__": 247 } ], "_prefab": { - "__id__": 241 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -5566,11 +5742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -5594,11 +5770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5678,11 +5854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -5706,11 +5882,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5751,15 +5927,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 255 }, "clickEvents": [ { - "__id__": 248 + "__id__": 256 } ], "_interactable": true, @@ -5799,7 +5975,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 223 + "__id__": 231 }, "_id": "" }, @@ -5810,7 +5986,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 214 + "__id__": 222 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -5823,11 +5999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 258 }, "_alignFlags": 16, "_target": null, @@ -5872,36 +6048,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 222 }, "_children": [ { - "__id__": 253 + "__id__": 261 }, { - "__id__": 259 + "__id__": 267 }, { - "__id__": 265 + "__id__": 273 } ], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 279 }, { - "__id__": 273 + "__id__": 281 }, { - "__id__": 275 + "__id__": 283 }, { - "__id__": 278 + "__id__": 286 } ], "_prefab": { - "__id__": 280 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -5938,20 +6114,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 252 + "__id__": 260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 254 + "__id__": 262 }, { - "__id__": 256 + "__id__": 264 } ], "_prefab": { - "__id__": 258 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -5988,11 +6164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -6016,11 +6192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 265 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6100,20 +6276,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 252 + "__id__": 260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 260 + "__id__": 268 }, { - "__id__": 262 + "__id__": 270 } ], "_prefab": { - "__id__": 264 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -6150,11 +6326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 259 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -6178,11 +6354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 259 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 271 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6262,20 +6438,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 252 + "__id__": 260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 266 + "__id__": 274 }, { - "__id__": 268 + "__id__": 276 } ], "_prefab": { - "__id__": 270 + "__id__": 278 }, "_lpos": { "__type__": "cc.Vec3", @@ -6312,11 +6488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -6340,11 +6516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6398,11 +6574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", @@ -6426,11 +6602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 282 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6471,15 +6647,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 284 }, "clickEvents": [ { - "__id__": 277 + "__id__": 285 } ], "_interactable": true, @@ -6519,7 +6695,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 252 + "__id__": 260 }, "_id": "" }, @@ -6530,7 +6706,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 214 + "__id__": 222 }, "component": "", "_componentId": "06f47u6codPJodunp6ofax0", @@ -6543,11 +6719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 287 }, "_alignFlags": 16, "_target": null, @@ -6592,11 +6768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -6620,11 +6796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6665,11 +6841,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_alignFlags": 40, "_target": null, @@ -6701,23 +6877,23 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 296 }, "timeLabel": { - "__id__": 227 + "__id__": 235 }, "timeBtnLabel": { - "__id__": 239 + "__id__": 247 }, "vipLabel": { - "__id__": 256 + "__id__": 264 }, "vipBtnLabel": { - "__id__": 262 + "__id__": 270 }, "_id": "" }, @@ -6731,11 +6907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 298 }, "_opacity": 255, "_id": "" @@ -6767,20 +6943,20 @@ }, "_children": [ { - "__id__": 293 + "__id__": 301 } ], "_active": true, "_components": [ { - "__id__": 317 + "__id__": 325 }, { - "__id__": 319 + "__id__": 327 } ], "_prefab": { - "__id__": 321 + "__id__": 329 }, "_lpos": { "__type__": "cc.Vec3", @@ -6817,24 +6993,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 292 + "__id__": 300 }, "_children": [ { - "__id__": 294 + "__id__": 302 } ], "_active": true, "_components": [ { - "__id__": 312 + "__id__": 320 }, { - "__id__": 314 + "__id__": 322 } ], "_prefab": { - "__id__": 316 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -6871,27 +7047,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 293 + "__id__": 301 }, "_children": [ { - "__id__": 295 + "__id__": 303 } ], "_active": true, "_components": [ { - "__id__": 305 + "__id__": 313 }, { - "__id__": 307 + "__id__": 315 }, { - "__id__": 309 + "__id__": 317 } ], "_prefab": { - "__id__": 311 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -6928,26 +7104,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 294 + "__id__": 302 }, "_children": [], "_active": true, "_components": [ { - "__id__": 296 + "__id__": 304 }, { - "__id__": 298 + "__id__": 306 }, { - "__id__": 300 + "__id__": 308 }, { - "__id__": 302 + "__id__": 310 } ], "_prefab": { - "__id__": 304 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -6984,11 +7160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 305 }, "_contentSize": { "__type__": "cc.Size", @@ -7012,11 +7188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 307 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7054,11 +7230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 309 }, "_alignFlags": 12, "_target": null, @@ -7090,11 +7266,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 311 }, "clickEvents": [], "_interactable": true, @@ -7159,11 +7335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -7187,11 +7363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 316 }, "_type": 3, "_inverted": false, @@ -7209,11 +7385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7267,11 +7443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 321 }, "_contentSize": { "__type__": "cc.Size", @@ -7295,11 +7471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 293 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 323 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7353,11 +7529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -7381,14 +7557,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 292 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 328 }, "image": { - "__id__": 298 + "__id__": 306 }, "_id": "" }, @@ -7419,7 +7595,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -7447,7 +7623,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 333 }, "_alignFlags": 45, "_target": null, @@ -7483,26 +7659,26 @@ }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 335 }, "m_rootNode": null, "payToTalkPanel": { - "__id__": 287 + "__id__": 295 }, "editBox": { - "__id__": 179 + "__id__": 187 }, "girlName": { - "__id__": 36 + "__id__": 44 }, "videoArea": { - "__id__": 138 + "__id__": 146 }, "layout": { - "__id__": 80 + "__id__": 88 }, "popUpImage": { - "__id__": 319 + "__id__": 327 }, "_id": "" }, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index b4c0d48f..6cc65d7f 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -3534,7 +3534,7 @@ { "__type__": "cc.Node", "_name": "Label", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 139 @@ -4172,6 +4172,8 @@ "__id__": 0 }, "fileId": "6a2CN7fWtBcrzN10b5jxf2", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4728,6 +4730,8 @@ "__id__": 0 }, "fileId": "10g5cCQelOxZynS+Tp8j5r", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6425,6 +6429,8 @@ "__id__": 0 }, "fileId": "33s3MVJE1MP4K1OMcHeRR6", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6591,6 +6597,8 @@ "__id__": 0 }, "fileId": "93dAiS3fFNcbPNEaVTnY6H", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8914,12 +8922,12 @@ "__prefab": { "__id__": 389 }, - "_alignFlags": 45, + "_alignFlags": 40, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 770, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8947,8 +8955,6 @@ "__id__": 0 }, "fileId": "47GAgASDxMgr95ufaUc9Za", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -9445,6 +9451,9 @@ "chatBtn": { "__id__": 98 }, + "descContent": { + "__id__": 15 + }, "imgItemInst": { "__id__": 377 }, diff --git a/assets/bundles/Chat18x/Image/Theme/1001.png b/assets/bundles/Chat18x/Image/Theme/1001.png index bb04553f..34a8150a 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1001.png and b/assets/bundles/Chat18x/Image/Theme/1001.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1001.png.meta b/assets/bundles/Chat18x/Image/Theme/1001.png.meta index c1024398..83116edb 100644 --- a/assets/bundles/Chat18x/Image/Theme/1001.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1001.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1002.png b/assets/bundles/Chat18x/Image/Theme/1002.png index 1e3fc890..d9b8340f 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1002.png and b/assets/bundles/Chat18x/Image/Theme/1002.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1002.png.meta b/assets/bundles/Chat18x/Image/Theme/1002.png.meta index b9c37386..e2512f8c 100644 --- a/assets/bundles/Chat18x/Image/Theme/1002.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1002.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1003.png b/assets/bundles/Chat18x/Image/Theme/1003.png index 9b0c486e..371e5a19 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1003.png and b/assets/bundles/Chat18x/Image/Theme/1003.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1003.png.meta b/assets/bundles/Chat18x/Image/Theme/1003.png.meta index dcd9557f..94508c39 100644 --- a/assets/bundles/Chat18x/Image/Theme/1003.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1003.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1004.png b/assets/bundles/Chat18x/Image/Theme/1004.png index 142013cb..9cd96c9c 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1004.png and b/assets/bundles/Chat18x/Image/Theme/1004.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1004.png.meta b/assets/bundles/Chat18x/Image/Theme/1004.png.meta index 9833c5d9..2e25bc2d 100644 --- a/assets/bundles/Chat18x/Image/Theme/1004.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1004.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1005.png b/assets/bundles/Chat18x/Image/Theme/1005.png index a285f432..246744d3 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1005.png and b/assets/bundles/Chat18x/Image/Theme/1005.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1005.png.meta b/assets/bundles/Chat18x/Image/Theme/1005.png.meta index d4d67bfc..9aa37160 100644 --- a/assets/bundles/Chat18x/Image/Theme/1005.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1005.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/bundles/Chat18x/Image/Theme/1006.png b/assets/bundles/Chat18x/Image/Theme/1006.png index dd16976c..4bf50345 100644 Binary files a/assets/bundles/Chat18x/Image/Theme/1006.png and b/assets/bundles/Chat18x/Image/Theme/1006.png differ diff --git a/assets/bundles/Chat18x/Image/Theme/1006.png.meta b/assets/bundles/Chat18x/Image/Theme/1006.png.meta index 3eb4cb03..07f768e5 100644 --- a/assets/bundles/Chat18x/Image/Theme/1006.png.meta +++ b/assets/bundles/Chat18x/Image/Theme/1006.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 550, - "height": 450, - "rawWidth": 550, - "rawHeight": 450, + "width": 460, + "height": 460, + "rawWidth": 460, + "rawHeight": 460, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -275, - -225, + -230, + -230, 0, - 275, - -225, + 230, + -230, 0, - -275, - 225, + -230, + 230, 0, - 275, - 225, + 230, + 230, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 450, - 550, - 450, + 460, + 460, + 460, 0, 0, - 550, + 460, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -275, - -225, + -230, + -230, 0 ], "maxPos": [ - 275, - 225, + 230, + 230, 0 ] }, diff --git a/assets/resources/xzg_422653.mp3 b/assets/resources/xzg_422653.mp3 new file mode 100644 index 00000000..83c692e8 Binary files /dev/null and b/assets/resources/xzg_422653.mp3 differ diff --git a/assets/resources/xzg_422653.mp3.meta b/assets/resources/xzg_422653.mp3.meta new file mode 100644 index 00000000..618279ed --- /dev/null +++ b/assets/resources/xzg_422653.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "78e9f81f-ddb9-460d-bbce-74e58e0ce7e4", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/proto_cs b/proto_cs index 5a82a609..02474af6 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 5a82a609b0dc5778ebb7afe701d424ed1d97bd4a +Subproject commit 02474af62a6831a909fa28fefa83afa382cc86ee diff --git a/xchat_cfg b/xchat_cfg index 564088fe..cc6aa938 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 564088febe1f4e89a900e6712659dad22fff58f2 +Subproject commit cc6aa9382db0ee133926dbf5c18f2df682aa4dc7