From 42120398ab14078f140e0936c8e824eb6490ebb7 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Fri, 26 Sep 2025 17:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=B4=AD=E4=B9=B0=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat18x/ui/panels/GirlDetailPanel.ts | 64 +++++++++--------- .../Scripts/chat18x/ui/panels/ThemePanel.ts | 28 ++++---- .../Scripts/chat18x/uiitems/GirlListItem.ts | 39 +++++------ assets/bundles/DataTable/tblanguage.bin | Bin 33555 -> 33326 bytes xchat_cfg | 2 +- 5 files changed, 67 insertions(+), 66 deletions(-) diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 42f60123..b0346d87 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -192,18 +192,18 @@ export class GirlDetailPanel extends li_BaseView { const isRelease = girlData.getIsRelease(this.category.toString(), this.id); const isFree = girlData.isGirlFreeType(this.category.toString(), this.id); - if (isRelease || isFree) { - // 先设置选中的角色ID - this.girlPrice.node.active = false; - this.sendMsgText.active = true; - } else { - this.girlPrice.node.active = true; - this.sendMsgText.active = false; + //if (isRelease || isFree) { + // 先设置选中的角色ID + this.girlPrice.node.active = false; + this.sendMsgText.active = true; + // } else { + // this.girlPrice.node.active = true; + // this.sendMsgText.active = false; - this.girlPrice.string = girlData - .getGrilOriginalPrice(this.category.toString(), this.id) - .toString(); - } + // this.girlPrice.string = girlData + // .getGrilOriginalPrice(this.category.toString(), this.id) + // .toString(); + // } // 请求详细数据 const reqData = { @@ -339,27 +339,27 @@ export class GirlDetailPanel extends li_BaseView { const isRelease = girlData.getIsRelease(this.category.toString(), this.id); const isFree = girlData.isGirlFreeType(this.category.toString(), this.id); - if (isRelease || isFree) { - // 使用带过渡动画的导航方法 - NavigationManager.Instance.switchToPanel( - PanelType.PAST_GIRL_LIST, - false, - (base) => { - const chatData = { girlId: this.id, base: base }; - NavigationManager.Instance.openSubPanel("ChatPanel", base, chatData, { - openAnimation: PageTransitionType.SLIDE_LEFT, - closeAnimation: PageTransitionType.SLIDE_RIGHT, - }); - } - ); - } else { - //未解锁 - NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", { - base: this, - category: this.category, - id: this.id, - }); - } + //if (isRelease || isFree) { + // 使用带过渡动画的导航方法 + NavigationManager.Instance.switchToPanel( + PanelType.PAST_GIRL_LIST, + false, + (base) => { + const chatData = { girlId: this.id, base: base }; + NavigationManager.Instance.openSubPanel("ChatPanel", base, chatData, { + openAnimation: PageTransitionType.SLIDE_LEFT, + closeAnimation: PageTransitionType.SLIDE_RIGHT, + }); + } + ); + // } else { + // //未解锁 + // NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", { + // base: this, + // category: this.category, + // id: this.id, + // }); + // } } returnBtn() { diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts index 10e362e9..74d3da32 100644 --- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts @@ -315,21 +315,21 @@ export class ThemePanel extends li_BaseView { girlData.getGrilCategoryById(this.recId).toString(), this.recId ) == 0; - if (isRelease || isFree) { - NavigationManager.Instance.setSelectedGirlId(this.recId); - NavigationManager.Instance.setSelectedCategoryId( - girlData.getGrilCategoryById(this.recId) - ); - NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); - } else { - //未解锁 + //if (isRelease || isFree) { + NavigationManager.Instance.setSelectedGirlId(this.recId); + NavigationManager.Instance.setSelectedCategoryId( + girlData.getGrilCategoryById(this.recId) + ); + NavigationManager.Instance.switchToPanel(PanelType.GIRL_DETAIL); + // } else { + // //未解锁 - NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", { - base: this, - category: girlData.getGrilCategoryById(this.recId), - id: this.recId, - }); - } + // NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", { + // base: this, + // category: girlData.getGrilCategoryById(this.recId), + // id: this.recId, + // }); + // } } openSetting() { diff --git a/assets/Scripts/chat18x/uiitems/GirlListItem.ts b/assets/Scripts/chat18x/uiitems/GirlListItem.ts index f07e118f..a4d2314b 100644 --- a/assets/Scripts/chat18x/uiitems/GirlListItem.ts +++ b/assets/Scripts/chat18x/uiitems/GirlListItem.ts @@ -111,25 +111,26 @@ export class GirlListItem extends Component { .getGrilOriginalPrice(this.category.toString(), this.id) .toString(); - if (isRelease) { - this.price.node.active = false; - this.freeNode.active = false; - this.starParent.active = true; - this.chatIcon.active = true; - this.unreleaseCover.active = false; - } else { - this.unreleaseCover.active = true; - this.chatIcon.active = false; - if (priceType == PriceType.free) { - this.price.node.active = false; - this.freeNode.active = true; - this.starParent.active = true; - } else { - this.price.node.active = true; - this.freeNode.active = false; - this.starParent.active = false; - } - } + this.price.node.active = false; + this.freeNode.active = false; + this.starParent.active = true; + this.chatIcon.active = true; + this.unreleaseCover.active = false; + // if (isRelease) { + + // } else { + // this.unreleaseCover.active = true; + // this.chatIcon.active = false; + // if (priceType == PriceType.free) { + // this.price.node.active = false; + // this.freeNode.active = true; + // this.starParent.active = true; + // } else { + // this.price.node.active = true; + // this.freeNode.active = false; + // this.starParent.active = false; + // } + // } // this.price.node.active = priceType == PriceType.pay; // this.freeNode.active = priceType == PriceType.free; diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 9fd5d6480cc37b59289dca77c1d4abf563009b3a..d9f37ba65785e1fad9e5d2ac06770459704ec427 100644 GIT binary patch delta 203 zcmbQ-#&VYO$Wdi!E!P?A!p<|Fn1E(+Pd= z_w+n#TJd~V%ZtXYr%P5oTeI-l)D6$3FL*g~!qbjzj~kjA7<(ow3)*WvSTgm&(guYG wOJ+S-+VNn?{0B?+KUmWAV99i#5L9LdP{D&G>n2MG$*^|=Wq{nx7DBfR0L~a@=>Px# delta 414 zcmYk0PfG$(6vaXM0J;cTw0IvtqFu{~7ST=!+_jkWO+Ii&nLmWIFr`#NEf`IZAc8w& z3;#e8qn0iE5N+;aMr_qr=+1Ldt9S1CopX4D%ZO8nj1Hp3^F7t#2Fu$80mN+XOqwwA&Z>}E5j7Mkkh%;LT6TnGc(UqLKQsCETM6x8j8l_l%t!dZfhqr zpHt