修改 移除角色购买设计
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Binary file not shown.
+1
-1
Submodule xchat_cfg updated: 589b4921b7...bd503fd652
Reference in New Issue
Block a user