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

军团：权限判断函数提取

Browse Source
This commit is contained in:
luying
2021-08-04 16:40:20 +08:00
parent 8cbf0090c5
commit 4d3c0fe302
18 changed files with 270 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
game-server/app/servers/guild/handler/guildTrainHandler.ts
View File

@@ -4,7 +4,7 @@ import { STATUS, TASK_TYPE } from '../../../consts';
import { GuildTrainModel } from '../../../db/GuildTrain';
import { BattleRecordModel } from '../../../db/BattleRecord';
import { nowSeconds, getTimeFun, getZeroPoint } from '../../../pubUtils/timeUtil';
import { getUserGuild, getGuildTrainInfo, unlockTrain, getGuildTrainRewards, getGuildTrainInstance, getTrainBoxRewardsResult } from '../../../services/guildTrainService';
import { refreshTrain, getGuildTrainInfo, unlockTrain, getGuildTrainRewards, getGuildTrainInstance, getTrainBoxRewardsResult } from '../../../services/guildTrainService';
import { findIndex, findWhere } from 'underscore'
import { lockData } from '../../../services/redLockService';
import { GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
@@ -20,6 +20,7 @@ import { DATA_NAME } from '../../../consts/dataName';
import { pushGuildTrainSucMsg } from '../../../services/chatService';
import { checkActivityTask, checkTask } from '../../../services/taskService';
import { sendPopUpActivityData } from '../../../services/guildActivityService';
import { guildInter } from '../../../pubUtils/interface';
export default function (app: Application) {
new HandlerService(app, {});
@@ -32,10 +33,11 @@ export class GuildTrainHandler {
}
//获得试炼的详情
async getTrainInstance(msg: {}, session: BackendSession) {
async getTrainInstance(msg: guildInter & {}, session: BackendSession) {
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
let userGuild = await getUserGuild(roleId, serverId);
const { myUserGuild } = msg;
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -44,10 +46,11 @@ export class GuildTrainHandler {
return resResult(STATUS.SUCCESS, result);
}
//获得试炼战报
async getTrainReports(msg: {}, session: BackendSession) {
async getTrainReports(msg: guildInter & {}, session: BackendSession) {
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
let userGuild = await getUserGuild(roleId, serverId);
const { myUserGuild } = msg;
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -69,10 +72,11 @@ export class GuildTrainHandler {
}
//获得试炼宝箱
async getTrainBoxs(msg: {}, session: BackendSession) {
async getTrainBoxs(msg: guildInter & {}, session: BackendSession) {
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
let userGuild = await getUserGuild(roleId, serverId);
const { myUserGuild } = msg;
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -84,12 +88,12 @@ export class GuildTrainHandler {
* @param msg
* @param session
*/
async trainBattleStart(msg: { hid: number, trainId: number, difficulty: number }, session: BackendSession) {
const { hid, difficulty, trainId } = msg;
async trainBattleStart(msg: guildInter & { hid: number, trainId: number, difficulty: number }, session: BackendSession) {
const { hid, difficulty, trainId, myUserGuild } = msg;
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const serverId = parseInt(session.get('serverId'));
let userGuild = await getUserGuild(roleId, serverId);
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -126,14 +130,14 @@ export class GuildTrainHandler {
* @param msg
* @param session
*/
async trainBattleEnd(msg: { battleCode: string, isSuccess: boolean }, session: BackendSession) {
const { battleCode, isSuccess } = msg;
async trainBattleEnd(msg: guildInter & { battleCode: string, isSuccess: boolean }, session: BackendSession) {
const { battleCode, isSuccess, myUserGuild } = msg;
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
const roleName: string = session.get('roleName');
const sid: string = session.get('sid');
const funcs: number[] = session.get('funcs');
let userGuild = await getUserGuild(roleId, serverId);
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -260,13 +264,13 @@ export class GuildTrainHandler {
* @param msg
* @param session
*/
async getTrainInstanceBox(msg: { trainId: number, hid: number, index: number }, session: BackendSession) {
let { trainId, hid, index } = msg;
async getTrainInstanceBox(msg: guildInter & { trainId: number, hid: number, index: number }, session: BackendSession) {
let { trainId, hid, index, myUserGuild } = msg;
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
const roleName: string = session.get('roleName');
const sid = session.get('sid');
let userGuild = await getUserGuild(roleId, serverId);
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -320,13 +324,13 @@ export class GuildTrainHandler {
* @param msg
* @param session
*/
async getTrainLvUpRewards(msg: { trainId: number }, session: BackendSession) {
let { trainId } = msg;
async getTrainLvUpRewards(msg: guildInter & { trainId: number }, session: BackendSession) {
let { trainId, myUserGuild } = 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 getUserGuild(roleId, serverId);
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
const { guildCode: code } = userGuild;
@@ -346,12 +350,12 @@ export class GuildTrainHandler {
}
//购买挑战次数
async purchaseTrainCount(msg: { count: number }, session: BackendSession) {
let { count } = msg;
async purchaseTrainCount(msg: guildInter & { count: number }, session: BackendSession) {
let { count, myUserGuild } = msg;
const roleId: string = session.get('roleId');
const serverId: number = parseInt(session.get('serverId'));
const sid: string = session.get('sid');
let userGuild = await getUserGuild(roleId, serverId);
let userGuild = await refreshTrain(myUserGuild, roleId, serverId);
if (!userGuild)
return resResult(STATUS.WRONG_PARMS);
if (userGuild.buyTrainCount >= ARMY.ARMY_TRAIN_BUYTIMES)