Commit 153280ea authored by Melledy's avatar Melledy
Browse files

Fix quest data parser

parent a23b29b6
...@@ -81,24 +81,24 @@ public class QuestData extends GameResource { ...@@ -81,24 +81,24 @@ public class QuestData extends GameResource {
} }
public void onLoad() { public void onLoad() {
this.acceptConditons = acceptCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new); this.acceptConditons = acceptCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
acceptCond = null; acceptCond = null;
this.finishConditons = finishCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new); this.finishConditons = finishCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
finishCond = null; finishCond = null;
this.failConditons = failCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new); this.failConditons = failCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
failCond = null; failCond = null;
} }
public class QuestParam { public class QuestParam {
QuestTrigger Type; QuestTrigger _type;
int[] Param; int[] _param;
String count; String _count;
} }
public class QuestExecParam { public class QuestExecParam {
QuestTrigger Type; QuestTrigger _type;
String[] Param; String[] _param;
String count; String _count;
} }
public static class QuestCondition { public static class QuestCondition {
...@@ -107,8 +107,8 @@ public class QuestData extends GameResource { ...@@ -107,8 +107,8 @@ public class QuestData extends GameResource {
private String count; private String count;
public QuestCondition(QuestParam param) { public QuestCondition(QuestParam param) {
this.type = param.Type; this.type = param._type;
this.param = param.Param; this.param = param._param;
} }
public QuestTrigger getType() { public QuestTrigger getType() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment