fix 合成英雄

back_recharge
wangyuan 2019-08-07 16:30:09 +08:00
parent 89ffd40206
commit b87d7a370e
4 changed files with 7 additions and 42 deletions

View File

@ -465,7 +465,7 @@ public class MapLogic {
public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> cells, MessageTypeProto.MessageType messageType) throws Exception { public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> 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)) { if (updateMapByOnlyConsumeActionPower(session, curXY, triggerXY, cells, messageType)) {
return; return;
} }
@ -480,6 +480,7 @@ public class MapLogic {
int uid = session.getUid(); int uid = session.getUid();
User user = UserManager.getUser(uid); User user = UserManager.getUser(uid);
MapManager mapManager = user.getMapManager(); MapManager mapManager = user.getMapManager();
int lastXY = mapManager.getCurXY();
if (mapManager.getMapInfo() == null) { if (mapManager.getMapInfo() == null) {
LOGGER.info("mapManager.getMapInfo() == null"); LOGGER.info("mapManager.getMapInfo() == null");
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "");
@ -562,12 +563,12 @@ public class MapLogic {
// LOGGER.info("updateMap() uid=>{} mapId =>{} eventId=>{}", uid, mapManager.getCurMapId(), cell.getEventId()); // LOGGER.info("updateMap() uid=>{} mapId =>{} eventId=>{}", uid, mapManager.getCurMapId(), cell.getEventId());
mapManager.updateFoodBufferByStep(cells.size()); mapManager.updateFoodBufferByStep(cells.size());
if(!cells.isEmpty()){ if(!cells.isEmpty()){
int lastXY = cells.get(0);
if(cells.size() >2){ if(cells.size() >2){
lastXY = cells.get(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); MessageUtil.sendMessage(session, 1, messageType.getNumber(), mapUpdateResponse.build(), true);
} }
@ -1176,7 +1177,7 @@ public class MapLogic {
} }
} }
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse FightInfoProto.FastFightResponse build = FightInfoProto.FastFightResponse
.newBuilder() .newBuilder()
.setResult(resultCode) .setResult(resultCode)
.setEnventDrop(dropBuilder) .setEnventDrop(dropBuilder)
@ -1185,7 +1186,7 @@ public class MapLogic {
.setLastXY(mapManager.getLastXY()) .setLastXY(mapManager.getLastXY())
.build(); .build();
mapManager.setCurXY(mapManager.getLastXY()); mapManager.setCurXY(mapManager.getLastXY());
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true); MessageUtil.sendMessage(session, 1, messageType.getNumber(), build, true);
return; return;
} }
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId); List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);

View File

@ -34,12 +34,6 @@ public class PlayerManager extends MongoBase {
private String head; private String head;
private long gold;
private int gem;
private int chargeGem;
private int mapId; private int mapId;
private long createTime; //创建时间 private long createTime; //创建时间
@ -157,33 +151,6 @@ public class PlayerManager extends MongoBase {
this.head = head; 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() { public int getMapId() {
return mapId; return mapId;
} }

View File

@ -63,9 +63,6 @@ public class UserManager {
playerManager.setLevel(1); playerManager.setLevel(1);
playerManager.setExp(0); playerManager.setExp(0);
playerManager.setHead("image_head_1"); playerManager.setHead("image_head_1");
playerManager.setGold(100000l);
playerManager.setGem(9999);
playerManager.setChargeGem(666);
playerManager.updateGuidePoint(1,1); playerManager.updateGuidePoint(1,1);
playerManager.setCreateTime(now); playerManager.setCreateTime(now);
playerManager.setLoginTime(now); playerManager.setLoginTime(now);

View File

@ -1258,7 +1258,7 @@ public class HeroLogic {
.newBuilder() .newBuilder()
.setDrop(drop) .setDrop(drop)
.build(); .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); } MessageUtil.sendMessage(iSession,1,msgId,heroComposeResponse,true); }
public String getQuality(int natural) { public String getQuality(int natural) {