root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fight type

wangyuan 2019-11-01 19:35:43 +08:00
parent c73dc313df
commit ef408a0d4c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
View File

@ -180,8 +180,9 @@ public class BehaviorUtil {
// int seed = 1553167956;
fightData.setFightSeed(seed);
fightData.setFightMaxTime(maxTime);
fightStartRespons.setFightData(fightData);
fightData.setFightType(FightType.MapExploreFight.getType());
fightStartRespons.setFightData(fightData);
String key = RedisKey.getKey(RedisKey.FIGHT, Integer.toString(user.getId()), false);
Map<String,Object> fightInfo = new HashMap<>();

2
serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
View File

@ -907,7 +907,6 @@ public class CombatLogic {
}
takeTimes+=times;
}
ItemUtil.extraAddItem(user,baseItemMap);
int fightId = mainLevelManager.getFightId();
SMainLevelConfig targetMainLevelConfig = SMainLevelConfig.config.get(fightId);
int lastTime = mainLevelManager.getLastTime();
@ -926,6 +925,7 @@ public class CombatLogic {
}
lastTimeTakes=times;
}
ItemUtil.extraAddItem(user,baseItemMap);
if(viewBaseReward){
myResult = true;
rewardStr = ItemUtil.getReward(baseItemMap, baseCardMap, baseEquipMap, baseRandomMap);