root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加神将神魂相关字段

back_recharge
yuanshuai 2021-10-26 16:26:35 +08:00
parent 7a445058d0
commit 30a3220741
12 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fightmanager/src/main/java/com/ljsd/fight/FamilyHeroInfo.java
View File

@ -9,6 +9,7 @@ public class FamilyHeroInfo {
private int star; private int star;
private Map<Integer,Long> attribute; private Map<Integer,Long> attribute;
private int position; private int position;
private int godSoulLv;
public int getTempleteId() { public int getTempleteId() {
return templeteId; return templeteId;
@ -22,6 +23,10 @@ public class FamilyHeroInfo {
return star; return star;
} }
public int getGodSoulLv() {
return godSoulLv;
}
public Map<Integer, Long> getAttribute() { public Map<Integer, Long> getAttribute() {
return attribute; return attribute;
} }
@ -47,12 +52,13 @@ public class FamilyHeroInfo {
} }
public FamilyHeroInfo(int templeteId, int level, int star, Map<Integer, Long> attribute, int position) { public FamilyHeroInfo(int templeteId, int level, int star, Map<Integer, Long> attribute, int position,int godSoulLv) {
this.templeteId = templeteId; this.templeteId = templeteId;
this.level = level; this.level = level;
this.star = star; this.star = star;
this.attribute = attribute; this.attribute = attribute;
this.position = position; this.position = position;
this.godSoulLv=godSoulLv;
} }
public FamilyHeroInfo(int templeteId, int level, int star, Map<Integer, Long> attribute) { public FamilyHeroInfo(int templeteId, int level, int star, Map<Integer, Long> attribute) {

2
serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java
View File

@ -137,7 +137,7 @@ public class TasuilingxiaoHandler extends BaseHandler<ActivityProto.Tasuilingxia
Map<Integer, TaSuiHero> heroMap = new HashMap<>(); Map<Integer, TaSuiHero> heroMap = new HashMap<>();
for(TeamPosHeroInfo hero:teamPosForHero){ for(TeamPosHeroInfo hero:teamPosForHero){
Hero myHero = user.getHeroManager().getHero(hero.getHeroId()); Hero myHero = user.getHeroManager().getHero(hero.getHeroId());
TaSuiHero taSuiHero = new TaSuiHero(myHero.getTemplateId(),myHero.getOriginalLevel(),myHero.getStar()); TaSuiHero taSuiHero = new TaSuiHero(myHero.getTemplateId(),myHero.getOriginalLevel(),myHero.getStar(),myHero.getGodSoulLv());
heroMap.put(hero.getPosition(),taSuiHero); heroMap.put(hero.getPosition(),taSuiHero);
} }
user.getHeroManager().setTaSuiHeroMap(heroMap); user.getHeroManager().setTaSuiHeroMap(heroMap);

2
serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java
View File

@ -165,6 +165,7 @@ public class ChampinGetHandler extends BaseHandler {
.setStar(familyHeroInfo.getStar()) .setStar(familyHeroInfo.getStar())
.setLevel(familyHeroInfo.getLevel()) .setLevel(familyHeroInfo.getLevel())
.setPosition(familyHeroInfo.getPosition()) .setPosition(familyHeroInfo.getPosition())
.setGodSoulLv(familyHeroInfo.getGodSoulLv())
.build() .build()
); );
} }
@ -201,6 +202,7 @@ public class ChampinGetHandler extends BaseHandler {
.setStar(familyHeroInfo.getStar()) .setStar(familyHeroInfo.getStar())
.setLevel(familyHeroInfo.getLevel()) .setLevel(familyHeroInfo.getLevel())
.setPosition(familyHeroInfo.getPosition()) .setPosition(familyHeroInfo.getPosition())
.setGodSoulLv(familyHeroInfo.getGodSoulLv())
.build() .build()
); );
} }

2
serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
View File

@ -197,6 +197,7 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
.setStar(familyHeroInfo.getStar()) .setStar(familyHeroInfo.getStar())
.setLevel(familyHeroInfo.getLevel()) .setLevel(familyHeroInfo.getLevel())
.setPosition(familyHeroInfo.getPosition()) .setPosition(familyHeroInfo.getPosition())
.setGodSoulLv(familyHeroInfo.getGodSoulLv())
.build() .build()
); );
} }
@ -234,6 +235,7 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
.setStar(familyHeroInfo.getStar()) .setStar(familyHeroInfo.getStar())
.setLevel(familyHeroInfo.getLevel()) .setLevel(familyHeroInfo.getLevel())
.setPosition(familyHeroInfo.getPosition()) .setPosition(familyHeroInfo.getPosition())
.setGodSoulLv(familyHeroInfo.getGodSoulLv())
.build() .build()
); );
} }

