fix merge conflict
This commit is contained in:
18
proto/SetPlayerBirthdayReq.proto
Normal file
18
proto/SetPlayerBirthdayReq.proto
Normal file
@@ -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;
|
||||
}
|
||||
18
proto/SetPlayerBirthdayRsp.proto
Normal file
18
proto/SetPlayerBirthdayRsp.proto
Normal file
@@ -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;
|
||||
}
|
||||
1
proto/SetPlayerBornDataReq.proto
Executable file → Normal file
1
proto/SetPlayerBornDataReq.proto
Executable file → Normal file
@@ -2,7 +2,6 @@ syntax = "proto3";
|
||||
|
||||
option java_package = "emu.grasscutter.net.proto";
|
||||
|
||||
|
||||
message SetPlayerBornDataReq {
|
||||
enum CmdId {
|
||||
option allow_alias = true;
|
||||
|
||||
15
proto/SetPlayerBornDataRsp.proto
Normal file
15
proto/SetPlayerBornDataRsp.proto
Normal file
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user