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 9fd5d648..d9f37ba6 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ diff --git a/xchat_cfg b/xchat_cfg index 589b4921..bd503fd6 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 589b4921b732b16cd45fdb9030af045ae54fa48b +Subproject commit bd503fd6527cecedc14af8a595305ab4beefbf22