Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
e84a1463c4
|
@ -2338,9 +2338,6 @@ public class HeroLogic {
|
|||
public void getPracticeSkill(List<CommonProto.FightUnitInfo> infoList,
|
||||
Map<Integer, Integer> practiceSkillMap,
|
||||
long maxForce,int sex,int userLv,List<Integer> tfInfoList) {
|
||||
if (practiceSkillMap.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
StringBuilder skillStr = new StringBuilder();
|
||||
// 修行技能
|
||||
for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) {
|
||||
|
|
|
@ -268,14 +268,14 @@ public class FightDataUtil {
|
|||
for (int i = 0; i < pokemonUnitList.size(); i++) {
|
||||
CommonProto.FightUnitInfo unitInfo=pokemonUnitList.get(i);
|
||||
String skillId = unitInfo.getUnitSkillIds();
|
||||
if(skillId.equals("0")||skillId==""){
|
||||
if(skillId.equals("0")|| StringUtil.isEmpty(skillId)){
|
||||
continue;
|
||||
}
|
||||
///100代表是修行技能
|
||||
if (unitInfo.getPosition()==100){
|
||||
LuaValue monster = new LuaTable();
|
||||
monster.set("id",0);
|
||||
monster.set("star",0);
|
||||
monster.set("star",unitInfo.getStar());
|
||||
monster.set("teamDamage",unitInfo.getForceScore());
|
||||
monster.set("camp",camp);
|
||||
monster.set("position",unitInfo.getPosition());
|
||||
|
|
Loading…
Reference in New Issue