xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 音效 - 主题图

Browse Source
This commit is contained in:
xionglijia
2025-09-11 18:49:27 +08:00
parent 0f9690b0e1
commit 49f4d21c56
27 changed files with 1130 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scenes/MainScene.scene
+116 -24
View File
@@ -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
},
assets/Scripts/Sub/UI/SceneBgVideoLayer.ts
+109 -163
View File
@@ -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;
}
}
assets/Scripts/chat18x/manager/NavigationManager.ts
+10 -21
View File
@@ -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 = {
assets/Scripts/chat18x/ui/panels/ChatPanel.ts
+39 -131
View File
@@ -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<GirlData>(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<GirlData>(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);
assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
+14 -3
View File
@@ -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) {
assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts
+3 -1
View File
@@ -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);
assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts
+4 -1
View File
@@ -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);
assets/Scripts/chat18x/uiitems/DetailImageItem.ts
+1 -1
View File
@@ -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;
});
assets/Scripts/chat18x/utils/UITransitionHelper.ts
-3
View File
@@ -42,9 +42,6 @@ export class UITransitionHelper {
{ position: originalPosition },
{
easing: "linear",
onUpdate: () => {
console.log(node.position);
},
}
)
.call(() => {
assets/bundles/Chat18x/ChatPanel.prefab
+684 -508
View File
File diff suppressed because it is too large Load Diff
assets/bundles/Chat18x/GirlDetailPanel.prefab
+14 -5
View File
@@ -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
},
assets/bundles/Chat18x/Image/Theme/1001.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 292 KiB

assets/bundles/Chat18x/Image/Theme/1001.png.meta
+20 -20
View File
@@ -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
]
},
assets/bundles/Chat18x/Image/Theme/1002.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 406 KiB

assets/bundles/Chat18x/Image/Theme/1002.png.meta
+20 -20
View File
@@ -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
]
},
assets/bundles/Chat18x/Image/Theme/1003.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 KiB

After

Width:  |  Height:  |  Size: 341 KiB

assets/bundles/Chat18x/Image/Theme/1003.png.meta
+20 -20
View File
@@ -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
]
},
assets/bundles/Chat18x/Image/Theme/1004.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 KiB

After

Width:  |  Height:  |  Size: 307 KiB

assets/bundles/Chat18x/Image/Theme/1004.png.meta
+20 -20
View File
@@ -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
]
},
assets/bundles/Chat18x/Image/Theme/1005.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 300 KiB

After

Width:  |  Height:  |  Size: 316 KiB

assets/bundles/Chat18x/Image/Theme/1005.png.meta
+20 -20
View File
@@ -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
]
},
assets/bundles/Chat18x/Image/Theme/1006.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 442 KiB

After

Width:  |  Height:  |  Size: 335 KiB

assets/bundles/Chat18x/Image/Theme/1006.png.meta
+20 -20
View File
@@ -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
]
},
assets/resources/xzg_422653.mp3
BIN
View File
Binary file not shown.
assets/resources/xzg_422653.mp3.meta
+14
View File
@@ -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
}
}
proto_cs
+1 -1
Submodule proto_cs updated: 5a82a609b0...02474af62a
xchat_cfg
+1 -1
Submodule xchat_cfg updated: 564088febe...cc6aa9382d