Merge branch 'master_online_gn' into master_test_gn

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java
back_recharge
lvxinran 2021-03-29 14:26:02 +08:00
commit d080a9a0d8
2 changed files with 6 additions and 2 deletions

View File

@ -1332,7 +1332,7 @@ public class MapLogic {
.newBuilder() .newBuilder()
.setResult(resultCode) .setResult(resultCode)
.setEnventDrop(dropBuilder) .setEnventDrop(dropBuilder)
.addAllRemainHpList(remainHp) // .addAllRemainHpList(remainHp)
.setEssenceValue(mapManager.getTrialInfo().getEnergy()) .setEssenceValue(mapManager.getTrialInfo().getEnergy())
.setLastXY(mapManager.getLastXY()) .setLastXY(mapManager.getLastXY())
.build(); .build();
@ -1384,7 +1384,7 @@ public class MapLogic {
} }
fastFightResponse.setEnventDrop(drop.build()); fastFightResponse.setEnventDrop(drop.build());
fastFightResponse.setResult(resultCode); fastFightResponse.setResult(resultCode);
fastFightResponse.addAllRemainHpList(remainHp); // fastFightResponse.addAllRemainHpList(remainHp);
fastFightResponse.setEssenceValue(mapManager.getTrialInfo().getEnergy()); fastFightResponse.setEssenceValue(mapManager.getTrialInfo().getEnergy());
fastFightResponse.build(); fastFightResponse.build();

View File

@ -342,7 +342,11 @@ public class GuildChallengeLogic {
otherIndication.setIsRefresh(1);//需要前端刷新次数 otherIndication.setIsRefresh(1);//需要前端刷新次数
} }
if(isession!=null){ if(isession!=null){
<<<<<<< HEAD
LOGGER.info("向{}发送indication",sendUid); LOGGER.info("向{}发送indication",sendUid);
=======
// LOGGER.info("向{}发送indication",sendUid);
>>>>>>> master_online_gn
MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true);
} }
} }