日志去除
parent
1b345924de
commit
bece9581b3
|
@ -61,9 +61,9 @@ public class BloodLogic {
|
|||
Hero hero = heroManager.getHero(heroInfo.getHeroId());
|
||||
Map<Integer, Long> heroAttributeMap = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
|
||||
//加buff
|
||||
if(buffInfo!=null && buffInfo.length>0){
|
||||
for(int i = 0 ; i < buffInfo.length ; i++){
|
||||
heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]);
|
||||
if(buffInfo != null){
|
||||
for (int j : buffInfo) {
|
||||
heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap, j);
|
||||
}
|
||||
}
|
||||
int position = heroInfo.getPosition();
|
||||
|
|
|
@ -91,7 +91,7 @@ public class CombatLogic {
|
|||
SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(effectId);
|
||||
if( sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){
|
||||
if(effectId == HeroAttributeEnum.CurHpExtra.getPropertyId()){
|
||||
effectId = HeroAttributeEnum.CurHP.getPropertyId();
|
||||
effectId = HeroAttributeEnum.CurHP.getPropertyId();
|
||||
effectValue = (int) (value.get(HeroAttributeEnum.Hp.getPropertyId()) * effectValue/10000);
|
||||
}else{
|
||||
if(sPropertyConfig.getTargetPropertyId()!=0){
|
||||
|
|
|
@ -2710,10 +2710,11 @@ public class HeroLogic {
|
|||
heroAllAttribute.remove(HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId());
|
||||
heroAllAttribute.remove(HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId());
|
||||
}
|
||||
|
||||
// LOGGER.info("战力基础属性1=================={}",heroAllAttribute);
|
||||
// 总计算
|
||||
calInteractAdd(heroAllAttribute, isForce);
|
||||
heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(), heroAllAttribute.get(GlobalsDef.HP_TYPE));
|
||||
// LOGGER.info("战力基础属性2=================={}",heroAllAttribute);
|
||||
return heroAllAttribute;
|
||||
}
|
||||
|
||||
|
@ -3220,7 +3221,7 @@ public class HeroLogic {
|
|||
private void applyPassiveSkillAttribute(Map<Integer, Long> heroAllAttribute, Hero hero, int teamId, User user){
|
||||
// ...被动技能处理...
|
||||
Set<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero, teamId);
|
||||
LOGGER.info("战力技能============={}",heroSkillList);
|
||||
// LOGGER.info("战力技能============={}",heroSkillList);
|
||||
|
||||
// 大闹天宫队伍特殊处理
|
||||
if (teamId == TeamEnum.EXPEDITION_TEAM.getTeamId()) {
|
||||
|
@ -3313,15 +3314,15 @@ public class HeroLogic {
|
|||
if (targetPropertyId == 0) {
|
||||
continue;
|
||||
}
|
||||
SPropertyConfig stargetPro = SPropertyConfig.getsPropertyConfigByPID(targetPropertyId);
|
||||
if (stargetPro == null) {
|
||||
SPropertyConfig targetPro = SPropertyConfig.getsPropertyConfigByPID(targetPropertyId);
|
||||
if (targetPro == null) {
|
||||
continue;
|
||||
}
|
||||
int style = sPropertyConfig.getStyle();
|
||||
int effectValue = item.getValue().intValue();
|
||||
|
||||
//如果目标属性也是万分比 直接加
|
||||
if (style == GlobalsDef.ABSOLUTE_TYPE || stargetPro.getStyle() == GlobalsDef.PERCENT_TYPE) {
|
||||
if (style == GlobalsDef.ABSOLUTE_TYPE || targetPro.getStyle() == GlobalsDef.PERCENT_TYPE) {
|
||||
if (heroAllAttribute.containsKey(targetPropertyId)) {
|
||||
long targetValue = heroAllAttribute.getOrDefault(targetPropertyId, 0L);
|
||||
effectValue += targetValue;
|
||||
|
@ -3342,7 +3343,7 @@ public class HeroLogic {
|
|||
for (Map.Entry<Integer, Integer> item : propertyPercentMap.entrySet()) {
|
||||
Integer propertyId = item.getKey();
|
||||
Long propertyValue = heroAllAttribute.getOrDefault(propertyId, 0L);
|
||||
heroAllAttribute.put(propertyId, (BigDecimal.valueOf(propertyValue).multiply(BigDecimal.valueOf(item.getValue()).divide(BigDecimal.valueOf(10000f))).intValue() + propertyValue));
|
||||
heroAllAttribute.put(propertyId, BigDecimal.valueOf(propertyValue).multiply(BigDecimal.valueOf(item.getValue()).divide(BigDecimal.valueOf(10000f))).intValue() + propertyValue);
|
||||
}
|
||||
|
||||
Long maxHp = heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId());
|
||||
|
@ -3408,7 +3409,6 @@ public class HeroLogic {
|
|||
public int calForce(Map<Integer, Long> heroAllAttribute) {
|
||||
float forceNum = 0;//基础值
|
||||
float forceAdd = 0;//加成值
|
||||
// LOGGER.info("战力基础属性=================={}",heroAllAttribute);
|
||||
//战力计算
|
||||
for(Map.Entry<Integer, Long> item : heroAllAttribute.entrySet()){
|
||||
Integer propertyId = item.getKey();
|
||||
|
|
|
@ -71,7 +71,7 @@ public class ArchitectureUnLockHandler implements IEventHandler {
|
|||
// 浮生殿等级解锁
|
||||
ArchitectureInfo beforeInfo = infoMap.get(5);
|
||||
if (beforeInfo == null){
|
||||
LOGGER.info("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId());
|
||||
// LOGGER.info("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId());
|
||||
continue;
|
||||
}
|
||||
Integer level = Optional.ofNullable(levelMap.get(beforeInfo.getId())).map(SHomeLandLevel::getlevel).orElse(0);
|
||||
|
|
|
@ -28,7 +28,6 @@ public class PowerRiceRank extends AbstractRank implements IEventHandler {
|
|||
public PowerRiceRank(int type, String redisKey) {
|
||||
super(type, redisKey);
|
||||
Poster.getPoster().listenEvent(this, UserMainTeamForceEvent.class);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue