From 39404df90d9ed07b98094c12d5ee22fad3034434 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 19 Apr 2019 20:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=8F=E6=9C=BA=E9=81=93?= =?UTF-8?q?=E5=85=B7=E6=95=B0=E9=87=8F=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/map/StartFightRequestHandler.java | 11 +++++++++++ .../com/ljsd/jieling/logic/fight/CombatLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java index 0b8762b36..5e0fb6be9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java @@ -1,11 +1,14 @@ package com.ljsd.jieling.handler.map; import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.FightInfoProto; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; @Component @@ -23,7 +26,15 @@ public class StartFightRequestHandler extends BaseHandler{ int type = fightStartRequest.getType(); int fightId = fightStartRequest.getFightId(); int teamId = fightStartRequest.getTeamId(); + + if (type ==1){ + User user = UserManager.getUser(iSession.getUid()); + int curMapId = user.getMapManager().getCurMapId(); + if(curMapId>0){ + MessageUtil.sendErrorResponse(iSession, 0, MessageTypeProto.MessageType.FIGHT_START_RESPONSE.getNumber(),"在地图探索中,不可以操作"); + return; + } MapLogic.getInstance().startLevelDifficultyFight(iSession,fightId,teamId,type,MessageTypeProto.MessageType.FIGHT_START_RESPONSE); }else{ MapLogic.getInstance().startFight(iSession, MessageTypeProto.MessageType.FIGHT_START_RESPONSE); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index e5392f699..bdff0237c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -50,7 +50,7 @@ public class CombatLogic { MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ADVENTURE_INFO_RESPONSE_VALUE,response,true); List itemlistList = dropBuilder.getItemlistList(); for(CommonProto.Item item: itemlistList){ - LOGGER.info("the uid={},itemID={}",uid,item.getItemId()); + LOGGER.info("the uid={},itemID={},itemNum={}",uid,item.getItemId(),item.getItemNum()); } LOGGER.info("the uid={},offlineTimeLong={}",uid,offLineTime); 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 5fe8aae76..eb804b198 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -251,6 +251,9 @@ public class ItemUtil { if (sItem == null){ continue; } + if(entry.getValue() == 0){ + continue; + } Item item = itemManager.getItem(entry.getKey()); if (item == null) { item = itemManager.newItem(entry.getKey(), entry.getValue());