Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
91acb26eed
|
@ -466,6 +466,14 @@ public class PlayerLogic {
|
||||||
teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero));
|
teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
int guildId = user.getPlayerInfoManager().getGuildId();
|
||||||
|
if(guildId!=0){
|
||||||
|
if(GuilidManager.guildInfoMap.containsKey(guildId)){
|
||||||
|
String name = GuilidManager.guildInfoMap.get(guildId).getName();
|
||||||
|
oneInfo.setGuildName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
oneInfo.setTeam(teamInfo);
|
oneInfo.setTeam(teamInfo);
|
||||||
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
|
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue