神魂功能战斗相关修改
parent
f39af137f9
commit
3e2455b84a
|
@ -269,6 +269,7 @@ public class BehaviorUtil {
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -331,6 +331,7 @@ public class FightUtil {
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
@ -398,6 +399,7 @@ public class FightUtil {
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
@ -438,6 +440,7 @@ public class FightUtil {
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
@ -661,6 +664,7 @@ public class FightUtil {
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
@ -707,6 +711,7 @@ public class FightUtil {
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv((hero.getGodSoulLv()))
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
@ -747,6 +752,7 @@ public class FightUtil {
|
||||||
.setPosition(teamPosHeroInfo.getPosition())
|
.setPosition(teamPosHeroInfo.getPosition())
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,6 +109,7 @@ public class SevenWorldFightHandler implements IFightEventProcesor {
|
||||||
.setStar(hero.getStar())
|
.setStar(hero.getStar())
|
||||||
.setSkinId(hero.getSkin())
|
.setSkinId(hero.getSkin())
|
||||||
.setForceScore(HeroLogic.getInstance().calTeamForce(user,teamId))
|
.setForceScore(HeroLogic.getInstance().calTeamForce(user,teamId))
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
.build();
|
.build();
|
||||||
heroFightInfos.add(heroFightInfo);
|
heroFightInfos.add(heroFightInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,7 @@ import java.math.BigDecimal;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.function.IntToDoubleFunction;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class HeroLogic {
|
public class HeroLogic {
|
||||||
|
@ -1932,15 +1933,10 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (hero.getGodSoulLv()>0){
|
||||||
//神魂技能
|
skillList.addAll(GetGodSoulSkill(hero.getTemplateId(),hero.getGodSoulLv()));
|
||||||
for (int i = 0; i < tempHero.getSoulSkill().length; i++) {
|
|
||||||
if (i<hero.getGodSoulLv()){
|
|
||||||
skillList.add(tempHero.getSoulSkill()[i][1]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return skillList;
|
return skillList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2310,6 +2306,14 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
sb.append(sPlayerHeadIcon.getSkill()[0][0]).append(DIVISION);
|
sb.append(sPlayerHeadIcon.getSkill()[0][0]).append(DIVISION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//神魂技能
|
||||||
|
if (hero.getGodSoulLv()>0) {
|
||||||
|
List<Integer>godSoulSkills= HeroLogic.getInstance().GetGodSoulSkill(hero.getTemplateId(),hero.getGodSoulLv());
|
||||||
|
for (Integer godSoulSkill : godSoulSkills) {
|
||||||
|
sb.append(godSoulSkill).append(DIVISION);
|
||||||
|
}
|
||||||
|
}
|
||||||
return sb;
|
return sb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5800,4 +5804,16 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///获取英雄神魂技能
|
||||||
|
public List<Integer> GetGodSoulSkill(int heroTId,int godSoulLv){
|
||||||
|
List<Integer>skillList=new ArrayList<>();
|
||||||
|
SCHero tempHero = SCHero.getsCHero().get(heroTId);
|
||||||
|
for (int[] ints : tempHero.getSoulSkill()) {
|
||||||
|
if (ints[0]<=godSoulLv){
|
||||||
|
skillList.add(ints[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return skillList;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -572,7 +572,13 @@ public class PlayerLogic {
|
||||||
Map<Integer, TaSuiHero> taSuiHeroMap = user.getHeroManager().getTaSuiHeroMap();
|
Map<Integer, TaSuiHero> taSuiHeroMap = user.getHeroManager().getTaSuiHeroMap();
|
||||||
for(Map.Entry<Integer,TaSuiHero> entry:taSuiHeroMap.entrySet()){
|
for(Map.Entry<Integer,TaSuiHero> entry:taSuiHeroMap.entrySet()){
|
||||||
TaSuiHero hero = entry.getValue();
|
TaSuiHero hero = entry.getValue();
|
||||||
CommonProto.TeamSimpleInfo info = CommonProto.TeamSimpleInfo.newBuilder().setHeroTid(hero.getTempId()).setLevel(hero.getLeve()).setStar(hero.getStar()).setPosition(entry.getKey()).setGodSoulLv(hero.getGodSoulLv()).build();
|
CommonProto.TeamSimpleInfo info = CommonProto.TeamSimpleInfo.newBuilder()
|
||||||
|
.setHeroTid(hero.getTempId())
|
||||||
|
.setLevel(hero.getLeve())
|
||||||
|
.setStar(hero.getStar())
|
||||||
|
.setPosition(entry.getKey())
|
||||||
|
.setGodSoulLv(hero.getGodSoulLv())
|
||||||
|
.build();
|
||||||
teamInfo.addTeam(info);
|
teamInfo.addTeam(info);
|
||||||
}
|
}
|
||||||
teamInfo.setTotalForce(user.getHeroManager().getTaSuiLingXiaoRankForce());
|
teamInfo.setTotalForce(user.getHeroManager().getTaSuiLingXiaoRankForce());
|
||||||
|
@ -1378,7 +1384,7 @@ public class PlayerLogic {
|
||||||
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().
|
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().
|
||||||
setLevel(hero.getLevel(user.getHeroManager()))
|
setLevel(hero.getLevel(user.getHeroManager()))
|
||||||
.setEspecialEquipLevel(hero.getEspecialEquipLevel())
|
.setEspecialEquipLevel(hero.getEspecialEquipLevel())
|
||||||
.setStar(hero.getStar()).setId(hero.getId())
|
.setStar(hero.getStar()).setId(hero.getId()).setGodSoulLv(hero.getGodSoulLv())
|
||||||
.setHeroId(hero.getTemplateId())
|
.setHeroId(hero.getTemplateId())
|
||||||
.setBreakId(hero.getBreakIdByHongMeng(user.getHeroManager()))
|
.setBreakId(hero.getBreakIdByHongMeng(user.getHeroManager()))
|
||||||
.setStarBreakId(hero.getStarBreakId());
|
.setStarBreakId(hero.getStarBreakId());
|
||||||
|
@ -1423,6 +1429,7 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
// 皮肤
|
// 皮肤
|
||||||
heroBuilder.setSkinId(hero.getSkin());
|
heroBuilder.setSkinId(hero.getSkin());
|
||||||
|
heroBuilder.setGodSoulLv(hero.getGodSoulLv());
|
||||||
// 英雄技能
|
// 英雄技能
|
||||||
int profession = SCHero.getsCHero().get(hero.getTemplateId()).getProfession();
|
int profession = SCHero.getsCHero().get(hero.getTemplateId()).getProfession();
|
||||||
int skill = user.getGuildMyInfo().getGuildSkill().getOrDefault(profession, 0);
|
int skill = user.getGuildMyInfo().getGuildSkill().getOrDefault(profession, 0);
|
||||||
|
@ -1471,6 +1478,7 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
// 皮肤
|
// 皮肤
|
||||||
heroBuilder.setSkinId(hero.getSkin());
|
heroBuilder.setSkinId(hero.getSkin());
|
||||||
|
heroBuilder.setGodSoulLv(hero.getGodSoulLv());
|
||||||
// 英雄技能
|
// 英雄技能
|
||||||
int profession = SCHero.getsCHero().get(hero.getTemplateId()).getProfession();
|
int profession = SCHero.getsCHero().get(hero.getTemplateId()).getProfession();
|
||||||
int skill = query.getGuildSkill().getOrDefault(profession, 0);
|
int skill = query.getGuildSkill().getOrDefault(profession, 0);
|
||||||
|
|
Loading…
Reference in New Issue