工会名字
parent
b0e341601e
commit
0994b02b85
|
@ -29,6 +29,7 @@ import com.ljsd.jieling.logic.dao.*;
|
||||||
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
|
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
|
||||||
import com.ljsd.jieling.logic.dao.gm.ArenaOfHero;
|
import com.ljsd.jieling.logic.dao.gm.ArenaOfHero;
|
||||||
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
|
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.GuildCache;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.family.CrossDeathPathLogic;
|
import com.ljsd.jieling.logic.family.CrossDeathPathLogic;
|
||||||
import com.ljsd.jieling.logic.family.GuildLogic;
|
import com.ljsd.jieling.logic.family.GuildLogic;
|
||||||
|
@ -1048,13 +1049,15 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
//基本信息从redis中拿 剩下的队伍 属性 数据量大的数据rpc调用
|
//基本信息从redis中拿 剩下的队伍 属性 数据量大的数据rpc调用
|
||||||
String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(csPlayer.getServerId());
|
String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(csPlayer.getServerId());
|
||||||
|
GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(csPlayer.getGuildId());
|
||||||
|
|
||||||
CommonProto.TeamOneInfo.Builder builder = CommonProto.TeamOneInfo.newBuilder()
|
CommonProto.TeamOneInfo.Builder builder = CommonProto.TeamOneInfo.newBuilder()
|
||||||
.setHead(csPlayer.getHead())
|
.setHead(csPlayer.getHead())
|
||||||
.setHeadFrame(csPlayer.getHeadFrame())
|
.setHeadFrame(csPlayer.getHeadFrame())
|
||||||
.setUserTitle(csPlayer.getUserTitle())
|
.setUserTitle(csPlayer.getUserTitle())
|
||||||
.setLevel(csPlayer.getLevel())
|
.setLevel(csPlayer.getLevel())
|
||||||
.setName(csPlayer.getName())
|
.setName(csPlayer.getName())
|
||||||
.setGuildName("nb guild") //csPlayer.getGuildName()
|
.setGuildName(Optional.ofNullable(mapEntry).map(GuildCache::getName).orElse("")) //csPlayer.getGuildName()
|
||||||
.setPracticeLevel(csPlayer.getPracticeLevel())
|
.setPracticeLevel(csPlayer.getPracticeLevel())
|
||||||
.setUid(id).setCrossTeamScore(csPlayer.getCrossYuxulundaoNewScore())
|
.setUid(id).setCrossTeamScore(csPlayer.getCrossYuxulundaoNewScore())
|
||||||
.setServerName(serverName);
|
.setServerName(serverName);
|
||||||
|
|
Loading…
Reference in New Issue