✨ feat(幸运转盘优化): 新增

game-server/app/servers/activity/handler/luckyHandler.ts

@@ -0,0 +1,98 @@
+import { Application, BackendSession, HandlerService, } from 'pinus';
+import { resResult } from '../../../pubUtils/util';
+import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
+import { getPlayerLuckyDataShow, getPlayerLuckyData } from '../../../services/activity/luckyService';
+import { addItems, handleCost } from '../../../services/role/rewardService';
+import { pick } from 'underscore';
+import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
+import { ActivityLuckyModel } from '../../../db/ActivityLuckyRec';
+
+
+export default function (app: Application) {
+    new HandlerService(app, {});
+    return new LuckyTurntableNewHandler(app);
+}
+
+export class LuckyTurntableNewHandler {
+    constructor(private app: Application) {
+    }
+
+    /************************幸运转盘****************************/
+    /** 
+    * @description 幸运转盘活动
+    * @param {{ activityId: number, }} msg
+    * @param {BackendSession} session
+    * @memberof LuckyHandler
+    */
+    async getTurntableData(msg: { activityId: number }, session: BackendSession) {
+        const { activityId } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+
+        let playerData = await getPlayerLuckyDataShow(activityId, serverId, roleId);
+        if (!playerData) {
+            return resResult(STATUS.ACTIVITY_MISSING);
+        }
+
+        return resResult(STATUS.SUCCESS, { playerData });
+    }
+
+    /** 
+    * @description 转转盘
+    * @param {{ activityId: number, }} msg
+    * @param {BackendSession} session
+    * @memberof LuckyHandler
+    */
+    async pull(msg: { activityId: number, count: number }, session: BackendSession) {
+        const { activityId, count } = msg;
+        const roleId = session.get('roleId');
+        const roleName = session.get('roleName');
+        const sid = session.get('sid');
+        const serverId = session.get('serverId');
+
+        let playerData = await getPlayerLuckyData(activityId, serverId, roleId);
+        if (!playerData) {
+            return resResult(STATUS.ACTIVITY_MISSING);
+        }
+
+        let cost = playerData.getCost(count);
+        let costResult = await handleCost(roleId, sid, cost, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL);
+        if (!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
+
+        let { result, records, goodResult, pool, floorCount } = playerData.pull(roleName, count);
+        await ActivityLuckyModel.updateData(serverId, activityId, roleId, playerData.roundIndex, { ...pick(playerData, ['todayCount', 'count', 'records', 'greatRewardCount']), refTodayCount: new Date() });
+        await addItems(roleId, roleName, sid, goodResult, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL);
+
+        return resResult(STATUS.SUCCESS, { result, records, todayCount: playerData.todayCount, count: playerData.count, pool, floorCount });
+    }
+
+
+    /** 
+    * @description 领宝箱
+    * @param {{ activityId: number, boxCount: number }} msg
+    * @param {BackendSession} session
+    * @memberof LuckyHandler
+    */
+    async receiveBox(msg: { activityId: number, boxCount: number }, session: BackendSession) {
+        const { activityId, boxCount } = msg;
+        const roleId = session.get('roleId');
+        const roleName = session.get('roleName');
+        const sid = session.get('sid');
+        const serverId = session.get('serverId');
+
+        let playerData = await getPlayerLuckyData(activityId, serverId, roleId);
+        if (!playerData) {
+            return resResult(STATUS.ACTIVITY_MISSING);
+        }
+
+        let canReceive = playerData.canReceive(boxCount);
+        if (!canReceive) return resResult(STATUS.BOX_CAN_NOT_RECEIVE);
+
+        let box = playerData.findBox(boxCount);
+        let rewardArray = stringToRewardParam(box.rewards)
+        let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.ACT_TURNTABLE_RECEIVE_BOX);
+        await ActivityLuckyModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, boxCount);
+
+        return resResult(STATUS.SUCCESS, { ...result, box: { ...box, isReceived: true } });
+    }
+}

game-server/app/services/activity/activityService.ts

