Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
commit
fb1d8980a5
|
@ -39,7 +39,7 @@ public class CrossServiceLogic {
|
||||||
return CrossServiceLogic.Instance.instance;
|
return CrossServiceLogic.Instance.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String findServerName(int serverId) throws UnknownHostException {
|
public String findServerName(int serverId) {
|
||||||
return CrossDeathPathLogic.getInstance().getServerName(serverId);
|
return CrossDeathPathLogic.getInstance().getServerName(serverId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,11 +143,7 @@ public class CrossServiceLogic {
|
||||||
arenaOfPlayerManager.setGender(player.getSex());
|
arenaOfPlayerManager.setGender(player.getSex());
|
||||||
arenaOfPlayerManager.setSkin(player.getUserSkin());
|
arenaOfPlayerManager.setSkin(player.getUserSkin());
|
||||||
arenaOfPlayerManager.setUserMount(player.getUserMount());
|
arenaOfPlayerManager.setUserMount(player.getUserMount());
|
||||||
try {
|
|
||||||
arenaOfPlayerManager.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId));
|
arenaOfPlayerManager.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId));
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return arenaOfPlayerManager;
|
return arenaOfPlayerManager;
|
||||||
}
|
}
|
||||||
private ArenaOfHeroManager buildArenaOfHeroManager(User user){
|
private ArenaOfHeroManager buildArenaOfHeroManager(User user){
|
||||||
|
@ -197,4 +193,23 @@ public class CrossServiceLogic {
|
||||||
return arenaOfHero;
|
return arenaOfHero;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据uid获取服务器名称
|
||||||
|
* @param uid
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public String getServerNameByUId(int uid){
|
||||||
|
String name = "";
|
||||||
|
try {
|
||||||
|
ArenaOfUser query = query(uid);
|
||||||
|
if (query != null){
|
||||||
|
int serverId = query.getPlayerManager().getServerId();
|
||||||
|
return CrossDeathPathLogic.getInstance().getServerNameByDeathPath(serverId);
|
||||||
|
}
|
||||||
|
} catch (UnknownHostException e) {
|
||||||
|
LOGGER.error("===========获取跨服玩家信息报错=======:{}",e.getMessage());
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -993,9 +993,7 @@ public class ArenaLogic {
|
||||||
int enemyId = enemy.getEnemyId();
|
int enemyId = enemy.getEnemyId();
|
||||||
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId);
|
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId);
|
||||||
CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build();
|
CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build();
|
||||||
CommonProto.ArenaPersonInfo personInfoBuild = null;
|
CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
|
||||||
try {
|
|
||||||
personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
|
|
||||||
.setUid(enemy.getEnemyId_UUid())
|
.setUid(enemy.getEnemyId_UUid())
|
||||||
.setLevel(sArenaRobotConfig.getRobotLevel())
|
.setLevel(sArenaRobotConfig.getRobotLevel())
|
||||||
.setName(enemy.getRandomName()==null?"":enemy.getRandomName())
|
.setName(enemy.getRandomName()==null?"":enemy.getRandomName())
|
||||||
|
@ -1006,9 +1004,6 @@ public class ArenaLogic {
|
||||||
.setGender(enemy.isGender()?1:0)
|
.setGender(enemy.isGender()?1:0)
|
||||||
.setRank(rank)
|
.setRank(rank)
|
||||||
.build();
|
.build();
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return CommonProto.ArenaEnemy.newBuilder()
|
return CommonProto.ArenaEnemy.newBuilder()
|
||||||
.setPersonInfo(personInfoBuild)
|
.setPersonInfo(personInfoBuild)
|
||||||
.setWorshipTime(proudTime)
|
.setWorshipTime(proudTime)
|
||||||
|
|
|
@ -1169,6 +1169,7 @@ public class HeroLogic{
|
||||||
}
|
}
|
||||||
if (teamId == GlobalsDef.FORMATION_NORMAL) {
|
if (teamId == GlobalsDef.FORMATION_NORMAL) {
|
||||||
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid()));
|
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid()));
|
||||||
|
CrossServiceLogic.getInstance().dispose(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 跨服 更新编队信息
|
// 跨服 更新编队信息
|
||||||
|
|
|
@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.rank.rankImpl;
|
||||||
import com.ljsd.jieling.db.redis.RedisKey;
|
import com.ljsd.jieling.db.redis.RedisKey;
|
||||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||||
import com.ljsd.jieling.logic.GlobleSystemLogic;
|
import com.ljsd.jieling.logic.GlobleSystemLogic;
|
||||||
|
import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.rank.IRank;
|
import com.ljsd.jieling.logic.rank.IRank;
|
||||||
|
@ -152,8 +153,10 @@ public abstract class AbstractRank implements IRank {
|
||||||
CommonProto.UserRank.Builder oneUserRank = getOneUserRank(everyUser, everyRankInfo);
|
CommonProto.UserRank.Builder oneUserRank = getOneUserRank(everyUser, everyRankInfo);
|
||||||
builder.addRanks(oneUserRank);
|
builder.addRanks(oneUserRank);
|
||||||
}
|
}
|
||||||
public CommonProto.UserRank.Builder getOneUserRank(User everyUser,CommonProto.RankInfo.Builder everyRankInfo) throws Exception {
|
|
||||||
CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder()
|
private CommonProto.UserRank.Builder getOneUserRank(User everyUser,CommonProto.RankInfo.Builder everyRankInfo){
|
||||||
|
String serverName = CrossServiceLogic.getInstance().getServerNameByUId(everyUser.getId());
|
||||||
|
return CommonProto.UserRank.newBuilder()
|
||||||
.setUid(everyUser.getId())
|
.setUid(everyUser.getId())
|
||||||
.setUserName(everyUser.getPlayerInfoManager().getNickName())
|
.setUserName(everyUser.getPlayerInfoManager().getNickName())
|
||||||
.setHead(everyUser.getPlayerInfoManager().getHead())
|
.setHead(everyUser.getPlayerInfoManager().getHead())
|
||||||
|
@ -165,8 +168,8 @@ public abstract class AbstractRank implements IRank {
|
||||||
.setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
|
.setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
|
||||||
.setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
|
.setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
|
||||||
.setUserMount(everyUser.getPlayerInfoManager().getUserMount())
|
.setUserMount(everyUser.getPlayerInfoManager().getUserMount())
|
||||||
.setPracticeLevel(everyUser.getHeroManager().getPracticeLevel());
|
.setPracticeLevel(everyUser.getHeroManager().getPracticeLevel())
|
||||||
return everyRank;
|
.setServerName(serverName);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void getMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){
|
protected void getMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){
|
||||||
|
|
Loading…
Reference in New Issue