Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
467024e9bb
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue