Skip to content

Commit

Permalink
Support giftPackage BatchUse
Browse files Browse the repository at this point in the history
Co-authored-by: pris <lilch1022@hotmail.com>
  • Loading branch information
2 people authored and Melledy committed May 3, 2022
1 parent 8c7681b commit 86e6eef
Show file tree
Hide file tree
Showing 14 changed files with 371 additions and 112 deletions.
153 changes: 153 additions & 0 deletions data/ShopChest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
[
{
"itemId": 115019,
"containsItem": [
{
"Id": 104002,
"Count": 40
},
{
"Id": 202,
"Count": 30000
}
]
},
{
"itemId": 115020,
"containsItem": [
{
"Id": 104013,
"Count": 25
},
{
"Id": 202,
"Count": 30000
}
]
},
{
"itemId": 115021,
"containsItem": [
{
"Id": 115013,
"Count": 5
},
{
"Id": 104003,
"Count": 40
},
{
"Id": 202,
"Count": 120000
}
]
},
{
"itemId": 115022,
"containsItem": [
{
"Id": 115017,
"Count": 25
},
{
"Id": 202,
"Count": 150000
}
]
},
{
"itemId": 115023,
"containsItem": [
{
"Id": 115025,
"Count": 10
},
{
"Id": 202,
"Count": 60000
}
]
},
{
"itemId": 115029,
"containsItem": [
{
"Id": 104013,
"Count": 100
},
{
"Id": 202,
"Count": 100000
}
]
},
{
"itemId": 115030,
"containsItem": [
{
"Id": 104003,
"Count": 12
},
{
"Id": 202,
"Count": 10000
}
]
},
{
"itemId": 115034,
"containsItem": [
{
"Id": 115013,
"Count": 6
},
{
"Id": 202,
"Count": 60000
}
]
},
{
"itemId": 115032,
"containsItem": [
{
"Id": 115024,
"Count": 12
}
]
},
{
"itemId": 115010,
"containsItem": [
{
"Id": 104002,
"Count": 80
},
{
"Id": 104012,
"Count": 40
}
]
},
{
"itemId": 115011,
"containsItem": [
{
"Id": 104003,
"Count": 50
},
{
"Id": 104013,
"Count": 25
},
{
"Id": 107009,
"Count": 1
},
{
"Id": 202,
"Count": 50000
}
]
}
]
55 changes: 55 additions & 0 deletions data/ShopChestBatchUse.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[
{
"itemId": 115017,
"optionItem": [
104302,
104305,
104308,
104311,
104314,
104317,
104321,
104324,
104327
]
},
{
"itemId": 115024,
"optionItem": [
114001,
114005,
114009,
114013,
114017,
114021,
114025,
114029,
114033
]
},
{
"itemId": 115013,
"optionItem": [
104112,
104122,
104142,
104152,
104162,
104172
]
},
{
"itemId": 115025,
"optionItem": [
114002,
114006,
114010,
114014,
114018,
114022,
114026,
114030,
114034
]
}
]
5 changes: 0 additions & 5 deletions src/main/java/emu/grasscutter/data/GameData.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public class GameData {
private static final Int2ObjectMap<FetterData> fetterDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<RewardBoxData> rewardBoxDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap = new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
Expand Down Expand Up @@ -264,10 +263,6 @@ public static Int2ObjectMap<RewardData> getRewardDataMap() {
return rewardDataMap;
}

public static Int2ObjectMap<RewardBoxData> getRewardBoxDataMap() {
return rewardBoxDataMap;
}

public static Map<Integer, List<Integer>> getFetterDataEntries() {
if (fetters.isEmpty()) {
fetterDataMap.forEach((k, v) -> {
Expand Down
22 changes: 0 additions & 22 deletions src/main/java/emu/grasscutter/data/common/RewardBoxItemData.java

This file was deleted.

27 changes: 0 additions & 27 deletions src/main/java/emu/grasscutter/data/def/RewardBoxData.java

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/java/emu/grasscutter/data/def/ShopGoodsData.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public class ShopGoodsData extends GameResource {
private transient ShopInfo.ShopRefreshType RefreshTypeEnum;

private int RefreshParam;
private int ShowId;

@Override
public void onLoad() {
Expand Down Expand Up @@ -106,8 +105,4 @@ public ShopInfo.ShopRefreshType getRefreshType() {
public int getRefreshParam() {
return RefreshParam;
}

public int getShowId() {
return ShowId;
}
}
11 changes: 0 additions & 11 deletions src/main/java/emu/grasscutter/game/inventory/GameItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ public class GameItem {
// Relic
private int mainPropId;
private List<Integer> appendPropIdList;

// shopMailBox
private int rewardBoxId;

private int equipCharacter;
@Transient private int weaponEntityId;
Expand Down Expand Up @@ -251,14 +248,6 @@ public void setMainPropId(int mainPropId) {
this.mainPropId = mainPropId;
}

public int getRewardBoxId() {
return rewardBoxId;
}

public void setRewardBoxId(int rewardBoxId) {
this.rewardBoxId = rewardBoxId;
}

public List<Integer> getAppendPropIdList() {
return appendPropIdList;
}
Expand Down
Loading

0 comments on commit 86e6eef

Please sign in to comment.