活动：弹窗活动新类型

shared/domain/activityField/popUpShopField.ts

@@ -307,6 +307,7 @@ export class PopUpShopPackage {
 // 礼包，购买以此为单位
 export class PopShopItem {
     id: number;             // 档位唯一id，升降档的时候按照id顺序排，升档id+，降档id- 
+    param: string;
     conditionParam: number[]; // 条件类型的参数，填法根据conditionType表判断
     price: number;          // 商品价格
     productID: string;      // 商品id支付时使用
@@ -325,6 +326,7 @@ export class PopShopItem {
 
     constructor(data: PopUpShopItemInDb, parent: PopUpShopPackage) {
         this.id = data.id;
+        this.param = data.conditionParam;
         this.conditionParam = parseNumberList(data.conditionParam);
         this.price = data.price;
         this.productID = data.productID;
@@ -361,6 +363,14 @@ export class PopShopItem {
             case POP_UP_SHOP_CONDITION_TYPE.GACHA_RES_NOT_ENOUGH:
             case POP_UP_SHOP_CONDITION_TYPE.TERAPH_RES_NOT_ENOUGH:
                 return true;
+            case POP_UP_SHOP_CONDITION_TYPE.MAIN_BATTLE:
+                return param.warId == this.conditionParam[0];
+            case POP_UP_SHOP_CONDITION_TYPE.PVP:
+                return param.rank <= this.conditionParam[0];
+            case POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR:
+                return param.equipStar >= this.conditionParam[0];
+            case POP_UP_SHOP_CONDITION_TYPE.AUCTION:
+                return true;
             default:
                 return false;
         }
@@ -425,6 +435,9 @@ export interface PopUpConditionParamInter {
     oldLv?: number;
     newLv?: number;
     quality?: number;
+    warId?: number;
+    rank?: number;
+    equipStar?: number;
 }