diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java index 52a212636..03e277fe1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.handler.gtw; +import com.ljsd.GameApplication; import com.ljsd.GameLogicService; import com.ljsd.fight.CheckFight; import com.ljsd.fight.FightType; @@ -18,6 +19,7 @@ import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic; import com.ljsd.jieling.logic.arena.ArenaLogic; import com.ljsd.jieling.logic.arenaworld.ArenaWorldLogic; import com.ljsd.jieling.logic.dao.CrossArenaEnemy; +import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; @@ -42,6 +44,7 @@ import org.springframework.data.redis.core.ZSetOperations; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; import rpc.world.WorldProto; +import util.TimeUtils; import java.util.HashSet; import java.util.List; @@ -90,7 +93,7 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandlersetting.getRestTime()[0]&&diff entry = rewardMapByRank.floorEntry(index); - String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("mserverarena_reward_content",new Object[]{index},new int[]{0}); + String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("mserverarena_reward_content",new Object[]{index},new int[]{0},"#"); MailLogic.getInstance().sendMail(uid,title,content,StringUtil.parseArrayToString(entry.getValue().getSeasonReward()),TimeUtils.nowInt(),Global.MAIL_EFFECTIVE_TIME); } catch (Exception e) { e.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java index 88382b5f7..dea1eee31 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java @@ -28,12 +28,13 @@ public class ArenaOfPlayerManager { private int headFrame; private String guildName; private int userTitle; + private int userMount; private int practiceLevel; private int serverId; private String serverName; - public ArenaOfPlayerManager(int uId, int level, String name, int head, int headFrame, String guildName, int userTitle, int practiceLevel, int serverId, String serverName) { + public ArenaOfPlayerManager(int uId, int level, String name, int head, int headFrame, String guildName, int userTitle, int userMount, int practiceLevel, int serverId, String serverName) { this.uId = uId; this.level = level; this.name = name; @@ -41,6 +42,7 @@ public class ArenaOfPlayerManager { this.headFrame = headFrame; this.guildName = guildName; this.userTitle = userTitle; + this.userMount = userMount; this.practiceLevel = practiceLevel; this.serverId = serverId; this.serverName = serverName; @@ -128,4 +130,12 @@ public class ArenaOfPlayerManager { public void setServerName(String serverName) { this.serverName = serverName; } + + public int getUserMount() { + return userMount; + } + + public void setUserMount(int userMount) { + this.userMount = userMount; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 9ba4afe1c..51324863b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -622,15 +622,28 @@ public class PlayerLogic { } public PlayerInfoProto.GetPlayerOneTeamInfoResponse getOneTeamInfo( int id,int teamId) throws Exception { + return getOneTeamInfo(id,teamId,null); + } + + + private CommonProto.TeamOneInfo.Builder getRobotOneInfo(SArenaRobotConfig sArenaRobotConfig,CrossArenaEnemy info){ + CommonProto.TeamOneInfo.Builder oneInfo=getRobotTeamInfo(sArenaRobotConfig); + if(info!=null){ + oneInfo.setName(info.getRandomName()); + } + return oneInfo; + } + + public PlayerInfoProto.GetPlayerOneTeamInfoResponse getOneTeamInfo( int id,int teamId,CrossArenaEnemy info) throws Exception { if(id==0){ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(id); CommonProto.TeamOneInfo.Builder oneInfo=null; if(sArenaRobotConfig!=null){ - oneInfo=getRobotTeamInfo(sArenaRobotConfig); + getRobotOneInfo(sArenaRobotConfig,info); }else{ - oneInfo = getUserTeamOneInfo(id, teamId); + oneInfo = getUserTeamOneInfo(id, teamId); if(UserManager.getUser(id).getFriendManager().getMyApplyFriends().contains(id)){ oneInfo.setIsApplyed(1); } @@ -652,6 +665,7 @@ public class PlayerLogic { .setHeadFrame(query.getPlayerManager().getHeadFrame()) .setLevel(query.getPlayerManager().getLevel()) .setName(query.getPlayerManager().getName()) + .setGuildName(query.getPlayerManager().getGuildName()) .setUid(id); CommonProto.TeamOneTeamInfo.Builder teamOneTeamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); List teamPosHeroInfos = query.getHeroManager().getTeams().get(teamId); @@ -659,6 +673,9 @@ public class PlayerLogic { ArenaOfHero hero = query.getHeroManager().getHeros().get(heroInfo.getHeroId()); teamOneTeamInfo.addTeam(CBean2Proto.getCrossSimpleHero(hero,heroInfo.getPosition())); } + for(Map.Entry entry:query.getPokemons().entrySet()){ + CBean2Proto.getSimpleTeamInfoByPokeMon(entry.getValue(),entry.getKey()); + } teamOneTeamInfo.setTotalForce(query.getHeroManager().getTotalForce()); builder.setTeam(teamOneTeamInfo.build()); PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java index 1fdd6bde0..1d53312b4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java @@ -76,7 +76,9 @@ public class CrossArenaRank extends AbstractRank { .setUid(query.getId()) .setUserName(query.getPlayerManager().getName()) .setLevel(query.getPlayerManager().getLevel()) + .setUserTitle(query.getPlayerManager().getUserTitle()) .setUserSkin(80012) + .setUserMount(query.getPlayerManager().getUserMount()) .setRankInfo(everyRankInfo) .setForce(query.getHeroManager().getTotalForce()) .setSex(0);