活动：新武将抽卡活动

shared/consts/constModules/activityConst.ts

@@ -51,6 +51,7 @@ export enum ACTIVITY_TYPE {
     COMMON_SIGN_IN = 36, //通用签到
     NEW_HERO_GIFTS = 37, //新将好礼(很多红包，用积分兑换一遍结束)
     NEW_HERO_GK = 38, //新将演绎 (配置N个武将，每个武将有X个关卡；活动期间，*天(时间自定义)开启每个武将对应的一个关卡，只有第一次通关会获得奖励)
+    NEW_HERO_GACHA = 39, //新将擢迁（新武将抽取）
 }
 
 /**

shared/consts/statusCode.ts

@@ -370,6 +370,7 @@ export const STATUS = {
     MONOPOLY_BANK_COUNT_ERROR: { code: 50031, simStr: '数量错误' },
     MONOPOLY_BANK_SAVE_MAX: { code: 50032, simStr: '超过最大限制数量' },
     NOT_GIFTPACKAGE: { code: 50033, simStr: '非礼包类型' },
+    SHOP_CLOSED: { code: 50034, simStr: '停业' },
     // GM后台相关状态 60000 - 69999
     GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' },
     GM_MISS_API: { code: 60002, simStr: '未找到该接口' },

shared/db/ActivityNewHeroGacha.ts

@@ -0,0 +1,67 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+export class Record {
+    @prop({ required: true })
+    count: number;			        // 次数
+    @prop({ required: true })
+    reward: string;			        // 奖励内容
+    @prop({ required: true })
+    time: Date;				        // 抽卡时间
+}
+
+/**
+  * 活动系统 - 每日关卡活动
+*/
+@index({ roleId: 1 })
+
+export default class Activity_New_Hero_Gacha extends BaseModel {
+    @prop({ required: true })
+    serverId: number;				// 服id
+    @prop({ required: true })
+    activityId: number;				// 活动Id
+    @prop({ required: true })
+    roleId: string;			        // 用户Id
+    @prop({ required: true })
+    hid: number;				        // 武将id
+    @prop({ required: true })
+    count: number;				        // 抽卡次数，抽中大奖后重新统计
+    @prop({ required: true })
+    records: Record[];				    // 抽卡历史记录
+
+    //重置统计次数
+    public static async resetCount(serverId: number, activityId: number, roleId: string, hid: number, count: number) {
+        let result: ActivityNewHeroGachaModelType = await ActivityNewHeroGachaModel.findOneAndUpdate({ serverId, roleId, activityId, hid },
+            { $set: { count } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //抽卡记录
+    public static async addRecord(serverId: number, activityId: number, roleId: string, hid: number, count: number, reward: string) {
+        let result: ActivityNewHeroGachaModelType = await ActivityNewHeroGachaModel.findOneAndUpdate({ serverId, roleId, activityId, hid },
+            { $inc: { count }, $push: { records: { count, reward, time: new Date() } } }, { upsert: true, new: true }).lean(true);
+        return result;
+    }
+
+    //根据活动id查询活动数据
+    public static async findDataByHid(serverId: number, activityId: number, roleId: string, hid: number) {
+        let result: ActivityNewHeroGachaModelType = await ActivityNewHeroGachaModel.findOne({ serverId, roleId, activityId, hid }).lean(true);
+        return result;
+    }
+
+    //根据活动id查询活动数据
+    public static async findData(serverId: number, activityId: number, roleId: string) {
+        let result: ActivityNewHeroGachaModelType[] = await ActivityNewHeroGachaModel.find({ serverId, roleId, activityId }).lean(true);
+        return result;
+    }
+
+    //删除活动领取记录
+    public static async deleteActivity(serverId: number, activityId: number, roleId: string) {
+        await ActivityNewHeroGachaModel.deleteMany({ serverId, roleId, activityId });
+    }
+}
+
+export const ActivityNewHeroGachaModel = getModelForClass(Activity_New_Hero_Gacha);
+
+export interface ActivityNewHeroGachaModelType extends Pick<DocumentType<Activity_New_Hero_Gacha>, keyof Activity_New_Hero_Gacha> { }
+export type ActivityNewHeroGachaModelTypeParam = Partial<ActivityNewHeroGachaModelType>; // 将所有字段变成可选项

shared/domain/activityField/monopolyField.ts

@@ -14,6 +14,7 @@ export class LandItem {
     saveMax: number           //银行存钱最大数额
     takeOutMax: number        //银行取钱最大次数
     shopActivityId: number     //商店对应的商店id
+    shoppingCountMax: number     //逛商店次数
 
     record: any[] = [];     //历史操作
     stopCount: number        //停留次数
@@ -27,6 +28,7 @@ export class LandItem {
         this.saveMax = data.saveMax;
         this.takeOutMax = data.takeOutMax;
         this.shopActivityId = data.shopActivityId;
+        this.shoppingCountMax = data.shoppingCountMax;
         this.record = [];
         this.stopCount = 0;
     }

shared/domain/activityField/newHeroGachaField.ts

@@ -0,0 +1,72 @@
+import { ActivityModelType } from '../../db/Activity';
+import { ActivityNewHeroGachaModelType } from '../../db/ActivityNewHeroGacha';
+import { RewardInter } from '../../pubUtils/interface';
+import { parseGoodStr, splitString } from '../../pubUtils/util';
+import { ActivityBase } from './activityField';
+
+
+// 每个英雄的奖池配置数据
+export class NewHeroGachaItem {
+    floorCount: number = 0;//保底最大的次数,一定会出现一次
+    count: number = 0;//多少次没有抽中
+    hid: number = 0;//武将id
+    name: string = '';//名字
+    cost: RewardInter[];//每次抽卡消耗资源
+    floorReward: number = 0;//保底奖励，percent下标+1
+    percent: { id: number, weight: number, goodId: number }[];//奖品百分比  contentId & percent & id(英雄hid，物品id)
+
+    constructor(data: any) {
+        this.hid = data.hid;
+        this.name = data.name;
+        this.floorCount = data.floorCount;
+        this.cost = parseGoodStr(data.cost);
+        this.percent = [];
+        this.floorReward = data.floorReward;
+        this.count = 0;
+        let arr = data.percent.split('|').filter(obj => { return obj && obj != '' });
+        for (let obj of arr) {
+            let numArr = splitString(obj, '&');
+            this.percent.push({
+                id: numArr[0],
+                weight: numArr[1],
+                goodId: numArr.length > 2 ? numArr[2] : 0,
+            })
+        }
+    }
+}
+
+
+
+// 每日关卡活动数据
+export class NewHeroGachaData extends ActivityBase {
+    list: NewHeroGachaItem[] = [];
+
+    public findItem(hid: number) {
+        let index = this.list.findIndex(obj => { return obj && obj.hid == hid })
+        return (index != -1) ? this.list[index] : null;
+    }
+
+    //解析玩家记录
+    public setPlayerRecords(data: ActivityNewHeroGachaModelType[]) {
+        for (let item of this.list) {
+            let index = data.findIndex(obj => { return obj.hid == item.hid });
+            if (index != -1) {
+                item.count = data[index].count ? data[index].count : 0;
+            }
+        }
+    }
+
+    public initData(data: string) {
+        let dataObj = JSON.parse(data);
+        let arr = dataObj;
+        for (let obj of arr) {
+            this.list.push(new NewHeroGachaItem(obj))
+        }
+
+    }
+
+    constructor(activityData: ActivityModelType) {
+        super(activityData)
+        this.initData(activityData.data)
+    }
+}

shared/domain/activityField/refreshShopField.ts

@@ -58,11 +58,11 @@ export class RefreshShopData extends ActivityBase {
     nextRefreshTime: number;//下次刷新时间
     roundIndex: number = 1;//周期数从1开始
 
-    public findItemByProductID(productID: string) {
+    public findItemByProductID(productID: string): RefreshShopItem {
         for (let pageData of this.list) {
             let index = pageData.items.findIndex(obj => { return obj && obj.productID === productID });
             if (index != -1) {
-                this.list[index]
+                return pageData.items[index]
             }
         }
         return null;