diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index d45c5afd7..647e59038 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -6,7 +6,7 @@ import { difference } from 'underscore'; * @Last Modified by: 梁桐川 * @Last Modified time: 2021-08-27 17:47:56 */ -import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, MSG_SOURCE, ROLE_SELECT, TASK_TYPE, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON, getChannelType, CHANNEL_PREFIX, DEBUG_MAGIC_WORD, PUSH_ROUTE } from './../../../consts'; +import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, MSG_SOURCE, ROLE_SELECT, TASK_TYPE, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON, getChannelType, CHANNEL_PREFIX, DEBUG_MAGIC_WORD, PUSH_ROUTE, POPULATE_TYPE } from './../../../consts'; import Role, { RoleModel } from '../../../db/Role'; import { STATUS } from '../../../consts/statusCode'; import { Application, BackendSession } from 'pinus'; @@ -27,7 +27,8 @@ import { checkTask, checkTaskInComBattleStart } from '../../../services/task/tas import { gameData, getWarByBlueprtId } from '../../../pubUtils/data'; import { HeroModel } from '../../../db/Hero'; import { addUserToTeamChannel, delTeamChannel, removeFromTeamChannel, sendMessageToTeam, sendMessageToUsersWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService'; -import { getFriendRelationType } from '../../../services/friendService'; +import { getFriendRelationType, getRecommendType } from '../../../services/friendService'; +import { FriendRelationModel } from '../../../db/FriendRelation'; export default function(app: Application) { return new ComBattleHandler(app); @@ -767,11 +768,15 @@ export class ComBattleHandler { const invitations = await ComBattleTeamModel.findInvitations(roleId, minLv, maxLv, role.topLineupCe, refreshTime, INFO_WINDOW.TEAM_VIEW); let roleIds = invitations.map(cur => cur.capId); let roles = await RoleModel.findByRoleIds(roleIds); + let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT); const teams: ComBattleInvitation[] = []; for(let invitation of invitations) { let leader = roles.find(role => role.roleId == invitation.capId); if(leader) { let leaderParam = new FriendParams(leader); + let type = getRecommendType(myFriendRelation, roleId, leader.roleId); + leaderParam.setType(type); + let serverName = await getServerName(leader.serverId); leaderParam.setServerName(leader.serverId, serverName); teams.push(new ComBattleInvitation(invitation, leaderParam));