Merge branch 'master_prb_gn' into master_test_gn
commit
20a26c4f7c
|
@ -753,7 +753,7 @@ public class FightUtil {
|
||||||
return CommonProto.FightTeamInfo.
|
return CommonProto.FightTeamInfo.
|
||||||
newBuilder()
|
newBuilder()
|
||||||
.addAllFightUnitList(heroFightInfos)
|
.addAllFightUnitList(heroFightInfos)
|
||||||
.addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager))
|
.addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager,csPlayer))
|
||||||
.setTeamPassiveList("")
|
.setTeamPassiveList("")
|
||||||
.setForceScore(crossArenaManager.getMaxHistoryForce())
|
.setForceScore(crossArenaManager.getMaxHistoryForce())
|
||||||
.build();
|
.build();
|
||||||
|
|
|
@ -27,6 +27,7 @@ import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler;
|
||||||
import com.ljsd.jieling.logic.activity.eventhandler.PokemonFiveStarGetEventHandler;
|
import com.ljsd.jieling.logic.activity.eventhandler.PokemonFiveStarGetEventHandler;
|
||||||
import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic;
|
import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
|
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
|
||||||
import com.ljsd.jieling.logic.dao.gm.ArenaOfHero;
|
import com.ljsd.jieling.logic.dao.gm.ArenaOfHero;
|
||||||
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
|
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
|
@ -2371,7 +2372,7 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
///获取修行技能数据
|
///获取修行技能数据
|
||||||
public void getPracticeSkill(List<CommonProto.FightUnitInfo> infoList, Map<Integer, Integer> practiceSkillMap,long maxForce) {
|
public void getPracticeSkill(List<CommonProto.FightUnitInfo> infoList, Map<Integer, Integer> practiceSkillMap,long maxForce,int sex,int userLv) {
|
||||||
if (practiceSkillMap.isEmpty()) {
|
if (practiceSkillMap.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -2390,8 +2391,10 @@ public class HeroLogic {
|
||||||
.setUnitSkillIds(skillStr.toString())
|
.setUnitSkillIds(skillStr.toString())
|
||||||
.setProperty("0")
|
.setProperty("0")
|
||||||
.setPosition(100)
|
.setPosition(100)
|
||||||
|
.setStar(userLv)
|
||||||
.setSkinId(0)
|
.setSkinId(0)
|
||||||
.setForceScore(maxForce)
|
.setForceScore(maxForce)
|
||||||
|
.setPlayerSex(sex)
|
||||||
.build();
|
.build();
|
||||||
infoList.add(skillInfo);
|
infoList.add(skillInfo);
|
||||||
}
|
}
|
||||||
|
@ -2431,7 +2434,7 @@ public class HeroLogic {
|
||||||
.build();
|
.build();
|
||||||
pokemonInfos.add(info);
|
pokemonInfos.add(info);
|
||||||
}
|
}
|
||||||
getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce());
|
getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel());
|
||||||
return pokemonInfos;
|
return pokemonInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2459,7 +2462,7 @@ public class HeroLogic {
|
||||||
return pokemonInfos;
|
return pokemonInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<CommonProto.FightUnitInfo> getCrossPokemon(CrossArenaManager crossArenaManager) {
|
public List<CommonProto.FightUnitInfo> getCrossPokemon(CrossArenaManager crossArenaManager, CSPlayer csPlayer) {
|
||||||
//todo 灵兽
|
//todo 灵兽
|
||||||
Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemonMap = crossArenaManager.getPokemons();
|
Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemonMap = crossArenaManager.getPokemons();
|
||||||
Map<Integer, String> teamMap = crossArenaManager.getPokemonTeamMap();
|
Map<Integer, String> teamMap = crossArenaManager.getPokemonTeamMap();
|
||||||
|
@ -2487,7 +2490,7 @@ public class HeroLogic {
|
||||||
.setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build();
|
.setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build();
|
||||||
pokemonInfos.add(info);
|
pokemonInfos.add(info);
|
||||||
}
|
}
|
||||||
getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce());
|
getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),csPlayer.getSex(),csPlayer.getLevel());
|
||||||
return pokemonInfos;
|
return pokemonInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2520,7 +2523,7 @@ public class HeroLogic {
|
||||||
.setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build();
|
.setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build();
|
||||||
pokemonInfos.add(info);
|
pokemonInfos.add(info);
|
||||||
}
|
}
|
||||||
getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce());
|
getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel());
|
||||||
return pokemonInfos;
|
return pokemonInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue