活动：弹窗活动新类型

shared/consts/constModules/activityConst.ts

@@ -178,6 +178,10 @@ export enum POP_UP_SHOP_CONDITION_TYPE {
     GET_HERO_BY_QUALITY = 2,  // 获得某种品质的武将
     GACHA_RES_NOT_ENOUGH = 3, // 点击抽卡资源不足
     TERAPH_RES_NOT_ENOUGH = 4, // 神兽强化材料不足
+    MAIN_BATTLE = 5, // 通关主线
+    PVP = 6,         // pvp
+    EQUIP_STAR = 7,  // 装备精炼
+    AUCTION = 8,     // 拍卖行  
 }
 
 export enum POP_UP_SHOP_REFRESH_TIME_TYPE {

shared/consts/constModules/sysConst.ts

@@ -25,6 +25,7 @@ export const REF_CIRCLE_MAIL_TIME = 6; // 统一一天刷新定期邮件时间
 export const PUSH_BATCH = 100; // 推送分批人数
 export const PUSH_INTERVAL = 5 * 1000; // 分批时间，5秒一批
 
+
 export enum TIME_OUTPUT_TYPE {
     DATE = 1,
     STAMP_10 = 2,

shared/db/Role.ts

@@ -180,6 +180,8 @@ export default class Role extends BaseModel {
     payRecord: PayRecord[];				// 支付记录
     @prop({ required: true, default: 0 })
     jewelCount: number;				// 装备数量
+    @prop({ required: true })
+    equipStarSum: number;           // 装备上的星级的数量
 
     @prop({ required: true, default: 0 })
     coin: number;						// 总铜钱

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;
 }