Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
2982500416
|
@ -13,7 +13,7 @@ public class EventType {
|
|||
public static final int businessman = 6;
|
||||
public static final int box = 7;
|
||||
public static final int hinder = 8;
|
||||
public static final int allEvents = 9;
|
||||
public static final int towerBuff = 9;
|
||||
public static final int suddenlyBoss = 11; //精英怪
|
||||
|
||||
/**
|
||||
|
|
|
@ -657,6 +657,11 @@ public class MapLogic {
|
|||
SEventPointConfig sEventPointConfig = STableManager.getConfig(SEventPointConfig.class).get(initialEventId);
|
||||
StoreLogic.initOneStore(user, sEventPointConfig.getOption()[0]);
|
||||
}
|
||||
}else if(mapPointConfig.getStyle()==EventType.towerBuff){
|
||||
if(cell.getEventId()==0){
|
||||
BehaviorUtil.destoryApointXY(user,triggerXY);
|
||||
throw new ErrorCodeException(ErrorCode.newDefineCode("该点已被清除"));
|
||||
}
|
||||
}
|
||||
|
||||
mapManager.setTriggerXY(triggerXY);
|
||||
|
|
|
@ -471,6 +471,7 @@ public class EndlessMap extends AbstractMap{
|
|||
}
|
||||
}
|
||||
private int getMapIdByWorldLevel() throws Exception {
|
||||
// return 4002;
|
||||
return GlobalDataManaager.getEndleeMapIdByLevel();
|
||||
|
||||
}
|
||||
|
|
|
@ -113,7 +113,7 @@ public class GuildChallengeLogic {
|
|||
}
|
||||
int remainHp;
|
||||
if(bossHpRemain==0){
|
||||
remainHp = 0;
|
||||
remainHp = 10000;
|
||||
}else if(bossHpRemain==-1){
|
||||
remainHp = -1;
|
||||
}else{
|
||||
|
@ -304,7 +304,7 @@ public class GuildChallengeLogic {
|
|||
}
|
||||
int remainHp;
|
||||
if(guildInfo.getBossHpRemain()==0){
|
||||
remainHp = 0;
|
||||
remainHp = 10000;
|
||||
}else if(guildInfo.getBossHpRemain()==-1){
|
||||
remainHp = -1;
|
||||
}else{
|
||||
|
|
|
@ -682,7 +682,7 @@ public class HeroLogic{
|
|||
// 卡牌不存在
|
||||
return "card not exists";
|
||||
}
|
||||
}if(teamId==GlobalsDef.TRIAL_TEAM){
|
||||
}else if(teamId==GlobalsDef.TRIAL_TEAM){
|
||||
if(!user.getMapManager().getTrialInfo().getHeroInfo().containsKey(heroId)){
|
||||
return "card not exists";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue