mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-30 15:08:43 +00:00
Merge branch 'development' into dungeon-scripts
This commit is contained in:
commit
6673876abf
@ -108,6 +108,7 @@ There is a dummy user named "Server" in every player's friends list that you can
|
|||||||
| -------------- | ------------------------------------------------- | ------------------------- | ------------ | ------------------------------------------------------------ | ----------------------------------------------- |
|
| -------------- | ------------------------------------------------- | ------------------------- | ------------ | ------------------------------------------------------------ | ----------------------------------------------- |
|
||||||
| account | account <create\|delete> <username> [UID] | | Server only | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. | |
|
| account | account <create\|delete> <username> [UID] | | Server only | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. | |
|
||||||
| broadcast | broadcast <message> | server.broadcast | Both side | Sends a message to all the players. | b |
|
| broadcast | broadcast <message> | server.broadcast | Both side | Sends a message to all the players. | b |
|
||||||
|
| coop | coop <playerId> <target playerId> | server.coop | Both side | Forces someone to join the world of others. | |
|
||||||
| changescene | changescene <scene id> | player.changescene | Client only | Switch scenes by scene ID. | scene |
|
| changescene | changescene <scene id> | player.changescene | Client only | Switch scenes by scene ID. | scene |
|
||||||
| clearartifacts | clearartifacts | player.clearartifacts | Client only | Deletes all unequipped and unlocked level 0 artifacts, including 5-star rarity ones from your inventory. | clearart |
|
| clearartifacts | clearartifacts | player.clearartifacts | Client only | Deletes all unequipped and unlocked level 0 artifacts, including 5-star rarity ones from your inventory. | clearart |
|
||||||
| clearweapons | clearweapons | player.clearweapons | Client only | Deletes all unequipped and unlocked weapons, including 5-star rarity ones from your inventory. | clearwpns |
|
| clearweapons | clearweapons | player.clearweapons | Client only | Deletes all unequipped and unlocked weapons, including 5-star rarity ones from your inventory. | clearwpns |
|
||||||
@ -134,6 +135,7 @@ There is a dummy user named "Server" in every player's friends list that you can
|
|||||||
| stop | stop | server.stop | Both side | Stops the server | |
|
| stop | stop | server.stop | Both side | Stops the server | |
|
||||||
| talent | talent <talentID> <value> | player.settalent | Client only | Sets talent level for your currently selected character | |
|
| talent | talent <talentID> <value> | player.settalent | Client only | Sets talent level for your currently selected character | |
|
||||||
| teleport | teleport <x> <y> <z> | player.teleport | Client only | Change the player's position. | tp |
|
| teleport | teleport <x> <y> <z> | player.teleport | Client only | Change the player's position. | tp |
|
||||||
|
| tpall | | player.tpall | Client only | Teleports all players in your world to your position | |
|
||||||
| weather | weather <weatherID> <climateID> | player.weather | Client only | Changes the weather | w |
|
| weather | weather <weatherID> <climateID> | player.weather | Client only | Changes the weather | w |
|
||||||
|
|
||||||
### Bonus
|
### Bonus
|
||||||
|
@ -109,6 +109,7 @@ chmod +x gradlew
|
|||||||
| -------------- | -------------------------------------------- | ------------------------- | -------- | ------------------------------------------ | ----------------------------------------------- |
|
| -------------- | -------------------------------------------- | ------------------------- | -------- | ------------------------------------------ | ----------------------------------------------- |
|
||||||
| account | account <create\|delete> <用户名> [uid] | | 仅服务端 | 通过指定用户名和uid增删账户 | |
|
| account | account <create\|delete> <用户名> [uid] | | 仅服务端 | 通过指定用户名和uid增删账户 | |
|
||||||
| broadcast | broadcast <消息内容> | server.broadcast | 均可使用 | 给所有玩家发送公告 | b |
|
| broadcast | broadcast <消息内容> | server.broadcast | 均可使用 | 给所有玩家发送公告 | b |
|
||||||
|
| coop | coop <uid> <目标uid> | server.coop | 均可使用 | 强制某位玩家进入指定玩家的多人世界 | |
|
||||||
| changescene | changescene <场景ID> | player.changescene | 仅客户端 | 切换到指定场景 | scene |
|
| changescene | changescene <场景ID> | player.changescene | 仅客户端 | 切换到指定场景 | scene |
|
||||||
| clearartifacts | clearartifacts | player.clearartifacts | 仅客户端 | 删除所有未装备及未解锁的圣遗物,包括五星 | clearart |
|
| clearartifacts | clearartifacts | player.clearartifacts | 仅客户端 | 删除所有未装备及未解锁的圣遗物,包括五星 | clearart |
|
||||||
| clearweapons | clearweapons | player.clearweapons | 仅客户端 | 删除所有未装备及未解锁的武器,包括五星 | clearwp |
|
| clearweapons | clearweapons | player.clearweapons | 仅客户端 | 删除所有未装备及未解锁的武器,包括五星 | clearwp |
|
||||||
@ -135,6 +136,7 @@ chmod +x gradlew
|
|||||||
| stop | stop | server.stop | 均可使用 | 停止服务器 | |
|
| stop | stop | server.stop | 均可使用 | 停止服务器 | |
|
||||||
| talent | talent <天赋ID> <等级> | player.settalent | 仅客户端 | 设置当前角色的天赋等级 | |
|
| talent | talent <天赋ID> <等级> | player.settalent | 仅客户端 | 设置当前角色的天赋等级 | |
|
||||||
| teleport | teleport <x> <y> <z> | player.teleport | 仅客户端 | 传送玩家到指定坐标 | tp |
|
| teleport | teleport <x> <y> <z> | player.teleport | 仅客户端 | 传送玩家到指定坐标 | tp |
|
||||||
|
| tpall | | player.tpall | 仅客户端 | 传送多人世界中所有的玩家到自身地点 | |
|
||||||
| weather | weather <天气ID> <气候ID> | player.weather | 仅客户端 | 改变天气 | w |
|
| weather | weather <天气ID> <气候ID> | player.weather | 仅客户端 | 改变天气 | w |
|
||||||
|
|
||||||
### 额外功能
|
### 额外功能
|
||||||
|
11
proto/VehicleInteractReq.proto
Normal file
11
proto/VehicleInteractReq.proto
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "VehicleInteractType.proto";
|
||||||
|
|
||||||
|
message VehicleInteractReq {
|
||||||
|
uint32 entity_id = 1;
|
||||||
|
VehicleInteractType interact_type = 2;
|
||||||
|
uint32 pos = 3;
|
||||||
|
}
|
13
proto/VehicleInteractRsp.proto
Normal file
13
proto/VehicleInteractRsp.proto
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "VehicleInteractType.proto";
|
||||||
|
import "VehicleMember.proto";
|
||||||
|
|
||||||
|
message VehicleInteractRsp {
|
||||||
|
int32 retcode = 1;
|
||||||
|
uint32 entity_id = 2;
|
||||||
|
VehicleInteractType interact_type = 3;
|
||||||
|
VehicleMember member = 4;
|
||||||
|
}
|
9
proto/VehicleInteractType.proto
Normal file
9
proto/VehicleInteractType.proto
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
enum VehicleInteractType {
|
||||||
|
VEHICLE_INTERACT_NONE = 0;
|
||||||
|
VEHICLE_INTERACT_IN = 1;
|
||||||
|
VEHICLE_INTERACT_OUT = 2;
|
||||||
|
}
|
12
proto/VehicleSpawnReq.proto
Normal file
12
proto/VehicleSpawnReq.proto
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "Vector.proto";
|
||||||
|
|
||||||
|
message VehicleSpawnReq {
|
||||||
|
uint32 vehicleId = 1;
|
||||||
|
uint32 pointId = 2;
|
||||||
|
Vector pos = 3;
|
||||||
|
Vector rot = 4;
|
||||||
|
}
|
8
proto/VehicleSpawnRsp.proto
Normal file
8
proto/VehicleSpawnRsp.proto
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
message VehicleSpawnRsp {
|
||||||
|
uint32 vehicleId = 2;
|
||||||
|
uint32 entityId = 3;
|
||||||
|
}
|
8
proto/VehicleStaminaNotify.proto
Normal file
8
proto/VehicleStaminaNotify.proto
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
message VehicleStaminaNotify {
|
||||||
|
uint32 entity_id = 1;
|
||||||
|
float cur_stamina = 2;
|
||||||
|
}
|
@ -73,6 +73,10 @@ public final class Config {
|
|||||||
public boolean WatchGacha = false;
|
public boolean WatchGacha = false;
|
||||||
public int[] WelcomeEmotes = {2007, 1002, 4010};
|
public int[] WelcomeEmotes = {2007, 1002, 4010};
|
||||||
public String WelcomeMotd = "Welcome to Grasscutter emu";
|
public String WelcomeMotd = "Welcome to Grasscutter emu";
|
||||||
|
public String WelcomeMailContent = "Hi there!\r\nFirst of all, welcome to Grasscutter. If you have any issues, please let us know so that Lawnmower can help you! \r\n\r\nCheck out our:\r\n<type=\"browser\" text=\"Discord\" href=\"https://discord.gg/T5vZU6UyeG\"/> <type=\"browser\" text=\"GitHub\" href=\"https://github.com/Melledy/Grasscutter\"/>";
|
||||||
|
public int[] WelcomeMailItems = {13509};
|
||||||
|
|
||||||
|
public boolean EnableOfficialShop = true;
|
||||||
|
|
||||||
public GameRates Game = new GameRates();
|
public GameRates Game = new GameRates();
|
||||||
|
|
||||||
|
@ -0,0 +1,36 @@
|
|||||||
|
package emu.grasscutter.command.commands;
|
||||||
|
|
||||||
|
import emu.grasscutter.command.Command;
|
||||||
|
import emu.grasscutter.command.CommandHandler;
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Command(label = "coop", usage = "coop",
|
||||||
|
description = "Forces someone to join the world of others", permission = "server.coop")
|
||||||
|
public class CoopCommand implements CommandHandler {
|
||||||
|
@Override
|
||||||
|
public void execute(Player sender, List<String> args) {
|
||||||
|
if (args.size() < 2) {
|
||||||
|
CommandHandler.sendMessage(sender, "Usage: coop <playerId> <target playerId>");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
int tid = Integer.parseInt(args.get(0));
|
||||||
|
int hostId = Integer.parseInt(args.get(1));
|
||||||
|
Player host = sender.getServer().getPlayerByUid(hostId);
|
||||||
|
Player want = sender.getServer().getPlayerByUid(tid);
|
||||||
|
if (host == null || want == null) {
|
||||||
|
CommandHandler.sendMessage(sender, "Player is offline.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (want.isInMultiplayer()) {
|
||||||
|
sender.getServer().getMultiplayerManager().leaveCoop(want);
|
||||||
|
}
|
||||||
|
sender.getServer().getMultiplayerManager().applyEnterMp(want, hostId);
|
||||||
|
sender.getServer().getMultiplayerManager().applyEnterMpReply(host, tid, true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
CommandHandler.sendMessage(sender, "Player id is not valid.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,31 @@
|
|||||||
|
package emu.grasscutter.command.commands;
|
||||||
|
|
||||||
|
import emu.grasscutter.Grasscutter;
|
||||||
|
import emu.grasscutter.command.Command;
|
||||||
|
import emu.grasscutter.command.CommandHandler;
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Command(label = "resetshop", usage = "resetshop",
|
||||||
|
description = "Reset target player's shop refresh time.", permission = "server.resetshop")
|
||||||
|
public final class ResetShopLimitCommand implements CommandHandler {
|
||||||
|
@Override
|
||||||
|
public void execute(Player sender, List<String> args) {
|
||||||
|
if (args.size() < 1) {
|
||||||
|
CommandHandler.sendMessage(sender,"Usage: /resetshop <player id>");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int target = Integer.parseInt(args.get(0));
|
||||||
|
Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
|
||||||
|
if (targetPlayer == null) {
|
||||||
|
CommandHandler.sendMessage(sender, "Player not found.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
targetPlayer.getShopLimit().forEach(x -> x.setNextRefreshTime(0));
|
||||||
|
targetPlayer.save();
|
||||||
|
CommandHandler.sendMessage(sender, "Success");
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,31 @@
|
|||||||
|
package emu.grasscutter.command.commands;
|
||||||
|
|
||||||
|
import emu.grasscutter.command.Command;
|
||||||
|
import emu.grasscutter.command.CommandHandler;
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.utils.Position;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Command(label = "tpall", usage = "tpall",
|
||||||
|
description = "Teleports all players in your world to your position", permission = "player.tpall")
|
||||||
|
public class TpallCommand implements CommandHandler {
|
||||||
|
@Override
|
||||||
|
public void execute(Player sender, List<String> args) {
|
||||||
|
if (sender == null) {
|
||||||
|
CommandHandler.sendMessage(null, "Run this command in-game.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!sender.getWorld().isMultiplayer()) {
|
||||||
|
CommandHandler.sendMessage(sender, "You only can use this command in MP mode.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (Player gp : sender.getWorld().getPlayers()) {
|
||||||
|
if (gp.equals(sender))
|
||||||
|
continue;
|
||||||
|
Position pos = sender.getPos();
|
||||||
|
|
||||||
|
gp.getWorld().transferPlayerToScene(gp, sender.getSceneId(), pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -62,9 +62,13 @@ public class GameData {
|
|||||||
private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
|
private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
|
private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
|
private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
|
||||||
// Cache
|
// Cache
|
||||||
private static Map<Integer, List<Integer>> fetters = new HashMap<>();
|
private static Map<Integer, List<Integer>> fetters = new HashMap<>();
|
||||||
|
private static Map<Integer, List<ShopGoodsData>> shopGoods = new HashMap<>();
|
||||||
|
|
||||||
|
public static char EJWOA = 's';
|
||||||
|
|
||||||
public static Int2ObjectMap<?> getMapByResourceDef(Class<?> resourceDefinition) {
|
public static Int2ObjectMap<?> getMapByResourceDef(Class<?> resourceDefinition) {
|
||||||
Int2ObjectMap<?> map = null;
|
Int2ObjectMap<?> map = null;
|
||||||
@ -275,4 +279,16 @@ public class GameData {
|
|||||||
public static Int2ObjectMap<DungeonData> getDungeonDataMap() {
|
public static Int2ObjectMap<DungeonData> getDungeonDataMap() {
|
||||||
return dungeonDataMap;
|
return dungeonDataMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Map<Integer, List<ShopGoodsData>> getShopGoodsDataEntries() {
|
||||||
|
if (shopGoods.isEmpty()) {
|
||||||
|
shopGoodsDataMap.forEach((k, v) -> {
|
||||||
|
if (!shopGoods.containsKey(v.getShopType()))
|
||||||
|
shopGoods.put(v.getShopType(), new ArrayList<>());
|
||||||
|
shopGoods.get(v.getShopType()).add(v);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return shopGoods;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,12 @@ public class ItemParamData {
|
|||||||
private int Id;
|
private int Id;
|
||||||
private int Count;
|
private int Count;
|
||||||
|
|
||||||
|
public ItemParamData() {}
|
||||||
|
public ItemParamData(int id, int count) {
|
||||||
|
this.Id = id;
|
||||||
|
this.Count = count;
|
||||||
|
}
|
||||||
|
|
||||||
public int getId() {
|
public int getId() {
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,7 @@ public class GadgetData extends GameResource {
|
|||||||
private String InteeIconName;
|
private String InteeIconName;
|
||||||
private long NameTextMapHash;
|
private long NameTextMapHash;
|
||||||
private int CampID;
|
private int CampID;
|
||||||
|
private String LODPatternName;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getId() {
|
public int getId() {
|
||||||
@ -54,6 +55,8 @@ public class GadgetData extends GameResource {
|
|||||||
return CampID;
|
return CampID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getLODPatternName() { return LODPatternName; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
|
|
||||||
|
108
src/main/java/emu/grasscutter/data/def/ShopGoodsData.java
Normal file
108
src/main/java/emu/grasscutter/data/def/ShopGoodsData.java
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
package emu.grasscutter.data.def;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.GameResource;
|
||||||
|
import emu.grasscutter.data.ResourceType;
|
||||||
|
import emu.grasscutter.data.common.ItemParamData;
|
||||||
|
import emu.grasscutter.game.shop.ShopInfo;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@ResourceType(name = "ShopGoodsExcelConfigData.json")
|
||||||
|
public class ShopGoodsData extends GameResource {
|
||||||
|
private int GoodsId;
|
||||||
|
private int ShopType;
|
||||||
|
private int ItemId;
|
||||||
|
|
||||||
|
private int ItemCount;
|
||||||
|
|
||||||
|
private int CostScoin;
|
||||||
|
private int CostHcoin;
|
||||||
|
private int CostMcoin;
|
||||||
|
|
||||||
|
private List<ItemParamData> CostItems;
|
||||||
|
private int MinPlayerLevel;
|
||||||
|
private int MaxPlayerLevel;
|
||||||
|
|
||||||
|
private int BuyLimit;
|
||||||
|
private int SubTabId;
|
||||||
|
|
||||||
|
private String RefreshType;
|
||||||
|
private transient ShopInfo.ShopRefreshType RefreshTypeEnum;
|
||||||
|
|
||||||
|
private int RefreshParam;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onLoad() {
|
||||||
|
if (this.RefreshType == null)
|
||||||
|
this.RefreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
|
||||||
|
else {
|
||||||
|
this.RefreshTypeEnum = switch (this.RefreshType) {
|
||||||
|
case "SHOP_REFRESH_DAILY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_DAILY;
|
||||||
|
case "SHOP_REFRESH_WEEKLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_WEEKLY;
|
||||||
|
case "SHOP_REFRESH_MONTHLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_MONTHLY;
|
||||||
|
default -> ShopInfo.ShopRefreshType.NONE;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getId() {
|
||||||
|
return getGoodsId();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getGoodsId() {
|
||||||
|
return GoodsId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getShopType() {
|
||||||
|
return ShopType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getItemId() {
|
||||||
|
return ItemId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getItemCount() {
|
||||||
|
return ItemCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCostScoin() {
|
||||||
|
return CostScoin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCostHcoin() {
|
||||||
|
return CostHcoin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCostMcoin() {
|
||||||
|
return CostMcoin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemParamData> getCostItems() {
|
||||||
|
return CostItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMinPlayerLevel() {
|
||||||
|
return MinPlayerLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMaxPlayerLevel() {
|
||||||
|
return MaxPlayerLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getBuyLimit() {
|
||||||
|
return BuyLimit;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSubTabId() {
|
||||||
|
return SubTabId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ShopInfo.ShopRefreshType getRefreshType() {
|
||||||
|
return RefreshTypeEnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getRefreshParam() {
|
||||||
|
return RefreshParam;
|
||||||
|
}
|
||||||
|
}
|
@ -180,4 +180,6 @@ public final class DatabaseHelper {
|
|||||||
Filters.eq("friendId", friendship.getOwnerId())
|
Filters.eq("friendId", friendship.getOwnerId())
|
||||||
)).first();
|
)).first();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static char AWJVN = 'e';
|
||||||
}
|
}
|
||||||
|
@ -83,6 +83,9 @@ public class DropManager {
|
|||||||
ItemData itemData = GameData.getItemDataMap().get(dd.getItemId());
|
ItemData itemData = GameData.getItemDataMap().get(dd.getItemId());
|
||||||
int num = Utils.randomRange(dd.getMinCount(), dd.getMaxCount());
|
int num = Utils.randomRange(dd.getMinCount(), dd.getMaxCount());
|
||||||
|
|
||||||
|
if (itemData == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (itemData.isEquip()) {
|
if (itemData.isEquip()) {
|
||||||
for (int i = 0; i < num; i++) {
|
for (int i = 0; i < num; i++) {
|
||||||
float range = (5f + (.1f * num));
|
float range = (5f + (.1f * num));
|
||||||
|
124
src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
Normal file
124
src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
package emu.grasscutter.game.entity;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.game.props.EntityIdType;
|
||||||
|
import emu.grasscutter.game.props.PlayerProperty;
|
||||||
|
import emu.grasscutter.game.world.Scene;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
|
||||||
|
import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
|
||||||
|
import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
|
||||||
|
import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
|
||||||
|
import emu.grasscutter.net.proto.FightPropPairOuterClass.*;
|
||||||
|
import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
|
||||||
|
import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
|
||||||
|
import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
|
||||||
|
import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
|
||||||
|
import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
|
||||||
|
import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
|
||||||
|
import emu.grasscutter.net.proto.VectorOuterClass.Vector;
|
||||||
|
import emu.grasscutter.net.proto.VehicleInfoOuterClass.*;
|
||||||
|
|
||||||
|
import emu.grasscutter.utils.Position;
|
||||||
|
import emu.grasscutter.utils.ProtoHelper;
|
||||||
|
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2FloatMap;
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
|
||||||
|
|
||||||
|
public class EntityVehicle extends EntityGadget {
|
||||||
|
private final Player owner;
|
||||||
|
private final Int2FloatOpenHashMap fightProp;
|
||||||
|
|
||||||
|
private final Position pos;
|
||||||
|
private final Position rot;
|
||||||
|
|
||||||
|
private float curStamina;
|
||||||
|
private final int pointId;
|
||||||
|
private final int gadgetId;
|
||||||
|
|
||||||
|
public EntityVehicle(Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
|
||||||
|
super(scene);
|
||||||
|
this.owner = player;
|
||||||
|
this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
|
||||||
|
this.fightProp = new Int2FloatOpenHashMap();
|
||||||
|
this.pos = new Position(pos);
|
||||||
|
this.rot = new Position(rot);
|
||||||
|
this.gadgetId = gadgetId;
|
||||||
|
this.pointId = pointId;
|
||||||
|
this.curStamina = 240;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getGadgetId() { return gadgetId; }
|
||||||
|
|
||||||
|
public Player getOwner() {
|
||||||
|
return owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getCurStamina() { return curStamina; }
|
||||||
|
|
||||||
|
public void setCurStamina(float stamina) { this.curStamina = stamina; }
|
||||||
|
|
||||||
|
public int getPointId() { return pointId; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Int2FloatOpenHashMap getFightProperties() {
|
||||||
|
return fightProp;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Position getPosition() { return this.pos; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Position getRotation() {
|
||||||
|
return this.rot;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SceneEntityInfo toProto() {
|
||||||
|
|
||||||
|
VehicleInfo vehicle = VehicleInfo.newBuilder()
|
||||||
|
.setOwnerUid(this.owner.getUid())
|
||||||
|
.setCurStamina(getCurStamina())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
|
||||||
|
.setAbilityInfo(AbilitySyncStateInfo.newBuilder())
|
||||||
|
.setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
|
||||||
|
.setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(getPosition().toProto()))
|
||||||
|
.setBornPos(getPosition().toProto())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
|
||||||
|
.setGadgetId(this.getGadgetId())
|
||||||
|
.setAuthorityPeerId(this.getOwner().getPeerId())
|
||||||
|
.setIsEnableInteract(true)
|
||||||
|
.setVehicleInfo(vehicle);
|
||||||
|
|
||||||
|
SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
|
||||||
|
.setEntityId(getId())
|
||||||
|
.setEntityType(ProtEntityType.PROT_ENTITY_GADGET)
|
||||||
|
.setMotionInfo(MotionInfo.newBuilder().setPos(getPosition().toProto()).setRot(getRotation().toProto()).setSpeed(Vector.newBuilder()))
|
||||||
|
.addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
|
||||||
|
.setGadget(gadgetInfo)
|
||||||
|
.setEntityAuthorityInfo(authority)
|
||||||
|
.setLifeState(1);
|
||||||
|
|
||||||
|
PropPair pair = PropPair.newBuilder()
|
||||||
|
.setType(PlayerProperty.PROP_LEVEL.getId())
|
||||||
|
.setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 47))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
|
||||||
|
if (entry.getIntKey() == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
|
||||||
|
entityInfo.addFightPropList(fightProp);
|
||||||
|
}
|
||||||
|
|
||||||
|
entityInfo.addPropList(pair);
|
||||||
|
|
||||||
|
return entityInfo.build();
|
||||||
|
}
|
||||||
|
}
|
@ -21,6 +21,7 @@ import emu.grasscutter.game.inventory.Inventory;
|
|||||||
import emu.grasscutter.game.mail.Mail;
|
import emu.grasscutter.game.mail.Mail;
|
||||||
import emu.grasscutter.game.props.ActionReason;
|
import emu.grasscutter.game.props.ActionReason;
|
||||||
import emu.grasscutter.game.props.PlayerProperty;
|
import emu.grasscutter.game.props.PlayerProperty;
|
||||||
|
import emu.grasscutter.game.shop.ShopInfo;
|
||||||
import emu.grasscutter.game.shop.ShopLimit;
|
import emu.grasscutter.game.shop.ShopLimit;
|
||||||
import emu.grasscutter.game.world.Scene;
|
import emu.grasscutter.game.world.Scene;
|
||||||
import emu.grasscutter.game.world.World;
|
import emu.grasscutter.game.world.World;
|
||||||
@ -621,27 +622,26 @@ public class Player {
|
|||||||
return shopLimit;
|
return shopLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getGoodsLimitNum(int goodsId) {
|
public ShopLimit getGoodsLimit(int goodsId) {
|
||||||
for (ShopLimit sl : getShopLimit()) {
|
Optional<ShopLimit> shopLimit = this.shopLimit.stream().filter(x -> x.getShopGoodId() == goodsId).findFirst();
|
||||||
if (sl.getShopGoodId() == goodsId)
|
if (shopLimit.isEmpty())
|
||||||
return sl.getHasBought();
|
return null;
|
||||||
}
|
return shopLimit.get();
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addShopLimit(int goodsId, int boughtCount) {
|
public void addShopLimit(int goodsId, int boughtCount, int nextRefreshTime) {
|
||||||
boolean found = false;
|
ShopLimit target = getGoodsLimit(goodsId);
|
||||||
for (ShopLimit sl : getShopLimit()) {
|
if (target != null) {
|
||||||
if (sl.getShopGoodId() == goodsId){
|
target.setHasBought(target.getHasBought() + boughtCount);
|
||||||
sl.setHasBought(sl.getHasBought() + boughtCount);
|
target.setHasBoughtInPeriod(target.getHasBoughtInPeriod() + boughtCount);
|
||||||
found = true;
|
target.setNextRefreshTime(nextRefreshTime);
|
||||||
}
|
} else {
|
||||||
}
|
|
||||||
if (!found) {
|
|
||||||
ShopLimit sl = new ShopLimit();
|
ShopLimit sl = new ShopLimit();
|
||||||
sl.setShopGoodId(goodsId);
|
sl.setShopGoodId(goodsId);
|
||||||
sl.setHasBought(boughtCount);
|
sl.setHasBought(boughtCount);
|
||||||
shopLimit.add(sl);
|
sl.setHasBoughtInPeriod(boughtCount);
|
||||||
|
sl.setNextRefreshTime(nextRefreshTime);
|
||||||
|
getShopLimit().add(sl);
|
||||||
}
|
}
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package emu.grasscutter.game.shop;
|
package emu.grasscutter.game.shop;
|
||||||
|
|
||||||
import emu.grasscutter.data.common.ItemParamData;
|
import emu.grasscutter.data.common.ItemParamData;
|
||||||
|
import emu.grasscutter.data.def.ShopGoodsData;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -14,7 +15,6 @@ public class ShopInfo {
|
|||||||
private int buyLimit = 0;
|
private int buyLimit = 0;
|
||||||
private int beginTime = 0;
|
private int beginTime = 0;
|
||||||
private int endTime = 1924992000;
|
private int endTime = 1924992000;
|
||||||
private int nextRefreshTime = 1924992000;
|
|
||||||
private int minLevel = 0;
|
private int minLevel = 0;
|
||||||
private int maxLevel = 61;
|
private int maxLevel = 61;
|
||||||
private List<Integer> preGoodsIdList = new ArrayList<>();
|
private List<Integer> preGoodsIdList = new ArrayList<>();
|
||||||
@ -23,6 +23,43 @@ public class ShopInfo {
|
|||||||
private int disableType = 0;
|
private int disableType = 0;
|
||||||
private int secondarySheetId = 0;
|
private int secondarySheetId = 0;
|
||||||
|
|
||||||
|
private String refreshType;
|
||||||
|
|
||||||
|
public enum ShopRefreshType {
|
||||||
|
NONE(0),
|
||||||
|
SHOP_REFRESH_DAILY(1),
|
||||||
|
SHOP_REFRESH_WEEKLY(2),
|
||||||
|
SHOP_REFRESH_MONTHLY(3);
|
||||||
|
|
||||||
|
private final int value;
|
||||||
|
ShopRefreshType(int value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int value() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private transient ShopRefreshType shopRefreshType;
|
||||||
|
private int shopRefreshParam;
|
||||||
|
|
||||||
|
public ShopInfo(ShopGoodsData sgd) {
|
||||||
|
this.goodsId = sgd.getGoodsId();
|
||||||
|
this.goodsItem = new ItemParamData(sgd.getItemId(), sgd.getItemCount());
|
||||||
|
this.scoin = sgd.getCostScoin();
|
||||||
|
this.mcoin = sgd.getCostMcoin();
|
||||||
|
this.hcoin = sgd.getCostHcoin();
|
||||||
|
this.buyLimit = sgd.getBuyLimit();
|
||||||
|
|
||||||
|
this.minLevel = sgd.getMinPlayerLevel();
|
||||||
|
this.maxLevel = sgd.getMaxPlayerLevel();
|
||||||
|
this.costItemList = sgd.getCostItems().stream().filter(x -> x.getId() != 0).map(x -> new ItemParamData(x.getId(), x.getCount())).toList();
|
||||||
|
this.secondarySheetId = sgd.getSubTabId();
|
||||||
|
this.shopRefreshType = sgd.getRefreshType();
|
||||||
|
this.shopRefreshParam = sgd.getRefreshParam();
|
||||||
|
}
|
||||||
|
|
||||||
public int getHcoin() {
|
public int getHcoin() {
|
||||||
return hcoin;
|
return hcoin;
|
||||||
}
|
}
|
||||||
@ -127,14 +164,6 @@ public class ShopInfo {
|
|||||||
this.endTime = endTime;
|
this.endTime = endTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNextRefreshTime() {
|
|
||||||
return nextRefreshTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNextRefreshTime(int nextRefreshTime) {
|
|
||||||
this.nextRefreshTime = nextRefreshTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getMinLevel() {
|
public int getMinLevel() {
|
||||||
return minLevel;
|
return minLevel;
|
||||||
}
|
}
|
||||||
@ -150,4 +179,27 @@ public class ShopInfo {
|
|||||||
public void setMaxLevel(int maxLevel) {
|
public void setMaxLevel(int maxLevel) {
|
||||||
this.maxLevel = maxLevel;
|
this.maxLevel = maxLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ShopRefreshType getShopRefreshType() {
|
||||||
|
if (refreshType == null)
|
||||||
|
return ShopRefreshType.NONE;
|
||||||
|
return switch (refreshType) {
|
||||||
|
case "SHOP_REFRESH_DAILY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_DAILY;
|
||||||
|
case "SHOP_REFRESH_WEEKLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_WEEKLY;
|
||||||
|
case "SHOP_REFRESH_MONTHLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_MONTHLY;
|
||||||
|
default -> ShopInfo.ShopRefreshType.NONE;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setShopRefreshType(ShopRefreshType shopRefreshType) {
|
||||||
|
this.shopRefreshType = shopRefreshType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getShopRefreshParam() {
|
||||||
|
return shopRefreshParam;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setShopRefreshParam(int shopRefreshParam) {
|
||||||
|
this.shopRefreshParam = shopRefreshParam;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,24 @@ public class ShopLimit {
|
|||||||
this.hasBought = hasBought;
|
this.hasBought = hasBought;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getNextRefreshTime() {
|
||||||
|
return nextRefreshTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNextRefreshTime(int nextRefreshTime) {
|
||||||
|
this.nextRefreshTime = nextRefreshTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getHasBoughtInPeriod() {
|
||||||
|
return hasBoughtInPeriod;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setHasBoughtInPeriod(int hasBoughtInPeriod) {
|
||||||
|
this.hasBoughtInPeriod = hasBoughtInPeriod;
|
||||||
|
}
|
||||||
|
|
||||||
private int shopGoodId;
|
private int shopGoodId;
|
||||||
private int hasBought;
|
private int hasBought;
|
||||||
|
private int hasBoughtInPeriod = 0;
|
||||||
|
private int nextRefreshTime = 0;
|
||||||
}
|
}
|
||||||
|
@ -2,12 +2,20 @@ package emu.grasscutter.game.shop;
|
|||||||
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.data.common.ItemParamData;
|
||||||
|
import emu.grasscutter.data.def.ShopGoodsData;
|
||||||
|
import emu.grasscutter.net.proto.ItemParamOuterClass;
|
||||||
|
import emu.grasscutter.net.proto.ShopGoodsOuterClass;
|
||||||
import emu.grasscutter.server.game.GameServer;
|
import emu.grasscutter.server.game.GameServer;
|
||||||
|
import emu.grasscutter.utils.Utils;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
|
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ShopManager {
|
public class ShopManager {
|
||||||
@ -25,18 +33,57 @@ public class ShopManager {
|
|||||||
this.load();
|
this.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final int REFRESH_HOUR = 4; // In GMT+8 server
|
||||||
|
private static final String TIME_ZONE = "Asia/Shanghai"; // GMT+8 Timezone
|
||||||
|
|
||||||
|
public static int getShopNextRefreshTime(ShopInfo shopInfo) {
|
||||||
|
return switch (shopInfo.getShopRefreshType()) {
|
||||||
|
case SHOP_REFRESH_DAILY -> Utils.GetNextTimestampOfThisHour(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
|
||||||
|
case SHOP_REFRESH_WEEKLY -> Utils.GetNextTimestampOfThisHourInNextWeek(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
|
||||||
|
case SHOP_REFRESH_MONTHLY -> Utils.GetNextTimestampOfThisHourInNextMonth(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
|
||||||
|
default -> 0;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public synchronized void load() {
|
public synchronized void load() {
|
||||||
try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "Shop.json")) {
|
try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "Shop.json")) {
|
||||||
getShopData().clear();
|
getShopData().clear();
|
||||||
List<ShopTable> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ShopTable.class).getType());
|
List<ShopTable> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ShopTable.class).getType());
|
||||||
if(banners.size() > 0) {
|
if(banners.size() > 0) {
|
||||||
for (ShopTable shopTable : banners) {
|
for (ShopTable shopTable : banners) {
|
||||||
|
for (ShopInfo cost : shopTable.getItems()) {
|
||||||
|
if (cost.getCostItemList() != null) {
|
||||||
|
Iterator<ItemParamData> iterator = cost.getCostItemList().iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
ItemParamData ipd = iterator.next();
|
||||||
|
if (ipd.getId() == 201) {
|
||||||
|
cost.setHcoin(cost.getHcoin() + ipd.getCount());
|
||||||
|
iterator.remove();
|
||||||
|
}
|
||||||
|
if (ipd.getId() == 203) {
|
||||||
|
cost.setMcoin(cost.getMcoin() + ipd.getCount());
|
||||||
|
iterator.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
getShopData().put(shopTable.getShopId(), shopTable.getItems());
|
getShopData().put(shopTable.getShopId(), shopTable.getItems());
|
||||||
}
|
}
|
||||||
Grasscutter.getLogger().info("Shop data successfully loaded.");
|
Grasscutter.getLogger().info("Shop data successfully loaded.");
|
||||||
} else {
|
} else {
|
||||||
Grasscutter.getLogger().error("Unable to load shop data. Shop data size is 0.");
|
Grasscutter.getLogger().error("Unable to load shop data. Shop data size is 0.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Grasscutter.getConfig().getGameServerOptions().EnableOfficialShop) {
|
||||||
|
GameData.getShopGoodsDataEntries().forEach((k, v) -> {
|
||||||
|
if (!getShopData().containsKey(k.intValue()))
|
||||||
|
getShopData().put(k.intValue(), new ArrayList<>());
|
||||||
|
for (ShopGoodsData sgd : v) {
|
||||||
|
var shopInfo = new ShopInfo(sgd);
|
||||||
|
getShopData().get(k.intValue()).add(shopInfo);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
@ -3,6 +3,7 @@ package emu.grasscutter.net.packet;
|
|||||||
public class PacketOpcodes {
|
public class PacketOpcodes {
|
||||||
// Empty
|
// Empty
|
||||||
public static final int NONE = 0;
|
public static final int NONE = 0;
|
||||||
|
public static final char ONLWE = 'u';
|
||||||
|
|
||||||
// Opcodes
|
// Opcodes
|
||||||
public static final int AbilityChangeNotify = 1179;
|
public static final int AbilityChangeNotify = 1179;
|
||||||
@ -1171,6 +1172,11 @@ public class PacketOpcodes {
|
|||||||
public static final int UseWidgetCreateGadgetRsp = 4290;
|
public static final int UseWidgetCreateGadgetRsp = 4290;
|
||||||
public static final int UseWidgetRetractGadgetReq = 4255;
|
public static final int UseWidgetRetractGadgetReq = 4255;
|
||||||
public static final int UseWidgetRetractGadgetRsp = 4297;
|
public static final int UseWidgetRetractGadgetRsp = 4297;
|
||||||
|
public static final int VehicleSpawnReq = 809;
|
||||||
|
public static final int VehicleSpawnRsp = 865;
|
||||||
|
public static final int VehicleInteractReq = 862;
|
||||||
|
public static final int VehicleInteractRsp = 889;
|
||||||
|
public static final int VehicleStaminaNotify = 866;
|
||||||
public static final int ViewCodexReq = 4210;
|
public static final int ViewCodexReq = 4210;
|
||||||
public static final int ViewCodexRsp = 4209;
|
public static final int ViewCodexRsp = 4209;
|
||||||
public static final int WatcherAllDataNotify = 2260;
|
public static final int WatcherAllDataNotify = 2260;
|
||||||
|
@ -1,9 +1,13 @@
|
|||||||
package emu.grasscutter.server.packet.recv;
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.data.common.ItemParamData;
|
||||||
import emu.grasscutter.game.inventory.GameItem;
|
import emu.grasscutter.game.inventory.GameItem;
|
||||||
import emu.grasscutter.game.props.ActionReason;
|
import emu.grasscutter.game.props.ActionReason;
|
||||||
import emu.grasscutter.game.props.PlayerProperty;
|
import emu.grasscutter.game.props.PlayerProperty;
|
||||||
|
import emu.grasscutter.game.shop.ShopInfo;
|
||||||
|
import emu.grasscutter.game.shop.ShopLimit;
|
||||||
|
import emu.grasscutter.game.shop.ShopManager;
|
||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
import emu.grasscutter.net.packet.PacketHandler;
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
@ -13,9 +17,11 @@ import emu.grasscutter.net.proto.ShopGoodsOuterClass;
|
|||||||
import emu.grasscutter.server.game.GameSession;
|
import emu.grasscutter.server.game.GameSession;
|
||||||
import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
|
import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
|
||||||
import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
|
import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
|
||||||
|
import emu.grasscutter.utils.Utils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Opcodes(PacketOpcodes.BuyGoodsReq)
|
@Opcodes(PacketOpcodes.BuyGoodsReq)
|
||||||
@ -24,8 +30,34 @@ public class HandlerBuyGoodsReq extends PacketHandler {
|
|||||||
@Override
|
@Override
|
||||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
BuyGoodsReqOuterClass.BuyGoodsReq buyGoodsReq = BuyGoodsReqOuterClass.BuyGoodsReq.parseFrom(payload);
|
BuyGoodsReqOuterClass.BuyGoodsReq buyGoodsReq = BuyGoodsReqOuterClass.BuyGoodsReq.parseFrom(payload);
|
||||||
|
List<ShopInfo> configShop = session.getServer().getShopManager().getShopData().get(buyGoodsReq.getShopType());
|
||||||
|
if (configShop == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Don't trust your users' input
|
||||||
|
List<Integer> targetShopGoodsId = buyGoodsReq.getGoodsListList().stream().map(ShopGoodsOuterClass.ShopGoods::getGoodsId).toList();
|
||||||
|
for (int goodsId : targetShopGoodsId) {
|
||||||
|
Optional<ShopInfo> sg2 = configShop.stream().filter(x -> x.getGoodsId() == goodsId).findFirst();
|
||||||
|
if (sg2.isEmpty())
|
||||||
|
continue;
|
||||||
|
ShopInfo sg = sg2.get();
|
||||||
|
|
||||||
|
int currentTs = Utils.getCurrentSeconds();
|
||||||
|
ShopLimit shopLimit = session.getPlayer().getGoodsLimit(sg.getGoodsId());
|
||||||
|
int bought = 0;
|
||||||
|
if (shopLimit != null) {
|
||||||
|
if (currentTs > shopLimit.getNextRefreshTime()) {
|
||||||
|
shopLimit.setNextRefreshTime(ShopManager.getShopNextRefreshTime(sg));
|
||||||
|
} else {
|
||||||
|
bought = shopLimit.getHasBoughtInPeriod();
|
||||||
|
}
|
||||||
|
session.getPlayer().save();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bought + buyGoodsReq.getBoughtNum() > sg.getBuyLimit()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (ShopGoodsOuterClass.ShopGoods sg : buyGoodsReq.getGoodsListList()) {
|
|
||||||
if (sg.getScoin() > 0 && session.getPlayer().getMora() < buyGoodsReq.getBoughtNum() * sg.getScoin()) {
|
if (sg.getScoin() > 0 && session.getPlayer().getMora() < buyGoodsReq.getBoughtNum() * sg.getScoin()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -37,12 +69,14 @@ public class HandlerBuyGoodsReq extends PacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
HashMap<GameItem, Integer> itemsCache = new HashMap<>();
|
HashMap<GameItem, Integer> itemsCache = new HashMap<>();
|
||||||
for (ItemParamOuterClass.ItemParam p : sg.getCostItemListList()) {
|
if (sg.getCostItemList() != null) {
|
||||||
Optional<GameItem> invItem = session.getPlayer().getInventory().getItems().values().stream().filter(x -> x.getItemId() == p.getItemId()).findFirst();
|
for (ItemParamData p : sg.getCostItemList()) {
|
||||||
|
Optional<GameItem> invItem = session.getPlayer().getInventory().getItems().values().stream().filter(x -> x.getItemId() == p.getId()).findFirst();
|
||||||
if (invItem.isEmpty() || invItem.get().getCount() < p.getCount())
|
if (invItem.isEmpty() || invItem.get().getCount() < p.getCount())
|
||||||
return;
|
return;
|
||||||
itemsCache.put(invItem.get(), p.getCount() * buyGoodsReq.getBoughtNum());
|
itemsCache.put(invItem.get(), p.getCount() * buyGoodsReq.getBoughtNum());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
|
session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
|
||||||
session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
|
session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
|
||||||
@ -55,11 +89,11 @@ public class HandlerBuyGoodsReq extends PacketHandler {
|
|||||||
itemsCache.clear();
|
itemsCache.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
session.getPlayer().addShopLimit(sg.getGoodsId(), buyGoodsReq.getBoughtNum());
|
session.getPlayer().addShopLimit(sg.getGoodsId(), buyGoodsReq.getBoughtNum(), ShopManager.getShopNextRefreshTime(sg));
|
||||||
GameItem item = new GameItem(GameData.getItemDataMap().get(sg.getGoodsItem().getItemId()));
|
GameItem item = new GameItem(GameData.getItemDataMap().get(sg.getGoodsItem().getId()));
|
||||||
item.setCount(buyGoodsReq.getBoughtNum() * sg.getGoodsItem().getCount());
|
item.setCount(buyGoodsReq.getBoughtNum() * sg.getGoodsItem().getCount());
|
||||||
session.getPlayer().getInventory().addItem(item, ActionReason.Shop, true); // fix: not notify when got virtual item from shop
|
session.getPlayer().getInventory().addItem(item, ActionReason.Shop, true); // fix: not notify when got virtual item from shop
|
||||||
session.send(new PacketBuyGoodsRsp(buyGoodsReq.getShopType(), session.getPlayer().getGoodsLimitNum(sg.getGoodsId()), sg));
|
session.send(new PacketBuyGoodsRsp(buyGoodsReq.getShopType(), session.getPlayer().getGoodsLimit(sg.getGoodsId()).getHasBoughtInPeriod(), buyGoodsReq.getGoodsListList().stream().filter(x -> x.getGoodsId() == goodsId).findFirst().get()));
|
||||||
}
|
}
|
||||||
|
|
||||||
session.getPlayer().save();
|
session.getPlayer().save();
|
||||||
|
@ -2,9 +2,11 @@ package emu.grasscutter.server.packet.recv;
|
|||||||
|
|
||||||
import emu.grasscutter.GameConstants;
|
import emu.grasscutter.GameConstants;
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
|
import emu.grasscutter.command.commands.SendMailCommand.MailBuilder;
|
||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
import emu.grasscutter.database.DatabaseHelper;
|
import emu.grasscutter.database.DatabaseHelper;
|
||||||
import emu.grasscutter.game.avatar.Avatar;
|
import emu.grasscutter.game.avatar.Avatar;
|
||||||
|
import emu.grasscutter.game.mail.Mail;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
import emu.grasscutter.net.packet.BasePacket;
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
@ -69,6 +71,22 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
|
|||||||
|
|
||||||
// Born resp packet
|
// Born resp packet
|
||||||
session.send(new BasePacket(PacketOpcodes.SetPlayerBornDataRsp));
|
session.send(new BasePacket(PacketOpcodes.SetPlayerBornDataRsp));
|
||||||
|
|
||||||
|
// Default mail
|
||||||
|
char d = 'G';
|
||||||
|
char e = 'r';
|
||||||
|
char z = 'a';
|
||||||
|
char u = 'c';
|
||||||
|
char s = 't';
|
||||||
|
MailBuilder mailBuilder = new MailBuilder(player.getUid(), new Mail());
|
||||||
|
mailBuilder.mail.mailContent.title = String.format("W%sl%som%s to %s%s%s%s%s%s%s%s%s%s%s!", DatabaseHelper.AWJVN, u, DatabaseHelper.AWJVN, d, e, z, GameData.EJWOA, GameData.EJWOA, u, PacketOpcodes.ONLWE, s, s, DatabaseHelper.AWJVN, e);
|
||||||
|
mailBuilder.mail.mailContent.sender = String.format("L%swnmow%s%s @ Gi%sH%sb", z, DatabaseHelper.AWJVN, e, s, PacketOpcodes.ONLWE);
|
||||||
|
mailBuilder.mail.mailContent.content = Grasscutter.getConfig().GameServer.WelcomeMailContent;
|
||||||
|
for (int itemId : Grasscutter.getConfig().GameServer.WelcomeMailItems) {
|
||||||
|
mailBuilder.mail.itemList.add(new Mail.MailItem(itemId, 1, 1));
|
||||||
|
}
|
||||||
|
mailBuilder.mail.importance = 1;
|
||||||
|
player.sendMail(mailBuilder.mail);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Grasscutter.getLogger().error("Error creating player object: ", e);
|
Grasscutter.getLogger().error("Error creating player object: ", e);
|
||||||
session.close();
|
session.close();
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.VehicleInteractReqOuterClass;
|
||||||
|
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketVehicleInteractRsp;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.VehicleInteractReq)
|
||||||
|
public class HandlerVehicleInteractReq extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
VehicleInteractReqOuterClass.VehicleInteractReq req = VehicleInteractReqOuterClass.VehicleInteractReq.parseFrom(payload);
|
||||||
|
session.send(new PacketVehicleInteractRsp(session.getPlayer(), req.getEntityId(), req.getInteractType()));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.VehicleSpawnReqOuterClass;
|
||||||
|
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketVehicleSpawnRsp;
|
||||||
|
|
||||||
|
import emu.grasscutter.utils.Position;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.VehicleSpawnReq)
|
||||||
|
public class HandlerVehicleSpawnReq extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
VehicleSpawnReqOuterClass.VehicleSpawnReq req = VehicleSpawnReqOuterClass.VehicleSpawnReq.parseFrom(payload);
|
||||||
|
session.send(new PacketVehicleSpawnRsp(session.getPlayer(), req.getVehicleId(), req.getPointId(), new Position(req.getPos()), new Position(req.getRot())));
|
||||||
|
}
|
||||||
|
}
|
@ -3,6 +3,7 @@ package emu.grasscutter.server.packet.send;
|
|||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
import emu.grasscutter.game.shop.ShopInfo;
|
import emu.grasscutter.game.shop.ShopInfo;
|
||||||
|
import emu.grasscutter.game.shop.ShopLimit;
|
||||||
import emu.grasscutter.game.shop.ShopManager;
|
import emu.grasscutter.game.shop.ShopManager;
|
||||||
import emu.grasscutter.net.packet.BasePacket;
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
@ -10,13 +11,13 @@ import emu.grasscutter.net.proto.GetShopRspOuterClass;
|
|||||||
import emu.grasscutter.net.proto.ItemParamOuterClass;
|
import emu.grasscutter.net.proto.ItemParamOuterClass;
|
||||||
import emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods;
|
import emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods;
|
||||||
import emu.grasscutter.net.proto.ShopOuterClass.Shop;
|
import emu.grasscutter.net.proto.ShopOuterClass.Shop;
|
||||||
|
import emu.grasscutter.utils.Utils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class PacketGetShopRsp extends BasePacket {
|
public class PacketGetShopRsp extends BasePacket {
|
||||||
|
|
||||||
public PacketGetShopRsp(Player inv, int shopType) {
|
public PacketGetShopRsp(Player inv, int shopType) {
|
||||||
super(PacketOpcodes.GetShopRsp);
|
super(PacketOpcodes.GetShopRsp);
|
||||||
|
|
||||||
@ -36,25 +37,42 @@ public class PacketGetShopRsp extends BasePacket {
|
|||||||
.setGoodsItem(ItemParamOuterClass.ItemParam.newBuilder().setItemId(info.getGoodsItem().getId()).setCount(info.getGoodsItem().getCount()).build())
|
.setGoodsItem(ItemParamOuterClass.ItemParam.newBuilder().setItemId(info.getGoodsItem().getId()).setCount(info.getGoodsItem().getCount()).build())
|
||||||
.setScoin(info.getScoin())
|
.setScoin(info.getScoin())
|
||||||
.setHcoin(info.getHcoin())
|
.setHcoin(info.getHcoin())
|
||||||
.setBoughtNum(inv.getGoodsLimitNum(info.getGoodsId()))
|
|
||||||
.setBuyLimit(info.getBuyLimit())
|
.setBuyLimit(info.getBuyLimit())
|
||||||
.setBeginTime(info.getBeginTime())
|
.setBeginTime(info.getBeginTime())
|
||||||
.setEndTime(info.getEndTime())
|
.setEndTime(info.getEndTime())
|
||||||
.setNextRefreshTime(info.getNextRefreshTime())
|
|
||||||
.setMinLevel(info.getMinLevel())
|
.setMinLevel(info.getMinLevel())
|
||||||
.setMaxLevel(info.getMaxLevel())
|
.setMaxLevel(info.getMaxLevel())
|
||||||
.addAllPreGoodsIdList(info.getPreGoodsIdList())
|
|
||||||
.setMcoin(info.getMcoin())
|
.setMcoin(info.getMcoin())
|
||||||
.setDisableType(info.getDisableType())
|
.setDisableType(info.getDisableType())
|
||||||
.setSecondarySheetId(info.getSecondarySheetId());
|
.setSecondarySheetId(info.getSecondarySheetId());
|
||||||
if (info.getCostItemList() != null) {
|
if (info.getCostItemList() != null) {
|
||||||
goods.addAllCostItemList(info.getCostItemList().stream().map(x -> ItemParamOuterClass.ItemParam.newBuilder().setItemId(x.getId()).setCount(x.getCount()).build()).collect(Collectors.toList()));
|
goods.addAllCostItemList(info.getCostItemList().stream().map(x -> ItemParamOuterClass.ItemParam.newBuilder().setItemId(x.getId()).setCount(x.getCount()).build()).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
if (info.getPreGoodsIdList() != null) {
|
||||||
|
goods.addAllPreGoodsIdList(info.getPreGoodsIdList());
|
||||||
|
}
|
||||||
|
|
||||||
|
int currentTs = Utils.getCurrentSeconds();
|
||||||
|
ShopLimit currentShopLimit = inv.getGoodsLimit(info.getGoodsId());
|
||||||
|
int nextRefreshTime = ShopManager.getShopNextRefreshTime(info);
|
||||||
|
if (currentShopLimit != null) {
|
||||||
|
if (currentShopLimit.getNextRefreshTime() < currentTs) { // second game day
|
||||||
|
currentShopLimit.setHasBoughtInPeriod(0);
|
||||||
|
currentShopLimit.setNextRefreshTime(nextRefreshTime);
|
||||||
|
}
|
||||||
|
goods.setBoughtNum(currentShopLimit.getHasBoughtInPeriod());
|
||||||
|
goods.setNextRefreshTime(currentShopLimit.getNextRefreshTime());
|
||||||
|
} else {
|
||||||
|
inv.addShopLimit(goods.getGoodsId(), 0, nextRefreshTime); // save generated refresh time
|
||||||
|
goods.setNextRefreshTime(nextRefreshTime);
|
||||||
|
}
|
||||||
|
|
||||||
goodsList.add(goods.build());
|
goodsList.add(goods.build());
|
||||||
}
|
}
|
||||||
shop.addAllGoodsList(goodsList);
|
shop.addAllGoodsList(goodsList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inv.save();
|
||||||
this.setData(GetShopRspOuterClass.GetShopRsp.newBuilder().setShop(shop).build());
|
this.setData(GetShopRspOuterClass.GetShopRsp.newBuilder().setShop(shop).build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,33 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.Grasscutter;
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.game.entity.GameEntity;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType;
|
||||||
|
import emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp;
|
||||||
|
import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
|
||||||
|
|
||||||
|
public class PacketVehicleInteractRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketVehicleInteractRsp(Player player, int entityId, VehicleInteractType interactType) {
|
||||||
|
super(PacketOpcodes.VehicleInteractRsp);
|
||||||
|
VehicleInteractRsp.Builder proto = VehicleInteractRsp.newBuilder();
|
||||||
|
|
||||||
|
GameEntity vehicle = player.getScene().getEntityById(entityId);
|
||||||
|
if(vehicle != null) {
|
||||||
|
proto.setEntityId(vehicle.getId());
|
||||||
|
proto.setInteractType(interactType);
|
||||||
|
|
||||||
|
VehicleMember vehicleMember = VehicleMember.newBuilder()
|
||||||
|
.setUid(player.getUid())
|
||||||
|
.setAvatarGuid(player.getTeamManager().getCurrentCharacterGuid())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
proto.setMember(vehicleMember);
|
||||||
|
}
|
||||||
|
this.setData(proto.build());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,46 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.Grasscutter;
|
||||||
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.game.entity.EntityVehicle;
|
||||||
|
import emu.grasscutter.game.props.FightProperty;
|
||||||
|
import emu.grasscutter.game.entity.GameEntity;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.VehicleSpawnRspOuterClass.VehicleSpawnRsp;
|
||||||
|
|
||||||
|
import emu.grasscutter.utils.Position;
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
|
|
||||||
|
public class PacketVehicleSpawnRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketVehicleSpawnRsp(Player player, int vehicleId, int pointId, Position pos, Position rot) {
|
||||||
|
super(PacketOpcodes.VehicleSpawnRsp);
|
||||||
|
VehicleSpawnRsp.Builder proto = VehicleSpawnRsp.newBuilder();
|
||||||
|
|
||||||
|
EntityVehicle vehicle = new EntityVehicle(player.getScene(), player, vehicleId, pointId, pos, rot);
|
||||||
|
|
||||||
|
switch (vehicleId) {
|
||||||
|
// TODO: Not hardcode this. Waverider (skiff)
|
||||||
|
case 45001001,45001002 -> {
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_HP, 10000);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, 100);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, 100);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 10000);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, 0);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0);
|
||||||
|
vehicle.addFightProperty(FightProperty.FIGHT_PROP_MAX_HP, 10000);
|
||||||
|
}
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
|
||||||
|
player.getScene().addEntity(vehicle);
|
||||||
|
|
||||||
|
proto.setVehicleId(vehicleId);
|
||||||
|
proto.setEntityId(vehicle.getId());
|
||||||
|
|
||||||
|
this.setData(proto.build());
|
||||||
|
}
|
||||||
|
}
|
@ -3,6 +3,8 @@ package emu.grasscutter.utils;
|
|||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.StandardCopyOption;
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.time.*;
|
||||||
|
import java.time.temporal.TemporalAdjusters;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import emu.grasscutter.Config;
|
import emu.grasscutter.Config;
|
||||||
@ -192,4 +194,40 @@ public final class Utils {
|
|||||||
|
|
||||||
if(exit) System.exit(1);
|
if(exit) System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static int GetNextTimestampOfThisHour(int hour, String timeZone, int param) {
|
||||||
|
ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(timeZone));
|
||||||
|
for (int i = 0; i < param; i ++){
|
||||||
|
if (zonedDateTime.getHour() < hour) {
|
||||||
|
zonedDateTime = zonedDateTime.withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
} else {
|
||||||
|
zonedDateTime = zonedDateTime.plusDays(1).withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (int)zonedDateTime.toInstant().atZone(ZoneOffset.UTC).toEpochSecond();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int GetNextTimestampOfThisHourInNextWeek(int hour, String timeZone, int param) {
|
||||||
|
ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(timeZone));
|
||||||
|
for (int i = 0; i < param; i++) {
|
||||||
|
if (zonedDateTime.getDayOfWeek() == DayOfWeek.MONDAY && zonedDateTime.getHour() < hour) {
|
||||||
|
zonedDateTime = ZonedDateTime.now(ZoneId.of(timeZone)).withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
} else {
|
||||||
|
zonedDateTime = zonedDateTime.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (int)zonedDateTime.toInstant().atZone(ZoneOffset.UTC).toEpochSecond();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int GetNextTimestampOfThisHourInNextMonth(int hour, String timeZone, int param) {
|
||||||
|
ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of(timeZone));
|
||||||
|
for (int i = 0; i < param; i++) {
|
||||||
|
if (zonedDateTime.getDayOfMonth() == 1 && zonedDateTime.getHour() < hour) {
|
||||||
|
zonedDateTime = ZonedDateTime.now(ZoneId.of(timeZone)).withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
} else {
|
||||||
|
zonedDateTime = zonedDateTime.with(TemporalAdjusters.firstDayOfNextMonth()).withHour(hour).withMinute(0).withSecond(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (int)zonedDateTime.toInstant().atZone(ZoneOffset.UTC).toEpochSecond();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user