From b74e3525a7e989b5fa729f563a200c0c3927525c Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 17 May 2021 17:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=8C=E5=90=8D=E5=AD=97=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/champion/ChampinGetHandler.java | 17 +++-------------- .../champion/ChampionBetInfoHandler.java | 17 +++-------------- .../ljsd/jieling/logic/arena/ArenaLogic.java | 3 +++ .../logic/championship/ChampionshipLogic.java | 12 +++--------- .../ljsd/jieling/logic/dao/HeroManager.java | 3 +++ .../jieling/logic/dao/PlayerInfoCache.java | 9 +++++++++ .../ljsd/jieling/logic/player/PlayerLogic.java | 9 ++------- .../logic/rank/rankImpl/AbstractRank.java | 4 ++-- .../logic/rank/rankImpl/GuildForceRank.java | 3 ++- .../rank/rankImpl/GuildSheJiScoreRank.java | 3 ++- .../rank/rankImpl/RandomCardPerfectRank.java | 1 + .../com/ljsd/jieling/util/CBean2Proto.java | 18 ++++++++++++++++-- .../world/logic/rank/AbstractCrossRank.java | 1 + 13 files changed, 50 insertions(+), 50 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java index b95eefff6..6ac8e9339 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java @@ -12,6 +12,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.CBean2Proto; import rpc.protocols.ArenaInfoProto; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; @@ -148,13 +149,7 @@ public class ChampinGetHandler extends BaseHandler { //fix 整个过程都不能调整编队 User user = UserManager.getUser(arenaRecord.getAttackId()); - PlayerManager playerManager = user.getPlayerInfoManager(); - CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() - .setHead(playerManager.getHead()) - .setHeadFrame(playerManager.getHeadFrame()) - .setLevel(playerManager.getLevel()) - .setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId()) - .setUserTitle(playerManager.getUserTitle()); + CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user); CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); teamInfo.setTotalForce(fightInfo.getForce()); if (!fightInfo.getPokenmonIds().isEmpty()) { @@ -190,13 +185,7 @@ public class ChampinGetHandler extends BaseHandler { //fix 整个过程都不能调整编队 User user = UserManager.getUser(arenaRecord.getDefUid()); - PlayerManager playerManager = user.getPlayerInfoManager(); - CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() - .setHead(playerManager.getHead()) - .setHeadFrame(playerManager.getHeadFrame()) - .setLevel(playerManager.getLevel()) - .setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid()) - .setUserTitle(playerManager.getUserTitle()); + CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user); CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); teamInfo.setTotalForce(fightInfo.getForce()); if (!fightInfo.getPokenmonIds().isEmpty()) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java index 0bb5cda66..61d3af2f1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java @@ -18,6 +18,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import config.SArenaRobotConfig; @@ -175,13 +176,7 @@ public class ChampionBetInfoHandler extends BaseHandler