Merge branch 'master' of 60.1.1.230:backend/jieling_server

wangyuan 2019-12-30 13:34:58 +08:00
commit 2e18953817
1 changed files with 7 additions and 1 deletions

View File

@ -5,7 +5,9 @@ import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.logic.dao.GuilidManager;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mission.GameEvent;
import com.ljsd.jieling.logic.rank.rankKey.RandomCardSpecialKey;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.PlayerInfoProto;
@ -49,8 +51,11 @@ public class RandomCardPerfectRank extends AbstractRank {
.build();
int guildId = everyUser.getPlayerInfoManager().getGuildId();
String familyName = "";
int familySign = 0;
if(guildId!=0){
familyName = GuilidManager.guildInfoMap.get(guildId).getName();
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);
familyName = guildInfo.getName();
familySign = guildInfo.getIcon();
}
CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder()
.setUid(everyUser.getId())
@ -59,6 +64,7 @@ public class RandomCardPerfectRank extends AbstractRank {
.setHeadFrame(everyUser.getPlayerInfoManager().getHeadFrame())
.setLevel(everyUser.getPlayerInfoManager().getLevel())
.setRankInfo(everyRankInfo)
.setGuildSign(familySign)
.setGuildName(familyName)
.build();
builder.addRanks(everyRank);