diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index c75178ca3..eb3cdc695 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -29,7 +29,7 @@ public class GmService implements RPCRequestGMIFace.Iface { private static final Logger LOGGER = LoggerFactory.getLogger(GmService.class); @Override - public Result idipGm(String reserved, String cmd) throws InvalidOperException, TException { + public Result idipGm(String reserved, String cmd){ return exeCmd(cmd); } @@ -42,11 +42,9 @@ public class GmService implements RPCRequestGMIFace.Iface { String[] arg = cmd.split(" "); GmInterface obj; try { - obj = (GmInterface) Class.forName( GmInterface.class.getPackage().getName() + ".Cmd_" + arg[0].toLowerCase()).newInstance(); - } catch (Exception ex) { result.setResultMsg("Cmd Illegal"); ex.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java index 26ecfc05e..b4ca3dd3d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java @@ -193,7 +193,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler pass = user.getPlayerInfoManager().getSituationPass(); + pass.put(Integer.parseInt(args[0]),Integer.parseInt(args[1])); + user.getPlayerInfoManager().updateSituationPass(pass); + return true; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java index 8ebb16f58..7b00770da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java @@ -29,7 +29,7 @@ public class EquipManager extends MongoBase { this.setRootCollection(User._COLLECTION_NAME); } - public void addEquip(User user,PropertyItem equip) throws Exception { + public void addEquip(PropertyItem equip){ equip.init(this.getRootId(),getMongoKey() + ".equipMap." + equip.getId()); updateString("equipMap." + equip.getId(), equip); equipMap.put(equip.getId(),equip); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 78d990aeb..9e90e1bf1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -195,7 +195,7 @@ public class HeroLogic { LOGGER.error("Excepeion 背包入库错误" + integer); for (int i = 0; i < itemManager.getItemMap().get(integer).getItemNum(); i++) { Jewel equip = new Jewel(user.getId(), integer); - equipManager.addEquip(user, equip); + equipManager.addEquip(equip); } itemManager.removeItem(integer); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/InnerMessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/InnerMessageUtil.java index 559df5cc3..104db1cb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/InnerMessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/InnerMessageUtil.java @@ -30,7 +30,7 @@ public class InnerMessageUtil { @Override public void run() { HandlerLogicThread handlerThread = ProtocolsManager.handlerThreads[getUid() % ProtocolsManager.HANDLER_THREAD_NUM]; - User userInMem = UserManager.getUserInMem(getUid()); + User userInMem = UserManager.getUserNotCache(getUid()); if(userInMem == null){ return; } 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 6faaaf74c..87c196ad3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1018,7 +1018,7 @@ public class ItemUtil { return; } if(equip instanceof Equip){ - equipManager.addEquip(user,equip); + equipManager.addEquip(equip); } KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,BIReason.TEMPORARY_REWARD,GlobalsDef.addReason,sItem.getId(),1,-1); @@ -1269,7 +1269,7 @@ public class ItemUtil { String msgTem = ""; if(itemType==GlobalItemType.JEWEL){ Jewel equip = new Jewel(user.getId(),equipId); - equipManager.addEquip(user,equip); + equipManager.addEquip(equip); jewelList.add(CBean2Proto.getEquipProto(equip)); msgTem="lamp_lottery_equip_content"; if (!jewels.containsKey(item.getQuantity())) {