寻宝战斗内状态同步接口；
修改寻宝组队bug
This commit is contained in:
liangtongchuan
@@ -29,11 +29,12 @@ class ComTeam {
|
||||
capId: string;
|
||||
// 战力限制
|
||||
ceLimit: number;
|
||||
// boss 血量
|
||||
bossHp: number;
|
||||
}
|
||||
export class ComBattleHandler {
|
||||
constructor(private app: Application) {
|
||||
}
|
||||
private bossHp: number = 10000;
|
||||
private teamMap: Map<string, ComTeam> = new Map();
|
||||
|
||||
async createTeam(msg: {blueprtId: number, heroes: [ number ], pub: boolean, ceLimit: number}, session: BackendSession) {
|
||||
@@ -55,7 +56,7 @@ export class ComBattleHandler {
|
||||
// 检查是否有已创建未结束的寻宝，预先占用一张藏宝图
|
||||
let teams = await ComBattleTeamModel.findTeamByCapAndStatus(roleId, COM_TEAM_STATUS.FIGHTING);
|
||||
if (teams && blueprt.count <= teams.length) return resResult(STATUS.COM_BATTLE_BLUEPRT_NOT_ENOUGH);
|
||||
//TODO: 检查武将是否拥有
|
||||
// TODO: 检查武将是否拥有
|
||||
|
||||
// 创建队伍数据结构
|
||||
let comTeam = new ComTeam();
|
||||
@@ -66,6 +67,8 @@ export class ComBattleHandler {
|
||||
comTeam.roleIds = [roleId];
|
||||
comTeam.status = COM_TEAM_STATUS.DEFAULT;
|
||||
comTeam.ceLimit = ceLimit;
|
||||
// TODO: boss 血量读表
|
||||
comTeam.bossHp = 10000;
|
||||
|
||||
let roleStatus = new RoleStatus();
|
||||
roleStatus.heroes = heroes;
|
||||
@@ -73,6 +76,8 @@ export class ComBattleHandler {
|
||||
roleStatus.headHid = headHid;
|
||||
roleStatus.topFiveCe = topFiveCe;
|
||||
roleStatus.roleId = roleId;
|
||||
roleStatus.isReady = true;
|
||||
roleStatus.totalDmg = 0;
|
||||
comTeam.roleStatus = [roleStatus];
|
||||
|
||||
this.teamMap.set(teamCode, comTeam);
|
||||
@@ -94,11 +99,10 @@ export class ComBattleHandler {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let sid = session.get('sid');
|
||||
console.log('role in joinTeam: ', roleId, roleName, msg, this.app.rpc);
|
||||
console.log('teamMap:' + JSON.stringify(this.teamMap));
|
||||
let { teamCode, isFrd } = msg;
|
||||
let teamStatus = this.teamMap.get(teamCode);
|
||||
if (teamStatus.status !== 0 || teamStatus.roleIds.length === 3) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
|
||||
if (!teamStatus || teamStatus.status !== 0 || teamStatus.roleIds.length === 3) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
|
||||
if (teamStatus.roleIds.indexOf(roleId) !== -1) return resResult(STATUS.COM_BATTLE_DUP_ENTER);
|
||||
// TODO:助战等级限制，等表
|
||||
let { lv, headHid, topFiveCe } = await Role.findByRoleId(roleId);
|
||||
@@ -115,6 +119,8 @@ export class ComBattleHandler {
|
||||
roleStatus.topFiveCe = topFiveCe || 0;
|
||||
roleStatus.roleId = roleId;
|
||||
roleStatus.isFrd = isFrd;
|
||||
roleStatus.isReady = false;
|
||||
roleStatus.totalDmg = 0;
|
||||
const team = await ComBattleTeamModel.addRole(teamCode, roleStatus);
|
||||
if (!team) {
|
||||
return resResult(STATUS.COM_BATTLE_CREATE_ERR);
|
||||
@@ -144,72 +150,180 @@ export class ComBattleHandler {
|
||||
return resResult(STATUS.SUCCESS, { teamInfos: teams});
|
||||
}
|
||||
|
||||
async startBattle(msg: {}, session: BackendSession) {
|
||||
async teammateReady(msg: {teamCode: string, heroes: Array<number>}, session: BackendSession) {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let sid = session.get('sid');
|
||||
let teamCode = session.get('teamCode');
|
||||
console.log('role in startBattle: ', roleId, roleName, teamCode);
|
||||
let { teamCode, heroes } = msg;
|
||||
let teamStatus = this.teamMap.get(teamCode);
|
||||
if (!teamStatus || !teamStatus.roleIds || teamStatus.roleIds.indexOf(roleId) === -1) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
|
||||
|
||||
let team = await ComBattleTeamModel.updateHeroes(teamCode, roleId, heroes);
|
||||
if (!team) return resResult(STATUS.COM_BATTLE_UPDATE_HEROES_ERR);
|
||||
|
||||
teamStatus.roleStatus.forEach(st => {
|
||||
if (st && st.roleId === roleId) {
|
||||
st.heroes = heroes;
|
||||
st.isReady = true;
|
||||
}
|
||||
});
|
||||
|
||||
let channelService = this.app.get('channelService');
|
||||
let channel = channelService.getChannel(teamCode, true);
|
||||
let users = channel.getMembers();
|
||||
if (users.indexOf(roleId) === -1) {
|
||||
channel.add(roleId, sid);
|
||||
}
|
||||
|
||||
users = channel.getMembers();
|
||||
channel.pushMessage('onAdd', {users});
|
||||
let tsid = channel.getMember(roleId)['sid'];
|
||||
channelService.pushMessageByUids('bossHp', {data: 'datadata'}, [{
|
||||
uid: roleId,
|
||||
sid: tsid
|
||||
}]);
|
||||
|
||||
return resResult(STATUS.SUCCESS, { users, teamCode });
|
||||
let channel = channelService.getChannel(teamCode, false);
|
||||
channel.pushMessage('onTeammateReady', {teamCode, roleId, heroes});
|
||||
return resResult(STATUS.SUCCESS);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send messages to users
|
||||
*
|
||||
* @param {Object} msg message from client
|
||||
* @param {Object} session
|
||||
*
|
||||
*/
|
||||
async enterBattle(msg: {battleId: string , target: string}, session: BackendSession) {
|
||||
async startBattle(msg: {teamCode: string}, session: BackendSession) {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let sid = session.get('sid');
|
||||
console.log('role in enterBattle: ', roleId, roleName, msg, this.app.rpc);
|
||||
let { teamCode } = msg;
|
||||
let teamStatus = this.teamMap.get(teamCode);
|
||||
if (!teamStatus || !teamStatus.roleIds || teamStatus.roleIds.indexOf(roleId) === -1) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
|
||||
if (teamStatus.capId !== roleId) return resResult(STATUS.COM_BATTLE_CAP_ONLY);
|
||||
if (teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_ALREADY_START);
|
||||
|
||||
for (let roleSt of teamStatus.roleStatus) {
|
||||
if (!roleSt.isReady) {
|
||||
return resResult(STATUS.COM_BATTLE_TEAM_NO_READY);
|
||||
}
|
||||
}
|
||||
teamStatus.status = COM_TEAM_STATUS.FIGHTING;
|
||||
|
||||
let channelService = this.app.get('channelService');
|
||||
let channel = channelService.getChannel(msg.battleId, false);
|
||||
let users = channel.getMembers();
|
||||
if (users.indexOf(roleId) === -1) {
|
||||
channel.add(roleId, sid);
|
||||
} else {
|
||||
return resResult(STATUS.COM_BATTLE_DUP_ENTER);
|
||||
}
|
||||
channel.pushMessage('onAddBattle', {users});
|
||||
|
||||
return resResult(STATUS.SUCCESS, { users });
|
||||
let channel = channelService.getChannel(teamCode, false);
|
||||
channel.pushMessage('onComBtlStart', {teamCode, roleStatus: teamStatus.roleStatus});
|
||||
return resResult(STATUS.SUCCESS);
|
||||
}
|
||||
|
||||
async hurtHp(msg: {battleId: string, bossHurt: number, actorHurt: [{ actorId: number, actorHurt: number}]}, session: BackendSession) {
|
||||
async action(msg: {teamCode: string, heroes: Array<{hid: number, hurtHp: number}>, killed: Array<number>}, session: BackendSession) {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
console.log('role in enterBattle: ', roleId, roleName, msg);
|
||||
let { teamCode, heroes, killed } = msg;
|
||||
let teamStatus = this.teamMap.get(teamCode);
|
||||
if (!teamStatus || !teamStatus.roleIds || teamStatus.roleIds.indexOf(roleId) === -1) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
|
||||
if (teamStatus.status !== COM_TEAM_STATUS.FIGHTING) return resResult(STATUS.COM_BATTLE_NOT_START);
|
||||
|
||||
let totalHurtHp = 0;
|
||||
if (heroes && heroes.length) {
|
||||
heroes.forEach(hero => {
|
||||
if (hero.hurtHp > 0) {
|
||||
totalHurtHp += hero.hurtHp;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let curRoleSt = null;
|
||||
teamStatus.roleStatus.forEach(roleSt => {
|
||||
if (roleSt.roleId === roleId) {
|
||||
if (killed && killed.length) {
|
||||
killed.forEach(killedHid => {
|
||||
if (roleSt.killed.indexOf(killedHid) === -1) {
|
||||
roleSt.killed.push(killedHid);
|
||||
}
|
||||
});
|
||||
}
|
||||
roleSt.totalDmg += totalHurtHp;
|
||||
curRoleSt = roleSt;
|
||||
teamStatus.bossHp -= totalHurtHp;
|
||||
}
|
||||
});
|
||||
let channelService = this.app.get('channelService');
|
||||
let channel = channelService.getChannel(teamCode, false);
|
||||
channel.pushMessage('onTeammateAct', {teamCode, bossHp: teamStatus.bossHp, roleStatus: {roleId, totalDmg: curRoleSt.totalDmg, killed}});
|
||||
return resResult(STATUS.SUCCESS);
|
||||
}
|
||||
|
||||
async battleEnd(msg: {teamCode: string, isSuccess: boolean}, session: BackendSession) {
|
||||
let roleId = session.get('roleId');
|
||||
let { teamCode, isSuccess } = msg;
|
||||
let teamStatus = this.teamMap.get(teamCode);
|
||||
if (!teamStatus || !teamStatus.roleIds || teamStatus.roleIds.indexOf(roleId) === -1) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
|
||||
|
||||
let channelService = this.app.get('channelService');
|
||||
let channel = channelService.getChannel(msg.battleId, false);
|
||||
|
||||
this.bossHp -= msg.bossHurt;
|
||||
if (this.bossHp < 0) {
|
||||
this.bossHp = 0;
|
||||
channel.pushMessage('bossHp', {data: 'boss 挂啦！！！！！'}, undefined);
|
||||
let channel = channelService.getChannel(teamCode, false);
|
||||
if (isSuccess && teamStatus.bossHp <= 0) {
|
||||
let team = await ComBattleTeamModel.updateResult(teamCode, roleId, isSuccess);
|
||||
if (!team) return resResult(STATUS.COM_BATTLE_RESULT_ERR);
|
||||
// TODO: 根据策划结论考虑是否在推送中添加掉落
|
||||
// TODO: 用户总伤害等的持久化
|
||||
channel.pushMessage('onTeamComplete', {teamCode, result: isSuccess});
|
||||
} else if (!isSuccess) {
|
||||
let team = await ComBattleTeamModel.updateResult(teamCode, roleId, isSuccess);
|
||||
if (!team) return resResult(STATUS.COM_BATTLE_RESULT_ERR);
|
||||
if (team.status === COM_TEAM_STATUS.LOOSE) {
|
||||
channel.pushMessage('onTeamComplete', {teamCode, result: isSuccess});
|
||||
} else {
|
||||
channel.pushMessage('onTeammateAct', {teamCode, bossHp: teamStatus.bossHp, roleStatus: {roleId, battleStatus: 2}});
|
||||
}
|
||||
}
|
||||
channel.pushMessage('bossHp', {bossHp: this.bossHp}, undefined);
|
||||
|
||||
return resResult(STATUS.SUCCESS, { bossHp: this.bossHp});
|
||||
return resResult(STATUS.SUCCESS, { bossHp: teamStatus.bossHp });
|
||||
}
|
||||
|
||||
|
||||
|
||||
// async startBattle(msg: {}, session: BackendSession) {
|
||||
// let roleId = session.get('roleId');
|
||||
// let roleName = session.get('roleName');
|
||||
// let sid = session.get('sid');
|
||||
// let teamCode = session.get('teamCode');
|
||||
// console.log('role in startBattle: ', roleId, roleName, teamCode);
|
||||
|
||||
// let channelService = this.app.get('channelService');
|
||||
// let channel = channelService.getChannel(teamCode, true);
|
||||
// let users = channel.getMembers();
|
||||
// if (users.indexOf(roleId) === -1) {
|
||||
// channel.add(roleId, sid);
|
||||
// }
|
||||
|
||||
// users = channel.getMembers();
|
||||
// channel.pushMessage('onAdd', {users});
|
||||
// let tsid = channel.getMember(roleId)['sid'];
|
||||
// channelService.pushMessageByUids('bossHp', {data: 'datadata'}, [{
|
||||
// uid: roleId,
|
||||
// sid: tsid
|
||||
// }]);
|
||||
|
||||
// return resResult(STATUS.SUCCESS, { users, teamCode });
|
||||
// }
|
||||
|
||||
// /**
|
||||
// * Send messages to users
|
||||
// *
|
||||
// * @param {Object} msg message from client
|
||||
// * @param {Object} session
|
||||
// *
|
||||
// */
|
||||
// async enterBattle(msg: {battleId: string , target: string}, session: BackendSession) {
|
||||
// let roleId = session.get('roleId');
|
||||
// let roleName = session.get('roleName');
|
||||
// let sid = session.get('sid');
|
||||
// console.log('role in enterBattle: ', roleId, roleName, msg, this.app.rpc);
|
||||
|
||||
// let channelService = this.app.get('channelService');
|
||||
// let channel = channelService.getChannel(msg.battleId, false);
|
||||
// let users = channel.getMembers();
|
||||
// if (users.indexOf(roleId) === -1) {
|
||||
// channel.add(roleId, sid);
|
||||
// } else {
|
||||
// return resResult(STATUS.COM_BATTLE_DUP_ENTER);
|
||||
// }
|
||||
// channel.pushMessage('onAddBattle', {users});
|
||||
|
||||
// return resResult(STATUS.SUCCESS, { users });
|
||||
// }
|
||||
|
||||
// async hurtHp(msg: {battleId: string, bossHurt: number, actorHurt: [{ actorId: number, actorHurt: number}]}, session: BackendSession) {
|
||||
// let roleId = session.get('roleId');
|
||||
// let roleName = session.get('roleName');
|
||||
// console.log('role in enterBattle: ', roleId, roleName, msg);
|
||||
|
||||
// let channelService = this.app.get('channelService');
|
||||
// let channel = channelService.getChannel(msg.battleId, false);
|
||||
|
||||
// this.bossHp -= msg.bossHurt;
|
||||
// if (this.bossHp < 0) {
|
||||
// this.bossHp = 0;
|
||||
// channel.pushMessage('bossHp', {data: 'boss 挂啦！！！！！'}, undefined);
|
||||
// }
|
||||
// channel.pushMessage('bossHp', {bossHp: this.bossHp}, undefined);
|
||||
|
||||
// return resResult(STATUS.SUCCESS, { bossHp: this.bossHp});
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user