Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

# Conflicts:
#	assets/Scripts/chat18x/data/GirlData.ts
#	assets/Scripts/chat18x/uiitems/GirlListItem.ts

assets/Scripts/chat18x/data/GirlData.ts

@@ -211,6 +211,14 @@ export class GirlData extends BaseData {
     return oneData.getGrilPriceType();
   }
 
+  /** 获取原来的价格，除100 */
+  public getGrilOriginalPrice(categoryId: string, girlId: number): number {
+    let oneData = this.getGrilBrief(categoryId, girlId);
+    if (!oneData) return 0;
+    let price = oneData.getGrilPrice();
+    return price / 100;
+  }
+
   /** 获取价格 */
   public getGrilPrice(categoryId: string, girlId: number): number {
     let oneData = this.getGrilBrief(categoryId, girlId);
@@ -376,9 +384,21 @@ export class GirlData extends BaseData {
   ): number {
     let oneData = this.getGrilDetail(categoryId, girlId);
     if (!oneData) return 0;
+
     return oneData.getGrilPhotoUnlockCounts(id);
   }
 
+  /** 获取技师图片的原来价格，除100 */
+  public getGrilPhotoOriginalPrice(
+    categoryId: string,
+    girlId: number,
+    id: number
+  ): number {
+    let oneData = this.getGrilDetail(categoryId, girlId);
+    if (!oneData) return 0;
+    let price = oneData.getGrilPhotoPrice(id);
+    return price / 100;
+  }
   /** 获取技师图片的价格 */
   public getGrilPhotoPrice(
     categoryId: string,
@@ -500,6 +520,18 @@ export class GirlData extends BaseData {
     return oneData.getGrilVideoEmotion(id);
   }
 
+  /** 获取技师视频的原来价格，除100 */
+  public getGrilVideoOriginalPrice(
+    categoryId: string,
+    girlId: number,
+    id: number
+  ): number {
+    let oneData = this.getGrilDetail(categoryId, girlId);
+    if (!oneData) return 0;
+    let price = oneData.getGrilVideoPrice(id);
+    return price / 100;
+  }
+
   /** 获取技师视频的价格 */
   public getGrilVideoPrice(
     categoryId: string,
@@ -565,6 +597,17 @@ export class GirlData extends BaseData {
     return oneData.getIsRelease();
   }
 
+  /** 保存 付费技师是否已经解锁 */
+  public setIsRelease(
+    categoryId: string,
+    girlId: number,
+    value: boolean
+  ): void {
+    let oneData = this.getGrilUnlock(categoryId, girlId);
+    if (!oneData) return;
+    oneData.setIsRelease(value);
+  }
+
   /** 判断图片是否解锁 */
   public isImageUnlock(
     categoryId: string,