Merge branch 'master' of 60.1.1.230:backend/jieling_server

back_recharge
wangyuan 2019-08-06 13:56:31 +08:00
commit 6869a65f46
4 changed files with 22 additions and 13 deletions

0
gradlew vendored 100644 → 100755
View File

View File

@ -439,7 +439,7 @@ public class MapLogic {
int[][] cost = new int[1][];
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
int costNum = cells.size();
mapManager.updateEndlessConsumeExecution(costNum);
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
cost[0]= new int[]{costId,costNum};
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
if(!costResult) {
@ -545,7 +545,7 @@ public class MapLogic {
int[][] cost = new int[1][];
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
int costNum = cells.size();
mapManager.updateEndlessConsumeExecution(costNum);
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
cost[0]= new int[]{costId,costNum};
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
if(!costResult){
@ -921,7 +921,6 @@ public class MapLogic {
MapInfoProto.MapOutResponse.Builder builder = MapInfoProto.MapOutResponse.newBuilder();
//无尽副本
if(challengeConfig.getType()==4) {
mapManager.updateEndlessLocation(curXY);
if(outType==1){
mapManager.updateEndlessLocation(0);
int[][] cost = new int[1][];
@ -929,7 +928,7 @@ public class MapLogic {
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapId).getTeleportCost();
int costNum2 = SEndlessMapConfig.sEndlessMapConfigMap.get(targetMapId).getTeleportCost();
int resultCost = Math.abs(costNum-costNum2);
mapManager.updateEndlessConsumeExecution(resultCost);
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+resultCost);
cost[0]= new int[]{costId,resultCost};//Math.abs(costNum-costNum)
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
mapManager.setCurMapId(0);
@ -941,6 +940,10 @@ public class MapLogic {
return;
}
LOGGER.info("传送消耗{}行动力"+Math.abs(costNum-costNum2));
}else{
mapManager.updateEndlessLocation(curXY);
mapManager.updateEndlessConsumeExecution(0);
mapManager.updateEndlessFightCount(0);
}
}
if(outType == 0||mapManager.getTower()-1==STrialConfig.getHighestTower()){
@ -1132,7 +1135,7 @@ public class MapLogic {
int teamId = mapManager.getTeamId();
mapManager.setLastFightResult(resultCode);
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
mapManager.updateEndlessFightCount();
mapManager.updateEndlessFightCount(1+mapManager.getEndlessMapInfo().getFightCount());
}
if (resultCode == 0) {
// 失败需要等待n秒后复活所有英雄
@ -1348,12 +1351,12 @@ public class MapLogic {
mapManager.setLastFightResult(resultCode);
if (resultCode == 0) {
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
mapManager.updateEndlessFightCount();
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
//消耗行动力
int [][] cost = new int[1][];
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapManager.getCurMapId()).getDeathCost();
mapManager.updateEndlessConsumeExecution(costNum);
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
int [] cost1 = new int[]{costId,costNum};
cost[0] = cost1;
if(ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1)) {
@ -1418,7 +1421,7 @@ public class MapLogic {
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
}
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
mapManager.updateEndlessFightCount();
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
for (int i = 0 ; i <team.size();i++) {
mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),checkResult[i+2]);
mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]);
@ -2964,6 +2967,8 @@ public class MapLogic {
MapInfoProto.EndlessOutConsumeResponse.Builder response = MapInfoProto.EndlessOutConsumeResponse.newBuilder();
response.setFightCount(mapManager.getEndlessMapInfo().getFightCount());
response.setConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution());
LOGGER.info("战斗次数{}",response.getFightCount());
LOGGER.info("消耗行动力{}",response.getConsumeExecution());
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
}

View File

@ -727,12 +727,14 @@ public class MapManager extends MongoBase {
endlessMapInfo.getMapSign().get(mapId).remove(cellId);
removeString(getMongoKey()+".endlessMapInfo.mapSign."+mapId+"."+cellId);
}
public void updateEndlessFightCount(){
endlessMapInfo.setFightCount(1+endlessMapInfo.getFightCount());
public void updateEndlessFightCount(int count){
endlessMapInfo.setFightCount(count);
updateString("endlessMapInfo.fightCount",endlessMapInfo.getFightCount());
}
public void updateEndlessConsumeExecution(int count){
endlessMapInfo.setFightCount(count+endlessMapInfo.getFightCount());
endlessMapInfo.setConsumeExecution(count);
updateString("endlessMapInfo.consumeExecution",endlessMapInfo.getConsumeExecution());
}
}

View File

@ -368,8 +368,10 @@ public class PlayerLogic {
.setHead(1)
.setHeadFrame(playerManager.getHeadFrame())
.setName(playerManager.getNickName()).setUid(session.getUid()).setTeam(team);
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(1)){
playerTeamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
if(teamPosManager.getTeamPosForPoken().get(1)!=null&&teamPosManager.getTeamPosForPoken().get(1).size()>0){
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(1)){
playerTeamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
}
}
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);