Unverified Commit 96caa7db authored by pfyy's avatar pfyy Committed by GitHub
Browse files

fix serenitea pot (#1726)

* partial fix of serenitea pot

* fix serenitea pot
parent 7dd0c899
...@@ -465,7 +465,7 @@ public class ResourceLoader { ...@@ -465,7 +465,7 @@ public class ResourceLoader {
} }
try { try {
var sceneId = Integer.parseInt(matcher.group(1)); var sceneId = Integer.parseInt(matcher.group(1));
var data = JsonUtils.loadToClass(filename, HomeworldDefaultSaveData.class); var data = JsonUtils.loadToClass(file.toString(), HomeworldDefaultSaveData.class);
GameData.getHomeworldDefaultSaveData().put(sceneId, data); GameData.getHomeworldDefaultSaveData().put(sceneId, data);
} catch (Exception ignored) {} } catch (Exception ignored) {}
}); });
...@@ -480,7 +480,7 @@ public class ResourceLoader { ...@@ -480,7 +480,7 @@ public class ResourceLoader {
return; return;
} }
try { try {
var data = JsonUtils.loadToClass(file.getFileName().toString(), SceneNpcBornData.class); var data = JsonUtils.loadToClass(file.toString(), SceneNpcBornData.class);
if (data.getBornPosList() == null || data.getBornPosList().size() == 0) { if (data.getBornPosList() == null || data.getBornPosList().size() == 0) {
return; return;
} }
......
...@@ -75,7 +75,7 @@ public class ItemData extends GameResource { ...@@ -75,7 +75,7 @@ public class ItemData extends GameResource {
private int comfort; private int comfort;
private List<Integer> furnType; private List<Integer> furnType;
private List<Integer> furnitureGadgetID; private List<Integer> furnitureGadgetID;
@SerializedName("JFDLJGDFIGL") @SerializedName(value="OHIANNAEEAK", alternate={"DANFGGLKLNO", "JFDLJGDFIGL"})
private int roomSceneId; private int roomSceneId;
// Custom // Custom
......
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