2
serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java
View File

@ -177,7 +177,7 @@ public class Cmd_role_gm extends GmRoleAbstract {
int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv(); int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv();
int robotLevel = sArenaRobotConfig.getRoleLv(); int robotLevel = sArenaRobotConfig.getRoleLv();
Map<Integer, Long> robotHeroAttribute = HeroLogic.getInstance().calRobotHeroAttribute(scHero, robotLevel, 0, differDemonsId, differDemonsLv, false); Map<Integer, Long> robotHeroAttribute = HeroLogic.getInstance().calRobotHeroAttribute(scHero, robotLevel, 0, differDemonsId, differDemonsLv, false);
heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute,inner++)); heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute,inner++,0));
// String property = HeroLogic.getInstance().getRobotHeroProperty(sArenaRobotConfig,scHero,propertySb,robotHeroAttribute).toString(); // String property = HeroLogic.getInstance().getRobotHeroProperty(sArenaRobotConfig,scHero,propertySb,robotHeroAttribute).toString();
} }

2
serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
View File

@ -73,7 +73,7 @@ public class BloodLogic {
} }
} }
int position = heroInfo.getPosition(); int position = heroInfo.getPosition();
heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(user.getHeroManager()),hero.getStar(), heroAttributeMap,position)); heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(user.getHeroManager()),hero.getStar(), heroAttributeMap,position,hero.getGodSoulLv()));
} }
return heroAllAttribute; return heroAllAttribute;
} }

9
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TaSuiHero.java
View File

@ -13,6 +13,8 @@ public class TaSuiHero {
private int star; private int star;
private int godSoulLv;
public int getTempId() { public int getTempId() {
return tempId; return tempId;
} }
@ -25,9 +27,14 @@ public class TaSuiHero {
return star; return star;
} }
public TaSuiHero(int tempId, int leve, int star) { public int getGodSoulLv() {
return godSoulLv;
}
public TaSuiHero(int tempId, int leve, int star,int godSoulLv) {
this.tempId = tempId; this.tempId = tempId;
this.leve = leve; this.leve = leve;
this.star = star; this.star = star;
this.godSoulLv=godSoulLv;
} }
} }

2
serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/BattleNode.java
View File

@ -200,7 +200,7 @@ public class BattleNode extends AbstractExpedition {
Map<Integer,Long> longAttribute = new HashMap<>(); Map<Integer,Long> longAttribute = new HashMap<>();
robotHeroAttribute.forEach((k,v)->longAttribute.put(k,(long)v)); robotHeroAttribute.forEach((k,v)->longAttribute.put(k,(long)v));
force+=HeroLogic.getInstance().calForce(longAttribute); force+=HeroLogic.getInstance().calForce(longAttribute);
heroAllAttribute.put(id.toString(), new FamilyHeroInfo(id, property.getId(), property.getStar(), longAttribute,innerPosition++)); heroAllAttribute.put(id.toString(), new FamilyHeroInfo(id, property.getId(), property.getStar(), longAttribute,innerPosition++,0));
} }
fightInfo.setForce(force); fightInfo.setForce(force);

2
serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/SpecialNode.java
View File

@ -70,7 +70,7 @@ public class SpecialNode extends AbstractExpedition {
int force = HeroLogic.getInstance().calForce(longAttribute); int force = HeroLogic.getInstance().calForce(longAttribute);
fightInfo.setForce(force); fightInfo.setForce(force);
//试炼节点 放到第二个位置上 //试炼节点 放到第二个位置上
heroAllAttribute.put(Integer.toString(heroId), new FamilyHeroInfo(heroId,level,robot.getStar(),longAttribute,2)); heroAllAttribute.put(Integer.toString(heroId), new FamilyHeroInfo(heroId,level,robot.getStar(),longAttribute,2,0));
fightInfo.updateHeroSkill(String.valueOf(heroId),skills.substring(0,skills.length()-1)); fightInfo.updateHeroSkill(String.valueOf(heroId),skills.substring(0,skills.length()-1));
// 获取灵兽信息 // 获取灵兽信息
SRobotProperty property = STableManager.getConfig(SRobotProperty.class).get(level); SRobotProperty property = STableManager.getConfig(SRobotProperty.class).get(level);

1
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java
View File

@ -131,6 +131,7 @@ public class GuildFightLogic {
.setHeroTid(familyHeroInfo.getTempleteId()) .setHeroTid(familyHeroInfo.getTempleteId())
.setStar(familyHeroInfo.getStar()) .setStar(familyHeroInfo.getStar())
.setLevel(familyHeroInfo.getLevel()) .setLevel(familyHeroInfo.getLevel())
.setGodSoulLv(familyHeroInfo.getGodSoulLv())
.build() .build()
); );
Map<Integer, Long> attribute = entry.getValue().getAttribute(); Map<Integer, Long> attribute = entry.getValue().getAttribute();

