✨ feat(活动): 小游戏
This commit is contained in:
luying
@@ -1,6 +1,6 @@
|
||||
import { Application, BackendSession, HandlerService, } from 'pinus';
|
||||
import { resResult } from '../../../pubUtils/util';
|
||||
import { FIRST_GIFT_STATE, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
|
||||
import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
|
||||
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
|
||||
import { getMetialStr, getPlayerForgeData, getPlayerForgeDataShow } from '../../../services/activity/forgeService';
|
||||
import { ActivityForgeModel } from '../../../db/ActivityForge';
|
||||
@@ -67,7 +67,7 @@ export class ForgeHandler {
|
||||
// 保存数据
|
||||
let buildResult = await ActivityForgeModel.build(serverId, activityId, roleId, playerData.roundIndex, id, { todayIndex: playerData.todayIndex, isSuccess, material: getMetialStr(material) });
|
||||
// 更新数据
|
||||
manual.setPlayerData(buildResult, playerData.todayIndex);
|
||||
manual.setPlayerData(buildResult, playerData.todayIndex, playerData.hint);
|
||||
let activityGoods = undefined;
|
||||
if(isSuccess) {
|
||||
let { goods } = await addReward(roleId, roleName, sid, serverId, stringToRewardParam(manual.reward), ITEM_CHANGE_REASON.ACT_FORGE_BUILD);
|
||||
|
||||
201
game-server/app/servers/activity/handler/miniGameHandler.ts
Normal file
201
game-server/app/servers/activity/handler/miniGameHandler.ts
Normal file
@@ -0,0 +1,201 @@
|
||||
import { Application, BackendSession, HandlerService, } from 'pinus';
|
||||
import { resResult } from '../../../pubUtils/util';
|
||||
import { ITEM_CHANGE_REASON, REDIS_KEY, STATUS } from '../../../consts';
|
||||
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
|
||||
import { getPlayerMiniGameData, getPlayerMiniGameDataShow } from '../../../services/activity/miniGameService';
|
||||
import { ActivityMiniGameRecModel } from '../../../db/ActivityMiniGameRec';
|
||||
import { ActivityMiniGameModel } from '../../../db/ActivityMiniGame';
|
||||
import { handleCost } from '../../../services/role/rewardService';
|
||||
import { Rank } from '../../../services/rankService';
|
||||
import { nowSeconds } from '../../../pubUtils/timeUtil';
|
||||
import { RoleRankInfo } from '../../../domain/rank';
|
||||
import { getAllServerName } from '../../../services/redisService';
|
||||
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
return new ForgeHandler(app);
|
||||
}
|
||||
|
||||
export class ForgeHandler {
|
||||
constructor(private app: Application) {
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 小游戏数据
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async getMiniGameActivity(msg: { activityId: number }, session: BackendSession) {
|
||||
const { activityId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameDataShow(activityId, serverId, roleId);
|
||||
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
return resResult(STATUS.SUCCESS, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 小游戏开始
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async gameStart(msg: { activityId: number }, session: BackendSession) {
|
||||
const { activityId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
if(playerData.playCnt >= playerData.buyCnt + playerData.freeCnt) return resResult(STATUS.ACTIVITY_MINI_GAME_COUNT_LACK);
|
||||
let record = await ActivityMiniGameRecModel.gameStart(serverId, activityId, playerData.roundIndex, playerData.todayIndex, roleId);
|
||||
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
activityId,
|
||||
gameCode: record.gameCode,
|
||||
playCnt: playerData.playCnt
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 小游戏结束
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async gameEnd(msg: { activityId: number, gameCode: string, score: number }, session: BackendSession) {
|
||||
const { activityId, gameCode, score } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const roleName = session.get('roleName');
|
||||
const sid = session.get('sid');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
// 记录得分&次数
|
||||
let record = await ActivityMiniGameRecModel.gameEnd(activityId, roleId, gameCode, score);
|
||||
if(!record) return resResult(STATUS.ACTIVITY_MINI_GAME_RECORD_NOT_FOUND);
|
||||
|
||||
let playerRecord = await ActivityMiniGameModel.incScore(serverId, activityId, playerData.roundIndex, roleId, score, playerData.nextRefreshTime);
|
||||
if(!record) return resResult(STATUS.ACTIVITY_MINI_GAME_RECORD_NOT_FOUND);
|
||||
playerData.setPlayerData(playerRecord);
|
||||
playerData.incPlayerCnt();
|
||||
|
||||
let rewards = stringToRewardParam(playerData.reward, playerData.nextRefreshTime);
|
||||
let { goods } = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_MINI_GAME_REWARD);
|
||||
|
||||
let r = new Rank(REDIS_KEY.ACTIVITY_MINI_GAME, { activityId, roundIndex: playerData.roundIndex });
|
||||
await r.setRankWithRoleInfo(roleId, score, nowSeconds(), null, true);
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
activityId,
|
||||
gameCode,
|
||||
score: playerData.score,
|
||||
goods
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 购买挑战次数
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async buyCnt(msg: { activityId: number, count: number }, session: BackendSession) {
|
||||
const { activityId, count } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const sid = session.get('sid');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
if(playerData.buyCnt + count > playerData.maxBuyCnt) return resResult(STATUS.ACTIVITY_MINI_GAME_BUY_COUNT_MAX);
|
||||
// 扣材料
|
||||
let costResult = await handleCost(roleId, sid, stringToConsumeParam(playerData.consume), ITEM_CHANGE_REASON.ACT_MINI_GAME_BUY_CNT);
|
||||
if(!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
|
||||
|
||||
let playerRecord = await ActivityMiniGameModel.buyCnt(serverId, activityId, playerData.roundIndex, roleId, count, playerData.nextRefreshTime);
|
||||
playerData.setPlayerData(playerRecord);
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
activityId,
|
||||
buyCnt: playerData.buyCnt,
|
||||
maxBuyCnt: playerData.maxBuyCnt
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 领取宝箱
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async receiveBox(msg: { activityId: number, boxId: number }, session: BackendSession) {
|
||||
const { activityId, boxId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const roleName = session.get('roleName');
|
||||
const sid = session.get('sid');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
let box = playerData.findBox(boxId);
|
||||
if(!box) return resResult(STATUS.ACTIVITY_MINI_GAME_BOX_NOT_FOUND);
|
||||
if(box.hasReceived) return resResult(STATUS.ACTIVITY_MINI_GAME_BOX_HAS_RECEIVED);
|
||||
if(box.score > playerData.score) return resResult(STATUS.ACTIVITY_MINI_GAME_SCORE_NOT_ENOUGH);
|
||||
let result = await ActivityMiniGameModel.receiveBox(serverId, activityId, playerData.roundIndex, roleId, boxId);
|
||||
if(!result) return resResult(STATUS.ACTIVITY_MINI_GAME_BOX_HAS_RECEIVED);
|
||||
playerData.setPlayerData(result);
|
||||
|
||||
let rewards = stringToRewardParam(playerData.reward, playerData.nextRefreshTime);
|
||||
let { goods } = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_MINI_GAME_REWARD);
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
activityId,
|
||||
curBox: playerData.findBox(boxId),
|
||||
goods
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 排行榜
|
||||
* @param {{ activityId: number}} msg
|
||||
* @param {BackendSession} session
|
||||
* @memberof ForgeHandler
|
||||
*/
|
||||
async getRanks(msg: { activityId: number }, session: BackendSession) {
|
||||
const { activityId } = msg;
|
||||
const roleId = session.get('roleId');
|
||||
const serverId = session.get('serverId');
|
||||
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
let serverNames = await getAllServerName();
|
||||
let r = new Rank(REDIS_KEY.ACTIVITY_MINI_GAME, { activityId, roundIndex: playerData.roundIndex });
|
||||
r.setGenerFieldsFun((obj => {
|
||||
if(obj instanceof RoleRankInfo) {
|
||||
return { rank: obj.rank, roleId: obj.roleId, name: obj.roleName, serverId: obj.serverId, serverName: serverNames[obj.serverId], num: obj.num }
|
||||
}
|
||||
return null
|
||||
}));
|
||||
|
||||
let { ranks, myRank } = await r.getRankListWithMyRank({ roleId });
|
||||
if (!myRank) {
|
||||
myRank = await r.generMyRankWithRole(roleId, playerData.score, nowSeconds());
|
||||
}
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
activityId,
|
||||
gameType: playerData.gameType,
|
||||
ranks, myRank
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -42,6 +42,7 @@ import { _getActivities, _getActivitiesByServerId, _getActivitiesByType, _getAct
|
||||
import { getGroupShopDataShow } from './groupShopService';
|
||||
import { getBindPhoneDataShow } from './bindPhoneService';
|
||||
import { getPlayerForgeDataShow } from './forgeService';
|
||||
import { getPlayerMiniGameDataShow } from './miniGameService';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -238,6 +239,11 @@ export async function getActivity(serverId: number, roleId: string, uid: number,
|
||||
activityData = await getPlayerForgeDataShow(activityId, serverId, roleId);
|
||||
break
|
||||
}
|
||||
case ACTIVITY_TYPE.MINI_GAME:
|
||||
{
|
||||
activityData = await getPlayerMiniGameDataShow(activityId, serverId, roleId);
|
||||
break
|
||||
}
|
||||
default: {
|
||||
console.log('未知活动类型.........', activityType)
|
||||
break;
|
||||
|
||||
46
game-server/app/services/activity/miniGameService.ts
Normal file
46
game-server/app/services/activity/miniGameService.ts
Normal file
@@ -0,0 +1,46 @@
|
||||
import { ActivityForgeModel } from "../../db/ActivityForge";
|
||||
import { ActivityMiniGameModel } from "../../db/ActivityMiniGame";
|
||||
import { ActivityMiniGameRecModel } from "../../db/ActivityMiniGameRec";
|
||||
import { MiniGameData } from "../../domain/activityField/miniGameField";
|
||||
import { getRoleCreateTime, getServerCreateTime } from "../redisService";
|
||||
import { getActivityById } from "./activityService";
|
||||
|
||||
/**
|
||||
* 玩家活动数据
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getPlayerMiniGameData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new MiniGameData(activityData, createTime, serverTime);
|
||||
let playerRecord = await ActivityMiniGameModel.findData(serverId, activityId, playerData.roundIndex, roleId);
|
||||
let records = await ActivityMiniGameRecModel.findRecords(serverId, activityId, playerData.roundIndex, roleId);
|
||||
playerData.setPlayerData(playerRecord);
|
||||
playerData.setPlayerRecords(records);
|
||||
return playerData;
|
||||
}
|
||||
|
||||
/**
|
||||
* 玩家活动数据
|
||||
*
|
||||
* @param {number} serverId 区Id
|
||||
* @param {number} activityId 活动Id
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getPlayerMiniGameDataShow(activityId: number, serverId: number, roleId: string) {
|
||||
let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
|
||||
if(playerData && playerData.canShow && playerData.canShow()) {
|
||||
return playerData.getShowResult();
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
export function getMetialStr(material: { id: number, count: number }[]) {
|
||||
return material.map(({id, count}) => `${id}&${count}`).join('|')
|
||||
}
|
||||
@@ -120,6 +120,7 @@ export function checkRouteParam(route: string, msg: any) {
|
||||
case 'activity.groupShopHandler.getGroupShopPage':
|
||||
case 'activity.groupShopHandler.leaveGroupShopPage':
|
||||
case 'activity.forgeHandler.getForgeActivity':
|
||||
case 'activity.miniGameHandler.getMiniGameActivity':
|
||||
{
|
||||
if(!checkNaturalNumbers(msg.activityId)) return false;
|
||||
break;
|
||||
@@ -442,6 +443,35 @@ export function checkRouteParam(route: string, msg: any) {
|
||||
if(!checkNaturalNumbers(activityId, id, count)) return false;
|
||||
break;
|
||||
}
|
||||
case 'activity.miniGameHandler.gameStart':
|
||||
{
|
||||
if(!checkNaturalNumbers(msg.activityId)) return false;
|
||||
break;
|
||||
}
|
||||
case 'activity.miniGameHandler.gameEnd':
|
||||
{
|
||||
let { activityId, gameCode, score } = msg;
|
||||
if(!checkNaturalNumbers(activityId, score)) return false;
|
||||
if(!checkNaturalStrings(gameCode)) return false;
|
||||
break;
|
||||
}
|
||||
case 'activity.miniGameHandler.buyCnt':
|
||||
{
|
||||
let { activityId, count } = msg;
|
||||
if(!checkNaturalNumbers(activityId, count)) return false;
|
||||
break;
|
||||
}
|
||||
case 'activity.miniGameHandler.receiveBox':
|
||||
{
|
||||
let { activityId, boxId } = msg;
|
||||
if(!checkNaturalNumbers(activityId, boxId)) return false;
|
||||
break;
|
||||
}
|
||||
case 'activity.miniGameHandler.getRanks':
|
||||
{
|
||||
if(!checkNaturalNumbers(msg.activityId)) return false;
|
||||
break;
|
||||
}
|
||||
case "battle.barrageHandler.getBarrageList":
|
||||
{
|
||||
if(!checkNaturalStrings(msg.rid)) return false;
|
||||
|
||||
@@ -20,6 +20,7 @@ import { GVGVestigeSumRankModel } from "../db/GVGVestigeSumRank";
|
||||
import { GVGLeagueModel, GVGLeagueType } from "../db/GVGLeague";
|
||||
import { GVGVestigeLeagueRankModel } from "../db/GVGVestigeLeagueRank";
|
||||
import { getDayKeyInfo } from "./gvg/gvgFightService";
|
||||
import { ActivityMiniGameModel } from "../db/ActivityMiniGame";
|
||||
|
||||
|
||||
/**
|
||||
@@ -1207,6 +1208,16 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (type == REDIS_KEY.ACTIVITY_MINI_GAME) {
|
||||
let ranks = await ActivityMiniGameModel.findRank();
|
||||
for(let { _id: { activityId, roundIndex }, roleIds, arr } of ranks) {
|
||||
let r = new Rank(type, { activityId, roundIndex });
|
||||
let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
|
||||
for(let { roleId, score, updatedAt } of arr) {
|
||||
let role = roles.find(cur => cur.roleId == roleId);
|
||||
if(role) await r.setRankWithRoleInfo(roleId, score, updatedAt.getTime(), role, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,12 +51,14 @@ export async function initAllRank() {
|
||||
await delKeys(REDIS_KEY.LADDER);
|
||||
await delKeys(REDIS_KEY.GVG_VESTIGE_MEMBER_ALL);
|
||||
await delKeys(REDIS_KEY.GVG_VESTIGE_LEAGUE);
|
||||
await delKeys(REDIS_KEY.ACTIVITY_MINI_GAME);
|
||||
// 测试服特殊处理，由于重启较频繁且联军数据较少，数据先不删，正式服激战期间不会重启
|
||||
if(!isDevelopEnv()) await delKeys(REDIS_KEY.LEAGUE_INFO);
|
||||
|
||||
await setRankRedisFromDb(REDIS_KEY.PVP_RANK, {});
|
||||
await setRankRedisFromDb(REDIS_KEY.GVG_VESTIGE_MEMBER_ALL, {});
|
||||
await setRankRedisFromDb(REDIS_KEY.GVG_VESTIGE_LEAGUE, {});
|
||||
await setRankRedisFromDb(REDIS_KEY.ACTIVITY_MINI_GAME, {});
|
||||
|
||||
for(let {id} of serverList) {
|
||||
await initRankByServerId(id);
|
||||
|
||||
Reference in New Issue
Block a user