From 945a238748ff817c56f9e16639cc4ce62750e800 Mon Sep 17 00:00:00 2001
From: xuexinpeng <xuexinpeng0816@163.com>
Date: Wed, 26 May 2021 16:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B2=B3=E6=88=98=E6=96=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E8=A1=8C=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/hardStage/HardStageReportRequsetHandler.java      | 4 ++--
 .../handler/hardStage/StartHardStageRequestHandler.java       | 1 -
 .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java      | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java
index 64a3c041c..eed43c879 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java
@@ -30,13 +30,13 @@ public class HardStageReportRequsetHandler extends BaseHandler<PlayerInfoProto.H
         //首次通关记录
         ArenaRecord firstPassRecord = RedisUtil.getInstence().get(RedisKey.HARD_STAGE_FIST_PASS, String.valueOf(id),ArenaRecord.class);
         if(firstPassRecord != null){
-            CommonProto.HardStagePlayerInfo first = CBean2Proto.getHardStagePlayerInfo(firstPassRecord,1);
+            CommonProto.HardStagePlayerInfo first = CBean2Proto.getHardStagePlayerInfo(firstPassRecord,1,user);
             response.addPlayer(first);
         }
         // 最低战力通关记录记录
         ArenaRecord minForcePassRecord = RedisUtil.getInstence().get(RedisKey.HARD_STAGE_PASS_MIN_FORCE, String.valueOf(id),ArenaRecord.class);
         if(minForcePassRecord!=null){
-            CommonProto.HardStagePlayerInfo min = CBean2Proto.getHardStagePlayerInfo(minForcePassRecord,2);
+            CommonProto.HardStagePlayerInfo min = CBean2Proto.getHardStagePlayerInfo(minForcePassRecord,2,user);
             response.addPlayer(min);
         }
         MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.HARD_STAGE_REPORT_RESPONSE.getNumber(), response.build(), true);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java
index bf9952ba8..11bcff983 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java
@@ -56,7 +56,6 @@ public class StartHardStageRequestHandler extends BaseHandler<PlayerInfoProto.Ha
         Map<Integer, HardStageChapter> chapterMap = user.getHardStageManager().getChapterMap(user);
        if (!chapterMap.containsKey(nodeConfig.getChapter()) ||chapterMap.get(nodeConfig.getChapter()).getNode(nodeId) == null) {
             //上一个节点
-            String a;
             SHardStage preNodeConfig = SHardStage.getConfigMap().get(nodeConfig.getNextLevel());
             if(preNodeConfig != null){
                 if(chapterMap.containsKey(preNodeConfig.getChapter())){
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
index ed4a4e1ba..6fac47d35 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
@@ -785,7 +785,7 @@ public class CBean2Proto {
         return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build();
     }
 
-    public static CommonProto.HardStagePlayerInfo getHardStagePlayerInfo(ArenaRecord arenaRecord,int type)throws Exception {
+    public static CommonProto.HardStagePlayerInfo getHardStagePlayerInfo(ArenaRecord arenaRecord,int type,User user)throws Exception {
         CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(arenaRecord.getFightData());
         return CommonProto.HardStagePlayerInfo.newBuilder()
                 .setUid(arenaRecord.getAttackId())
@@ -793,7 +793,7 @@ public class CBean2Proto {
                 .setHead(arenaRecord.getHead())
                 .setUserName(arenaRecord.getUserName())
                 .setHeadFrame(arenaRecord.getHeadFrame())
-                .setFightData(fightDataProto).setPower(arenaRecord.getAttackForce()).setType(type).build();
+                .setFightData(fightDataProto).setPower(arenaRecord.getAttackForce()).setType(type).setPracticeLevel(user.getHeroManager().getPracticeLevel()).build();
 
     }
     /**