14
serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
View File

@ -572,7 +572,7 @@ 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()).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());
@ -634,7 +634,7 @@ public class PlayerLogic {
for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList().entrySet()){ for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList().entrySet()){
Integer heroTid = item.getKey(); Integer heroTid = item.getKey();
Integer heroStar = item.getValue().getStar(); Integer heroStar = item.getValue().getStar();
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).build()); teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).setGodSoulLv( item.getValue().getGodSoulLv()).build());
} }
oneInfo.setTeam(teamInfo); oneInfo.setTeam(teamInfo);
//TODO 玉虚论道三队伍 //TODO 玉虚论道三队伍
@ -734,7 +734,7 @@ public class PlayerLogic {
for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList().entrySet()){ for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList().entrySet()){
Integer heroTid = item.getKey(); Integer heroTid = item.getKey();
Integer heroStar = item.getValue().getStar(); Integer heroStar = item.getValue().getStar();
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).build()); teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).setGodSoulLv(item.getValue().getGodSoulLv()).build());
} }
teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce1()); teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce1());
@ -742,7 +742,7 @@ public class PlayerLogic {
for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList2().entrySet()){ for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList2().entrySet()){
Integer heroTid = item.getKey(); Integer heroTid = item.getKey();
Integer heroStar = item.getValue().getStar(); Integer heroStar = item.getValue().getStar();
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).build()); teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).setGodSoulLv(item.getValue().getGodSoulLv()).build());
} }
teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce2()); teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce2());
@ -750,7 +750,7 @@ public class PlayerLogic {
for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList3().entrySet()){ for(Map.Entry<Integer,CommonProto.Hero> item : sArenaRobotConfig.getHeroMapList3().entrySet()){
Integer heroTid = item.getKey(); Integer heroTid = item.getKey();
Integer heroStar = item.getValue().getStar(); Integer heroStar = item.getValue().getStar();
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).build()); teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).setGodSoulLv(item.getValue().getGodSoulLv()).build());
} }
teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce3()); teamInfo.setTotalForce(sArenaRobotConfig.getYxldTotalForce3());
} }
@ -774,7 +774,7 @@ 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()).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());
@ -899,6 +899,7 @@ public class PlayerLogic {
.setStar(hero.getStar()) .setStar(hero.getStar())
.setPosition(heroInfo.getPosition()) .setPosition(heroInfo.getPosition())
.setSkinId(hero.getSkin()) .setSkinId(hero.getSkin())
.setGodSoulLv(hero.getGodSoulLv())
.build()); .build());
} }
} }
@ -969,6 +970,7 @@ public class PlayerLogic {
.setStar(hero.getStar()) .setStar(hero.getStar())
.setPosition(heroInfo.getPosition()) .setPosition(heroInfo.getPosition())
.setSkinId(hero.getSkin()) .setSkinId(hero.getSkin())
.setGodSoulLv(hero.getGodSoulLv())
.build()); .build());
} }
} }

2
serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
View File

@ -1082,7 +1082,7 @@ public class CBean2Proto {
} }
public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(User user, Hero hero,int position){ public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(User user, Hero hero,int position){
return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel(user.getHeroManager())).setStar(hero.getStar()).setPosition(position).setSkinId(hero.getSkin()).build(); return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel(user.getHeroManager())).setStar(hero.getStar()).setPosition(position).setSkinId(hero.getSkin()).setGodSoulLv(hero.getGodSoulLv()).build();
} }
public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByPokeMon(Pokemon pokemon,int position){ public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByPokeMon(Pokemon pokemon,int position){
return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build(); return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build();