team 顺序
parent
f4cdbdcf15
commit
0d308bc58c
|
@ -128,7 +128,7 @@ public class MapLogic {
|
||||||
SChallengeSetting sChallengeSetting = SChallengeSetting.challengeSetting;
|
SChallengeSetting sChallengeSetting = SChallengeSetting.challengeSetting;
|
||||||
if (mapManager.getDayFightCount() > sChallengeSetting.getLimit()) {
|
if (mapManager.getDayFightCount() > sChallengeSetting.getLimit()) {
|
||||||
LOGGER.info("enterMap() uid=>{} max fight count =>{} ", uid, mapManager.getDayFightCount());
|
LOGGER.info("enterMap() uid=>{} max fight count =>{} ", uid, mapManager.getDayFightCount());
|
||||||
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
|
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "请购买挑战次数");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (user.getPlayerInfoManager().getMapId() < mapId) {
|
if (user.getPlayerInfoManager().getMapId() < mapId) {
|
||||||
|
@ -186,10 +186,15 @@ public class MapLogic {
|
||||||
}else{
|
}else{
|
||||||
LOGGER.error("the curmap={}",mapManager.getCurMapId());
|
LOGGER.error("the curmap={}",mapManager.getCurMapId());
|
||||||
}
|
}
|
||||||
for (Map.Entry<String, Map<Integer, Integer>> entry : mapManager.getHeroAllAttributeMap().entrySet()) {
|
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
Map<Integer, Integer> map = entry.getValue();
|
Map<String, Map<Integer, Integer>> heroAllAttributeMap = mapManager.getHeroAllAttributeMap();
|
||||||
|
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
|
||||||
|
Map<Integer, Integer> map = heroAllAttributeMap.get(teamPosHeroInfo.getHeroId());
|
||||||
|
if (map == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
MapInfoProto.HeroInfo heroInfo = MapInfoProto.HeroInfo.newBuilder()
|
MapInfoProto.HeroInfo heroInfo = MapInfoProto.HeroInfo.newBuilder()
|
||||||
.setHeroId(entry.getKey())
|
.setHeroId(teamPosHeroInfo.getHeroId())
|
||||||
.setHeroHp(map.get(HeroAttributeEnum.CurHP.getPropertyId()) == null ? 0 : map.get(HeroAttributeEnum.CurHP.getPropertyId()))
|
.setHeroHp(map.get(HeroAttributeEnum.CurHP.getPropertyId()) == null ? 0 : map.get(HeroAttributeEnum.CurHP.getPropertyId()))
|
||||||
.build();
|
.build();
|
||||||
mapEnterResponse.addHeroInfos(heroInfo);
|
mapEnterResponse.addHeroInfos(heroInfo);
|
||||||
|
@ -457,7 +462,6 @@ public class MapLogic {
|
||||||
int[][] behaviorTypeValues = sOptionConfig.getBehaviorTypeValues();
|
int[][] behaviorTypeValues = sOptionConfig.getBehaviorTypeValues();
|
||||||
BaseBehavior baseBehavior = baseBehaviorMap.get(behaviorType);
|
BaseBehavior baseBehavior = baseBehaviorMap.get(behaviorType);
|
||||||
MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder();
|
MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder();
|
||||||
int targetEventId = cell.getEventId();
|
|
||||||
if (baseBehavior != null) {
|
if (baseBehavior != null) {
|
||||||
boolean isSuccess = baseBehavior.process(user, behaviorTypeValues, eventUpdateResponse);
|
boolean isSuccess = baseBehavior.process(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
if (!isSuccess) {
|
if (!isSuccess) {
|
||||||
|
@ -526,7 +530,6 @@ public class MapLogic {
|
||||||
else if (cell != null && nextEventId != 0) {
|
else if (cell != null && nextEventId != 0) {
|
||||||
cell.setEventId(nextEventId);
|
cell.setEventId(nextEventId);
|
||||||
mapManager.addOrUpdateCell(cell.getCellId(), cell);
|
mapManager.addOrUpdateCell(cell.getCellId(), cell);
|
||||||
targetEventId = nextEventId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
updateMapMission(mapManager,EventType.updateEvent, optionId,0);
|
updateMapMission(mapManager,EventType.updateEvent, optionId,0);
|
||||||
|
|
Loading…
Reference in New Issue