Toggles are not supposed to have modified duration.
Contributed by ver.
This commit is contained in:
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -258,7 +258,7 @@ public abstract class DocumentBase
|
|||||||
if (attrs.getNamedItem("time") != null)
|
if (attrs.getNamedItem("time") != null)
|
||||||
{
|
{
|
||||||
time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template));
|
time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template));
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()) && !((Skill) template).isToggle())
|
||||||
{
|
{
|
||||||
if (((Skill) template).getLevel() < 100)
|
if (((Skill) template).getLevel() < 100)
|
||||||
{
|
{
|
||||||
|
@@ -258,7 +258,7 @@ public abstract class DocumentBase
|
|||||||
if (attrs.getNamedItem("time") != null)
|
if (attrs.getNamedItem("time") != null)
|
||||||
{
|
{
|
||||||
time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template));
|
time = Integer.decode(getValue(attrs.getNamedItem("time").getNodeValue(), template));
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(((Skill) template).getId()) && !((Skill) template).isToggle())
|
||||||
{
|
{
|
||||||
if (((Skill) template).getLevel() < 100)
|
if (((Skill) template).getLevel() < 100)
|
||||||
{
|
{
|
||||||
|
@@ -236,7 +236,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalLevel = set.getInt("abnormalLevel", 0);
|
_abnormalLevel = set.getInt("abnormalLevel", 0);
|
||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -247,7 +247,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -237,7 +237,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalLevel = set.getInt("abnormalLevel", 0);
|
_abnormalLevel = set.getInt("abnormalLevel", 0);
|
||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -248,7 +248,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -239,7 +239,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -250,7 +250,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -238,7 +238,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -249,7 +249,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -239,7 +239,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -250,7 +250,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -239,7 +239,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -250,7 +250,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
@@ -239,7 +239,7 @@ public class Skill implements IIdentifiable
|
|||||||
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
_subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE);
|
||||||
int abnormalTime = set.getInt("abnormalTime", 0);
|
int abnormalTime = set.getInt("abnormalTime", 0);
|
||||||
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id))
|
if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id) && (_operateType != SkillOperateType.T))
|
||||||
{
|
{
|
||||||
if ((_level < 100) || (_level > 140))
|
if ((_level < 100) || (_level > 140))
|
||||||
{
|
{
|
||||||
@@ -250,7 +250,6 @@ public class Skill implements IIdentifiable
|
|||||||
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
abnormalTime += Config.SKILL_DURATION_LIST.get(_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_abnormalTime = abnormalTime;
|
_abnormalTime = abnormalTime;
|
||||||
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
|
||||||
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
|
||||||
|
Reference in New Issue
Block a user