试炼奖励修复

back_recharge
lvxinran 2019-07-03 16:16:16 +08:00
parent 78d14781c8
commit 12bb758a38
2 changed files with 10 additions and 4 deletions

View File

@ -14,7 +14,6 @@ import com.ljsd.jieling.handler.mission.Mission;
import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.CheckFight; import com.ljsd.jieling.logic.fight.CheckFight;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroAttributeEnum;
import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.GameEvent;
@ -838,6 +837,7 @@ public class MapLogic {
if(mapManager.getTower()>mapManager.getHighestTower()){ if(mapManager.getTower()>mapManager.getHighestTower()){
mapManager.setHighestTower(mapManager.getTower()); mapManager.setHighestTower(mapManager.getTower());
} }
mapManager.setCurrTowerTime(0);
MessageUtil.sendMessage(session, 1, messageType.getNumber(), builder.build(), true); MessageUtil.sendMessage(session, 1, messageType.getNumber(), builder.build(), true);
return; return;
} }
@ -998,6 +998,7 @@ public class MapLogic {
.setResult(resultCode) .setResult(resultCode)
.setEnventDrop(dropBuilder) .setEnventDrop(dropBuilder)
.addAllRemainHpList(remainHp) .addAllRemainHpList(remainHp)
.setEssenceValue(mapManager.getEssenceValue())
.build(); .build();
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
return; return;
@ -1022,6 +1023,7 @@ public class MapLogic {
fastFightResponse.setEnventDrop(drop.build()); fastFightResponse.setEnventDrop(drop.build());
fastFightResponse.setResult(resultCode); fastFightResponse.setResult(resultCode);
fastFightResponse.addAllRemainHpList(remainHp); fastFightResponse.addAllRemainHpList(remainHp);
fastFightResponse.setEssenceValue(mapManager.getEssenceValue());
fastFightResponse.build(); fastFightResponse.build();
if (sChallengeConfig.getType() == 2) { if (sChallengeConfig.getType() == 2) {
STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower()); STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower());
@ -1197,8 +1199,9 @@ public class MapLogic {
fightEndResponse.setResult(resultCode); fightEndResponse.setResult(resultCode);
fightEndResponse.setEnventDrop(dropBuilder); fightEndResponse.setEnventDrop(dropBuilder);
fightEndResponse.addAllRemainHpList(remainHp); fightEndResponse.addAllRemainHpList(remainHp);
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==2&&mapManager.getTower()==STrialConfig.getHighestTower()){ if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==2){
fightEndResponse.setLastTowerTime((int)mapManager.getCurrTowerTime()/1000); // &&mapManager.getTower()==STrialConfig.getHighestTower()
fightEndResponse.setLastTowerTime((int)(mapManager.getCurrTowerTime()/1000));
} }
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
return; return;
@ -1961,7 +1964,7 @@ public class MapLogic {
public String initTrialMap(MapManager mapManager, User user) throws Exception { public String initTrialMap(MapManager mapManager, User user) throws Exception {
STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower()); STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower());
if(mapManager.getTower()>1){ if(mapManager.getTower()>1&&mapManager.getMapIntoFlag()==0){
for(int i = 1 ; i <mapManager.getTower();i++){ for(int i = 1 ; i <mapManager.getTower();i++){
ItemUtil.drop(user,STrialConfig.sTrialConfigMap.get(i).getReward(),1.0f,1,BIReason.TOWER_SWEEP_REWARD); ItemUtil.drop(user,STrialConfig.sTrialConfigMap.get(i).getReward(),1.0f,1,BIReason.TOWER_SWEEP_REWARD);
int type = MathUtils.randomFromWeight(STrialConfig.sTrialConfigMap.get(i).getRandomMonsterType()); int type = MathUtils.randomFromWeight(STrialConfig.sTrialConfigMap.get(i).getRandomMonsterType());

View File

@ -31,6 +31,9 @@ public class FourtyTwoBehavior extends BaseBehavior{
LOGGER.info("当前层为{},进入下一层",mapManager.getTower()); LOGGER.info("当前层为{},进入下一层",mapManager.getTower());
mapManager.removeBoss(); mapManager.removeBoss();
mapManager.setTower(mapManager.getTower()+1); mapManager.setTower(mapManager.getTower()+1);
// if(mapManager.getTower()==5){
// mapManager.setTower();
// }
mapManager.setEssenceValue(0); mapManager.setEssenceValue(0);
long time = TimeUtils.now()-mapManager.getTowerStartTime(); long time = TimeUtils.now()-mapManager.getTowerStartTime();
mapManager.setCurrTowerTime(time); mapManager.setCurrTowerTime(time);