diff --git a/fightmanager/src/main/java/com/ljsd/fight/FightType.java b/fightmanager/src/main/java/com/ljsd/fight/FightType.java index 622c723a3..6c361ba1b 100644 --- a/fightmanager/src/main/java/com/ljsd/fight/FightType.java +++ b/fightmanager/src/main/java/com/ljsd/fight/FightType.java @@ -21,6 +21,7 @@ public enum FightType { NewGeneral(15),//新将 TenDespairArray(16),//十绝阵 Firend(17),//好友 + TowerMap(18),//森罗幻境 ; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java index bfbfa0c21..32fdb6a63 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java @@ -418,7 +418,7 @@ public class TowerMap extends AbstractMap { TrialInfo trialInfo = mapManager.getTrialInfo(); Map> monsterHp = trialInfo.getMonsterHp(); - PVEFightEvent pveFightEvent = new PVEFightEvent(uid, GlobalsDef.TRIAL_TEAM, 10, "", GameFightType.MapFastFight, groupId, 3); + PVEFightEvent pveFightEvent = new PVEFightEvent(uid, GlobalsDef.TRIAL_TEAM, 10, "", GameFightType.TowerMap, groupId, 3); //怪物剩余血量 if(monsterHp!=null&&!monsterHp.isEmpty()&&monsterHp.containsKey(cell.getCellId())){ pveFightEvent.setMonsterRemainHp(monsterHp.get(cell.getCellId())); @@ -456,7 +456,7 @@ public class TowerMap extends AbstractMap { } mapManager.updateMapMonsterHp(monsterHp); remainHp = 0; - }else{ + }else if (resultCode==1){ //判断是否是打败的boss if(trialInfo.getEnergy()==-1){ //生成传送门 @@ -471,6 +471,25 @@ public class TowerMap extends AbstractMap { remainHp = checkResult[3]; BehaviorUtil.destoryApointXY(user, destoryXY); mapManager.updateTrialKillCount(trialInfo.getKillCount()+1); + + SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD); + fastFightResponseBuilder.setEnventDrop(drop.build()); + }else{ + List hpList= new ArrayList<>(); + for(int i = 2;i 0) { BaseBehavior baseBehavior = baseBehaviorMap.get(10); baseBehavior.afterFastFight(user, groupId, fastFightResponseBuilder); } - fastFightResponseBuilder.setEnventDrop(drop.build()); fastFightResponseBuilder.setResult(resultCode); fastFightResponseBuilder.setEssenceValue(trialInfo.getEnergy()); fastFightResponseBuilder.setFightData(fightResult.getFightData()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java index 12a13bf5d..19ee1787d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java @@ -49,6 +49,7 @@ public enum GameFightType { CarPersonChallenge(FightType.CarBossFight,new PVPFightHandler(),null), GuildChallenge(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), NewGeneral(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), + TowerMap(FightType.TowerMap,new DefaultWithoutHandFightHandler(),null) ;