From b87d7a370e3f1fec06078841dd533d27868144e6 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 16:30:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E6=88=90=E8=8B=B1=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/MapLogic.java | 11 ++++--- .../ljsd/jieling/logic/dao/PlayerManager.java | 33 ------------------- .../ljsd/jieling/logic/dao/UserManager.java | 3 -- .../ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) 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 73eeb57fe..d37a3c247 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 @@ -465,7 +465,7 @@ public class MapLogic { public void updateMap(ISession session, int curXY, int triggerXY, List cells, MessageTypeProto.MessageType messageType) throws Exception { - LOGGER.info("updateMap() curXY=>{},triggerXY=>{}", curXY, triggerXY); + LOGGER.info("updateMap() curXY=>{},triggerXY=>{},cells={}", curXY, triggerXY,cells); if (updateMapByOnlyConsumeActionPower(session, curXY, triggerXY, cells, messageType)) { return; } @@ -480,6 +480,7 @@ public class MapLogic { int uid = session.getUid(); User user = UserManager.getUser(uid); MapManager mapManager = user.getMapManager(); + int lastXY = mapManager.getCurXY(); if (mapManager.getMapInfo() == null) { LOGGER.info("mapManager.getMapInfo() == null"); MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); @@ -562,12 +563,12 @@ public class MapLogic { // LOGGER.info("updateMap() uid=>{} mapId =>{} eventId=>{}", uid, mapManager.getCurMapId(), cell.getEventId()); mapManager.updateFoodBufferByStep(cells.size()); if(!cells.isEmpty()){ - int lastXY = cells.get(0); if(cells.size() >2){ lastXY = cells.get(cells.size()-2); } - mapManager.setLastXY(lastXY); } + mapManager.setLastXY(lastXY); + LOGGER.info("the uid+{},the lastXy={}",uid,lastXY); MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse.build(), true); } @@ -1176,7 +1177,7 @@ public class MapLogic { } } CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); - FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse + FightInfoProto.FastFightResponse build = FightInfoProto.FastFightResponse .newBuilder() .setResult(resultCode) .setEnventDrop(dropBuilder) @@ -1185,7 +1186,7 @@ public class MapLogic { .setLastXY(mapManager.getLastXY()) .build(); mapManager.setCurXY(mapManager.getLastXY()); - MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true); + MessageUtil.sendMessage(session, 1, messageType.getNumber(), build, true); return; } List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 0c7afbe80..196152f1d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -34,12 +34,6 @@ public class PlayerManager extends MongoBase { private String head; - private long gold; - - private int gem; - - private int chargeGem; - private int mapId; private long createTime; //创建时间 @@ -157,33 +151,6 @@ public class PlayerManager extends MongoBase { this.head = head; } - public long getGold() { - return gold; - } - - public void setGold(long gold) throws Exception { - updateString("gold", gold); - this.gold = gold; - } - - public int getGem() { - return gem; - } - - public void setGem(int gem) throws Exception { - updateString("gem", gem); - this.gem = gem; - } - - public int getChargeGem() { - return chargeGem; - } - - public void setChargeGem(int chargeGem) throws Exception { - updateString("chargeGem", chargeGem); - this.chargeGem = chargeGem; - } - public int getMapId() { return mapId; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index f0fbbcd63..eb1bbd909 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -63,9 +63,6 @@ public class UserManager { playerManager.setLevel(1); playerManager.setExp(0); playerManager.setHead("image_head_1"); - playerManager.setGold(100000l); - playerManager.setGem(9999); - playerManager.setChargeGem(666); playerManager.updateGuidePoint(1,1); playerManager.setCreateTime(now); playerManager.setLoginTime(now); 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 8c44279bb..2b37d9883 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 @@ -1258,7 +1258,7 @@ public class HeroLogic { .newBuilder() .setDrop(drop) .build(); - user.getUserMissionManager().onGameEvent(user,GameEvent.COMPOS_HERO,sItem.getRewardGroup(),composeNum); + user.getUserMissionManager().onGameEvent(user,GameEvent.COMPOS_HERO,drop.getHero(0).getHeroId(),composeNum); MessageUtil.sendMessage(iSession,1,msgId,heroComposeResponse,true); } public String getQuality(int natural) {