From 0d5650de3b9c864a17d07245e4673b298eb2631c Mon Sep 17 00:00:00 2001 From: zqj <582132116@qq.com> Date: Thu, 8 Dec 2022 14:21:08 +0800 Subject: [PATCH] fix: proto 改造 --- email.proto | 40 ++++++++++++++++++++++++++++++++++++++++ equipment.proto | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ game.proto | 367 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- gem.proto | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hero.proto | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ protocode.proto | 90 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- role.proto | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ store.proto | 25 +++++++++++++++++++++++++ 8 files changed, 459 insertions(+), 410 deletions(-) create mode 100644 email.proto create mode 100644 equipment.proto delete mode 100644 game.proto create mode 100644 gem.proto create mode 100644 hero.proto create mode 100644 role.proto create mode 100644 store.proto diff --git a/email.proto b/email.proto new file mode 100644 index 0000000..b28a364 --- /dev/null +++ b/email.proto @@ -0,0 +1,40 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + +message EmailListReq { +} + +message EmailListRsp { + repeated models.Email emails = 1; +} + +message EmailDrawReq { + string id = 1; +} + +message EmailDrawRsp { + repeated string ids = 1; + string reward = 2; +} + +message EmailCheckRar { + string id = 1; +} + +message EmailDelReq { +} + +message EmailDelRsp { + repeated string ids = 1; +} + +message EmailNewNty { + models.Email email = 1; +} diff --git a/equipment.proto b/equipment.proto new file mode 100644 index 0000000..99aa794 --- /dev/null +++ b/equipment.proto @@ -0,0 +1,52 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + + +message EquipmentDelReq { + repeated string id = 1; +} + +message EquipmentDelRsp { + map reward = 1; +} + +message EquipmentAddNty { + models.Equipment equip = 1; +} + +message EquipmentEnhanceReq { + string equip_id = 1; +} + +message EquipmentEnhanceRsp { + models.Equipment equip = 1; +} + +message EquipmentSetGemReq { + string equip_id = 1; + string gem_id = 2; +} + +message EquipmentSetGemRsp { + string equip_id = 1; + string gem_ids = 2; +} + +message EquipmentDelGemReq { + string equip_id = 1; + string gem_id = 2; +} + +message EquipmentDelGemRsp { + string equip_id = 1; + string gem_ids = 2; + string reward = 3; +} + diff --git a/game.proto b/game.proto deleted file mode 100644 index d5b055b..0000000 --- a/game.proto +++ /dev/null @@ -1,367 +0,0 @@ -syntax = "proto3"; -option go_package = "../pb;pb"; - -package game; -//import "google/protobuf/empty.proto"; -import "models.proto"; - -// rpc = req + rsp 请求/返回 -// rpc = rar + rar 自回包 - -message HeartReq { - int64 code = 1; -} - -message HeartRsp { - int64 code = 1; -} - -message LoginReq { - string token = 1; - string device = 2; -} - -message LoginRsp { - models.Role role = 1; - models.Store store = 2; - repeated models.Hero hero = 3; - repeated models.Team team = 4; - repeated models.Equipment equipments = 5; - repeated models.GemSlot gem_slot = 6; -} - -message CreateRar { - string token = 1; - string device = 2; - string channel = 3; -} - -message DisConnectNty { -} - -message ChangeTeamRar { - repeated models.Team team = 1; -} - -message EquipInfo { - string equipId = 1; - int32 pos = 2; -} - -message HeroEquipReferRar { - repeated EquipInfo equipIds = 1; - string hero_id = 2; - bool refer = 3; //true 穿戴， false 脱下 -} - -message RoleUpdatePropertyNty { - repeated string keys = 1; - models.Role role = 2; -} - -message RoleUpdateItemsNty { - string items = 1; -} - -message RoleClearItemsRar { - repeated string items = 1; -} - -message RoleStartBattleReq { - int32 chapter_id = 1; - int32 carbon_id = 2; -} - -message RoleStartBattleRsp { - int32 cur_sp = 1; - string drop_reward = 2; -} - -message RoleEndBattleReq { - int32 chapter_id = 1; - int32 carbon_id = 2; - bool pass = 3; - string team_id = 4; - string drop_reward = 5; -} - -message RoleEndBattleRsp { - int32 role_level = 1; - int32 role_exp = 2; - int32 role_expamount = 3; - string reward = 4; - bool pass = 5; - repeated models.Hero hero = 6; - int32 chapter_id = 7; - int32 carbon_id = 8; - string drop_reward = 9; -} - -message RoleGuideRar { - int32 guide_steps = 1; -} - -message RoleTaskRar { - int32 typ = 1; - int32 task_id = 2; - string reward = 3; -} - -message RoleOpenBoxReq { - map costs = 1; -} - -message RoleOpenBoxRsp { - map reward = 3; -} - -message RoleBuffRar { - string chapter_id = 1; - map buffs = 3; -} - -message RoleResetChapterRar { - string chapter_id = 1; - int32 cost_id = 2; - int32 cost_count = 3; -} - -message RoleCostReq { - map costs = 1; -} - -message RoleCostRsp { - int32 cur = 1; -} - -message EquipmentDelReq { - repeated string id = 1; -} - -message EquipmentDelRsp { - map reward = 1; -} - -message EquipmentAddNty { - models.Equipment equip = 1; -} - -message EquipmentEnhanceReq { - string equip_id = 1; -} - -message EquipmentEnhanceRsp { - models.Equipment equip = 1; -} - -message HeroUpLevelReq { - string heroId = 1; - string items = 2; // [itemId1=count1, itemId2=count2] -} - -message HeroUpLevelRsp { - models.Hero hero = 1; -} - -message HeroReinReq { - string hero_id = 1; -} - -message HeroReinRsp { - models.Hero hero = 1; -} - -message HeroSkillUpLevelReq { - string hero_id = 1; - int32 skill_id = 2; - int32 skill_type = 3; -} - -message HeroSkillUpLevelRsp { - string hero_id = 1; - int32 skill_id = 2; - int32 skill_level = 3; - int32 rein_point = 4; -} - -message EmailListReq { -} - -message EmailListRsp { - repeated models.Email emails = 1; -} - -message EmailDrawReq { - string id = 1; -} - -message EmailDrawRsp { - repeated string ids = 1; - string reward = 2; -} - -message EmailCheckRar { - string id = 1; -} - -message EmailDelReq { -} - -message EmailDelRsp { - repeated string ids = 1; -} - -message EmailNewNty { - models.Email email = 1; -} - -message StoreBuyReq { - int32 typ = 1; - int32 id = 2; - int32 count = 3; -} - -message StoreBuyRsp { - string reward = 1; -} - -message StoreUpdatePropertyNty { - repeated string keys = 1; // 键 名字 - models.Store store = 2; -} - -message HeroFragmentCovertReq { - string hero_id = 1; -} - -message HeroFragmentCovertRsp { - models.Hero hero = 1; -} - -message RoleLogOutRar { -} - -message RoleDrawCardReq { - int32 group_id = 1; - int32 pool_id = 2; - int32 draw_count = 3; -} - -message RoleDrawCardRsp { - string reward = 1; -} - -message RoleCdKeyReq { - string cdkey = 1; -} - -message RoleCdKeyRsp { - string reward = 1; -} - -message RoleStartClimbReq { - int32 chapter_id = 1; - int32 carbon_id = 2; - string team_id = 3; -} - -message RoleStartClimbRsp { -} - -message RoleMiddleClimbReq { - int32 chapter_id = 1; - int32 carbon_id = 2; - string team_id = 3; -} - -message RoleMiddleClimbRsp { - string reward = 1; - int64 timestamp = 2; -} - -message RoleEndClimbReq { - int32 chapter_id = 1; - int32 carbon_id = 2; - string team_id = 3; -} - -message RoleEndClimbRsp { - string reward = 1; - int32 hishigh = 2; - int64 timestamp = 3; -} - -message RoleRankClimbReq { - int32 chapter_id = 1; -} - -message RoleRankClimbRsp { - repeated models.RankClimb rank = 1; -} - -message EquipmentSetGemReq { - string equip_id = 1; - string gem_id = 2; -} - -message EquipmentSetGemRsp { - string equip_id = 1; - string gem_ids = 2; -} - -message EquipmentDelGemReq { - string equip_id = 1; - string gem_id = 2; -} - -message EquipmentDelGemRsp { - string equip_id = 1; - string gem_ids = 2; - string reward = 3; -} - - -message ItemGemCompoundReq { - int32 gem_id = 1; - int32 gem_count = 2; -} - -message ItemGemCompoundRsp { - string reward = 3; -} - -message GemSliceReq { - string slot_id = 1; - map costs = 2; - int32 attention_id = 3; -} - -message GemSliceRsp { - models.GemSlot gem_slot = 1; -} - -message GemSliceStopReq { - string slot_id = 1; -} - -message GemSliceStopRsp { - models.GemSlot gem_slot = 1; -} - -message GemAttentionReq { - string slot_id = 1; -} - -message GemAttentionRsp { - string slot_id = 1; - repeated int32 attentions = 2; -} - -message GemSliceRewardReq { - string slot_id = 1; - int32 draw_type = 2; -} - -message GemSliceRewardRsp { - string reward = 1; -} diff --git a/gem.proto b/gem.proto new file mode 100644 index 0000000..1064484 --- /dev/null +++ b/gem.proto @@ -0,0 +1,55 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + + +message GemSliceReq { + string slot_id = 1; + map costs = 2; + int32 attention_id = 3; +} + +message GemSliceRsp { + models.GemSlot gem_slot = 1; +} + +message GemSliceStopReq { + string slot_id = 1; +} + +message GemSliceStopRsp { + models.GemSlot gem_slot = 1; +} + +message GemAttentionReq { + string slot_id = 1; +} + +message GemAttentionRsp { + string slot_id = 1; + repeated int32 attentions = 2; +} + +message GemSliceRewardReq { + string slot_id = 1; + int32 draw_type = 2; +} + +message GemSliceRewardRsp { + string reward = 1; +} + +message ItemGemCompoundReq { + int32 gem_id = 1; + int32 gem_count = 2; +} + +message ItemGemCompoundRsp { + string reward = 3; +} diff --git a/hero.proto b/hero.proto new file mode 100644 index 0000000..49567f2 --- /dev/null +++ b/hero.proto @@ -0,0 +1,59 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + +message EquipInfo { + string equipId = 1; + int32 pos = 2; +} + +message HeroEquipReferRar { + repeated EquipInfo equipIds = 1; + string hero_id = 2; + bool refer = 3; //true 穿戴， false 脱下 +} + +message HeroFragmentCovertReq { + string hero_id = 1; +} + +message HeroFragmentCovertRsp { + models.Hero hero = 1; +} + + +message HeroUpLevelReq { + string heroId = 1; + string items = 2; // [itemId1=count1, itemId2=count2] +} + +message HeroUpLevelRsp { + models.Hero hero = 1; +} + +message HeroReinReq { + string hero_id = 1; +} + +message HeroReinRsp { + models.Hero hero = 1; +} + +message HeroSkillUpLevelReq { + string hero_id = 1; + int32 skill_id = 2; + int32 skill_type = 3; +} + +message HeroSkillUpLevelRsp { + string hero_id = 1; + int32 skill_id = 2; + int32 skill_level = 3; + int32 rein_point = 4; +} diff --git a/protocode.proto b/protocode.proto index 1482642..7253701 100644 --- a/protocode.proto +++ b/protocode.proto @@ -6,53 +6,57 @@ package protocode; enum ProtoCode { UNKNOWN = 0; - HeartRpc = 501; - LoginRpc = 502; - CreateRpc = 503; - ChangeTeamRpc = 504; - HeroEquipReferRpc = 505; - RoleClearItemsRpc = 506; - RoleStartBattleRpc = 507; - RoleEndBattleRpc = 508; - RoleGuideRpc = 509; - RoleTaskRpc = 510; - RoleOpenBoxRpc = 511; - RoleBuffRpc = 512; - RoleResetChapterRpc = 513; - RoleCostRpc = 514; - EquipmentDelRpc = 515; - EquipmentEnhanceRpc = 516; - HeroUpLevelRpc = 517; - HeroReinRpc = 518; - HeroSkillUpLevelRpc = 519; - EmailListRpc = 520; - EmailDrawRpc = 521; - EmailCheckRpc = 522; - EmailDelRpc = 523; - StoreBuyRpc = 524; - HeroFragmentCovertRpc = 525; - RoleLogOutRpc = 526; - RoleDrawCardRpc = 527; - RoleCdKeyRpc = 528; - RoleStartClimbRpc = 529; - RoleMiddleClimbRpc = 530; - RoleEndClimbRpc = 531; - RoleRankClimbRpc = 532; - EquipmentSetGemRpc = 533; - EquipmentDelGemRpc = 534; - ItemGemCompoundRpc = 535; - GemSliceRpc = 536; - GemSliceStopRpc = 537; - GemAttentionRpc = 538; - GemSliceRewardRpc = 539; + HeartRpc = 101; + LoginRpc = 102; + CreateRpc = 103; + ChangeTeamRpc = 104; + RoleClearItemsRpc = 105; + RoleStartBattleRpc = 106; + RoleEndBattleRpc = 107; + RoleGuideRpc = 108; + RoleTaskRpc = 109; + RoleOpenBoxRpc = 110; + RoleBuffRpc = 111; + RoleResetChapterRpc = 112; + RoleCostRpc = 113; + RoleLogOutRpc = 114; + RoleDrawCardRpc = 115; + RoleCdKeyRpc = 116; + RoleStartClimbRpc = 117; + RoleMiddleClimbRpc = 118; + RoleEndClimbRpc = 119; + RoleRankClimbRpc = 120; + + HeroEquipReferRpc = 201; + HeroFragmentCovertRpc = 202; + HeroUpLevelRpc = 203; + HeroReinRpc = 204; + HeroSkillUpLevelRpc = 205; + + EmailListRpc = 301; + EmailDrawRpc = 302; + EmailCheckRpc = 303; + EmailDelRpc = 304; + + EquipmentDelRpc = 401; + EquipmentEnhanceRpc = 402; + EquipmentSetGemRpc = 403; + EquipmentDelGemRpc = 404; + + StoreBuyRpc = 501; + + GemSliceRpc = 601; + GemSliceStopRpc = 602; + GemAttentionRpc = 603; + GemSliceRewardRpc = 604; + ItemGemCompoundRpc = 605; + DisConnectNty = 1001; RoleUpdatePropertyNty = 1002; RoleUpdateItemsNty = 1003; - EquipmentAddNty = 1004; - EmailNewNty = 1005; + EmailNewNty = 1004; + EquipmentAddNty = 1005; StoreUpdatePropertyNty = 1006; - - } \ No newline at end of file diff --git a/role.proto b/role.proto new file mode 100644 index 0000000..9e5eba9 --- /dev/null +++ b/role.proto @@ -0,0 +1,181 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + +message HeartReq { + int64 code = 1; +} + +message HeartRsp { + int64 code = 1; +} + +message LoginReq { + string token = 1; + string device = 2; +} + +message LoginRsp { + models.Role role = 1; + models.Store store = 2; + repeated models.Hero hero = 3; + repeated models.Team team = 4; + repeated models.Equipment equipments = 5; + repeated models.GemSlot gem_slot = 6; +} + +message CreateRar { + string token = 1; + string device = 2; + string channel = 3; +} + +message DisConnectNty { +} + +message ChangeTeamRar { + repeated models.Team team = 1; +} + +message RoleUpdatePropertyNty { + repeated string keys = 1; + models.Role role = 2; +} + +message RoleUpdateItemsNty { + string items = 1; +} + +message RoleClearItemsRar { + repeated string items = 1; +} + +message RoleStartBattleReq { + int32 chapter_id = 1; + int32 carbon_id = 2; +} + +message RoleStartBattleRsp { + int32 cur_sp = 1; + string drop_reward = 2; +} + +message RoleEndBattleReq { + int32 chapter_id = 1; + int32 carbon_id = 2; + bool pass = 3; + string team_id = 4; + string drop_reward = 5; +} + +message RoleEndBattleRsp { + int32 role_level = 1; + int32 role_exp = 2; + int32 role_expamount = 3; + string reward = 4; + bool pass = 5; + repeated models.Hero hero = 6; + int32 chapter_id = 7; + int32 carbon_id = 8; + string drop_reward = 9; +} + +message RoleGuideRar { + int32 guide_steps = 1; +} + +message RoleTaskRar { + int32 typ = 1; + int32 task_id = 2; + string reward = 3; +} + +message RoleOpenBoxReq { + map costs = 1; +} + +message RoleOpenBoxRsp { + map reward = 3; +} + +message RoleBuffRar { + string chapter_id = 1; + map buffs = 3; +} + +message RoleResetChapterRar { + string chapter_id = 1; + int32 cost_id = 2; + int32 cost_count = 3; +} + +message RoleCostReq { + map costs = 1; +} + +message RoleCostRsp { + int32 cur = 1; +} + +message RoleLogOutRar { +} + +message RoleDrawCardReq { + int32 group_id = 1; + int32 pool_id = 2; + int32 draw_count = 3; +} + +message RoleDrawCardRsp { + string reward = 1; +} + +message RoleCdKeyReq { + string cdkey = 1; +} + +message RoleCdKeyRsp { + string reward = 1; +} + +message RoleStartClimbReq { + int32 chapter_id = 1; + int32 carbon_id = 2; + string team_id = 3; +} + +message RoleStartClimbRsp { +} + +message RoleMiddleClimbReq { + int32 chapter_id = 1; + int32 carbon_id = 2; + string team_id = 3; +} + +message RoleMiddleClimbRsp { + string reward = 1; + int64 timestamp = 2; +} + +message RoleEndClimbReq { + int32 chapter_id = 1; + int32 carbon_id = 2; + string team_id = 3; +} + +message RoleEndClimbRsp { + string reward = 1; + int32 hishigh = 2; + int64 timestamp = 3; +} + +message RoleRankClimbReq { + int32 chapter_id = 1; +} diff --git a/store.proto b/store.proto new file mode 100644 index 0000000..0fa4112 --- /dev/null +++ b/store.proto @@ -0,0 +1,25 @@ +syntax = "proto3"; +option go_package = "../pb;pb"; + +package game; +//import "google/protobuf/empty.proto"; +import "models.proto"; + +// rpc = req + rsp 请求/返回 +// rpc = rar + rar 自回包 + + +message StoreBuyReq { + int32 typ = 1; + int32 id = 2; + int32 count = 3; +} + +message StoreBuyRsp { + string reward = 1; +} + +message StoreUpdatePropertyNty { + repeated string keys = 1; // 键 名字 + models.Store store = 2; +} -- libgit2 0.21.2