From 499bc8099fa3346a6cec6f14fc2a1918e379f721 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 21 Nov 2020 19:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=8B=E7=82=B9=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/ktbeans/ReportEventEnum.java | 6 +++--- .../java/com/ljsd/jieling/logic/item/ItemLogic.java | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index 3a062d047..534c77e98 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -58,9 +58,9 @@ public enum ReportEventEnum { COMPLETE_PANOPTIC_MIRROR(42,"complete_panoptic_mirror", new CommonEventHandler(),new String[]{"Panoptic_Mirror_id"}), - EQUIP_SYNTHESIS(43,"equip_synthesis", new CommonEventHandler(),new String[]{"item_id","item_name","cost_item_id","cost_amount"}), + EQUIP_SYNTHESIS(43,"equip_synthesis", new CommonEventHandler(),new String[]{"item_id_num","cost_item_id","cost_items_amount"}), - TREASURE_SYNTHESIS(44,"treasure_synthesis", new CommonEventHandler(),new String[]{"item_id","item_name","cost_item_id","cost_amount"}), + TREASURE_SYNTHESIS(44,"treasure_synthesis", new CommonEventHandler(),new String[]{"item_id_num","cost_item_id","cost_items_amount"}), FATALITY_SYNTHESIS(45,"fatality_synthesis", new CommonEventHandler(),new String[]{"item_id","item_name","cost_item_id"}), NORMAL_SUMMON(46,"Normal_summon", new CommonEventHandler(),new String[]{"hero_id","summon_type","cost_item_id","cost_amount","hero_id_quality_list"}), @@ -74,7 +74,7 @@ public enum ReportEventEnum { HERO_COMPOSITION(50,"hero_composition", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}), SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level_list","hero_quality_list","reward_list","reward_nums_list"}), - TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"item_id","item_level","item_quality","reward_list","reward_nums_list"}), + TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"cost_item_list","reward_list","reward_nums_list"}), START_TIANGONG(53,"start_tiangong",new CommonEventHandler(),new String[]{"stage_level","stage_id","stage_type","Combat_results","rewards_id_list","rewards_num_list"}), TREASURE_COMPOSITION(54,"treasure_composition",new CommonEventHandler(),new String[]{"hero_id","item_level","reward_list","reward_nums_list"}), 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 6f0a377de..4082ac1b7 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 @@ -320,9 +320,7 @@ public class ItemLogic { Map equipMap = user.getEquipManager().getEquipMap(); List items = new ArrayList<>(); StringBuilder reward = new StringBuilder(); - List jewelIdReport = new ArrayList<>(); - List jewelLevelReport = new ArrayList<>(); - List jewelQualityReport = new ArrayList<>(); + StringBuilder reportIdLevelQuality = new StringBuilder(); for (String jewelId : jewelList) { if(!equipMap.containsKey(jewelId)) throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP); @@ -336,6 +334,10 @@ public class ItemLogic { reward = getStringBuilder(reward, 1, sItem.getResolveReward()); continue; } + if(reportIdLevelQuality.length()!=0){ + reportIdLevelQuality.append("|"); + } + reportIdLevelQuality.append(jewel.getEquipId()).append("-").append(jewel.getLevel()).append("-").append(jewel.getBuildLevel()); if(jewel.getLevel()!=0){ Map rankupConfigMap = SJewelRankupConfig.rankupMap.get(config.getLevelupPool()).get(1); for(SJewelRankupConfig value:rankupConfigMap.values()){ @@ -373,9 +375,6 @@ public class ItemLogic { } } items.add(new int[]{propertyItem.getEquipId(),1}); - jewelIdReport.add(propertyItem.getEquipId()); - jewelLevelReport.add(propertyItem.getLevel()); - jewelQualityReport.add(((Jewel) propertyItem).getBuildLevel()); } for (String jewelId : jewelList) { user.getEquipManager().remove(jewelId); @@ -405,7 +404,7 @@ public class ItemLogic { itemId.add(item.getItemId()); itemNum.add(item.getItemNum()); }); - ReportUtil.onReportEvent(user,ReportEventEnum.TREASURE_DECOMPOSITION.getType(),jewelIdReport,jewelLevelReport,jewelQualityReport,itemId,itemNum); + ReportUtil.onReportEvent(user,ReportEventEnum.TREASURE_DECOMPOSITION.getType(),reportIdLevelQuality.toString(),itemId,itemNum); sendUseAndPriceItemMessage(session,MessageTypeProto.MessageType.USER_AND_PRICE_ITEM_RESPONSE_VALUE,drop); }