Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
7ae3da6636
|
@ -25,7 +25,7 @@ public class FightDataUtil {
|
|||
|
||||
LuaValue LuaTable = new LuaTable();
|
||||
LuaTable.set("uid",data);
|
||||
// LuaTable.set("enemyData", getEnemyData(monsterTeamList));
|
||||
// LuaTable.set("enemyData", getEnemyData(monsterTeamList));
|
||||
//
|
||||
// if (data.equals("") || data==null){
|
||||
// return new LuaTable();
|
||||
|
@ -99,6 +99,7 @@ public class FightDataUtil {
|
|||
SCHero hero = SCHero.getsCHero().get(sMonster.getMonsterId());
|
||||
if(hero!=null){
|
||||
unitData.set("job",hero.getJob());
|
||||
unitData.set("star",hero.getStar());
|
||||
}
|
||||
if (unitSkill.length==1){
|
||||
unitData.set("skill", getSkill(unitSkill[0],sMonster.getSkinId()));
|
||||
|
@ -389,6 +390,7 @@ public class FightDataUtil {
|
|||
unitData.set("property", getProperty(property));
|
||||
unitData.set("skinId",data.getSkinId());
|
||||
unitData.set("job",hero.getJob());
|
||||
unitData.set("star",data.getStar());
|
||||
return unitData;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue