协议调试

assets/Scripts/chat18x/uiitems/DetailImageItem.ts

@@ -62,15 +62,16 @@ export class DetailImageItem extends Component {
     };
     // 数据
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-    let isRelease = false;
+    // 是否可见，不可见代表需要解锁
+    let isVisible = false;
     if (this.type === 1) {
       // 图片
-      isRelease = girlData.isImageUnlock(this.category.toString(), this.girlId, this.resId);
+      isVisible = girlData.isGirlPhotoVisible(this.category.toString(), this.girlId, this.resId);
     } else if (this.type === 2) {
       // 视频
-      isRelease = girlData.isVideoUnlock(this.category.toString(), this.girlId, this.resId);
+      isVisible = girlData.isGirlVideoVisible(this.category.toString(), this.girlId, this.resId);
     }
-    if (isRelease) {
+    if (isVisible) {
       if (this.url) {
         ViewManager.I.openBundlesView("ShowPanel", data);
         this.base.setVideEnable(false);
@@ -81,6 +82,7 @@ export class DetailImageItem extends Component {
         resId: this.resId,
         girlId: this.girlId,
         base: this,
+        type: this.type,
       });
     }
     // if (!this.isImage) {
@@ -144,7 +146,6 @@ export class DetailImageItem extends Component {
     this.type = type;
     this.category = category;
     this.girlId = id;
-
     this.resId = resId;
     this.question.active = true; // 显示问号，表示加载中
 
@@ -153,7 +154,8 @@ export class DetailImageItem extends Component {
     this.video.enabled = type === 2;
     this.priceFrame.active = type === 2;
     let price = 0;
-    let isUnlock = false;
+    // 是否可见，不可见代表需要解锁
+    let isVisible = false;
     if (type === 1) {
       // 图片
       price = girlData.getGrilPhotoOriginalPrice(this.category.toString(), this.girlId, this.resId);
@@ -164,7 +166,7 @@ export class DetailImageItem extends Component {
       );
       imgPath = this.url;
       this.isImage = true;
-      isUnlock = girlData.isImageUnlock(this.category.toString(), this.girlId, this.resId);
+      isVisible = girlData.isGirlPhotoVisible(this.category.toString(), this.girlId, this.resId);
     } else if (type === 2) {
       // 视频
       price = girlData.getGrilVideoOriginalPrice(this.category.toString(), this.girlId, this.resId);
@@ -180,12 +182,8 @@ export class DetailImageItem extends Component {
         this.resId
       );
 
-      isUnlock = girlData.isVideoUnlock(
-        this.category.toString(),
-        this.girlId,
-        this.resId
-      );
-      if (isUnlock) {
+      isVisible = girlData.isGirlVideoVisible(this.category.toString(), this.girlId, this.resId);
+      if (isVisible) {
         imgPath = this.url + "_thumbnail_blur";
       } else {
         imgPath = this.url + "_thumbnail";