Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage

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 = CBean2Proto.getTeamOneInfo(user);
-                        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.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 = CBean2Proto.getTeamOneInfo(user);
-                        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.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
                         teamInfo.setTotalForce(fightInfo.getForce());
                         if (!fightInfo.getPokenmonIds().isEmpty()) {

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<ArenaInfoProto.ChampionG
                         //fix 整个过程都不能调整编队
 
                         User user = UserManager.getUser(arenaRecord.getAttackId());
-                        PlayerManager playerManager = user.getPlayerInfoManager();
+                        CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user);
-                        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.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
                         teamInfo.setTotalForce(fightInfo.getForce());
                         if (!fightInfo.getPokenmonIds().isEmpty()) {
@@ -218,13 +213,7 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
                         //fix 整个过程都不能调整编队
 
                         User user = UserManager.getUser(arenaRecord.getDefUid());
-                        PlayerManager playerManager = user.getPlayerInfoManager();
+                        CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user);
-                        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.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
                         teamInfo.setTotalForce(fightInfo.getForce());
                         if (!fightInfo.getPokenmonIds().isEmpty()) {

serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java

@@ -124,6 +124,7 @@ public class ArenaLogic {
                     .setScore(score)
                     .setHead(playerInfoManager.getHead())
                     .setTotalForce(totalForce)
+                    .setPracticeLevel(user.getHeroManager().getPracticeLevel())
                     .build();
          return CommonProto.ArenaEnemy.newBuilder()
                     .setPersonInfo(personInfoBuild)
@@ -148,6 +149,7 @@ public class ArenaLogic {
                     .setLevel(playerInfoManager.getLevel())
                     .setName(playerInfoManager.getNickName())
                     .setHead(playerInfoManager.getHead())
+                    .setPracticeLevel(user.getHeroManager().getPracticeLevel())
                     .setTotalForce(totalForce)
                     .build();
             return CommonProto.ArenaEnemy.newBuilder()
@@ -444,6 +446,7 @@ public class ArenaLogic {
                         .setUserSkin(playerInfoManager.getUserSkin())
                         .setUserTitle(playerInfoManager.getUserTitle())
                         .setGender(playerInfoManager.getSex())
+                        .setPracticeLevel(user.getHeroManager().getPracticeLevel())
                         .build();
                 arenaRankMemberInfo.add(CommonProto.ArenaEnemy.newBuilder()
                         .setPersonInfo(personInfoBuild)

serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java

@@ -531,14 +531,8 @@ public class ChampionshipLogic {
         //fix 整个过程都不能调整编队
 
         User user = UserManager.getUser(uid);
-        PlayerManager playerManager = user.getPlayerInfoManager();
+        return CBean2Proto.getTeamOneInfo(user);
-        CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
+        //        CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
-                .setHead(playerManager.getHead())
-                .setHeadFrame(playerManager.getHeadFrame())
-                .setLevel(playerManager.getLevel())
-                .setName(playerManager.getNickName()).setUid(uid)
-                .setUserTitle(playerManager.getUserTitle());
-//        CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
 //        teamInfo.setTotalForce(fightInfo.getForce());
 //        if (!fightInfo.getPokenmonIds().isEmpty()) {
 //            teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds());
@@ -557,7 +551,6 @@ public class ChampionshipLogic {
 //            );
 //        }
 //        oneInfo.setTeam(teamInfo);
-        return oneInfo;
     }
 
 
@@ -1222,6 +1215,7 @@ public class ChampionshipLogic {
                 .setUserSkin(playerInfoManager.getUserSkin())
                 .setUserTitle(playerInfoManager.getUserTitle())
                 .setGender(playerInfoManager.getSex())
+                .setPracticeLevel(user.getHeroManager().getPracticeLevel())
                 .build();
         return builder.setPersonInfo(personInfoBuild)
                 .build();

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java

@@ -273,6 +273,9 @@ public class HeroManager extends MongoBase {
 
 
     public int getPracticeLevel() {
+        if (practiceLevel <= 0){
+            setPracticeLevel(1);
+        }
         return practiceLevel;
     }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerInfoCache.java

@@ -8,6 +8,7 @@ public class PlayerInfoCache {
     private int level;
     private int guildPosition;
     private int id;
+    private int practiceLevel;
 
     public int getId() {
         return id;
@@ -64,4 +65,12 @@ public class PlayerInfoCache {
     public void setGuildPosition(int guildPosition) {
         this.guildPosition = guildPosition;
     }
+
+    public int getPracticeLevel() {
+        return practiceLevel;
+    }
+
+    public void setPracticeLevel(int practiceLevel) {
+        this.practiceLevel = practiceLevel;
+    }
 }

serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java

@@ -497,13 +497,7 @@ public class PlayerLogic {
 
     public CommonProto.TeamOneInfo.Builder getUserTeamOneInfo(int uid,int teamId) throws Exception {
         User user = UserManager.getUser(uid);
-        PlayerManager playerManager = user.getPlayerInfoManager();
+        CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user);
-        CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
-                .setHead(playerManager.getHead())
-                .setHeadFrame(playerManager.getHeadFrame())
-                .setLevel(playerManager.getLevel())
-                .setName(playerManager.getNickName()).setUid(uid)
-                .setUserTitle(playerManager.getUserTitle());
         TeamPosManager teamPosManager = user.getTeamPosManager();
         CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
         teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false));
@@ -718,6 +712,7 @@ public class PlayerLogic {
         cache.setLevel(playerInfoManager.getLevel());
         cache.setServerId(GameApplication.serverId);
         cache.setId(user.getId());
+        cache.setPracticeLevel(user.getHeroManager().getPracticeLevel());
         if(user.getPlayerInfoManager().getGuildId()==0){
             cache.setGuildPosition(0);
         }else{

serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java

@@ -13,7 +13,6 @@ import org.springframework.data.redis.core.ZSetOperations;
 import rpc.protocols.PlayerInfoProto;
 
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
@@ -153,7 +152,8 @@ public abstract class AbstractRank implements IRank {
                 .setSex(everyUser.getPlayerInfoManager().getSex())
                 .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
                 .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
-                .setUserMount(everyUser.getPlayerInfoManager().getUserMount());
+                .setUserMount(everyUser.getPlayerInfoManager().getUserMount())
+                .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel());
         return everyRank;
     }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java

@@ -112,7 +112,8 @@ public class GuildForceRank extends AbstractRank {
                 .setUserMount(user.getPlayerInfoManager().getUserMount())
                 .setUserSkin(user.getPlayerInfoManager().getUserSkin())
                 .setUserTitle(user.getPlayerInfoManager().getUserTitle())
-                .setGuildName(guildInfo.getName());
+                .setGuildName(guildInfo.getName())
+                .setPracticeLevel(user.getHeroManager().getPracticeLevel());
         return builder;
     }
 }

serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java

@@ -52,7 +52,8 @@ public class GuildSheJiScoreRank extends AbstractRank {
                 .setHeadFrame(user.getPlayerInfoManager().getHeadFrame())
                 .setUserMount(user.getPlayerInfoManager().getUserMount())
                 .setUserSkin(user.getPlayerInfoManager().getUserSkin())
-                .setUserTitle(user.getPlayerInfoManager().getUserTitle());
+                .setUserTitle(user.getPlayerInfoManager().getUserTitle())
+                .setPracticeLevel(user.getHeroManager().getPracticeLevel());
         builder.addRanks(everyRank);
     }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/RandomCardPerfectRank.java

@@ -67,6 +67,7 @@ public class RandomCardPerfectRank extends AbstractRank {
                 .setUserMount(everyUser.getPlayerInfoManager().getUserMount())
                 .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
                 .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
+                .setPracticeLevel(everyUser.getHeroManager().getPracticeLevel())
                 .build();
         builder.addRanks(everyRank);
     }

serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java

@@ -501,6 +501,7 @@ public class CBean2Proto {
         chatInfo.setSoulVal(playerInfoManager.getMaxForce());
         chatInfo.setMessageId(messageId);
         chatInfo.setUserTitle(playerInfoManager.getUserTitle());
+        chatInfo.setPracticeLevel(user.getHeroManager().getPracticeLevel());
         return chatInfo.build();
     }
 
@@ -560,6 +561,7 @@ public class CBean2Proto {
         friend.setUserSkin(playerInfoManager.getUserSkin());
         friend.setUserTitle(playerInfoManager.getUserTitle());
         friend.setSex(playerInfoManager.getSex());
+        friend.setPracticeLevel(user.getHeroManager().getPracticeLevel());
         return friend.build();
     }
 
@@ -614,6 +616,17 @@ public class CBean2Proto {
         return recoveryItemInfo[2];
     }
 
+    public static CommonProto.TeamOneInfo.Builder getTeamOneInfo(User user){
+        return CommonProto.TeamOneInfo.newBuilder()
+                .setHead(user.getPlayerInfoManager().getHead())
+                .setHeadFrame(user.getPlayerInfoManager().getHeadFrame())
+                .setLevel(user.getPlayerInfoManager().getLevel())
+                .setName(user.getPlayerInfoManager().getNickName())
+                .setUid(user.getId())
+                .setPracticeLevel(user.getHeroManager().getPracticeLevel())
+                .setUserTitle(user.getPlayerInfoManager().getUserTitle());
+    }
+
     public static CommonProto.FamilyBaseInfo getFamilyBaseInfo(GuildInfo guildInfo){
         CommonProto.FamilyContribute familyContribute = CommonProto.FamilyContribute.newBuilder()
                 .setWin(guildInfo.getResult(1))
@@ -670,6 +683,7 @@ public class CBean2Proto {
                 .setUserSkin(user.getPlayerInfoManager().getUserSkin())
                 .setUserTitle(user.getPlayerInfoManager().getUserTitle())
                 .setSex(user.getPlayerInfoManager().getSex())
+                .setPracticeLevel(user.getHeroManager().getPracticeLevel())
                 .build();
     }
 

worldserver/src/main/java/com/world/logic/rank/AbstractCrossRank.java

@@ -126,6 +126,7 @@ public abstract class AbstractCrossRank extends AbstractRank {
                 .setUid(everyUser.getId())
                 .setUserName(everyUser.getName())
                 .setRankInfo(everyRankInfo)
+                .setPracticeLevel(everyUser.getPracticeLevel())
                 .setServerName(MongoUtil.getInstence().getServerNameById(everyUser.getServerId()));
 
         return everyRank;