From d09523bb89a95a2e3c27b32189b475ea9cffde5f Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Thu, 8 Jul 2021 18:09:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=8A=80=E8=83=BD,=20?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9=E5=8D=87=E7=BA=A7bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ljsd/jieling/logic/family/GuildLogic.java | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
index 680a105b5..60b134881 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
@@ -1505,39 +1505,32 @@ public class GuildLogic  {
         Map<Integer, Integer> skillInfo= user.getGuildMyInfo().getGuildSkill();
 
         Map<Integer, Map<Integer, SGuildTechnology>> typeMap = SGuildTechnology.technologyMap.get(type);
-        if(skillInfo.getOrDefault(type, 0)!=beforeLevel||afterLevel>600)
+        if(skillInfo.getOrDefault(type, 0)!=beforeLevel||afterLevel>600) {
             throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
+        }
         int size = typeMap.size();
 
-
         Map<Integer,Integer> consumeMap = new HashMap<>(2);
         int baseLevel = beforeLevel / size;//100->16
         int nextIndex = beforeLevel % size;//100->4
 
         int afterBaseLevel =afterLevel / size;
         int afterNextIndex = afterLevel % size;
-//        if(){
-//        }else{
-//            int level = skillInfo.get(type);
-//            consume = typeMap.get(level%size+1).get(level/size).getConsume();
-//            if(typeMap.get(level%size+1).get(level/size+1)==null){
-//                throw new ErrorCodeException(ErrorCode.HERO_LEVE_MAX);
-//            }
-//        }
-        while(baseLevel<afterBaseLevel || nextIndex<afterNextIndex){
 
+        while(baseLevel<afterBaseLevel || nextIndex<afterNextIndex){
+            // 消耗道具获取
             int[][] consume = typeMap.get(nextIndex+1).get(baseLevel).getConsume();
             for(int[] consumeOnce:consume) {
                 consumeMap.put(consumeOnce[0],consumeMap.getOrDefault(consumeOnce[0], 0)+consumeOnce[1]);
             }
-
-            if(!ItemUtil.checkCost(user, consumeMap)){
-                //把这一次的减回去
-                for(int[] consumeOnce:consume) {
-                    consumeMap.put(consumeOnce[0],consumeMap.getOrDefault(consumeOnce[0], 0)-consumeOnce[1]);
-                }
-                break;
+            // 道具消耗
+            boolean itemCost = ItemUtil.itemCost(user, ItemUtil.mapToArray(consumeMap), BIReason.GUILD_SKILL_LEVEL_UP_CONSUME, 1);
+            if(!itemCost){
+                throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
             }
+            // 清理道具map
+            consumeMap.clear();
+            // 次数增加
             if(nextIndex+1==size){
                 nextIndex=0;
                 baseLevel++;
@@ -1545,14 +1538,10 @@ public class GuildLogic  {
                 nextIndex++;
             }
         }
-        boolean itemCost = ItemUtil.itemCost(user, ItemUtil.mapToArray(consumeMap), BIReason.GUILD_SKILL_LEVEL_UP_CONSUME, 1);
-        if(!itemCost){
-            throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
-        }
+
         Family.GuildSkillLevelUpResponse response = Family.GuildSkillLevelUpResponse.newBuilder().setType(type).setCurlevel(baseLevel*size+nextIndex).build();
 
         user.getGuildMyInfo().setGuildSkillByType(type,baseLevel*size+nextIndex);
-//        user.getGuildMyInfo().setGuildSkillByType(type,590);
 
         Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid()));
         MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);

From e9bf77669de3284c03be925c483d00f05b2a21ce Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Fri, 9 Jul 2021 10:19:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E5=BD=92=E5=85=83,=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9.=20=E6=97=A0=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
index 20ca4c67d..566ed99b7 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
@@ -3054,7 +3054,6 @@ public class HeroLogic{
         if(null!=err){
             throw new ErrorCodeException(err);
         }
-        HeroManager heroManager = user.getHeroManager();
         Hero hero = user.getHeroManager().getHero(heroId);
         int[] growthSwitch = SCHero.getsCHero().get(hero.getTemplateId()).getGrowthSwitch();
         if(growthSwitch!=null&&growthSwitch.length>0){
@@ -3167,7 +3166,7 @@ public class HeroLogic{
 
             SHeroReturn sHeroReturn = sHeroReturnMap.get(breakFloor);
             int[][] returnMaterials = sHeroReturn.getRankupReturn();
-            SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getLevel(user.getHeroManager()));
+            SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getOriginalLevel());
             int[][] levelReturn = ItemLogic.getInstance().itemReturnPercent(sHeroLevlConfig.getSumConsume(), returnPercent);
             //进阶材料返还乘万分比
             for(int i = 0 ; i <returnMaterials.length;i++){