From fffe477523cd54c5363f7539f1f78fbfb7ade5ae Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 13 Aug 2020 09:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E8=A3=85=E5=A4=87=E6=8E=89?= =?UTF-8?q?=E8=90=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/globals/BIReason.java | 5 ++++- .../main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 9 +++++++++ .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 5 ++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 507e2476e..baf51435f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -141,7 +141,10 @@ public interface BIReason { int EXCEPTION_TREASURE_REWARD = 77;//天空密境积分奖励 int PROUD_REWARD = 78;//膜拜获得金币奖励 - int EQUIP_UNLOAD_REWARD = 79; + + int EQUIP_UNLOAD_REWARD = 79;//卸下装备 + int ESPECIAL_BACK = 80;//法宝归元获得 + int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级 int SECRETBOX_CONSUME = 1001;//秘盒抽卡 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index eb1762e55..fb07a6371 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -380,6 +380,15 @@ public class ItemLogic { int rankUpReturnPercent= SSpecialConfig.getIntegerValue(SSpecialConfig.HERO_SACRIFICE_PERCENT); for (String heroId : heroIdsList) { Hero hero = heroManager.getHeroMap().get(heroId); + Map equipByPositionMap = hero.getEquipByPositionMap(); + Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); + if(equipByPositionMap!=null&&equipByPositionMap.size()>0){ + equipByPositionMap.forEach((k,v)->baseItemMap.put(v,baseItemMap.getOrDefault(v,0)+1)); + } + if(soulEquipByPositionMap!=null&&soulEquipByPositionMap.size()>0){ + soulEquipByPositionMap.forEach((k,v)->baseItemMap.put(v,baseItemMap.getOrDefault(v,0)+1)); + } + heroManager.removeHero(uid,heroId); int[][] sumConsume = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getLevel()).getSumConsume(); SHeroSacrifice starSHeroSacrifice = STableManager.getFigureConfig(HeroStaticConfig.class).getsHeroSacrificeMap(1, hero.getStar()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 523c42b61..c53439293 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -615,7 +615,10 @@ public class ItemUtil { extraDropAop(user,dropBuilder,sItem); sendToFront.add(CBean2Proto.getItem(item,-1)); if(sItem.getItemType()==GlobalItemType.EQUIP){ - user.getUserMissionManager().onGameEvent(user,GameEvent.GET_EQUIP,sItem.getId(),itemNum); + if(reason!=BIReason.EQUIP_UNLOAD_REWARD&&reason!=BIReason.DECOMPOS_HERO_REWARD){ + user.getUserMissionManager().onGameEvent(user,GameEvent.GET_EQUIP,sItem.getId(),itemNum); + ReportUtil.onReportEvent(user,ReportEventEnum.GET_EQUIP.getType(),sItem.getId(),itemNum,reason); + } } } if (dropBuilder != null) {