diff --git a/Ps/bg/bg.psd b/Ps/bg/bg.psd index e90ce6c2..40022e18 100644 Binary files a/Ps/bg/bg.psd and b/Ps/bg/bg.psd differ diff --git a/Ps/bg/kv.psd b/Ps/bg/kv.psd new file mode 100644 index 00000000..e92fdff7 Binary files /dev/null and b/Ps/bg/kv.psd differ diff --git a/Ps/bg/list.psd b/Ps/bg/list.psd index 75e12eac..05553a91 100644 Binary files a/Ps/bg/list.psd and b/Ps/bg/list.psd differ diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 430968f6..3f8c6e8e 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -105,8 +105,8 @@ export class GirlDetailPanel extends li_BaseView { this.avatarVideo.node.parent.getComponent(UITransform); const videoTransform = this.avatarVideo.node.getComponent(UITransform); - if (parentTransform && videoTransform && videoTransform.width > 0) { - const scale = parentTransform.width / videoTransform.width; + if (parentTransform && videoTransform && videoTransform.height > 0) { + const scale = parentTransform.height / videoTransform.height; this.avatarVideo.node.setScale(scale, scale, 1); console.log( `Video scaled to: ${scale}, parent height: ${parentTransform.height}, video height: ${videoTransform.height}` diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index b6f748b4..b0438a50 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -19,7 +19,7 @@ export class DetailImageItem extends Component { base: GirlDetailPanel; url: string; - + isImage: boolean; uitransform: UITransform; onLoad() { @@ -30,6 +30,8 @@ export class DetailImageItem extends Component { onClickThis() { let data = { url: this.url, + isImg: this.isImage, + closeFunc: () => { this.base.setVideEnable(true); }, @@ -87,6 +89,7 @@ export class DetailImageItem extends Component { this.url = path; let imgPath = this.url; + this.isImage = isImage; if (!isImage) { imgPath = this.url + "_thumbnail"; } diff --git a/proto_cs b/proto_cs index 664c8ad7..596a85ec 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 664c8ad737a91ffcbe862180fefd5a450777ce9a +Subproject commit 596a85eceabc1ca62e7ce5404d51df7edfa73a5f diff --git a/xchat_cfg b/xchat_cfg index e7d507d4..c9f321db 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit e7d507d493928ac09319a1c6f390fb4b3dad7b22 +Subproject commit c9f321db064d689ba84d1d3df1735c5fc7eb53f8