From e2df7ba34f7fc5419a3afa8e443326406dcf5f20 Mon Sep 17 00:00:00 2001 From: gaojie Date: Tue, 22 Jan 2019 16:15:25 +0800 Subject: [PATCH] GM --- .../com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 7 +------ .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 71f755cf1..c804af6c1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -2,20 +2,16 @@ package com.ljsd.jieling.handler.GameGM; import com.ljsd.jieling.globals.GlobalGm; import com.ljsd.jieling.handler.BaseHandler; -import com.ljsd.jieling.logic.dao.Item; -import com.ljsd.jieling.logic.dao.ItemManager; import com.ljsd.jieling.logic.dao.User; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; -import com.ljsd.jieling.protocols.GMCommandProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.ItemUtil; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -30,7 +26,7 @@ public class GMRequestHandler extends BaseHandler{ @Override public void process(ISession iSession, PacketNetData netData) throws Exception { byte[] message = netData.parseClientProtoNetData(); - GMCommandProto.GMCommand gmCommand = GMCommandProto.GMCommand.parseFrom(message); + CommonProto.GMCommand gmCommand = CommonProto.GMCommand.parseFrom(message); String command = gmCommand.getCommand(); if (!command.contains("#") || command.split("#").length < 3) { LOGGER.error("wrong command :" + command); @@ -46,7 +42,6 @@ public class GMRequestHandler extends BaseHandler{ giveItem(cUser,prarm1,prarm2); break; } - } private void giveItem(User cUser,int itemId,int itemNum) throws Exception { 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 d527acaa9..244ab067b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -200,7 +200,13 @@ public class ItemUtil { heroList.add(CBean2Proto.getHero(hero)); } - + /** + * 消耗道具 + * @param user + * @param costItems + * @return + * @throws Exception + */ public static boolean itemCost(User user,int[][] costItems) throws Exception { Map itemMap = new HashMap<>();