Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 17:34:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

2.7 Merge

Browse Source
This commit is contained in:
Melledy
2022-06-17 23:36:16 -07:00
parent 30c7bb9443
commit 2915b14c1f
11 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java
View File

@@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;

15
src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
View File

@@ -1,4 +1,4 @@
package emu.grasscutter.data.custom;
package emu.grasscutter.data.binout;
import emu.grasscutter.utils.Position;
import lombok.AccessLevel;
@@ -7,13 +7,26 @@ import lombok.experimental.FieldDefaults;
import java.util.List;
import com.google.gson.annotations.SerializedName;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class SceneNpcBornEntry {
@SerializedName(value="id", alternate={"_id", "ID"})
int id;
@SerializedName(value="configId", alternate={"_configId"})
int configId;
@SerializedName(value="pos", alternate={"_pos"})
Position pos;
@SerializedName(value="rot", alternate={"_rot"})
Position rot;
@SerializedName(value="groupId", alternate={"_groupId"})
int groupId;
@SerializedName(value="suiteIdList", alternate={"_suiteIdList"})
List<Integer> suiteIdList;
}

30
src/main/java/emu/grasscutter/data/excels/GatherData.java
View File

@@ -1,45 +1,45 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "GatherExcelConfigData.json")
public class GatherData extends GameResource {
private int PointType;
private int Id;
private int GadgetId;
private int ItemId;
private int Cd; // Probably hours
private boolean IsForbidGuest;
private boolean InitDisableInteract;
private int pointType;
private int id;
private int gadgetId;
private int itemId;
private int cd; // Probably hours
private boolean isForbidGuest;
private boolean initDisableInteract;
@Override
public int getId() {
return this.PointType;
return this.pointType;
}
public int getGatherId() {
return Id;
return id;
}
public int getGadgetId() {
return GadgetId;
return gadgetId;
}
public int getItemId() {
return ItemId;
return itemId;
}
public int getCd() {
return Cd;
return cd;
}
public boolean isForbidGuest() {
return IsForbidGuest;
return isForbidGuest;
}
public boolean initDisableInteract() {
return InitDisableInteract;
return initDisableInteract;
}
@Override

18
src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java
View File

@@ -1,4 +1,4 @@
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@@ -9,17 +9,17 @@ import java.util.List;
@ResourceType(name = "InvestigationMonsterConfigData.json")
@Data
public class InvestigationMonsterData extends GameResource {
private int Id;
private int CityId;
private List<Integer> MonsterIdList;
private List<Integer> GroupIdList;
private int RewardPreviewId;
private String MapMarkCreateType;
private String MonsterCategory;
private int id;
private int cityId;
private List<Integer> monsterIdList;
private List<Integer> groupIdList;
private int rewardPreviewId;
private String mapMarkCreateType;
private String monsterCategory;
@Override
public int getId() {
return this.Id;
return this.id;
}
@Override