From 232159bf229a75436f558adaffa45c4556785462 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 4 Jul 2019 20:19:44 +0800 Subject: [PATCH] =?UTF-8?q?BIReason=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E9=9A=BE=E5=BA=A6=E6=9A=82=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/globals/BIReason.java | 4 ++++ .../java/com/ljsd/jieling/handler/map/MapLogic.java | 11 +++++++++-- .../map/mapHandler/DifficultRecordHandler.java | 7 +++---- .../com/ljsd/jieling/logic/item/WorkShopLogic.java | 2 +- 4 files changed, 17 insertions(+), 7 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 5fb5751b3..6a26f6d5b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -55,6 +55,10 @@ public interface BIReason { int TOWER_SWEEP_REWARD = 34;//爬塔扫荡奖励 + int WORK_SHOP_TECHNOGY_RESET_DROP =35 ; + + int TAKE_STAR_REWARD = 36; + //道具消耗原因 1000开头 int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级 int SECRETBOX_CONSUME = 1001; //秘盒抽卡 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 1a1650a3c..042c4fcda 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.handler.map; -import ch.qos.logback.core.util.TimeUtil; import com.googlecode.protobuf.format.JsonFormat; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.VipPrivilegeType; @@ -1588,6 +1587,13 @@ public class MapLogic { .build(); builder.setTowerCopyInfo(towerCopyInfo); builder.addAllPlayedGenMapId(mapManager.getPlayGenMaps()); + + for(Map.Entry entry:mapManager.getDifficultyOptions().entrySet()){ + MapInfoProto.DifficultMapOption.Builder difficultMapOption = MapInfoProto.DifficultMapOption.newBuilder(); + difficultMapOption.setId(entry.getKey()); + difficultMapOption.setMapdifficulty(entry.getValue()); + builder.addDifficultMapOptions(difficultMapOption); + } // LOGGER.info("关卡信息{}",towerCopyInfo.toString()); MessageUtil.sendMessage(iSession, 1, msgId, builder.build(), true); } @@ -2422,7 +2428,7 @@ public class MapLogic { return; } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sChallengeStarBox.getReward(), 1); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sChallengeStarBox.getReward(), BIReason.TAKE_STAR_REWARD); mapManager.setStarReward(id); MapInfoProto.FbStarRewardResponse.Builder FbStarRewardResponse = MapInfoProto.FbStarRewardResponse.newBuilder(); FbStarRewardResponse.setFbStarReward(drop); @@ -2432,6 +2438,7 @@ public class MapLogic { } public void recordDifficultMap(ISession session ,int fbId,int difficultyId,MessageTypeProto.MessageType messageType) throws Exception { MapManager mapManager = UserManager.getUser(session.getUid()).getMapManager(); + if(mapManager.getDifficultyOptions()!=null){ if(fbId!=0&&difficultyId!=0){ mapManager.addDiffcultyOptions(fbId,difficultyId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/DifficultRecordHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/DifficultRecordHandler.java index 8d0aa6546..345f9ef17 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/DifficultRecordHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/DifficultRecordHandler.java @@ -18,9 +18,8 @@ public class DifficultRecordHandler extends BaseHandler { @Override public void process(ISession iSession, PacketNetData netData) throws Exception { byte[] message = netData.parseClientProtoNetData(); - MapInfoProto.DifficultMapOption difficultMapOption = MapInfoProto.DifficultMapOption.parseFrom(message); - difficultMapOption.getId(); - difficultMapOption.getMapdifficulty(); - MapLogic.getInstance().recordDifficultMap(iSession,difficultMapOption.getId(),difficultMapOption.getMapdifficulty(),MessageTypeProto.MessageType.DIFFICULT_MAP_OPTION_RECORD_RESPONSE); + MapInfoProto.DifficultMapRequest difficultMapRequest = MapInfoProto.DifficultMapRequest.parseFrom(message); + MapInfoProto.DifficultMapOption mapInfo = difficultMapRequest.getMapInfo(); + MapLogic.getInstance().recordDifficultMap(iSession,mapInfo.getId(),mapInfo.getMapdifficulty(),MessageTypeProto.MessageType.DIFFICULT_MAP_OPTION_RECORD_RESPONSE); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index 4276ec332..5b8459301 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -113,7 +113,7 @@ public class WorkShopLogic { HeroLogic.getInstance().combinedAttribute(willReturn,returnMap); } workShopController.resetTech(profession); - CommonProto.Drop.Builder builder = ItemUtil.dropMap(user, returnMap, 1); + CommonProto.Drop.Builder builder = ItemUtil.dropMap(user, returnMap, BIReason.WORK_SHOP_TECHNOGY_RESET_DROP); PlayerInfoProto.WorkTechnologyResetResponse build = PlayerInfoProto.WorkTechnologyResetResponse.newBuilder().setDrop(builder).build(); MessageUtil.sendMessage(session,1,msgId,build,true); }