弹出礼包：装备精炼计算方式修改

shared/db/ActivityPopUpShopRec.ts

@@ -0,0 +1,46 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+/**
+  * 活动系统 - 弹出商店的记录
+*/
+@index({ roleId: 1, effectBeginTime: 1, effectEndTime: 1 })
+
+export default class Activity_Pop_Up_Shop_Rec extends BaseModel {
+    @prop({ required: true })
+    serverId: number;				// 服id
+
+    @prop({ required: true })
+    activityId: number;				// 活动Id
+
+    @prop({ required: true })
+    roleId: string;			        // 用户Id
+
+    @prop({ required: true })
+    effectBeginTime: Date;		    // 刷新等生效开始时间
+
+    @prop({ required: true })
+    effectEndTime: Date;		    // 刷新等生效结束时间
+
+    @prop({ required: true })
+    id: number;				        // 礼包id
+
+    @prop({ required: true })
+    conditionType: number;				        // 礼包id
+    
+    @prop({ required: true })
+    num: number;                    // 值
+
+    public static async addRecord(serverId: number, activityId: number, roleId: string, id: number, effectBeginTime: Date, effectEndTime: Date, conditionType: number, num: number) {
+        let rec: ActivityPopUpShopRecModelType = await ActivityPopUpShopRecModel.findOneAndUpdate(
+            { roleId, serverId, activityId, effectBeginTime, effectEndTime, id }, 
+            { $inc: { num }, $setOnInsert: { conditionType } },
+            { new: true, upsert: true }).lean();
+        return rec;
+    }
+}
+
+export const ActivityPopUpShopRecModel = getModelForClass(Activity_Pop_Up_Shop_Rec);
+
+export interface ActivityPopUpShopRecModelType extends Pick<DocumentType<Activity_Pop_Up_Shop_Rec>, keyof Activity_Pop_Up_Shop_Rec> { }
+export type ActivityPopUpShopRecModelTypeParam = Partial<ActivityPopUpShopRecModelType>; // 将所有字段变成可选项

shared/domain/activityField/popUpShopField.ts

@@ -433,7 +433,7 @@ export class PopShopItem {
             case POP_UP_SHOP_CONDITION_TYPE.PVP:
                 return param.seasonWinNum >= this.conditionParam[0];
             case POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR:
-                return param.equipStar >= this.conditionParam[0];
+                return param.equipStarSum >= this.conditionParam[0];
             case POP_UP_SHOP_CONDITION_TYPE.AUCTION:
                 return true;
             case POP_UP_SHOP_CONDITION_TYPE.TITLE:
@@ -505,6 +505,7 @@ export interface PopUpConditionParamInter {
     warId?: number;
     seasonWinNum?: number;
     equipStar?: number;
+    equipStarSum?: number;
 }