back_recharge
jiahuiwen 2019-04-29 18:38:58 +08:00
commit ff7a87f8fd
4 changed files with 16 additions and 12 deletions

View File

@ -1263,10 +1263,6 @@ public class MapLogic {
if (crossInfo == null) {
crossInfo = new CrossInfo();
}
int beforTime = crossInfo.getLeastTime();
if (useTime < crossInfo.getLeastTime()) {
crossInfo.setLeastTime(useTime);
}
Set<Integer> stars = mapManager.getStars();
if (stars == null) {
stars = new HashSet<>();
@ -1277,8 +1273,12 @@ public class MapLogic {
if (useTime > 0 && useTime <= sChallengeConfig.getTime()) {
stars.add(STAR_2);
mapManager.setStars(stars);
}
if (useTime > 0 && useTime < crossInfo.getLeastTime()) {
crossInfo.setLeastTime(useTime);
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId());
int heroForces = 0;
crossInfo.getHeroIds().clear();
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
if (hero == null) {
@ -1288,11 +1288,11 @@ public class MapLogic {
crossInfo.getHeroIds().add(hero.getTemplateId());
}
crossInfo.setForces(heroForces);
}
SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId());
if (sChallengeMapConfig.getIfRank() == 1 && useTime > 0 && useTime < beforTime) {
String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapManager.getCurMapId()), false);
RedisUtil.getInstence().zsetAddOne(key, mapManager.getRootId(), useTime);
SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId());
if (sChallengeMapConfig.getIfRank() == 1) {
String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapManager.getCurMapId()), false);
RedisUtil.getInstence().zsetAddOne(key, mapManager.getRootId(), useTime);
}
}
mapManager.updateCrossInfoMap(mapManager.getCurMapId(), crossInfo);
}

View File

@ -120,6 +120,10 @@ public class Equip extends MongoBase {
for(Map.Entry<Integer,Integer> item : result.entrySet()){
int propertyId = item.getKey();
int value = item.getValue();
if(propertyValueByIdMap.containsKey(propertyId)){
propertyValueByIdMap.put(propertyId,propertyValueByIdMap.get(propertyId)+value);
continue;
}
if(secondValueByIdMap.containsKey(propertyId)){
secondValueByIdMap.put(propertyId,secondValueByIdMap.get(propertyId)+value);
}else{

View File

@ -752,6 +752,7 @@ public class HeroLogic {
combinedAttribute(propertyValueByIdMap,heroAllAttribute);
combinedAttribute(secondValueByIdMap,heroAllAttribute);
}
heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE));
return heroAllAttribute;
}

View File

@ -250,9 +250,8 @@ public class WorkShopLogic {
User user = UserManager.getUser(uid);
SWorkShopEquipmentConfig sWorkShopEquipmentConfig = SWorkShopEquipmentConfig.getsWorkShopEquipmentConfigMap().get(equipTid);
if(!checkIsUnlock(GlobalsDef.WORK_CREATE_TYPE,sWorkShopEquipmentConfig.getType(),user.getWorkShopController(),sWorkShopEquipmentConfig.getOpenRules())){
// MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开");
// return;
LOGGER.error("不匹配");
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开");
return;
}
int runesNum = sWorkShopEquipmentConfig.getRunesNum();
int[][] specialRunes = sWorkShopEquipmentConfig.getSpecialRunes();