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-10-20 15:55:50 +08:00
parent eeead1536a
commit d8fa04c7d0
8 changed files with 562 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/chat/remote/guildRemote.ts
+4 -3
View File
@@ -7,6 +7,7 @@ import { GuildRecType } from '../../../db/GuildRec';
import { leaveGuildChannel, groupRoomId } from '../../../services/chatService';
import { GuildRankParams, WoodenHorse, Event } from '../../../domain/battleField/guildActivity';
import { MailParam } from '../../../domain/roleField/mail';
import { pick } from 'underscore';
export default function (app: Application) {
new HandlerService(app, {});
@@ -27,7 +28,7 @@ export class GuildRemote {
private DEMOTION = 'onDemotion';
private PROMOTION = 'onPromotion';
private GUILD_REC_ADD = 'onGuildRecAdd';
private GUILD_BOSS_OPEN = 'onGuildBossOpen';
private GUILD_BOSS_OPEN = 'onGuildBossStatus';
private GATE_ACT_RANK = 'onGuildGateRankUpdate'; // 军团活动排行榜
private CITY_ACT_RANK = 'onGuildCityRankUpdate'; // 军团活动排行榜
private GUILD_GATE_ACT_HP = 'onGuildGateHpUpdate'; // 军团活动蛮夷入侵排行榜
@@ -284,8 +285,8 @@ export class GuildRemote {
* @param bossHp
* @param status
*/
public async pushBossOpen(guildCode: string, warId: number, bossHp: number, status: number) {
this.pushMessage(guildCode, this.GUILD_BOSS_OPEN, { guildCode, warId, bossHp, status });
public async pushBossStatus(guildCode: string, result: any) {
this.pushMessage(guildCode, this.GUILD_BOSS_OPEN, pick(result, ['status', 'bossInfo', 'leaderOpenCnt']));
}
/**
game-server/app/servers/guild/handler/guildBossHandler.ts
+64 -24
View File
@@ -1,17 +1,17 @@
import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
import { resResult, genCode, getRandSingleEelm } from '../../../pubUtils/util';
import { STATUS, TASK_TYPE } from '../../../consts';
import { AUCTION_SOURCE, DEBUG_MAGIC_WORD, MAIL_TYPE, STATUS, TASK_TYPE } from '../../../consts';
import { BossInstanceModel } from '../../../db/BossInstance';
import { BattleRecordModel } from '../../../db/BattleRecord';
import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
import { getBossInstanceInfo, checkBossResult, checkBossBattleMemberExists, pushBossHpMessage, addBossInstance, refreshUserGuildOfBoss, refreshGuildOfBoss, getRanks } from '../../../services/guildBossService';
import { getBossInstanceInfo, checkBossBattleMemberExists, pushBossHpMessage, addBossInstance, refreshUserGuildOfBoss, refreshGuildOfBoss, getRanks, getBossInstanceInfoByData } from '../../../services/guildBossService';
import { findWhere } from 'underscore'
import { GUILD_STRUCTURE, GUILD_BOSS_STATUS, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
import { DATA_NAME } from '../../../consts/dataName';
import { UserGuildModel } from '../../../db/UserGuild';
import { addActive } from '../../../services/guildService';
import { GuildModel } from '../../../db/Guild';
import { gameData, getBossByLv } from '../../../pubUtils/data';
import { gameData, getAuctionRewardByPoolId, getBossByLv } from '../../../pubUtils/data';
import { lockData } from '../../../services/redLockService';
import { pushGuildBossSucMsg, getGuildChannelSid } from '../../../services/chatService';
import { checkTask } from '../../../services/taskService';
@@ -20,6 +20,8 @@ import { addItems, handleCost } from '../../../services/rewardService';
import * as dicParam from '../../../pubUtils/dicParam';
import { getGoldObject } from '../../../pubUtils/itemUtils';
import { RoleModel } from '../../../db/Role';
import { sendMailToGuildByContent } from '../../../services/mailService';
import { genAuction } from '../../../services/auctionService';
export default function (app: Application) {
new HandlerService(app, {});
@@ -32,10 +34,8 @@ export class GuildHandler {
// 获得boss关卡
async getBossInstance(msg: guildInter & {}, session: BackendSession) {
const roleId: string = session.get('roleId');
let { myUserGuild: userGuild } = msg;
const { guildCode: code } = userGuild;
let result = await getBossInstanceInfo(code, roleId, userGuild);
let result = await getBossInstanceInfo(userGuild);
return resResult(STATUS.SUCCESS, result);
}
@@ -78,17 +78,16 @@ export class GuildHandler {
res.releaseCallback();
return resResult(STATUS.GUILD_SCRIPT_IS_OPENED_TODAY);
}
leaderOpenCnt = (await refreshGuildOfBoss(guild, 1)).leaderOpenCnt;
let { myChallengeCnt } = await refreshUserGuildOfBoss(userGuild);
await refreshGuildOfBoss(guild, 1);
await BossInstanceModel.openBossInstance(code, bossHp, warId, bossBase.bossLevel);
bossInstance = await BossInstanceModel.openBossInstance(code, bossHp, warId, bossBase.bossLevel);
res.releaseCallback();
let result = { warId, ranks: [], myRank: {}, bossHp, status: 3, bossLv: bossBase.bossLevel, leaderOpenCnt };
let result = await getBossInstanceInfoByData(bossInstance, userGuild, guild);
let chatSid = await getGuildChannelSid(code);
pinus.app.rpc.chat.guildRemote.pushBossOpen.toServer(chatSid, code, warId, bossHp, result.status);
pinus.app.rpc.chat.guildRemote.pushBossStatus.toServer(chatSid, code, result );
return resResult(STATUS.SUCCESS, {...result, leaderOpenCnt, myChallengeCnt});
return resResult(STATUS.SUCCESS, result);
}
async battleBoss(msg: guildInter & {}, session: BackendSession) {
@@ -139,15 +138,41 @@ export class GuildHandler {
}
//记录伤害
let bossInstance = await BossInstanceModel.updateBossHp(bossCode, damage, roleId);
if(!bossInstance) bossInstance = await BossInstanceModel.findByCode(bossCode);
if(!bossInstance) return resResult(STATUS.GUILD_SCRIPT_NOT_OPENED)
await BattleRecordModel.incBossDamage(battleCode, damage, bossInstance?.bossHp);
if (bossInstance.bossHp <= 0) {//进入结算
let flag = await checkBossResult(bossCode, guildCode, serverId, DATA_NAME.BOSS_SCRIPT, roleId, damage);
if (!flag) {
return resResult(STATUS.WRONG_PARMS);
if(!bossInstance) { // 如果已经被扣成负的了
return resResult(STATUS.SUCCESS, { bossHp: 0 });
}
if (bossInstance.bossHp <= damage) {//进入结算
let res:any = await lockData(serverId, DATA_NAME.BOSS_SCRIPT, guildCode);//加锁
if (!!res.err)
return resResult(STATUS.SUCCESS, { bossHp: 0 });
bossInstance = await BossInstanceModel.clearBoss(bossCode, bossInstance.bossHp, roleId);
if (!bossInstance) return resResult(STATUS.SUCCESS, { bossHp: 0 });
let { warId, bossLv } = bossInstance;//锁定关卡信息
await pushBossHpMessage(guildCode, serverId, 0, true);
// 击杀奖励&伤害奖励
let dicBossBase = gameData.bossBaseByBossLv.get(bossLv);
let dicWar = gameData.war.get(warId);
await sendMailToGuildByContent(MAIL_TYPE.GUILD_BOSS_REWARD, roleId, {
params: [`${dicWar.gk_name}`], goods: dicBossBase.killReward
});
// 加入拍卖行
if(dicBossBase) {
let rewards = getAuctionRewardByPoolId(dicBossBase.rewards);
await genAuction(guildCode, AUCTION_SOURCE.BOSS, bossCode, serverId, rewards);
}
let result = await getBossInstanceInfoByData(bossInstance, userGuild);
let chatSid = await getGuildChannelSid(guildCode);
pinus.app.rpc.chat.guildRemote.pushBossStatus.toServer(chatSid, guildCode, result );
pushGuildBossSucMsg(roleId, roleName, guildCode, bossInstance);
res.releaseCallback();//解锁
return resResult(STATUS.SUCCESS, { bossHp: 0 });
} else {
pushBossHpMessage(guildCode, serverId, bossInstance.bossHp);
@@ -182,10 +207,9 @@ export class GuildHandler {
// 任务
await checkTask(roleId, sid, TASK_TYPE.GUILD_BOSS, 1, true, {});
let { warId, ranks, bossHp, bossLv, status, encourageCnt } = bossInstance;
let rankInfo = getRanks(ranks, roleId);
let result = await getBossInstanceInfoByData(bossInstance, userGuild);
return resResult(STATUS.SUCCESS, { warId, ...rankInfo, bossHp, status, bossLv, encourageCnt, encourageMax: dicBossBase.encourageSum, battleGoods });
return resResult(STATUS.SUCCESS, { ...result, battleGoods });
}
async encourage(msg: guildInter & { count: number }, session: BackendSession) {
@@ -227,11 +251,27 @@ export class GuildHandler {
}
async debugAddBattleTimes(msg: {}, session: BackendSession) {
async debugAddBattleTimes(msg: { magicWord: string }, session: BackendSession) {
const { magicWord } = msg;
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
const roleId: string = session.get('roleId');
await UserGuildModel.updateInfo(roleId, { bossChallengeCnt: 0 }, {});
return resResult(STATUS.SUCCESS);
}
async debugAddOpenTimes(msg: { magicWord: string }, session: BackendSession) {
const { magicWord } = msg;
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
const guildCode: string = session.get('guildCode');
await GuildModel.updateInfo(guildCode, { openBossCnt: 0 }, {});
return resResult(STATUS.SUCCESS);
}
}
game-server/app/services/connectorService.ts
+1 -1
View File
@@ -117,7 +117,7 @@ async function getModuleData(type: string, data: { role: RoleType, session: Fron
}
case 'boss':
if (hasGuild) {
return await getBossInstanceInfo(guildCode, roleId, userGuild, guild);
return await getBossInstanceInfo(userGuild, guild);
}
return null;
case 'wishPool':
game-server/app/services/guildBossService.ts
+19 -72
View File
@@ -20,21 +20,30 @@ import { nowSeconds } from '../pubUtils/timeUtil';
* @param bossInstance
* @param roleId
*/
export async function getBossInstanceInfo(guildCode: string, roleId:string, userGuild: UserGuildType, guild?: GuildType) {
let bossInstance = await BossInstanceModel.findBossInstance(guildCode);
if(!guild) guild = await GuildModel.findByCode(guildCode, null, 'code refOpenBossTime openBossCnt');
export async function getBossInstanceInfo(userGuild: UserGuildType, guild?: GuildType) {
let bossInstance = await BossInstanceModel.findBossInstance(userGuild.guildCode);
if(!bossInstance) {
bossInstance = await BossInstanceModel.findLastOverBossInstance(userGuild.guildCode);
}
return await getBossInstanceInfoByData(bossInstance, userGuild, guild);
}
export async function getBossInstanceInfoByData(bossInstance: BossInstanceType, userGuild: UserGuildType, guild?: GuildType) {
if(!guild) guild = await GuildModel.findByCode(userGuild.guildCode, null, 'code refOpenBossTime openBossCnt');
let refObj = await getRefBossCnt(guild, userGuild); // 刷新次数
let showParamObj = await getLastBossInstance(guildCode, roleId);
let status = bossInstance? bossInstance.status: GUILD_BOSS_STATUS.WAIT_OPEN;
if(status == GUILD_BOSS_STATUS.CLEAR) status = GUILD_BOSS_STATUS.WAIT_OPEN;
let bossInfo = null;
if(bossInstance) {
let { warId, ranks, bossHp, bossLv, status, encourageCnt } = bossInstance;
let { warId, ranks, bossHp, bossLv, encourageCnt } = bossInstance;
let dicBossBase = gameData.bossBaseByBossLv.get(bossLv);
let rankInfo = getRanks(ranks, roleId);
// 此处showParamObj一定要放在最前
return { ...showParamObj, warId, ...rankInfo, bossHp, status, bossLv, encourageCnt, encourageMax: dicBossBase.encourageSum,...refObj };
} else {
return { ...showParamObj, ...refObj };
let rankInfo = getRanks(ranks, userGuild.roleId);
bossInfo = { warId, ...rankInfo, bossHp, bossLv, encourageCnt, encourageMax: dicBossBase.encourageSum };
}
return { status, bossInfo, ...refObj }
}
async function getRefBossCnt(guild: GuildType, userGuild: UserGuildType) {
@@ -83,68 +92,6 @@ export function getRanks(ranks: {roleId: string; score: number; time: number; jo
return { ranks: lastRanks, myRank }
}
export async function getLastBossInstance(guildCode: string, roleId: string) {
let lastBossInstance = await BossInstanceModel.findLastOverBossInstance(guildCode);
if(lastBossInstance) {
if(lastBossInstance.roleIdRecords.indexOf(roleId) == -1) {
await BossInstanceModel.recordRoleIdWhenCheck(lastBossInstance.code, roleId);
let { warId } = lastBossInstance;
return { status: GUILD_BOSS_STATUS.CLEAR, showParam: { winWarId: lastBossInstance.warId, winBossLv: lastBossInstance.bossLv }, warId }
} else {
return { status: GUILD_BOSS_STATUS.WAIT_OPEN }
}
} else {
return { status: GUILD_BOSS_STATUS.WAIT_OPEN }
}
}
/**
* 结算战斗
* @param code
* @param serverId
* @param dataName
* @param damage
* @param roleId
*/
export async function checkBossResult(bossCode: string, guildCode: string, serverId: number, dataName: string, roleId: string, damage: number) {
let res:any = await lockData(serverId, dataName, guildCode);//加锁
if (!!res.err)
return true;
let {status, ranks, warId, bossHp, bossLv } = await BossInstanceModel.findByCode(bossCode);//锁定关卡信息
if (status == GUILD_BOSS_STATUS.CLEAR) { // 已经被打败了
res.releaseCallback();//解锁
await BossInstanceModel.recordRoleIdWhenCheck(bossCode, roleId);
return true;
}
let index = findIndex(ranks, {roleId});
if (index == -1) { // 没有调用过battleBoss
res.releaseCallback();//解锁
return false;
}
ranks[index].score += bossHp; // 可能会把hp扣成负的，然后排行榜多加了，这里矫正回来
if (bossHp > damage) {//检查造成的伤害是否会让boss死亡
res.releaseCallback();//解锁
return true;
}
await BossInstanceModel.updateBossInstance(bossCode, { bossHp: 0, status: GUILD_BOSS_STATUS.CLEAR, ranks, roleIdRecords:[roleId], killTime: nowSeconds()}, );
await pushBossHpMessage(guildCode, serverId, 0, true);
res.releaseCallback();//数据修改解锁
// 击杀奖励&伤害奖励
let dicBossBase = gameData.bossBaseByBossLv.get(bossLv);
let dicWar = gameData.war.get(warId);
await sendMailToGuildByContent(MAIL_TYPE.GUILD_BOSS_REWARD, roleId, {
params: [`${dicWar.gk_name}`], goods: dicBossBase.killReward
});
// 加入拍卖行
if(dicBossBase) {
let rewards = getAuctionRewardByPoolId(dicBossBase.rewards);
await genAuction(guildCode, AUCTION_SOURCE.BOSS, bossCode, serverId, rewards);
}
return true;
}
/**
* 获得排名区间奖励
* @param rankLv