技能皮肤修改
parent
9ee34bc002
commit
298d799594
|
@ -256,6 +256,7 @@ public class CBean2Proto {
|
||||||
monsterBuilder.setProperty(monsterPropertyList.toString());
|
monsterBuilder.setProperty(monsterPropertyList.toString());
|
||||||
monsterBuilder.setUnitSkillIds(monsterSkillList.toString());
|
monsterBuilder.setUnitSkillIds(monsterSkillList.toString());
|
||||||
monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId()));
|
monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId()));
|
||||||
|
monsterBuilder.setSkinId(sMonsterConfig.getSkinId());
|
||||||
return monsterBuilder;
|
return monsterBuilder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,17 +92,18 @@ public class FightDataUtil {
|
||||||
unitData.set("position",unitInfo.getPosition());
|
unitData.set("position",unitInfo.getPosition());
|
||||||
unitData.set("quality", sMonster.getQuality());
|
unitData.set("quality", sMonster.getQuality());
|
||||||
unitData.set("element",sMonster.getPropertyName());
|
unitData.set("element",sMonster.getPropertyName());
|
||||||
|
unitData.set("skinId",sMonster.getSkinId());
|
||||||
if (unitSkill.length==1){
|
if (unitSkill.length==1){
|
||||||
unitData.set("skill", getSkill(unitSkill[0]));
|
unitData.set("skill", getSkill(unitSkill[0],sMonster.getSkinId()));
|
||||||
unitData.set("superSkill", new LuaTable());
|
unitData.set("superSkill", new LuaTable());
|
||||||
unitData.set("passivity", new LuaTable());
|
unitData.set("passivity", new LuaTable());
|
||||||
}else if (unitSkill.length==2){
|
}else if (unitSkill.length==2){
|
||||||
unitData.set("skill", getSkill(unitSkill[0]));
|
unitData.set("skill", getSkill(unitSkill[0],sMonster.getSkinId()));
|
||||||
unitData.set("superSkill", getSkill(unitSkill[1]));
|
unitData.set("superSkill", getSkill(unitSkill[1],sMonster.getSkinId()));
|
||||||
unitData.set("passivity", new LuaTable());
|
unitData.set("passivity", new LuaTable());
|
||||||
}else {
|
}else {
|
||||||
unitData.set("skill", getSkill(unitSkill[0]));
|
unitData.set("skill", getSkill(unitSkill[0],sMonster.getSkinId()));
|
||||||
unitData.set("superSkill", getSkill(unitSkill[1]));
|
unitData.set("superSkill", getSkill(unitSkill[1],sMonster.getSkinId()));
|
||||||
unitData.set("passivity", getPassivity(unitSkill));
|
unitData.set("passivity", getPassivity(unitSkill));
|
||||||
}
|
}
|
||||||
unitData.set("ai", getMonsterAi(sMonster.getMonsterAi()));
|
unitData.set("ai", getMonsterAi(sMonster.getMonsterAi()));
|
||||||
|
@ -269,7 +270,7 @@ public class FightDataUtil {
|
||||||
}else{
|
}else{
|
||||||
triggerCondition.rawset(1,LuaValue.valueOf(0));
|
triggerCondition.rawset(1,LuaValue.valueOf(0));
|
||||||
}
|
}
|
||||||
oneSkill.set("effect",getSkill(String.valueOf(skillIDList[j])));
|
oneSkill.set("effect",getSkill(String.valueOf(skillIDList[j]),0));
|
||||||
oneSkill.set("triggerCondition",triggerCondition);
|
oneSkill.set("triggerCondition",triggerCondition);
|
||||||
|
|
||||||
oneSkill.set("maxCount",sSpiritAnimalSkill.getWarEffectCount()[j]);
|
oneSkill.set("maxCount",sSpiritAnimalSkill.getWarEffectCount()[j]);
|
||||||
|
@ -310,11 +311,11 @@ public class FightDataUtil {
|
||||||
unitData.set("position", data.getPosition());
|
unitData.set("position", data.getPosition());
|
||||||
unitData.set("element", hero.getPropertyName());
|
unitData.set("element", hero.getPropertyName());
|
||||||
|
|
||||||
unitData.set("skill", getSkill(skillIds[0]));
|
unitData.set("skill", getSkill(skillIds[0],data.getSkinId()));
|
||||||
if(skillIds.length == 1){
|
if(skillIds.length == 1){
|
||||||
unitData.set("superSkill", getSkill(null));
|
unitData.set("superSkill", getSkill(null,data.getSkinId()));
|
||||||
}else {
|
}else {
|
||||||
unitData.set("superSkill", getSkill(skillIds[1]));
|
unitData.set("superSkill", getSkill(skillIds[1],data.getSkinId()));
|
||||||
}
|
}
|
||||||
unitData.set("passivity", getPassivity(skillIds));
|
unitData.set("passivity", getPassivity(skillIds));
|
||||||
unitData.set("property", getProperty(property));
|
unitData.set("property", getProperty(property));
|
||||||
|
@ -331,7 +332,7 @@ public class FightDataUtil {
|
||||||
return property;
|
return property;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static LuaValue getSkill(String skillId,String...args) {
|
private static LuaValue getSkill(String skillId,int skinId) {
|
||||||
LuaValue skill = new LuaTable();
|
LuaValue skill = new LuaTable();
|
||||||
if (StringUtil.isEmpty(skillId)){
|
if (StringUtil.isEmpty(skillId)){
|
||||||
return skill;
|
return skill;
|
||||||
|
@ -343,7 +344,14 @@ public class FightDataUtil {
|
||||||
// cd+=Integer.parseInt(args[0]);
|
// cd+=Integer.parseInt(args[0]);
|
||||||
// }
|
// }
|
||||||
skill.rawset(1, LuaValue.valueOf(skillId));
|
skill.rawset(1, LuaValue.valueOf(skillId));
|
||||||
int skillDisplay =sSkillLogicVo.getSkillDisplay();
|
int[][] display =sSkillLogicVo.getSkillDisplay();
|
||||||
|
int skillDisplay = display[0][0];
|
||||||
|
for(int[] skillArray:display){
|
||||||
|
if(skillArray[0]==skinId){
|
||||||
|
skillDisplay = skillArray[1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
||||||
int KeyFrame = sCombatControl.getKeyFrame();
|
int KeyFrame = sCombatControl.getKeyFrame();
|
||||||
int SkillDuration = sCombatControl.getSkillDuration();
|
int SkillDuration = sCombatControl.getSkillDuration();
|
||||||
|
|
|
@ -58,6 +58,8 @@ public class SMonsterConfig implements BaseConfig {
|
||||||
|
|
||||||
private int[] monsterAi;
|
private int[] monsterAi;
|
||||||
|
|
||||||
|
private int skinId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -177,4 +179,8 @@ public class SMonsterConfig implements BaseConfig {
|
||||||
public int[] getMonsterAi() {
|
public int[] getMonsterAi() {
|
||||||
return monsterAi;
|
return monsterAi;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getSkinId() {
|
||||||
|
return skinId;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -24,7 +24,7 @@ public class SSkillLogicConfig implements BaseConfig {
|
||||||
|
|
||||||
private float cd;
|
private float cd;
|
||||||
|
|
||||||
private int skillDisplay;
|
private int[][] skillDisplay;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
|
@ -66,7 +66,7 @@ public class SSkillLogicConfig implements BaseConfig {
|
||||||
return cd;
|
return cd;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSkillDisplay() {
|
public int[][] getSkillDisplay() {
|
||||||
return skillDisplay;
|
return skillDisplay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue