lvxinran 2020-06-08 22:28:33 +08:00
commit f47764b1da
3 changed files with 21 additions and 3 deletions

View File

@ -1427,13 +1427,11 @@ public class HeroLogic{
if(teamId!=0){
int[][] elementEffect = CombatLogic.getInstance().elementEffect(user,teamId);
if (elementEffect!=null&&elementEffect.length>0){
combinedAttribute(elementEffect,heroAllAttribute);
}
}
//被动技能加成
List<Integer> heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId);
Map<Integer, Integer> heroSkillAdMap = new HashMap<>();
@ -1449,6 +1447,23 @@ public class HeroLogic{
heroSkillAdMap.clear();
}
//特权加成
int vipLevel = user.getPlayerInfoManager().getVipLevel();
SVipLevelConfig sVipLevelConfig = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel);
if(null!=sVipLevelConfig){
int[][] elementEffect =sVipLevelConfig.getProperty();
if (elementEffect!=null&&elementEffect.length>0) {
combinedAttribute(elementEffect,heroAllAttribute);
}
}
//移除非pvp队伍加成
if(teamId!=GlobalsDef.TEAM_ARENA_ATTACH&&teamId!=GlobalsDef.TEAM_ARENA_DEFENSE){
heroAllAttribute.remove(HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId());
heroAllAttribute.remove(HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId());
}
calInteractAdd(heroAllAttribute);
heroSkillList.forEach(skill->{

View File

@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.mission.MissionType;
public class RefreshMissionRoomMamager implements BaseDataManager{
@Override
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
data.refreshMrTimes++;
data.refreshMrTimes+=(int)parm[0];
return new CumulationData.Result(missionType);
}
}

View File

@ -71,4 +71,7 @@ public class SVipLevelConfig implements BaseConfig {
return money2vip;
}
public int[][] getProperty() {
return property;
}
}