注释删除
parent
2a24bf37df
commit
0181282032
|
|
@ -28,7 +28,6 @@ public class MongoPropertyConverter implements Converter<BasicDBObject, Property
|
|||
target = Equip.class;
|
||||
}
|
||||
String realJson = source.toJson(jsonWriterSettings);
|
||||
PropertyItem propertyItem = JSON.parseObject(realJson,target);
|
||||
return propertyItem;
|
||||
return JSON.parseObject(realJson,target);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1867,7 +1867,7 @@ public class PlayerLogic {
|
|||
}
|
||||
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().
|
||||
setLevel(yuxuHero.getYuXuLevel()).
|
||||
setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).
|
||||
// setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).
|
||||
setStar(yuxuHero.getStar()).
|
||||
setId(rpcHero.getId()).
|
||||
setHeroId(rpcHero.getTemplateId()).
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ public class CBean2Proto {
|
|||
.setStarBreakId(hero.getStarBreakId())
|
||||
.setCreateTime(hero.getCreateTime())
|
||||
.addAllEquipIdList(hero.getEquipByPositionMap().values())
|
||||
.setEspecialEquipLevel(hero.getEspecialEquipLevel())
|
||||
// .setEspecialEquipLevel(hero.getEspecialEquipLevel())
|
||||
.addAllSoulPos(soulPoss)
|
||||
.setLockState(hero.getIsLock())
|
||||
.addAllJewels(hero.getJewelInfo())
|
||||
|
|
@ -496,8 +496,8 @@ public class CBean2Proto {
|
|||
if(equip instanceof Jewel){
|
||||
Jewel tempEquip =(Jewel)equip;
|
||||
equipProto.setRebuildLevel(tempEquip.getBuildLevel())
|
||||
.setExp(tempEquip.getLevel())
|
||||
.setTreeLv(tempEquip.getGodTreeLv());
|
||||
.setExp(tempEquip.getLevel());
|
||||
// .setTreeLv(tempEquip.getGodTreeLv());
|
||||
}
|
||||
return equipProto.build();
|
||||
}
|
||||
|
|
@ -1325,7 +1325,7 @@ public class CBean2Proto {
|
|||
builder.setBreakId(yuxuHero.getBreakId());
|
||||
builder.setStarBreakId(yuxuHero.getStarBreakId());
|
||||
//显示真实的法宝等级
|
||||
builder.setEspecialEquipLevel(hero.getEspecialEquipLevel());
|
||||
// builder.setEspecialEquipLevel(hero.getEspecialEquipLevel());
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -500,12 +500,8 @@ public class FightDataUtil {
|
|||
}
|
||||
SSkillLogicVo sSkillLogicVo = SSkillLogicConfig.getsSkillLogicVo(Integer.parseInt(skillId));
|
||||
if (sSkillLogicVo != null && !sSkillLogicVo.getSkillTargetVoList().isEmpty()) {
|
||||
// float cd = sSkillLogicVo.getCd();
|
||||
// if(args!=null&&args.length>0){
|
||||
// cd+=Integer.parseInt(args[0]);
|
||||
// }
|
||||
skill.rawset(1, LuaValue.valueOf(skillId));
|
||||
int[][] display =sSkillLogicVo.getSkillDisplay();
|
||||
int[][] display = sSkillLogicVo.getSkillDisplay();
|
||||
int skillDisplay = display[0][0];
|
||||
for(int[] skillArray:display){
|
||||
if(skillArray[0]==skinId){
|
||||
|
|
@ -520,17 +516,31 @@ public class FightDataUtil {
|
|||
skill.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
|
||||
skill.rawset(3, LuaValue.valueOf(SkillDuration/1000f));
|
||||
skill.rawset(4, LuaValue.valueOf(SkillNumber));
|
||||
skill.rawset(5, getSkillNumberTime(sCombatControl.getSkillNumberTime()));
|
||||
skill.rawset(6, getEffectArgs(sCombatControl.getAttackDisplaceoffset()));
|
||||
List<LuaValue> effectList = getEffect(sSkillLogicVo);
|
||||
int size = effectList.size();
|
||||
if (size > 0) {
|
||||
for (int i = 0; i < size; i++) {
|
||||
skill.rawset(i + 5, effectList.get(i));
|
||||
skill.rawset(i + 7, effectList.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
return skill;
|
||||
}
|
||||
|
||||
private static LuaValue getSkillNumberTime(int[][] skillNumberTime) {
|
||||
LuaValue effect = new LuaTable();
|
||||
List<LuaValue> effectValueList = getEffectArgs(skillNumberTime);
|
||||
int size = effectValueList.size();
|
||||
if (size > 0) {
|
||||
for (int i = 0; i < size; i++) {
|
||||
effect.rawset(i + 1, effectValueList.get(i));
|
||||
}
|
||||
}
|
||||
return effect;
|
||||
}
|
||||
|
||||
private static List<LuaValue> getEffect(SSkillLogicVo sSkillLogicVo) {
|
||||
List<LuaValue> effectList = new ArrayList<>();
|
||||
for (SkillTargetVo skillTargetVos : sSkillLogicVo.getSkillTargetVoList()) {
|
||||
|
|
@ -552,11 +562,36 @@ public class FightDataUtil {
|
|||
List<LuaValue> effectValueList = new ArrayList<>();
|
||||
int sizeY = effects.length;
|
||||
if (sizeY > 0) {
|
||||
for (int i = 0; i < sizeY; i++) {
|
||||
int sizeX = effects[i].length;
|
||||
for (float[] effect : effects) {
|
||||
int sizeX = effect.length;
|
||||
LuaValue effectValue = new LuaTable();
|
||||
for (int j = 0; j < sizeX; j++) {
|
||||
effectValue.rawset(j + 1, LuaValue.valueOf(effects[i][j]));
|
||||
effectValue.rawset(j + 1, LuaValue.valueOf(effect[j]));
|
||||
}
|
||||
effectValueList.add(effectValue);
|
||||
}
|
||||
}
|
||||
return effectValueList;
|
||||
}
|
||||
|
||||
private static LuaValue getEffectArgs(float[] effects) {
|
||||
int sizeX = effects.length;
|
||||
LuaValue effectValue = new LuaTable();
|
||||
for (int j = 0; j < sizeX; j++) {
|
||||
effectValue.rawset(j + 1, LuaValue.valueOf(effects[j]));
|
||||
}
|
||||
return effectValue;
|
||||
}
|
||||
|
||||
private static List<LuaValue> getEffectArgs(int[][] effects) {
|
||||
List<LuaValue> effectValueList = new ArrayList<>();
|
||||
int sizeY = effects.length;
|
||||
if (sizeY > 0) {
|
||||
for (int[] effect : effects) {
|
||||
int sizeX = effect.length;
|
||||
LuaValue effectValue = new LuaTable();
|
||||
for (int j = 0; j < sizeX; j++) {
|
||||
effectValue.rawset(j + 1, LuaValue.valueOf(effect[j]));
|
||||
}
|
||||
effectValueList.add(effectValue);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,33 @@
|
|||
package config;
|
||||
|
||||
import manager.STableManager;
|
||||
import manager.Table;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Table(name ="CombatControl")
|
||||
public class SCombatControl implements BaseConfig {
|
||||
|
||||
private int id;
|
||||
private int id;
|
||||
|
||||
private int keyFrame;
|
||||
private int keyFrame;
|
||||
|
||||
private int skillDuration;
|
||||
private int skillDuration;
|
||||
|
||||
private int skillNumber;
|
||||
private int skillNumber;
|
||||
|
||||
@Override
|
||||
private int[][] skillNumberTime;
|
||||
|
||||
private float[] attackDisplaceoffset;
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public int getId() {
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getKeyFrame() {
|
||||
public int getKeyFrame() {
|
||||
return keyFrame;
|
||||
}
|
||||
|
||||
|
|
@ -37,4 +38,12 @@ public class SCombatControl implements BaseConfig {
|
|||
public int getSkillNumber() {
|
||||
return skillNumber;
|
||||
}
|
||||
|
||||
public int[][] getSkillNumberTime() {
|
||||
return skillNumberTime;
|
||||
}
|
||||
|
||||
public float[] getAttackDisplaceoffset() {
|
||||
return attackDisplaceoffset;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue