Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
4971fced7b
|
@ -106,7 +106,7 @@ public class GuildHelpHelpOtherRequestHandler extends BaseHandler<Family.GuildHe
|
||||||
|
|
||||||
Family.GuildHelpInfoIndication.Builder build = Family.GuildHelpInfoIndication.newBuilder();
|
Family.GuildHelpInfoIndication.Builder build = Family.GuildHelpInfoIndication.newBuilder();
|
||||||
for (Map.Entry<Integer, Integer> entry : target.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
|
for (Map.Entry<Integer, Integer> entry : target.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
|
||||||
build.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setType(entry.getKey()).setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0)).setNum(entry.getValue()));
|
build.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setType(entry.getKey()).setHadtakenum(target.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0)).setNum(entry.getValue()));
|
||||||
}
|
}
|
||||||
build.setName(target.getPlayerInfoManager().getNickName()).setUid(target.getId());
|
build.setName(target.getPlayerInfoManager().getNickName()).setUid(target.getId());
|
||||||
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.GuildHelpInfoIndication,build.build());
|
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.GuildHelpInfoIndication,build.build());
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class GuildSendHelpRequestHandler extends BaseHandler<Family.GuildSendHel
|
||||||
builder.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder()
|
builder.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder()
|
||||||
.setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0))
|
.setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0))
|
||||||
.setType(entry.getKey())
|
.setType(entry.getKey())
|
||||||
.setNum(0));
|
.setNum(entry.getValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
//notify all change
|
//notify all change
|
||||||
|
|
Loading…
Reference in New Issue