Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

yuanshuai 2021-12-02 17:35:31 +08:00
commit e84a1463c4
2 changed files with 2 additions and 5 deletions

View File

@ -2338,9 +2338,6 @@ public class HeroLogic {
public void getPracticeSkill(List<CommonProto.FightUnitInfo> infoList, public void getPracticeSkill(List<CommonProto.FightUnitInfo> infoList,
Map<Integer, Integer> practiceSkillMap, Map<Integer, Integer> practiceSkillMap,
long maxForce,int sex,int userLv,List<Integer> tfInfoList) { long maxForce,int sex,int userLv,List<Integer> tfInfoList) {
if (practiceSkillMap.isEmpty()) {
return;
}
StringBuilder skillStr = new StringBuilder(); StringBuilder skillStr = new StringBuilder();
// 修行技能 // 修行技能
for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) { for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) {

View File

@ -268,14 +268,14 @@ public class FightDataUtil {
for (int i = 0; i < pokemonUnitList.size(); i++) { for (int i = 0; i < pokemonUnitList.size(); i++) {
CommonProto.FightUnitInfo unitInfo=pokemonUnitList.get(i); CommonProto.FightUnitInfo unitInfo=pokemonUnitList.get(i);
String skillId = unitInfo.getUnitSkillIds(); String skillId = unitInfo.getUnitSkillIds();
if(skillId.equals("0")||skillId==""){ if(skillId.equals("0")|| StringUtil.isEmpty(skillId)){
continue; continue;
} }
///100代表是修行技能 ///100代表是修行技能
if (unitInfo.getPosition()==100){ if (unitInfo.getPosition()==100){
LuaValue monster = new LuaTable(); LuaValue monster = new LuaTable();
monster.set("id",0); monster.set("id",0);
monster.set("star",0); monster.set("star",unitInfo.getStar());
monster.set("teamDamage",unitInfo.getForceScore()); monster.set("teamDamage",unitInfo.getForceScore());
monster.set("camp",camp); monster.set("camp",camp);
monster.set("position",unitInfo.getPosition()); monster.set("position",unitInfo.getPosition());