From ddedd0fe252642230e05461af0186525d1ea368d Mon Sep 17 00:00:00 2001 From: w4123 <1840686745@qq.com> Date: Wed, 20 Apr 2022 20:00:12 +0800 Subject: [PATCH 1/8] Add NpcTalk* protos --- proto/NpcTalkReq.proto | 9 +++++++++ proto/NpcTalkRsp.proto | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 proto/NpcTalkReq.proto create mode 100644 proto/NpcTalkRsp.proto diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto new file mode 100644 index 0000000..80490a6 --- /dev/null +++ b/proto/NpcTalkReq.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message NpcTalkReq { + uint32 npc_entity_id = 1; + uint32 talk_id = 3; + uint32 entity_id = 4; +} diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto new file mode 100644 index 0000000..0d02fa5 --- /dev/null +++ b/proto/NpcTalkRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message NpcTalkRsp { + int32 retcode = 1; + uint32 npc_entity_id = 2; + uint32 cur_talk_id = 4; + uint32 entity_id = 5; +} From 2d4e54554613d6a11e78f26c05dbf6010f3dfc27 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Wed, 20 Apr 2022 05:21:49 -0700 Subject: [PATCH 2/8] Add EvtDoSkillSuccNotify and SetEntityClientDataNotify --- proto/EvtDoSkillSuccNotify.proto | 13 +++++++++++++ proto/SetEntityClientDataNotify.proto | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 proto/EvtDoSkillSuccNotify.proto create mode 100644 proto/SetEntityClientDataNotify.proto diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto new file mode 100644 index 0000000..6c626a8 --- /dev/null +++ b/proto/EvtDoSkillSuccNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ForwardType.proto"; +import "Vector.proto"; + +message EvtDoSkillSuccNotify { + ForwardType forwardType = 1; + uint32 casterId = 2; + uint32 skillId = 3; + Vector forward = 4; +} diff --git a/proto/SetEntityClientDataNotify.proto b/proto/SetEntityClientDataNotify.proto new file mode 100644 index 0000000..5d16ceb --- /dev/null +++ b/proto/SetEntityClientDataNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "EntityClientData.proto"; + +message SetEntityClientDataNotify { + uint32 entityId = 1; + EntityClientData entityClientData = 2; +} From 4893a4e91696e36575d9ba4061774572d00cfe83 Mon Sep 17 00:00:00 2001 From: Yazawazi <47273265+Yazawazi@users.noreply.github.com> Date: Thu, 21 Apr 2022 05:33:33 +0800 Subject: [PATCH 3/8] SceneTransToPoint --- proto/SceneTransToPointReq.proto | 17 +++++++++++++++++ proto/SceneTransToPointRsp.proto | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 proto/SceneTransToPointReq.proto create mode 100644 proto/SceneTransToPointRsp.proto diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto new file mode 100644 index 0000000..0eae549 --- /dev/null +++ b/proto/SceneTransToPointReq.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message SceneTransToPointReq { + enum CmdId { + option allow_alias = true; + NONE = 0; + ENET_CHANNEL_ID = 0; + ENET_IS_RELIABLE = 1; + IS_ALLOW_CLIENT = 1; + CMD_ID = 219; + } + + uint32 sceneId = 1; + uint32 pointId = 2; +} diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto new file mode 100644 index 0000000..1182c69 --- /dev/null +++ b/proto/SceneTransToPointRsp.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message SceneTransToPointRsp { + enum CmdId { + option allow_alias = true; + NONE = 0; + ENET_CHANNEL_ID = 0; + ENET_IS_RELIABLE = 1; + CMD_ID = 220; + } + + int32 retcode = 1; + uint32 sceneId = 2; + uint32 pointId = 3; +} From 3edbb50d489d40be061794856496229531201e38 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Wed, 20 Apr 2022 18:55:38 -0700 Subject: [PATCH 4/8] Update WorldPlayerLocationNotify.proto to 2.6 --- proto/WorldPlayerLocationInfo.proto | 10 ++++++++++ proto/WorldPlayerLocationNotify.proto | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 proto/WorldPlayerLocationInfo.proto diff --git a/proto/WorldPlayerLocationInfo.proto b/proto/WorldPlayerLocationInfo.proto new file mode 100644 index 0000000..8afcf18 --- /dev/null +++ b/proto/WorldPlayerLocationInfo.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "PlayerLocationInfo.proto"; + +message WorldPlayerLocationInfo { + uint32 sceneId = 1; + PlayerLocationInfo playerLoc = 2; +} diff --git a/proto/WorldPlayerLocationNotify.proto b/proto/WorldPlayerLocationNotify.proto index d43efba..c71898a 100644 --- a/proto/WorldPlayerLocationNotify.proto +++ b/proto/WorldPlayerLocationNotify.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "PlayerLocationInfo.proto"; +import "WorldPlayerLocationInfo.proto"; message WorldPlayerLocationNotify { - repeated PlayerLocationInfo playerLocList = 1; + repeated WorldPlayerLocationInfo playerLocList = 2; } From 864123cd395803ad3a31079e5c002c0b874b7895 Mon Sep 17 00:00:00 2001 From: Yazawazi <47273265+Yazawazi@users.noreply.github.com> Date: Fri, 22 Apr 2022 00:22:12 +0800 Subject: [PATCH 5/8] Some Fetter Protos --- proto/AvatarFetterDataNotify.proto | 9 +++++++++ proto/AvatarFetterLevelRewardReq.proto | 8 ++++++++ proto/AvatarFetterLevelRewardRsp.proto | 10 ++++++++++ proto/FetterState.proto | 10 ++++++++++ 4 files changed, 37 insertions(+) create mode 100644 proto/AvatarFetterDataNotify.proto create mode 100644 proto/AvatarFetterLevelRewardReq.proto create mode 100644 proto/AvatarFetterLevelRewardRsp.proto create mode 100644 proto/FetterState.proto diff --git a/proto/AvatarFetterDataNotify.proto b/proto/AvatarFetterDataNotify.proto new file mode 100644 index 0000000..7e5d8e2 --- /dev/null +++ b/proto/AvatarFetterDataNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "AvatarFetterInfo.proto"; + +message AvatarFetterDataNotify { + map fetterInfoMap = 1; +} diff --git a/proto/AvatarFetterLevelRewardReq.proto b/proto/AvatarFetterLevelRewardReq.proto new file mode 100644 index 0000000..c97f532 --- /dev/null +++ b/proto/AvatarFetterLevelRewardReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message AvatarFetterLevelRewardReq { + uint64 avatarGuid = 1; + uint32 fetterLevel = 2; +} diff --git a/proto/AvatarFetterLevelRewardRsp.proto b/proto/AvatarFetterLevelRewardRsp.proto new file mode 100644 index 0000000..6e4fc21 --- /dev/null +++ b/proto/AvatarFetterLevelRewardRsp.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message AvatarFetterLevelRewardRsp { + int32 retcode = 1; + uint64 avatarGuid = 2; + uint32 fetterLevel = 3; + uint32 rewardId = 4; +} diff --git a/proto/FetterState.proto b/proto/FetterState.proto new file mode 100644 index 0000000..2121d45 --- /dev/null +++ b/proto/FetterState.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +enum FetterState { + NONE = 0; + NOT_OPEN = 1; + OPEN = 2; + FINISH = 3; +} From a8a04fc5887e99ffcf61e2b673dd778878515b2b Mon Sep 17 00:00:00 2001 From: Asnxthaony Date: Fri, 22 Apr 2022 14:40:19 +0800 Subject: [PATCH 6/8] Added some proto related to mail stuff --- proto/ChangeMailStarNotify.proto | 8 ++++++++ proto/DelMailReq.proto | 7 +++++++ proto/DelMailRsp.proto | 8 ++++++++ proto/EquipParam.proto | 10 ++++++++++ proto/GetAllMailReq.proto | 7 +++++++ proto/GetAllMailRsp.proto | 11 +++++++++++ proto/GetMailItemReq.proto | 7 +++++++ proto/GetMailItemRsp.proto | 11 +++++++++++ proto/MailChangeNotify.proto | 10 ++++++++++ proto/MailData.proto | 20 ++++++++++++++++++++ proto/MailItem.proto | 11 +++++++++++ proto/MailTextContent.proto | 9 +++++++++ proto/ReadMailNotify.proto | 7 +++++++ 13 files changed, 126 insertions(+) create mode 100644 proto/ChangeMailStarNotify.proto create mode 100644 proto/DelMailReq.proto create mode 100644 proto/DelMailRsp.proto create mode 100644 proto/EquipParam.proto create mode 100644 proto/GetAllMailReq.proto create mode 100644 proto/GetAllMailRsp.proto create mode 100644 proto/GetMailItemReq.proto create mode 100644 proto/GetMailItemRsp.proto create mode 100644 proto/MailChangeNotify.proto create mode 100644 proto/MailData.proto create mode 100644 proto/MailItem.proto create mode 100644 proto/MailTextContent.proto create mode 100644 proto/ReadMailNotify.proto diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto new file mode 100644 index 0000000..05e5b22 --- /dev/null +++ b/proto/ChangeMailStarNotify.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ChangeMailStarNotify { + repeated uint32 mailIdList = 1; + bool isStar = 2; +} diff --git a/proto/DelMailReq.proto b/proto/DelMailReq.proto new file mode 100644 index 0000000..5f07ac0 --- /dev/null +++ b/proto/DelMailReq.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message DelMailReq { + repeated uint32 mailIdList = 1; +} diff --git a/proto/DelMailRsp.proto b/proto/DelMailRsp.proto new file mode 100644 index 0000000..2fd5a7b --- /dev/null +++ b/proto/DelMailRsp.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message DelMailRsp { + int32 retcode = 1; + repeated uint32 mailIdList = 2; +} diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto new file mode 100644 index 0000000..047ce4b --- /dev/null +++ b/proto/EquipParam.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message EquipParam { + uint32 itemId = 1; + uint32 itemNum = 2; + uint32 itemLevel = 3; + uint32 PromoteLevel = 4; +} diff --git a/proto/GetAllMailReq.proto b/proto/GetAllMailReq.proto new file mode 100644 index 0000000..d116e09 --- /dev/null +++ b/proto/GetAllMailReq.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message GetAllMailReq { + bool isGiftMail = 1; +} diff --git a/proto/GetAllMailRsp.proto b/proto/GetAllMailRsp.proto new file mode 100644 index 0000000..6c7d7f3 --- /dev/null +++ b/proto/GetAllMailRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MailData.proto"; + +message GetAllMailRsp { + int32 retcode = 1; + repeated MailData mailList = 2; + bool isTruncated = 3; +} diff --git a/proto/GetMailItemReq.proto b/proto/GetMailItemReq.proto new file mode 100644 index 0000000..df20fdc --- /dev/null +++ b/proto/GetMailItemReq.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message GetMailItemReq { + repeated uint32 mailIdList = 1; +} diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto new file mode 100644 index 0000000..4eb3017 --- /dev/null +++ b/proto/GetMailItemRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "EquipParam.proto"; + +message GetMailItemRsp { + int32 retcode = 1; + repeated uint32 mailIdList = 2; + repeated EquipParam itemList = 3; +} diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto new file mode 100644 index 0000000..0fe80b2 --- /dev/null +++ b/proto/MailChangeNotify.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MailData.proto"; + +message MailChangeNotify { + repeated MailData mailList = 1; + repeated uint32 delMailIdList = 2; +} diff --git a/proto/MailData.proto b/proto/MailData.proto new file mode 100644 index 0000000..fe74217 --- /dev/null +++ b/proto/MailData.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "MailTextContent.proto"; +import "MailItem.proto"; + +message MailData { + uint32 mailId = 1; + MailTextContent mailTextContent = 4; + repeated MailItem itemList = 7; + uint32 sendTime = 8; + uint32 expireTime = 9; + uint32 importance = 10; + bool isRead = 11; + bool isAttachmentGot = 12; + uint32 configId = 13; + repeated string argumentList = 14; + uint32 stateValue = 15; +} diff --git a/proto/MailItem.proto b/proto/MailItem.proto new file mode 100644 index 0000000..72bcb8e --- /dev/null +++ b/proto/MailItem.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "ItemParam.proto"; +import "MaterialDeleteInfo.proto"; + +message MailItem { + ItemParam itemParam = 1; + MaterialDeleteInfo deleteInfo = 2; +} diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto new file mode 100644 index 0000000..097710f --- /dev/null +++ b/proto/MailTextContent.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message MailTextContent { + string title = 1; + string content = 2; + string sender = 3; +} diff --git a/proto/ReadMailNotify.proto b/proto/ReadMailNotify.proto new file mode 100644 index 0000000..d48c0d5 --- /dev/null +++ b/proto/ReadMailNotify.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +message ReadMailNotify { + repeated uint32 mailIdList = 1; +} From ac46dc3dd94528374c07b63603068a15da1b9fd3 Mon Sep 17 00:00:00 2001 From: yarik0chka <64433879+yarik0chka@users.noreply.github.com> Date: Sat, 23 Apr 2022 12:32:16 +0500 Subject: [PATCH 7/8] Protos for sitting --- proto/SitReq.proto | 10 ++++++++++ proto/SitRsp.proto | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 proto/SitReq.proto create mode 100644 proto/SitRsp.proto diff --git a/proto/SitReq.proto b/proto/SitReq.proto new file mode 100644 index 0000000..4a2b76e --- /dev/null +++ b/proto/SitReq.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message SitReq { + uint64 chair_id = 1; + Vector position = 2; +} diff --git a/proto/SitRsp.proto b/proto/SitRsp.proto new file mode 100644 index 0000000..16b3097 --- /dev/null +++ b/proto/SitRsp.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; + +import "Vector.proto"; + +message SitRsp { + uint32 entity_id = 2; + Vector position = 3; + uint64 chair_id = 4; +} From 7e5ae214caf4c962e8fa578c58aa6e96f475744b Mon Sep 17 00:00:00 2001 From: Miyucchi Date: Sat, 23 Apr 2022 10:38:21 +0200 Subject: [PATCH 8/8] SetBirthday protos --- proto/SetPlayerBirthdayReq.proto | 8 ++++++++ proto/SetPlayerBirthdayRsp.proto | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 proto/SetPlayerBirthdayReq.proto create mode 100644 proto/SetPlayerBirthdayRsp.proto diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto new file mode 100644 index 0000000..74b0df9 --- /dev/null +++ b/proto/SetPlayerBirthdayReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +import "proto/Birthday.proto"; + +message SetPlayerBirthdayReq { + Birthday birth = 1; +} diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto new file mode 100644 index 0000000..5a830c0 --- /dev/null +++ b/proto/SetPlayerBirthdayRsp.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "emu.grasscutter.net.proto"; +import "proto/Birthday.proto"; + +message SetPlayerBirthdayRsp { + Birthday birth = 1; +}