Compare commits

..

No commits in common. "93b41ff5ab0584bdaac32f6d967613e5dfd5c2de" and "a167699b13d6fec21af2d333784377c4e5ac546d" have entirely different histories.

3 changed files with 11 additions and 24 deletions

View File

@ -11,7 +11,6 @@ import emu.grasscutter.utils.Utils;
import org.reflections.Reflections; import org.reflections.Reflections;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
@ -435,14 +434,8 @@ public class ResourceLoader {
public static class OpenConfigData { public static class OpenConfigData {
public String $type; public String $type;
public String abilityName; public String abilityName;
@SerializedName(value="talentIndex", alternate={"OJOFFKLNAHN"})
public int talentIndex; public int talentIndex;
@SerializedName(value="skillID", alternate={"overtime"})
public int skillID; public int skillID;
@SerializedName(value="pointDelta", alternate={"IGEBKIHPOIF"})
public int pointDelta; public int pointDelta;
} }
} }

View File

@ -1,7 +1,5 @@
package emu.grasscutter.data.common; package emu.grasscutter.data.common;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.DailyDungeonData; import emu.grasscutter.data.excels.DailyDungeonData;
@ -13,11 +11,7 @@ public class PointData {
private int id; private int id;
private String $type; private String $type;
private Position tranPos; private Position tranPos;
@SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
private int[] dungeonIds; private int[] dungeonIds;
@SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
private int[] dungeonRandomList; private int[] dungeonRandomList;
private int tranSceneId; private int tranSceneId;

View File

@ -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 {
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() {