xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：礼包添加批量参数

Browse Source
This commit is contained in:
qiaoxin
2021-06-21 18:19:37 +08:00
parent 789660a701
commit 7c28103192
13 changed files with 170 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/donateHandler.ts
+22 -20
View File
@@ -5,21 +5,21 @@ import { STATUS, TASK_TYPE } from '../../../consts';
import { DonationModel } from '../../../db/Donation';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById } from '../../../pubUtils/data';
import { GuildModel } from '../../../db/Guild';
import { GuildModel } from '../../../db/Guild';
import { handleCost, addItems } from '../../../services/rewardService';
import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts';
import { getDonation } from '../../../services/donateService';
import { getUserGuildWithRefActive } from '../../../services/guildService';
import { ARMY } from '../../../pubUtils/dicParam';
import { addActive } from '../../../services/guildService'
import { checkTask } from '../../../services/taskService';
export default function(app: Application) {
import { checkActivityTask, checkTask } from '../../../services/taskService';
export default function (app: Application) {
return new DonationHandler(app);
}
export class DonationHandler {
constructor(private app: Application) {
}
/**
* 捐献所的等级，捐献的次数，战报，捐献达到的基金，领取宝箱记录
@@ -31,18 +31,18 @@ export class DonationHandler {
const serverId: number = parseInt(session.get('serverId'));
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
if (!userGuild)
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code, donateCnt, receiveBoxs } = userGuild;
let { donateFund, reports, donationLv } = await getDonation(code, serverId);
return resResult(STATUS.SUCCESS, { receiveBoxs, donateFund, reports, donateCnt:donateCnt||0, donationLv});
return resResult(STATUS.SUCCESS, { receiveBoxs, donateFund, reports, donateCnt: donateCnt || 0, donationLv });
}
/**
* 捐献
* @param msg
* @param session
*/
async donate(msg: {id: number}, session: BackendSession) {
async donate(msg: { id: number }, session: BackendSession) {
const { id } = msg;
const roleId: string = session.get('roleId');
const roleName: string = session.get('roleName');
@@ -50,20 +50,20 @@ export class DonationHandler {
const sid: string = session.get('sid');
const funcs: number[] = session.get('funcs');
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
if (!userGuild)
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code, donateCnt: resdonateCnt } = userGuild;
if (resdonateCnt >= ARMY.ARMY_DONATE_TIMES)
if (resdonateCnt >= ARMY.ARMY_DONATE_TIMES)
return resResult(STATUS.GUILD_DONATE_TIMES_NOT_ENOUGH);
let { donationLv } = await getDonation(code, serverId);
let { donateReward } = getArmyDonateBaseByLv(donationLv);
let { rewardGood, rewardFund, cosume } = donateReward.get(id);
let result = await handleCost(roleId, sid, [cosume]);
if(!result)
if (!result)
return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let { donateCnt } = await UserGuildModel.donateFund(roleId, 1);
let { donateFund, reports } = await DonationModel.donation(code, rewardFund, { reports: {id, roleName, time: nowSeconds()}});
let { donateFund, reports } = await DonationModel.donation(code, rewardFund, { reports: { id, roleName, time: nowSeconds() } });
let goods = [];
if (!!rewardGood)
goods = await addItems(roleId, roleName, sid, [rewardGood]);
@@ -73,32 +73,34 @@ export class DonationHandler {
await addActive(roleId, serverId, GUILD_POINT_WAYS.DONATE, id);
// 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_DONATE, 1, true, {});
//活动任务
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.GUILD_DONATE, 1);
return resResult(STATUS.SUCCESS, { donateFund, reports, donateCnt, goods });
}
/**
* 领取宝箱
* @param msg
* @param session
*/
async receiveBox(msg: {id: number}, session: BackendSession) {
*/
async receiveBox(msg: { id: number }, session: BackendSession) {
const { id } = msg;
const roleId: string = session.get('roleId');
const roleName: string = session.get('roleName');
const sid: string = session.get('sid');
const serverId: number = parseInt(session.get('serverId'));
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
if (!userGuild)
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code, receiveBoxs: resReceiveBoxs } = userGuild;
if (resReceiveBoxs.indexOf(id) != -1)
if (resReceiveBoxs.indexOf(id) != -1)
return resResult(STATUS.GUILD_DONATE_BOXS_IS_GOT);
let { boxRewards, fund } = getArmyDonateBoxBaseById(id);
let { donateFund, donationLv } = await getDonation(code, serverId);
let { boxRewardRatio, requireRewardRatio } = getArmyDonateBaseByLv(donationLv);
if (donateFund < Math.floor(fund * (100 + requireRewardRatio)/100) )
if (donateFund < Math.floor(fund * (100 + requireRewardRatio) / 100))
return resResult(STATUS.GUILD_DONATE_BOXS_NOT_GOT);
boxRewards = boxRewards.map(({id, count})=>{
boxRewards = boxRewards.map(({ id, count }) => {
return { id, count: count * (boxRewardRatio + 100) };
});
resReceiveBoxs.push(id);
@@ -106,4 +108,4 @@ export class DonationHandler {
let goods = await addItems(roleId, roleName, sid, boxRewards);
return resResult(STATUS.SUCCESS, { receiveBoxs, goods });
}
}
}
game-server/app/servers/battle/handler/eventBattleHandler.ts
+39 -36
View File
@@ -6,10 +6,10 @@ import { checkEvent, checkEventStatus, getEventSuccessStatus, getEvent, checkQui
import { addItems } from '../../../services/rewardService';
import { STATUS } from '../../../consts/statusCode';
import { resResult } from '../../../pubUtils/util';
import { checkTask } from '../../../services/taskService';
import { checkActivityTask, checkTask } from '../../../services/taskService';
import { gameData } from '../../../pubUtils/data';
export default function(app: Application) {
export default function (app: Application) {
return new EventBattleHandler(app);
}
@@ -18,11 +18,11 @@ export class EventBattleHandler {
}
// 主动获取奇遇事件
async getEvents(msg: { }, session: BackendSession) {
async getEvents(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let eventStatus = session.get('eventStatus');
let event = await getEvent(eventStatus, roleId, roleName);
return resResult(STATUS.SUCCESS, { list: event });
@@ -30,44 +30,44 @@ export class EventBattleHandler {
// 回答问题
async checkAnswer(msg: { eventId: number, eventCode: string, questionId: number, answer: number }, session: BackendSession) {
const {eventId, eventCode, questionId, answer} = msg;
const { eventId, eventCode, questionId, answer } = msg;
let roleId = session.get('roleId');
// let roleName = session.get('roleName');
// let eventStatus = session.get('eventStatus');
let event = await EventRecordModel.getEventRecordByCode(roleId, eventCode);
if(!event) {
if (!event) {
return resResult(STATUS.EVENT_RECORD_NOT_FOUND);
}
let { status, type, eventId: dataEventId, question } = event;
if(status != EVENT_RECORD_STATUS.WAITING) {
if (status != EVENT_RECORD_STATUS.WAITING) {
return resResult(STATUS.EVENT_STATUS_ERROR);
}
if(dataEventId != eventId) {
if (dataEventId != eventId) {
return resResult(STATUS.EVENT_WRONG_ID);
}
let curQuestion = question.find(cur => cur.id == questionId);
if(!curQuestion) return resResult(STATUS.EVENT_QUESTION_NOT_FOUND);
if (!curQuestion) return resResult(STATUS.EVENT_QUESTION_NOT_FOUND);
let {isCorrect, answerNo} = checkQuiz(questionId, answer);
let result = await EventRecordModel.saveEventAnswer(eventCode, questionId, isCorrect?EVENT_ANSWER_STATUS.CORRECT:EVENT_ANSWER_STATUS.WRONG);
if(!result) {
let { isCorrect, answerNo } = checkQuiz(questionId, answer);
let result = await EventRecordModel.saveEventAnswer(eventCode, questionId, isCorrect ? EVENT_ANSWER_STATUS.CORRECT : EVENT_ANSWER_STATUS.WRONG);
if (!result) {
return resResult(STATUS.EVENT_RECORD_NOT_FOUND);
}
let { question: newQuestion } = result;
let isClear = true, allCorrect = true;
for(let {status} of newQuestion) {
if(status) {
if(status == EVENT_ANSWER_STATUS.WRONG) {
allCorrect = false;
}
}else {
isClear = false; allCorrect = false;
for (let { status } of newQuestion) {
if (status) {
if (status == EVENT_ANSWER_STATUS.WRONG) {
allCorrect = false;
}
} else {
isClear = false; allCorrect = false;
}
}
if(isClear) {
await EventRecordModel.setStatusByCode(roleId, eventCode, allCorrect?EVENT_RECORD_STATUS.BATTLE_SUCCESS:EVENT_RECORD_STATUS.BATTLE_FAIL);
if (isClear) {
await EventRecordModel.setStatusByCode(roleId, eventCode, allCorrect ? EVENT_RECORD_STATUS.BATTLE_SUCCESS : EVENT_RECORD_STATUS.BATTLE_FAIL);
}
return resResult(STATUS.SUCCESS, { eventCode, eventId, questionId, isCorrect, answerNo });
@@ -75,59 +75,62 @@ export class EventBattleHandler {
// 获取关卡列表
async receiveEventReward(msg: { eventId: number, eventCode: string }, session: BackendSession) {
const {eventId, eventCode} = msg;
const { eventId, eventCode } = msg;
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let eventStatus = session.get('eventStatus');
let sid = session.get('sid');
const serverId = session.get('serverId');
const funcs: number[] = session.get('funcs');
let event = await EventRecordModel.getEventRecordByCode(roleId, eventCode);
if(!event) {
if (!event) {
return resResult(STATUS.EVENT_RECORD_NOT_FOUND);
}
let { status, type, eventId: dataEventId, question } = event;
let flag = checkEventStatus(type, status);
if(!flag) {
if (!flag) {
return resResult(STATUS.EVENT_STATUS_ERROR);
}
let checkResult = getEventSuccessStatus(type, status, question);
if(checkResult.status == -1) {
if (checkResult.status == -1) {
return resResult(STATUS.EVENT_QUESTION_NO_ANSWER);
}
let isSuccess = checkResult.isSuccess;
if(dataEventId != eventId) {
if (dataEventId != eventId) {
return resResult(STATUS.EVENT_WRONG_ID);
}
let dicEvent = gameData.event.get(eventId);
if(!dicEvent) {
if (!dicEvent) {
return resResult(STATUS.EVENT_INFO_NOT_FOUND);
}
// 保存状态
let result = await EventRecordModel.setStatusByCode(roleId, eventCode, isSuccess?EVENT_RECORD_STATUS.SUCCESS_RECEIVED:EVENT_RECORD_STATUS.FAIL_RECEIVED);
let result = await EventRecordModel.setStatusByCode(roleId, eventCode, isSuccess ? EVENT_RECORD_STATUS.SUCCESS_RECEIVED : EVENT_RECORD_STATUS.FAIL_RECEIVED);
// 保存奖励
let reward = isSuccess?dicEvent.winReward:dicEvent.loseReward;
let reward = isSuccess ? dicEvent.winReward : dicEvent.loseReward;
let goods = await addItems(roleId, roleName, sid, reward);
if(eventStatus == EVENT_STATUS.STARTING) { // 如果是第一次开启的挑战，保存成开启状态
if (eventStatus == EVENT_STATUS.STARTING) { // 如果是第一次开启的挑战，保存成开启状态
await RoleModel.setEventStatus(roleId, EVENT_STATUS.OPEN);
// 第一场时间挑战完，开始正常刷新事件，所以刷新时间也重置起来
session.set('eventStatus', EVENT_STATUS.OPEN);
session.push('eventStatus', () => {});
session.push('eventStatus', () => { });
}
// 推送消息刷新
await checkEvent(session, true);
// 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.BATTLE_EVENT, 1, true, { eventType: dicEvent.eventType })
// 活动任务
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.BATTLE_EVENT, 1, { eventType: dicEvent.eventType })
return resResult(STATUS.SUCCESS, {
isSuccess,
eventCode: result.eventCode,
eventId: result.eventId,
status: result.status,
goods
isSuccess,
eventCode: result.eventCode,
eventId: result.eventId,
status: result.status,
goods
});
}
}