Merge branch 'develop'

lvxinran 2019-09-28 05:59:53 +08:00
commit 6cb28477c9
2 changed files with 5 additions and 1 deletions

View File

@ -38,6 +38,8 @@ import org.luaj.vm2.LuaValue;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.redis.core.ZSetOperations; import org.springframework.data.redis.core.ZSetOperations;
import java.util.*; import java.util.*;
@ -214,6 +216,7 @@ public class MapLogic {
} }
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo(); EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo();
if(endlessMapInfo.getSeason()!=endlessSeason){ if(endlessMapInfo.getSeason()!=endlessSeason){
StoreLogic.initOneStore(user,SEndlessMapConfig.sEndlessMapConfigMap.get(endlessMapId).getMapStoreId());
mapManager.updateEndlessSeason(endlessSeason); mapManager.updateEndlessSeason(endlessSeason);
mapManager.updateEndlessMapId(0); mapManager.updateEndlessMapId(0);
mapManager.endlessWalkCellSave(new HashSet<>()); mapManager.endlessWalkCellSave(new HashSet<>());
@ -258,7 +261,7 @@ public class MapLogic {
mapEnterResponse.setLeftTime(getLeftTime(user, true)); mapEnterResponse.setLeftTime(getLeftTime(user, true));
for (Map.Entry<Integer, Integer> buffEntry : mapManager.getFoodBufferMap().entrySet()) { for (Map.Entry<Integer, Integer> buffEntry : mapManager.getFoodBufferMap().entrySet()) {
if (buffEntry.getValue()==0||buffEntry.getValue()==-1) { if (buffEntry.getValue()==0) {
continue; continue;
} }
CommonProto.FoodBuffer foodBuffer = CBean2Proto.getFoodBuffer(buffEntry.getKey(), buffEntry.getValue()); CommonProto.FoodBuffer foodBuffer = CBean2Proto.getFoodBuffer(buffEntry.getKey(), buffEntry.getValue());

View File

@ -344,6 +344,7 @@ public class CBean2Proto {
CommonProto.Cell.Builder protoCell = CommonProto.Cell.newBuilder(); CommonProto.Cell.Builder protoCell = CommonProto.Cell.newBuilder();
protoCell.setPointId(cell.getPointId()); protoCell.setPointId(cell.getPointId());
protoCell.setCellId(cell.getCellId()); protoCell.setCellId(cell.getCellId());
protoCell.setMonsterForce(cell.getForce());
return protoCell.build(); return protoCell.build();
} }
public static MapInfoProto.TowerBuff getTowerBuff(TowerBuff towerBuff){ public static MapInfoProto.TowerBuff getTowerBuff(TowerBuff towerBuff){