Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.javaback_recharge
commit
79bc55a648
|
|
@ -20,6 +20,8 @@ local propertyList = {
|
|||
RoleDataName.TreatFacter,
|
||||
RoleDataName.MaxHp,
|
||||
RoleDataName.MaxHp,
|
||||
RoleDataName.CureFacter,
|
||||
RoleDataName.Tenacity,
|
||||
}
|
||||
|
||||
local function buffRandomAction(random, caster, target, buffType, duration, ...)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ local propertyList = {
|
|||
RoleDataName.TreatFacter,
|
||||
RoleDataName.MaxHp,
|
||||
RoleDataName.MaxHp,
|
||||
RoleDataName.CureFacter,
|
||||
RoleDataName.Tenacity,
|
||||
}
|
||||
|
||||
--被动技能表
|
||||
|
|
|
|||
|
|
@ -1176,12 +1176,19 @@ public class MapLogic {
|
|||
}
|
||||
int nextEventId = 0;
|
||||
int triggerXY = mapManager.getTriggerXY();
|
||||
Cell cell = mapManager.getMapInfo().get(triggerXY);
|
||||
if (cell != null) {
|
||||
nextEventId = getNextEventId(user, cell, sOptionConfig);
|
||||
cell.setEventId(nextEventId);
|
||||
mapManager.addOrUpdateCell(triggerXY, cell);
|
||||
if (monsterGroupId == mapManager.getSuddenlyBoss()) {
|
||||
mapManager.findSuddenlyBoss(0, 0);
|
||||
BehaviorUtil.destoryApointXY(user,triggerXY);
|
||||
}else{
|
||||
Cell cell = mapManager.getMapInfo().get(triggerXY);
|
||||
if (cell != null) {
|
||||
nextEventId = getNextEventId(user, cell, sOptionConfig);
|
||||
cell.setEventId(nextEventId);
|
||||
mapManager.addOrUpdateCell(triggerXY, cell);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fightEndResponse.setEventId(nextEventId);
|
||||
// LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId);
|
||||
MapMissionManager.updateMapMission(mapManager, EventType.fightEvent, monsterGroupId, monsterGroupId);
|
||||
|
|
|
|||
|
|
@ -153,6 +153,9 @@ public class MapMissionManager {
|
|||
MapManager mapManager = user.getMapManager();
|
||||
|
||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||
if(sChallengeConfig.getType() !=3){
|
||||
return;
|
||||
}
|
||||
int mapId = sChallengeConfig.getMapId();
|
||||
MapMission copyMissionProgres = mapManager.getCopyMissionProgresById(mapId);
|
||||
int difficultType = sChallengeConfig.getDifficultType();
|
||||
|
|
@ -222,6 +225,7 @@ public class MapMissionManager {
|
|||
needUpdate =true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue