任务刷新放在战斗胜利后

back_recharge
jiahuiwen 2019-03-27 19:59:08 +08:00
parent f5fc376c1e
commit 83812a7c0d
2 changed files with 13 additions and 18 deletions

View File

@ -689,15 +689,11 @@ public class MapLogic {
mapManager.setCurXY(0); mapManager.setCurXY(0);
mapManager.setCurMapId(0); mapManager.setCurMapId(0);
mapManager.setTotalStep(0); mapManager.setTotalStep(0);
if (needTemporaryItem) { TemporaryItems temporaryItems = mapManager.getTemporaryItems();
TemporaryItems temporaryItems = mapManager.getTemporaryItems(); if (temporaryItems != null) {
if (temporaryItems != null) { ItemUtil.addTemporaryItemToBag(user, temporaryItems, needTemporaryItem);
ItemUtil.addTemporaryItemToBag(user, temporaryItems);
}
} else {
mapManager.setTemporaryItems(null); mapManager.setTemporaryItems(null);
} }
} }
/** /**
@ -834,22 +830,23 @@ public class MapLogic {
} }
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1); CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1);
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder();
.newBuilder() fightEndResponse.setDrop(drop);
.setDrop(drop) fightEndResponse.setResult(resultCode);
.setResult(resultCode) fightEndResponse.addAllRemainHpList(remainHp);
.addAllRemainHpList(remainHp) fightEndResponse.build();
.build();
int missionId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_MISSION_ID)); int missionId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_MISSION_ID));
int destoryId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_DESORY_ID)); int destoryId = Integer.parseInt((String)valueMap.get(RedisKey.NEED_DESORY_ID));
if (missionId != 0) { if (missionId != 0) {
BehaviorUtil.updateMission(user, missionId, null); MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder();
BehaviorUtil.updateMission(user, missionId, eventUpdateResponse);
fightEndResponse.addAllMission(eventUpdateResponse.getMissionList());
} }
if (destoryId != 0) { if (destoryId != 0) {
BehaviorUtil.distoryPoint(user, destoryId); BehaviorUtil.distoryPoint(user, destoryId);
} }
updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId); updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId);
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
} }

View File

@ -159,9 +159,7 @@ public class BehaviorUtil {
CheckMissionReturn checkMissionReturn = MissionLogic.getInstance().checkMission(mission, user); CheckMissionReturn checkMissionReturn = MissionLogic.getInstance().checkMission(mission, user);
for (Mission missions : checkMissionReturn.missions) { for (Mission missions : checkMissionReturn.missions) {
CommonProto.Mission missionProto = MapLogic.getInstance().getMission(missions); CommonProto.Mission missionProto = MapLogic.getInstance().getMission(missions);
if (eventUpdateResponse != null) { eventUpdateResponse.addMission(missionProto);
eventUpdateResponse.addMission(missionProto);
}
} }
return true; return true;
} }