@@ -54,6 +54,7 @@ import { getPlayerMidAutumnDataShow } from './midAutumnService';
 import { getPlayerAuthorGachaDataShow } from './authorGachaService';
 import { getPlayerChongYangDataShow } from './chongyangService';
 import { getPlayerNovemberDataShow } from './novemberServices';
+import { getPlayerLuckyDataShow } from './luckyService';
 
 /**
    * 获取活动数据
@@ -314,6 +315,11 @@ export async function getActivity(serverId: number, roleId: string, uid: number,
                 activityData = await getPlayerNovemberDataShow(activityId, serverId, roleId);
                 break;
             }
+        case ACTIVITY_TYPE.LUCKY://幸运转盘新
+            {
+                activityData = await getPlayerLuckyDataShow(activityId, serverId, roleId);
+                break;
+            }
         default: {
             console.log('未知活动类型.........', activityType)
             break;

game-server/app/services/activity/luckyService.ts

@@ -0,0 +1,35 @@
+import { ActivityLuckyModel } from "../../db/ActivityLuckyRec";
+import { LuckyData } from "../../domain/activityField/luckyField";
+import { shouldRefresh } from "../../pubUtils/util";
+import { getRoleCreateTime, getServerCreateTime } from "../redisService";
+import { getActivityById } from "./activityService";
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+ export async function getPlayerLuckyData(activityId: number, serverId: number, roleId: string) {
+    let activityData = await getActivityById(activityId);
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new LuckyData(activityData, createTime, serverTime);
+
+    let playerRecord = await ActivityLuckyModel.findByActivityId(serverId, activityId, roleId, playerData.roundIndex);
+    if(playerRecord && shouldRefresh(playerRecord.refTodayCount, new Date())) {
+        playerRecord = await ActivityLuckyModel.refreshTodayCount(serverId, activityId, roleId, playerData.roundIndex);
+    }
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+export async function getPlayerLuckyDataShow(activityId: number, serverId: number, roleId: string) {
+    let playerData = await getPlayerLuckyData(activityId, serverId, roleId);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}

game-server/app/services/checkParam.ts

@@ -101,6 +101,7 @@ export function checkRouteParam(route: string, msg: any) {
         case 'activity.guildPayHandler.getGuildPayData':
         case 'activity.limitPackageHandler.getNewPlayerLimitPackageActivity':
         case 'activity.luckyTurntableHandler.getTurntableData':
+        case 'activity.luckyHandler.getTurntableData':
         case 'activity.monthlyTicketHandler.getMonthlyTicketActivity':
         case 'activity.newHeroGachaHandler.getNewHeroGachaActivity':
         case 'activity.newHeroGiftsHandler.getNewHeroGiftsActivity':
@@ -283,6 +284,16 @@ export function checkRouteParam(route: string, msg: any) {
                 if (!checkNaturalNumbers(msg.activityId, msg.boxCount)) return false;
                 break;
             }
+        case 'activity.luckyHandler.pull':
+            {
+                if (!checkNaturalNumbers(msg.activityId, msg.count)) return false;
+                break;
+            }
+        case 'activity.luckyHandler.receiveBox':
+            {
+                if (!checkNaturalNumbers(msg.activityId, msg.boxCount)) return false;
+                break;
+            }
         case 'activity.monthlyTicketHandler.getMonthlyTicketReward':
             {
                 if (!checkNaturalNumbers(msg.activityId)) return false;

shared/consts/constModules/activityConst.ts

@@ -78,6 +78,7 @@ export enum ACTIVITY_TYPE {
     GROWTH_FUND_AUTHOR_VIP = 63, //列传高级密卷
     CHONGYANG = 64, //重阳集会
     NOVEMBER = 65, // 辜月集会
+    LUCKY = 66,     //幸运转盘新
 }
 
 /**

shared/db/ActivityLuckyRec.ts

@@ -0,0 +1,76 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+export class TurntableRecord {
+  @prop({ required: true })
+  roleName: string;
+
+  @prop({ required: true })
+  gid: number;
+
+  @prop({ required: true })
+  count: number;
+}
+
+/**
+  * 幸运转盘活动 
+*/
+@index({ roleId: 1, activityId: 1 })
+
+export default class Activity_Lucky_Rec extends BaseModel {
+
+    @prop({ required: true })
+    activityId: number;		    // 活动id
+
+    @prop({ required: true })
+    serverId: number;		    // 区id
+
+    @prop({ required: true })
+    roleId: string;				// 用户id
+
+    @prop({ required: true })
+    roundIndex: number;				// 循环次数
+
+    @prop({ required: true })
+    count: number;			   // 抽卡次数
+
+    @prop({ required: true })
+    greatRewardCount: number;	// 中头奖次数
+
+    @prop({ required: true })
+    todayCount: number;		  // 本日抽卡
+
+    @prop({ required: true })
+    refTodayCount: Date;		  // 本日抽卡刷新时间
+
+    @prop({ required: true, type: TurntableRecord, _id: false })
+    records: TurntableRecord[];		  // 本日抽卡刷新时间
+
+    @prop({ required: true, type: Number })
+    box: number[];		  // 宝箱已领取次数
+
+    public static async findByActivityId(serverId: number, activityId: number, roleId: string, roundIndex: number) {
+      let rec: ActivityLuckyModelType = await ActivityLuckyModel.findOne({ roleId, activityId, serverId, roundIndex }).lean();
+      return rec;
+    }
+
+    public static async updateData(serverId: number, activityId: number, roleId: string, roundIndex: number, update: ActivityLuckyModelTypeParam) {
+      let rec: ActivityLuckyModelType = await ActivityLuckyModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, { $set: update }, { upsert: true, new: true }).lean();
+      return rec;
+    }
+
+    public static async refreshTodayCount(serverId: number, activityId: number, roleId: string, roundIndex: number) {
+      let rec: ActivityLuckyModelType = await ActivityLuckyModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, {$set: { todayCount: 0, refTodayCount: new Date() }}).lean();
+      return rec;
+    }
+
+    public static async receiveBox(serverId: number, activityId: number, roleId: string, roundIndex: number, boxCount: number) {
+      let rec: ActivityLuckyModelType = await ActivityLuckyModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, {$addToSet: { box: boxCount }}, { new: true }).lean();
+      return rec;
+    }
+}
+
+export const ActivityLuckyModel = getModelForClass(Activity_Lucky_Rec);
+
+export interface ActivityLuckyModelType extends Pick<DocumentType<Activity_Lucky_Rec>, keyof Activity_Lucky_Rec> { }
+export type ActivityLuckyModelTypeParam = Partial<ActivityLuckyModelType>; // 将所有字段变成可选项

