From 9733422cc893a611a13d99fd1ef38a06e14ddf44 Mon Sep 17 00:00:00 2001 From: wetabq Date: Mon, 25 Apr 2022 16:50:50 +0800 Subject: [PATCH] fix merge conflict --- proto/SetPlayerBirthdayReq.proto | 18 ++++++++++++++++++ proto/SetPlayerBirthdayRsp.proto | 18 ++++++++++++++++++ proto/SetPlayerBornDataReq.proto | 1 - proto/SetPlayerBornDataRsp.proto | 15 +++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 proto/SetPlayerBirthdayReq.proto create mode 100644 proto/SetPlayerBirthdayRsp.proto mode change 100755 => 100644 proto/SetPlayerBornDataReq.proto create mode 100644 proto/SetPlayerBornDataRsp.proto diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto new file mode 100644 index 0000000..3085c75 --- /dev/null +++ b/proto/SetPlayerBirthdayReq.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +import "Birthday.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +message SetPlayerBirthdayReq { + enum CmdId { + option allow_alias = true; + ENET_CHANNEL_ID = 0; + NONE = 0; + ENET_IS_RELIABLE = 1; + IS_ALLOW_CLIENT = 1; + CMD_ID = 4024; + } + + Birthday birthday = 1; +} diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto new file mode 100644 index 0000000..a7ac3c0 --- /dev/null +++ b/proto/SetPlayerBirthdayRsp.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +import "Birthday.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +message SetPlayerBirthdayRsp { + enum CmdId { + option allow_alias = true; + NONE = 0; + ENET_CHANNEL_ID = 0; + ENET_IS_RELIABLE = 1; + CMD_ID = 4091; + } + + int32 retcode = 1; + Birthday birthday = 2; +} diff --git a/proto/SetPlayerBornDataReq.proto b/proto/SetPlayerBornDataReq.proto old mode 100755 new mode 100644 index 64f40cf..ce0594d --- a/proto/SetPlayerBornDataReq.proto +++ b/proto/SetPlayerBornDataReq.proto @@ -2,7 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - message SetPlayerBornDataReq { enum CmdId { option allow_alias = true; diff --git a/proto/SetPlayerBornDataRsp.proto b/proto/SetPlayerBornDataRsp.proto new file mode 100644 index 0000000..9192576 --- /dev/null +++ b/proto/SetPlayerBornDataRsp.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message SetPlayerBornDataRsp { + enum CmdId { + option allow_alias = true; + NONE = 0; + ENET_CHANNEL_ID = 0; + ENET_IS_RELIABLE = 1; + CMD_ID = 114; + } + + int32 retcode = 1; +}