root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修行,名字颜色

back_recharge
duhui 2021-05-27 16:06:07 +08:00
parent 2bfb6228b0
commit 839eb2af4f
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serverlogic/src/main/java/com/ljsd/jieling/handler/family/GuildHelpGetAllRequestHandler.java
View File

@ -60,7 +60,11 @@ public class GuildHelpGetAllRequestHandler extends BaseHandler<Family.GuildHelpG
for (Map.Entry<Integer, Integer> entry : entries) {
builder.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setType(entry.getKey()).setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0)).setHadtakenum(guidHelpHadTakeInfo.getOrDefault(entry.getKey(),0)).setNum(entry.getValue()));
}
Family.GuildHelpInfoIndication build = builder.setUid(target.getId()).setName(target.getPlayerInfoManager().getNickName()).build();
Family.GuildHelpInfoIndication build = builder
.setUid(target.getId())
.setName(target.getPlayerInfoManager().getNickName())
.setPracticeLevel(target.getHeroManager().getPracticeLevel())
.build();
builder1.addGuildHelpInfoIndication(build);
}

6
serverlogic/src/main/java/com/ljsd/jieling/handler/family/GuildHelpHelpOtherRequestHandler.java
View File

@ -101,11 +101,13 @@ public class GuildHelpHelpOtherRequestHandler extends BaseHandler<Family.GuildHe
for (Map.Entry<Integer, Integer> entry : target.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
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()).setPracticeLevel(target.getHeroManager().getPracticeLevel());
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.GuildHelpInfoIndication,build.build());
GuildHelpLog guildHelpLog = new GuildHelpLog(uid, target.getId(), user.getPlayerInfoManager().getNickName(), target.getPlayerInfoManager().getNickName(), (int) (System.currentTimeMillis() / 1000), proto.getType());
GuildHelpLog guildHelpLog = new GuildHelpLog(uid, target.getId(), user.getPlayerInfoManager().getNickName(),
target.getPlayerInfoManager().getNickName(), (int) (System.currentTimeMillis() / 1000), proto.getType(),
user.getHeroManager().getPracticeLevel(), target.getHeroManager().getPracticeLevel());
guildInfo.addGuildHelpLog(guildHelpLog);
//notify all log
Family.GuildHelpLogIndication build1 = Family.GuildHelpLogIndication.newBuilder()

6
serverlogic/src/main/java/com/ljsd/jieling/handler/family/GuildSendHelpRequestHandler.java
View File

@ -81,7 +81,11 @@ public class GuildSendHelpRequestHandler extends BaseHandler<Family.GuildSendHel
}
//notify all change
Family.GuildHelpInfoIndication build = builder.setUid(user.getId()).setName(user.getPlayerInfoManager().getNickName()).build();
Family.GuildHelpInfoIndication build = builder
.setUid(user.getId())
.setName(user.getPlayerInfoManager().getNickName())
.setPracticeLevel(user.getHeroManager().getPracticeLevel())
.build();
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.GuildHelpInfoIndication,build);

14
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/GuildHelpLog.java
View File

@ -8,14 +8,18 @@ public class GuildHelpLog {
private String targetName;
private int logTime; // time
private int type; // 援助类型
private int helpPracticeLevel;
private int targetPracticeLevel;
public GuildHelpLog(int helpId, int targetId, String helperName, String targetName, int logTime, int type) {
public GuildHelpLog(int helpId, int targetId, String helperName, String targetName, int logTime, int type, int helpPracticeLevel, int targetPracticeLevel) {
this.helpId = helpId;
this.targetId = targetId;
this.helperName = helperName;
this.targetName = targetName;
this.logTime = logTime;
this.type = type;
this.helpPracticeLevel = helpPracticeLevel;
this.targetPracticeLevel = targetPracticeLevel;
}
public static String getCollectionName() {
@ -45,4 +49,12 @@ public class GuildHelpLog {
public int getType() {
return type;
}
public int getHelpPracticeLevel() {
return helpPracticeLevel;
}
public int getTargetPracticeLevel() {
return targetPracticeLevel;
}
}

13
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -609,9 +609,12 @@ public class GuildLogic {
}
//notify all change
Family.GuildHelpInfoIndication build = builder.setUid(targetUser.getId()).setName(targetUser.getPlayerInfoManager().getNickName()).build();
Family.GuildHelpInfoIndication build = builder
.setUid(targetUser.getId())
.setName(targetUser.getPlayerInfoManager().getNickName())
.setPracticeLevel(targetUser.getHeroManager().getPracticeLevel())
.build();
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildInfo.getId()), MessageTypeProto.MessageType.GuildHelpInfoIndication,build);
// targetUser.getUserMissionManager().onGameEvent(targetUser, GameEvent.JOIN_FAMILY);
}finally {
RedisUtil.getInstence().releaseDistributedLock(RedisKey.OPERATE_FAMILY_APPLY_JOIN,Integer.toString(applyId), Integer.toString(applyId));
}
@ -1618,7 +1621,10 @@ public class GuildLogic {
.setHelpername(log.getHelperName())
.setTargetname(log.getTargetName())
.setTime(log.getLogTime())
.setType(log.getType()).build();
.setType(log.getType())
.setHelpPracticeLevel(log.getHelpPracticeLevel())
.setTargetPracticeLevel(log.getTargetPracticeLevel())
.build();
}
@ -1643,6 +1649,7 @@ public class GuildLogic {
for (Map.Entry<Integer, Integer> entry : user.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
//通知前端清除公会成员援助信息
build.setUid(user.getId());
build.setPracticeLevel(user.getHeroManager().getPracticeLevel());
build.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setType(entry.getKey()).setNum(-1));
}
GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(user.getPlayerInfoManager().getGuildId()), MessageTypeProto.MessageType.GuildHelpInfoIndication,build.build());