shared/domain/activityField/luckyField.ts

@@ -0,0 +1,256 @@
+import { pick } from 'underscore';
+import { ActivityModelType } from '../../db/Activity';
+import { RewardInter } from '../../pubUtils/interface';
+import { getRandEelmWithWeight, parseGoodStr } from '../../pubUtils/util';
+import { ActivityBase } from './activityField';
+import { ActivityLuckyModelType, TurntableRecord } from '../../db/ActivityLuckyRec';
+
+/************** 在数据库中的格式 ***********/
+
+interface TurntablePoolInDb {
+    id: number;         // 奖池id
+    gid: number;        // 物品id
+    count: number;      // 道具数量
+    weight: number;     // 权重
+    numLimit: number;    // 次数上限
+}
+
+interface TurntableFloorInDb { // 保底，每sum次必出count个头奖，头奖：权重最低的一项
+    sum: number;
+    count: number;
+    id: number;
+}
+
+interface TurntableBoxInDb {
+    count: number;       // 次数
+    rewards: string;      // 奖励 type&id&count
+}
+
+interface TurntableInDb {
+    cost: string;        // 抽1次的消耗，id&count
+    freeCount: number;   // 免费次数
+    pool: TurntablePoolInDb[]; // 奖池
+    floor: TurntableFloorInDb[]; // 保底
+    box: TurntableBoxInDb[];
+}
+
+/************** 给客户端返回的数据 ***********/
+// 转盘数据
+export class LuckyPool {
+    id: number;      // 奖池项唯一id
+    gid: number;     // 物品id
+    count: number;   // 物品数量
+    weight: number;  // 权重-最好填写整数，会自动做加和，如weight为1,2，则他们的概率为1/3和2/3
+    numLimit: number;    // 次数上限
+    getCnt: number
+
+    constructor(data: TurntablePoolInDb) {
+        this.id = data.id;
+        this.gid = data.gid;
+        this.count = data.count;
+        this.weight = data.weight;
+        this.numLimit = data.numLimit;    // 次数上限
+        this.getCnt = 0; //对应numLimit已抽次数
+    }
+
+    public getShowResult() {
+        return pick(this, ['id', 'gid', 'count', 'numLimit', 'getCnt']);
+    }
+}
+
+export class LuckyBox {
+    count: number;       // 次数
+    rewards: string;      // 奖励
+
+    isReceived: boolean = false; // 是否已领取
+
+    constructor(data: TurntableBoxInDb) {
+        this.count = data.count;
+        this.rewards = data.rewards;
+    }
+
+    public setReceived(box: number[] = []) {
+        if (box.indexOf(this.count) != -1) {
+            this.isReceived = true;
+        }
+    }
+}
+
+// 新云转盘活动数据
+export class LuckyData extends ActivityBase {
+    cost: string;          // 抽1次的消耗
+    freeCount: number;     // 免费次数
+    pool: LuckyPool[] = [];
+    // greateReward: LuckyPool; // 头奖，weight最小的那一个
+    box: LuckyBox[] = [];
+    floor: {               // 保底
+        sum: number;
+        count: number;
+        id: number;
+    }[];
+
+    todayCount: number = 0;    // 今天抽了几次
+    count: number = 0;         // 一共抽了几次
+    records: TurntableRecord[] = [];     // 奖励记录
+    greatRewardCount: number = 0;   // 已抽次数,用于计算保底
+
+    public getCost(count: number) {
+        if (this.todayCount < this.freeCount) {
+            count -= this.freeCount - this.todayCount;
+        }
+        let cost = parseGoodStr(this.cost);
+        return cost.map(cur => ({ ...cur, count: cur.count * count }));
+    }
+
+    private getGidMap() {
+        let gidMap = new Map<number, number>();
+        for (let { gid } of this.records) {
+            let num = (gidMap.get(gid) || 0) + 1;
+            gidMap.set(gid, num);
+        }
+        return gidMap;
+    }
+    // 奖池剔除numLimit限制
+    private getPoolByRecordNum() {
+        let gidMap = this.getGidMap();
+        let pool: LuckyPool[] = [];
+        for (let obj of this.pool) {
+            let { gid, numLimit } = obj;
+            if (numLimit != -1 || numLimit > (gidMap.get(gid) || 0)) pool.push(obj);
+        }
+        return pool;
+    }
+    // 保底
+    private getFloor(pool: LuckyPool[]) {
+        let ret: TurntableFloorInDb = { sum: 0, count: 0, id: 0 };
+        for (let { sum, count, id } of this.floor) {
+            if (this.greatRewardCount > (sum - count) && this.greatRewardCount <= sum) {
+                if ((ret?.sum || 0) < sum) ret = { sum, count, id };
+            }
+        }
+
+        if (ret && ret.id > 0) {
+            let newPool = pool.find(cur => cur.id == ret.id)
+            if (newPool) {
+                return { newPool };
+            }
+        }
+        return {};
+    }
+
+
+    public pull(roleName: string, count: number) {
+        let records: (string | number)[][] = [];
+        let result: number[] = [];
+        let goodResult: RewardInter[] = [];
+        for (let i = 0; i < count; i++) {
+            // 1.次数上限
+            let pool = this.getPoolByRecordNum();
+            // 2.保底
+            this.greatRewardCount++;
+            let { newPool } = this.getFloor(pool);
+            let randResult = newPool;
+            if (newPool) {
+                let floor = this.floor.find(cur => cur.id == newPool.id)
+                if (floor && floor.sum == this.greatRewardCount) {
+                    this.greatRewardCount = 0;
+                }
+                let tempPool = this.pool.find(cur => cur.id == randResult.id);
+                if (tempPool) {
+                    tempPool.getCnt = (tempPool.getCnt || 0) + 1;
+                }
+            }
+            else {
+                randResult = getRandEelmWithWeight(pool).dic;
+                if (randResult) {
+                    let floor = this.floor.find(cur => cur.id == randResult.id);
+                    let tempPool = this.pool.find(cur => cur.id == randResult.id);
+                    if (tempPool) {
+                        tempPool.getCnt = (tempPool.getCnt || 0) + 1;
+                    }
+
+                    if (floor && floor.count <= tempPool.getCnt) {
+                        this.greatRewardCount = 0;
+                    }
+                }
+            }
+            if (randResult) {
+                this.count++;
+                this.todayCount++;
+                let record = { roleName, gid: randResult.gid, count: randResult.count };
+                records.push([record.roleName, record.gid, record.count]);
+                this.records.push(record);
+                result.push(randResult.id);
+                goodResult.push({ id: randResult.gid, count: randResult.count });
+            }
+        }
+        return { result, records, goodResult, pool: this.pool.map(pool => pool.getShowResult()), floorCount: this.greatRewardCount };
+    }
+
+    // 宝箱是否可以领取
+    public canReceive(boxCount: number) {
+        if (this.count < boxCount) return false;
+        let box = this.box.find(cur => cur.count == boxCount);
+        if (!box) return false
+        if (box.isReceived) return false;
+        return true;
+    }
+
+    public findBox(boxCount: number) {
+        let box = this.box.find(cur => cur.count == boxCount);
+        return box;
+    }
+
+    public setPlayerRecords(playerData: ActivityLuckyModelType) {
+        if (!playerData) return null
+        let { todayCount, count, records, box, greatRewardCount } = playerData;
+        this.todayCount = todayCount;
+        this.count = count;
+        this.records = records;
+        for (let boxData of this.box) {
+            boxData.setReceived(box);
+        }
+        this.greatRewardCount = greatRewardCount;
+
+        let gidMap = this.getGidMap();
+        for (let obj of this.pool) {
+            obj.getCnt = (gidMap.get(obj.gid) || 0);
+        }
+    }
+
+    public initData(data: string) {
+        let dataObj: TurntableInDb = JSON.parse(data);
+        this.cost = dataObj.cost;
+        this.freeCount = dataObj.freeCount;
+        for (let pool of dataObj.pool) {
+            let poolObj = new LuckyPool(pool);
+            this.pool.push(poolObj);
+            // if (!this.greateReward || this.greateReward.weight > poolObj.weight) {
+            //     this.greateReward = poolObj;
+            // }
+        }
+        for (let box of dataObj.box) {
+            this.box.push(new LuckyBox(box));
+        }
+        this.floor = dataObj.floor;
+    }
+
+    public getShowResult() {
+        return {
+            ...this.getBaseKeys(),
+            cost: this.cost,
+            freeCount: this.freeCount,
+            todayCount: this.todayCount,
+            count: this.count,
+            box: this.box,
+            pool: this.pool.map(pool => pool.getShowResult()),
+            records: this.records.map(record => [record.roleName, record.gid, record.count]),
+            floorCount: this.greatRewardCount,
+        }
+    }
+
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
+        this.initData(activityData.data)
+    }
+}

shared/resource/jsons/dic_zyz_activityType.json

@@ -364,5 +364,11 @@
         "activityType": 65,
         "name": "MID_AUTUMN",
         "string": "辜月集会活动"
+    },
+    {
+        "id": 66,
+        "activityType": 66,
+        "name": "LUCKY_TURNTABLE",
+        "string": "幸运转盘新"
     }
 ]