diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 8a5f4ec2a..acc83d694 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -681,8 +681,8 @@ public class ArenaLogic { CommonProto.FightData build = CommonProto.FightData.newBuilder() .setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime()) .setFightSeed(seed) - .setHeroFightInfos(deffightTeamInfo) - .addMonsterList(fightTeamInfo) + .setHeroFightInfos(fightTeamInfo) + .addMonsterList(deffightTeamInfo) .build(); ArenaInfoProto.PlayWithSbResponse response = ArenaInfoProto.PlayWithSbResponse.newBuilder().setFightData(build).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.PLAY_WITH_SB_RESPONSE_VALUE,response,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index b5aa6e939..b7129fa97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -475,8 +475,10 @@ public class FriendLogic { sendFriendStatedication(uid,friendId,1); } friendManager.addBlackFriendId(friendId); - }else{ + }else if(optType == 2){ friendManager.delBlackFriends(friendId); + }else if(optType == 3){ + friendManager.setBlackFriends(new ArrayList<>(1)); } MessageUtil.sendMessage(session, 1, msgId, null, true);