zhangqijia / Pro2DServer

Commit 17fe96be5bbbf622bdbda304911a992fb237000c

Authored by zhangqijia
1 parent 8c3893b7

feat: 增加装备相关数据和协议 

1.models.hero型增加装备字段，models.Equipment增加hero_id字段。
2.增加穿戴装备，脱下装备协议HeroEquipReferReq
3.RoleRsp数据模型增加装备列表
Showing 13 changed files with 378 additions and 223 deletions   Show diff stats
Inline Side-by-side
cmd/gameserver/action/RoleAction.go
  Show/Hide comments   View file @17fe96b
... ... @@ -76,9 +76,10 @@ func LoginRpc(agent components.IAgent, msg components.IMessage) (int32, interfac
76 76 }
77 77 role.SetProperty("Device", req.Device)
78 78 protoMsg := &pb.RoleRsp{
79   - Role: role.Role,
80   - Hero: role.GetAllHero(),
81   - Team: role.GetAllTeam(),
  79 + Role: role.Role,
  80 + Hero: role.GetAllHero(),
  81 + Team: role.GetAllTeam(),
  82 + Equipments: role.GetEquipments(),
82 83 }
83 84 //登录成功，存储agent role
84 85 agent.SetSchema(role)
... ... @@ -99,3 +100,51 @@ func ChangeTeamRpc(agent components.IAgent, msg components.IMessage) (int32, int
99 100 role.UpdateTeam(req.Team)
100 101 return 0, nil
101 102 }
  103 +
  104 +func HeroEquipReferRpc(agent components.IAgent, msg components.IMessage) (int32, interface{}) {
  105 + req := pb.HeroEquipReferReq{}
  106 + if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
  107 + logger.Error("loginRpc err: %v", err)
  108 + return 1, nil
  109 + }
  110 + role := agent.GetSchema().(*models.RoleModel)
  111 + if role == nil {
  112 + return 2, nil
  113 + }
  114 +
  115 + e, ok := role.Equipments[req.EquipId]
  116 + if !ok {
  117 + return 3, nil
  118 + }
  119 +
  120 + equip := e.(*models.EquipModel)
  121 +
  122 + // 装备未被穿戴
  123 + if equip.Equip.HeroId == "" {
  124 +
  125 + h, ok := role.Heros[req.HeroId]
  126 + if ok {
  127 + hero := h.(*models.HeroModel)
  128 + hero.UpdateEquipment(equip.Equip.Id, equip.Equip.Type)
  129 + }
  130 + equip.SetProperty("heroid", req.HeroId)
  131 + } else {
  132 + //装备已经被穿戴
  133 + if req.HeroId != equip.Equip.HeroId {
  134 + h, ok := role.Heros[equip.Equip.HeroId]
  135 + if ok {
  136 + hero := h.(*models.HeroModel)
  137 + hero.UpdateEquipment(equip.Equip.Id, "")
  138 + }
  139 +
  140 + h, ok = role.Heros[req.HeroId]
  141 + if ok {
  142 + hero := h.(*models.HeroModel)
  143 + hero.UpdateEquipment(equip.Equip.Id, equip.Equip.Type)
  144 + }
  145 +
  146 + equip.SetProperty("heroid", req.HeroId)
  147 + }
  148 + }
  149 + return 0, nil
  150 +}
... ...
cmd/gameserver/action/protocode.go
  Show/Hide comments   View file @17fe96b
... ... @@ -12,6 +12,7 @@ func GetActionMap() map[interface{}]interface{} {
12 12 am[uint32(pb.ProtoCode_LoginReq)] = LoginRpc
13 13 am[uint32(pb.ProtoCode_CreateReq)] = CreateRpc
14 14 am[uint32(pb.ProtoCode_ChangeTeamReq)] = ChangeTeamRpc
  15 + am[uint32(pb.ProtoCode_HeroEquipReferReq)] = HeroEquipReferRpc
15 16  
16 17 return am
17 18 }
... ...
common/commonFunc.go
  Show/Hide comments   View file @17fe96b
1 1 package common
2 2  
3 3 import (
  4 + "bytes"
4 5 "errors"
5 6 "fmt"
6 7 "github.com/garyburd/redigo/redis"
7 8 "pro2d/common/db/redisproxy"
  9 + "strings"
8 10 )
9 11  
10 12 func GetNextRoleId() (string, error) {
... ... @@ -49,3 +51,28 @@ func GetNextUId() (string, error) {
49 51 }
50 52 return fmt.Sprintf("%d", ID), nil
51 53 }
  54 +
  55 +type IMapString map[string]interface{}
  56 +
  57 +func MapToString(params map[string]interface{}) string {
  58 + var items bytes.Buffer
  59 + for k, v := range params {
  60 + items.WriteString(k)
  61 + items.WriteString("=")
  62 + items.WriteString(fmt.Sprintf("%v", v))
  63 + items.WriteString(" ")
  64 + }
  65 + return items.String()
  66 +}
  67 +
  68 +func StringToMap(items string) map[string]interface{} {
  69 + backPack := make(map[string]interface{})
  70 + for _, v := range strings.Split(items, " ") {
  71 + ii := strings.Split(v, "=")
  72 + if len(ii) < 2 {
  73 + continue
  74 + }
  75 + backPack[ii[0]] = ii[1]
  76 + }
  77 + return backPack
  78 +}
... ...
models/equip.go
  Show/Hide comments   View file @17fe96b
... ... @@ -10,14 +10,11 @@ type EquipModel struct {
10 10 Equip *pb.Equipment
11 11 }
12 12  
13   -func NewEquip(id string) *EquipModel {
14   - data := &pb.Equipment{
15   - Id: id,
16   - }
  13 +func NewEquip(data *pb.Equipment) *EquipModel {
17 14 m := &EquipModel{
18   - ISchema: NewSchema(id, data),
19   - Equip: data,
  15 + ISchema: NewSchema(data.Id, data),
  16 + Equip: data,
20 17 }
21 18  
22 19 return m
23   -}
24 20 \ No newline at end of file
  21 +}
... ...
models/hero.go
  Show/Hide comments   View file @17fe96b
1 1 package models
2 2  
3 3 import (
  4 + "pro2d/common"
4 5 "pro2d/common/components"
5 6 "pro2d/pb"
6 7 )
7 8  
8 9 type HeroModel struct {
9 10 components.ISchema
10   - Hero *pb.Hero
  11 + Hero *pb.Hero
  12 + Equipments common.IMapString
11 13 }
12   -type HeroMap map[string]components.ISchema
  14 +
13 15 func NewHero(hero *pb.Hero) *HeroModel {
14 16 m := &HeroModel{
15   - ISchema: NewSchema(hero.Id, hero),
16   - Hero: hero,
  17 + ISchema: NewSchema(hero.Id, hero),
  18 + Hero: hero,
  19 + Equipments: common.StringToMap(hero.Equipments),
17 20 }
18 21 return m
19 22 }
  23 +
  24 +func (m *HeroModel) UpdateEquipment(key string, typ string) {
  25 + if typ == "" {
  26 + delete(m.Equipments, key)
  27 + } else {
  28 + m.Equipments[key] = typ
  29 + }
  30 +
  31 + m.SetProperty("equipments", common.MapToString(m.Equipments))
  32 +}
... ...
models/init.go deleted
View file @8c3893b
... ... @@ -1,24 +0,0 @@
1   -package models
2   -
3   -import (
4   - "pro2d/common/db/mongoproxy"
5   - "pro2d/pb"
6   -)
7   -
8   -func InitAccountModels() {
9   - var schema = []interface{}{
10   - pb.Account{},
11   - }
12   - mongoproxy.InitDoc(schema...)
13   -}
14   -
15   -func InitGameModels() {
16   - var schema = []interface{}{
17   - pb.Equipment{},
18   - pb.Hero{},
19   - pb.Prop{},
20   - pb.Role{},
21   - pb.Team{},
22   - }
23   - mongoproxy.InitDoc(schema...)
24   -}
models/role.go
  Show/Hide comments   View file @17fe96b
... ... @@ -11,15 +11,14 @@ import (
11 11 "sync/atomic"
12 12 )
13 13  
14   -type BackPackItems map[string]uint32
15   -
16 14 type RoleModel struct {
17 15 components.ISchema
18   - Role *pb.Role
19   - Heros SchemaMap
20   - Teams SchemaMap
21   - Prop *PropModel
22   - Items BackPackItems //背包
  16 + Role *pb.Role
  17 + Heros SchemaMap
  18 + Teams SchemaMap
  19 + Equipments SchemaMap
  20 + Prop *PropModel
  21 + Items common.IMapString //背包
23 22  
24 23 lastSaveTs int64
25 24 }
... ... @@ -38,7 +37,7 @@ func RoleExistByUid(uid string) *RoleModel {
38 37 Heros: make(SchemaMap),
39 38 Teams: make(SchemaMap),
40 39 Prop: new(PropModel),
41   - Items: make(BackPackItems),
  40 + Items: make(common.IMapString),
42 41 }
43 42 r.Load()
44 43 r.LoadAll()
... ... @@ -53,7 +52,7 @@ func NewRole(id string) *RoleModel {
53 52 Heros: make(SchemaMap),
54 53 Teams: make(SchemaMap),
55 54 Prop: new(PropModel),
56   - Items: make(BackPackItems),
  55 + Items: make(common.IMapString),
57 56 }
58 57 return m
59 58 }
... ... @@ -80,13 +79,12 @@ func (m *RoleModel) IncreTeamByKey(detal uint32) string {
80 79 func (m *RoleModel) InitRole() {
81 80 //init hero
82 81 h1 := pb.Hero{
83   - Id: m.IncreHearByKey(1),
84   - RoleId: m.Role.Id,
85   - Type: 1,
86   - Level: 1,
87   - ReinCount: 0,
88   - ReinPoint: 0,
89   - Equipments: "",
  82 + Id: m.IncreHearByKey(1),
  83 + RoleId: m.Role.Id,
  84 + Type: 1,
  85 + Level: 1,
  86 + ReinCount: 0,
  87 + ReinPoint: 0,
90 88 }
91 89 m.AddHero(&h1)
92 90  
... ... @@ -156,13 +154,26 @@ func (m *RoleModel) LoadTeams() {
156 154  
157 155 //加载背包数据到内存
158 156 func (m *RoleModel) LoadItems() {
159   - m.Items = m.StringToItems(m.Role.Items)
  157 + m.Items = common.StringToMap(m.Role.Items)
  158 +}
  159 +
  160 +func (m *RoleModel) LoadEquipments() {
  161 + data := make([]*pb.Equipment, 10)
  162 + err := mongoproxy.FindMany("equipment", "roleid", m.Role.Id, &data)
  163 + if err != nil {
  164 + logger.Error(err)
  165 + return
  166 + }
  167 + for _, d := range data {
  168 + m.Equipments[d.Id] = NewEquip(d)
  169 + }
160 170 }
161 171  
162 172 func (m *RoleModel) LoadAll() {
163 173 m.LoadHero()
164 174 m.LoadTeams()
165 175 m.LoadItems()
  176 + m.LoadEquipments()
166 177 }
167 178  
168 179 func (m *RoleModel) UpdateProperty(key string, val interface{}, notify bool) {
... ... @@ -211,6 +222,14 @@ func (m *RoleModel) GetAllTeam() []*pb.Team {
211 222 return t
212 223 }
213 224  
  225 +func (m *RoleModel) GetEquipments() []*pb.Equipment {
  226 + var equips []*pb.Equipment
  227 + for _, e := range m.Equipments {
  228 + equips = append(equips, e.(*EquipModel).Equip)
  229 + }
  230 + return equips
  231 +}
  232 +
214 233 func (m *RoleModel) AddHero(hero *pb.Hero) {
215 234 h := NewHero(hero)
216 235 h.Create()
... ...
models/rolePlugin.go
  Show/Hide comments   View file @17fe96b
1 1 package models
2 2  
3 3 import (
4   - "bytes"
5 4 "fmt"
6 5 "github.com/golang/protobuf/proto"
  6 + "pro2d/common"
7 7 "pro2d/common/logger"
8 8 "pro2d/pb"
9   - "strconv"
10   - "strings"
11 9 )
12 10  
13 11 //背包系统
... ... @@ -16,7 +14,7 @@ func (m *RoleModel) GetItemCount(key string) uint32 {
16 14 if !ok {
17 15 c = 0
18 16 }
19   - return c
  17 + return c.(uint32)
20 18 }
21 19  
22 20 func (m *RoleModel) CostItem(key string, count int32) bool {
... ... @@ -26,13 +24,13 @@ func (m *RoleModel) CostItem(key string, count int32) bool {
26 24 return m.AddItem(key, -count)
27 25 }
28 26  
29   -func (m *RoleModel) CostItems(params BackPackItems) bool {
  27 +func (m *RoleModel) CostItems(params common.IMapString) bool {
30 28 for k, v := range params {
31   - if v > m.GetItemCount(k) {
  29 + if v.(uint32) > m.GetItemCount(k) {
32 30 return false
33 31 }
34 32  
35   - m.AddItem(k, -int32(v))
  33 + m.AddItem(k, -v.(int32))
36 34 }
37 35 return true
38 36 }
... ... @@ -46,7 +44,7 @@ func (m *RoleModel) AddItem(key string, count int32) bool {
46 44 } else {
47 45 delete(m.Items, key)
48 46 }
49   - m.SetProperty("items", m.ItemsToString(m.Items))
  47 + m.SetProperty("items", common.MapToString(m.Items))
50 48  
51 49 rsp, err := proto.Marshal(&pb.RoleUpdateItemsRsp{Items: fmt.Sprintf("%s=%d", key, num)})
52 50 if err != nil {
... ... @@ -57,12 +55,12 @@ func (m *RoleModel) AddItem(key string, count int32) bool {
57 55 return true
58 56 }
59 57  
60   -func (m *RoleModel) AddItems(params BackPackItems) bool {
61   - tmp := make(BackPackItems)
  58 +func (m *RoleModel) AddItems(params common.IMapString) bool {
  59 + tmp := make(common.IMapString)
62 60 for k, v := range params {
63 61 c := m.GetItemCount(k)
64 62  
65   - num := c + v
  63 + num := c + v.(uint32)
66 64 if num > 0 {
67 65 m.Items[k] = num
68 66 tmp[k] = num
... ... @@ -71,9 +69,9 @@ func (m *RoleModel) AddItems(params BackPackItems) bool {
71 69 }
72 70 }
73 71  
74   - m.SetProperty("items", m.ItemsToString(m.Items))
  72 + m.SetProperty("items", common.MapToString(m.Items))
75 73  
76   - rsp, err := proto.Marshal(&pb.RoleUpdateItemsRsp{Items: m.ItemsToString(tmp)})
  74 + rsp, err := proto.Marshal(&pb.RoleUpdateItemsRsp{Items: common.MapToString(tmp)})
77 75 if err != nil {
78 76 logger.Error(err.Error())
79 77 return true
... ... @@ -85,30 +83,3 @@ func (m *RoleModel) AddItems(params BackPackItems) bool {
85 83  
86 84 return true
87 85 }
88   -
89   -func (m *RoleModel) ItemsToString(params BackPackItems) string {
90   - var items bytes.Buffer
91   - for k, v := range params {
92   - items.WriteString(k)
93   - items.WriteString("=")
94   - items.WriteString(fmt.Sprintf("%d", v))
95   - items.WriteString(" ")
96   - }
97   - return items.String()
98   -}
99   -
100   -func (m *RoleModel) StringToItems(items string) BackPackItems {
101   - backPack := make(BackPackItems)
102   - for _, v := range strings.Split(items, " ") {
103   - ii := strings.Split(v, "=")
104   - if len(ii) < 2 {
105   - continue
106   - }
107   - n, err := strconv.ParseUint(ii[1], 10, 32)
108   - if err != nil {
109   - continue
110   - }
111   - backPack[ii[0]] = uint32(n)
112   - }
113   - return backPack
114   -}
... ...
models/role_test.go
  Show/Hide comments   View file @17fe96b
... ... @@ -126,7 +126,7 @@ func TestRoleModel_IncreByKey(t *testing.T) {
126 126 ites := strings.SplitN("1=1 2=2 3=3", " ", -1)
127 127 fmt.Println(ites)
128 128  
129   - items := make(BackPackItems)
  129 + items := make(IMapString)
130 130 for _, v := range ites {
131 131 ii := strings.Split(v, "=")
132 132 if len(ii) < 2 {
... ...
pb/game.pb.go
  Show/Hide comments   View file @17fe96b
... ... @@ -227,6 +227,7 @@ func (x *CreateReq) GetDevice() string {
227 227 return ""
228 228 }
229 229  
  230 +//ResponseCmd ChangeTeamReq
230 231 type ChangeTeamReq struct {
231 232 state protoimpl.MessageState
232 233 sizeCache protoimpl.SizeCache
... ... @@ -274,20 +275,85 @@ func (x *ChangeTeamReq) GetTeam() []*Team {
274 275 return nil
275 276 }
276 277  
  278 +//ResponseCmd HeroEquipReferReq
  279 +type HeroEquipReferReq struct {
  280 + state protoimpl.MessageState
  281 + sizeCache protoimpl.SizeCache
  282 + unknownFields protoimpl.UnknownFields
  283 +
  284 + EquipId string `protobuf:"bytes,1,opt,name=equipId,proto3" json:"equipId,omitempty"`
  285 + HeroId string `protobuf:"bytes,2,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"`
  286 + Refer bool `protobuf:"varint,3,opt,name=refer,proto3" json:"refer,omitempty"` //true 穿戴， false 脱下
  287 +}
  288 +
  289 +func (x *HeroEquipReferReq) Reset() {
  290 + *x = HeroEquipReferReq{}
  291 + if protoimpl.UnsafeEnabled {
  292 + mi := &file_game_proto_msgTypes[5]
  293 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  294 + ms.StoreMessageInfo(mi)
  295 + }
  296 +}
  297 +
  298 +func (x *HeroEquipReferReq) String() string {
  299 + return protoimpl.X.MessageStringOf(x)
  300 +}
  301 +
  302 +func (*HeroEquipReferReq) ProtoMessage() {}
  303 +
  304 +func (x *HeroEquipReferReq) ProtoReflect() protoreflect.Message {
  305 + mi := &file_game_proto_msgTypes[5]
  306 + if protoimpl.UnsafeEnabled && x != nil {
  307 + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
  308 + if ms.LoadMessageInfo() == nil {
  309 + ms.StoreMessageInfo(mi)
  310 + }
  311 + return ms
  312 + }
  313 + return mi.MessageOf(x)
  314 +}
  315 +
  316 +// Deprecated: Use HeroEquipReferReq.ProtoReflect.Descriptor instead.
  317 +func (*HeroEquipReferReq) Descriptor() ([]byte, []int) {
  318 + return file_game_proto_rawDescGZIP(), []int{5}
  319 +}
  320 +
  321 +func (x *HeroEquipReferReq) GetEquipId() string {
  322 + if x != nil {
  323 + return x.EquipId
  324 + }
  325 + return ""
  326 +}
  327 +
  328 +func (x *HeroEquipReferReq) GetHeroId() string {
  329 + if x != nil {
  330 + return x.HeroId
  331 + }
  332 + return ""
  333 +}
  334 +
  335 +func (x *HeroEquipReferReq) GetRefer() bool {
  336 + if x != nil {
  337 + return x.Refer
  338 + }
  339 + return false
  340 +}
  341 +
277 342 type RoleRsp struct {
278 343 state protoimpl.MessageState
279 344 sizeCache protoimpl.SizeCache
280 345 unknownFields protoimpl.UnknownFields
281 346  
282   - Role *Role `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
283   - Hero []*Hero `protobuf:"bytes,3,rep,name=hero,proto3" json:"hero,omitempty"`
284   - Team []*Team `protobuf:"bytes,4,rep,name=team,proto3" json:"team,omitempty"`
  347 + Role *Role `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
  348 + Hero []*Hero `protobuf:"bytes,3,rep,name=hero,proto3" json:"hero,omitempty"`
  349 + Team []*Team `protobuf:"bytes,4,rep,name=team,proto3" json:"team,omitempty"`
  350 + Equipments []*Equipment `protobuf:"bytes,5,rep,name=equipments,proto3" json:"equipments,omitempty"`
285 351 }
286 352  
287 353 func (x *RoleRsp) Reset() {
288 354 *x = RoleRsp{}
289 355 if protoimpl.UnsafeEnabled {
290   - mi := &file_game_proto_msgTypes[5]
  356 + mi := &file_game_proto_msgTypes[6]
291 357 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
292 358 ms.StoreMessageInfo(mi)
293 359 }
... ... @@ -300,7 +366,7 @@ func (x *RoleRsp) String() string {
300 366 func (*RoleRsp) ProtoMessage() {}
301 367  
302 368 func (x *RoleRsp) ProtoReflect() protoreflect.Message {
303   - mi := &file_game_proto_msgTypes[5]
  369 + mi := &file_game_proto_msgTypes[6]
304 370 if protoimpl.UnsafeEnabled && x != nil {
305 371 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
306 372 if ms.LoadMessageInfo() == nil {
... ... @@ -313,7 +379,7 @@ func (x *RoleRsp) ProtoReflect() protoreflect.Message {
313 379  
314 380 // Deprecated: Use RoleRsp.ProtoReflect.Descriptor instead.
315 381 func (*RoleRsp) Descriptor() ([]byte, []int) {
316   - return file_game_proto_rawDescGZIP(), []int{5}
  382 + return file_game_proto_rawDescGZIP(), []int{6}
317 383 }
318 384  
319 385 func (x *RoleRsp) GetRole() *Role {
... ... @@ -337,6 +403,13 @@ func (x *RoleRsp) GetTeam() []*Team {
337 403 return nil
338 404 }
339 405  
  406 +func (x *RoleRsp) GetEquipments() []*Equipment {
  407 + if x != nil {
  408 + return x.Equipments
  409 + }
  410 + return nil
  411 +}
  412 +
340 413 //ResponseCmd RoleUpdatePropertyRsp
341 414 type RoleUpdatePropertyRsp struct {
342 415 state protoimpl.MessageState
... ... @@ -350,7 +423,7 @@ type RoleUpdatePropertyRsp struct {
350 423 func (x *RoleUpdatePropertyRsp) Reset() {
351 424 *x = RoleUpdatePropertyRsp{}
352 425 if protoimpl.UnsafeEnabled {
353   - mi := &file_game_proto_msgTypes[6]
  426 + mi := &file_game_proto_msgTypes[7]
354 427 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
355 428 ms.StoreMessageInfo(mi)
356 429 }
... ... @@ -363,7 +436,7 @@ func (x *RoleUpdatePropertyRsp) String() string {
363 436 func (*RoleUpdatePropertyRsp) ProtoMessage() {}
364 437  
365 438 func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message {
366   - mi := &file_game_proto_msgTypes[6]
  439 + mi := &file_game_proto_msgTypes[7]
367 440 if protoimpl.UnsafeEnabled && x != nil {
368 441 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
369 442 if ms.LoadMessageInfo() == nil {
... ... @@ -376,7 +449,7 @@ func (x *RoleUpdatePropertyRsp) ProtoReflect() protoreflect.Message {
376 449  
377 450 // Deprecated: Use RoleUpdatePropertyRsp.ProtoReflect.Descriptor instead.
378 451 func (*RoleUpdatePropertyRsp) Descriptor() ([]byte, []int) {
379   - return file_game_proto_rawDescGZIP(), []int{6}
  452 + return file_game_proto_rawDescGZIP(), []int{7}
380 453 }
381 454  
382 455 func (x *RoleUpdatePropertyRsp) GetId() []int32 {
... ... @@ -405,7 +478,7 @@ type RoleUpdateItemsRsp struct {
405 478 func (x *RoleUpdateItemsRsp) Reset() {
406 479 *x = RoleUpdateItemsRsp{}
407 480 if protoimpl.UnsafeEnabled {
408   - mi := &file_game_proto_msgTypes[7]
  481 + mi := &file_game_proto_msgTypes[8]
409 482 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
410 483 ms.StoreMessageInfo(mi)
411 484 }
... ... @@ -418,7 +491,7 @@ func (x *RoleUpdateItemsRsp) String() string {
418 491 func (*RoleUpdateItemsRsp) ProtoMessage() {}
419 492  
420 493 func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message {
421   - mi := &file_game_proto_msgTypes[7]
  494 + mi := &file_game_proto_msgTypes[8]
422 495 if protoimpl.UnsafeEnabled && x != nil {
423 496 ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
424 497 if ms.LoadMessageInfo() == nil {
... ... @@ -431,7 +504,7 @@ func (x *RoleUpdateItemsRsp) ProtoReflect() protoreflect.Message {
431 504  
432 505 // Deprecated: Use RoleUpdateItemsRsp.ProtoReflect.Descriptor instead.
433 506 func (*RoleUpdateItemsRsp) Descriptor() ([]byte, []int) {
434   - return file_game_proto_rawDescGZIP(), []int{7}
  507 + return file_game_proto_rawDescGZIP(), []int{8}
435 508 }
436 509  
437 510 func (x *RoleUpdateItemsRsp) GetItems() string {
... ... @@ -460,23 +533,32 @@ var file_game_proto_rawDesc = []byte{
460 533 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x31, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54,
461 534 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01,
462 535 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65,
463   - 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x6f, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65,
464   - 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
465   - 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52,
466   - 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20,
467   - 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72,
468   - 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18,
469   - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54,
470   - 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x49, 0x0a, 0x15, 0x52, 0x6f, 0x6c,
471   - 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52,
472   - 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x02,
473   - 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
  536 + 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x5c, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f,
  537 + 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a,
  538 + 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
  539 + 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f,
  540 + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
  541 + 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
  542 + 0x05, 0x72, 0x65, 0x66, 0x65, 0x72, 0x22, 0xa2, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52,
  543 + 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
474 544 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04,
475   - 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61,
476   - 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
477   - 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
478   - 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
479   - 0x6f, 0x74, 0x6f, 0x33,
  545 + 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03,
  546 + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f,
  547 + 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04,
  548 + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65,
  549 + 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x31, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69,
  550 + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d,
  551 + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52,
  552 + 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15, 0x52,
  553 + 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
  554 + 0x79, 0x52, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
  555 + 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
  556 + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65,
  557 + 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70,
  558 + 0x64, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05,
  559 + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65,
  560 + 0x6d, 0x73, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06,
  561 + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
480 562 }
481 563  
482 564 var (
... ... @@ -491,31 +573,34 @@ func file_game_proto_rawDescGZIP() []byte {
491 573 return file_game_proto_rawDescData
492 574 }
493 575  
494   -var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
  576 +var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
495 577 var file_game_proto_goTypes = []interface{}{
496 578 (*HeartReq)(nil), // 0: game.HeartReq
497 579 (*HeartRsp)(nil), // 1: game.HeartRsp
498 580 (*LoginReq)(nil), // 2: game.LoginReq
499 581 (*CreateReq)(nil), // 3: game.CreateReq
500 582 (*ChangeTeamReq)(nil), // 4: game.ChangeTeamReq
501   - (*RoleRsp)(nil), // 5: game.RoleRsp
502   - (*RoleUpdatePropertyRsp)(nil), // 6: game.RoleUpdatePropertyRsp
503   - (*RoleUpdateItemsRsp)(nil), // 7: game.RoleUpdateItemsRsp
504   - (*Team)(nil), // 8: models.Team
505   - (*Role)(nil), // 9: models.Role
506   - (*Hero)(nil), // 10: models.Hero
  583 + (*HeroEquipReferReq)(nil), // 5: game.HeroEquipReferReq
  584 + (*RoleRsp)(nil), // 6: game.RoleRsp
  585 + (*RoleUpdatePropertyRsp)(nil), // 7: game.RoleUpdatePropertyRsp
  586 + (*RoleUpdateItemsRsp)(nil), // 8: game.RoleUpdateItemsRsp
  587 + (*Team)(nil), // 9: models.Team
  588 + (*Role)(nil), // 10: models.Role
  589 + (*Hero)(nil), // 11: models.Hero
  590 + (*Equipment)(nil), // 12: models.Equipment
507 591 }
508 592 var file_game_proto_depIdxs = []int32{
509   - 8, // 0: game.ChangeTeamReq.team:type_name -> models.Team
510   - 9, // 1: game.RoleRsp.role:type_name -> models.Role
511   - 10, // 2: game.RoleRsp.hero:type_name -> models.Hero
512   - 8, // 3: game.RoleRsp.team:type_name -> models.Team
513   - 9, // 4: game.RoleUpdatePropertyRsp.role:type_name -> models.Role
514   - 5, // [5:5] is the sub-list for method output_type
515   - 5, // [5:5] is the sub-list for method input_type
516   - 5, // [5:5] is the sub-list for extension type_name
517   - 5, // [5:5] is the sub-list for extension extendee
518   - 0, // [0:5] is the sub-list for field type_name
  593 + 9, // 0: game.ChangeTeamReq.team:type_name -> models.Team
  594 + 10, // 1: game.RoleRsp.role:type_name -> models.Role
  595 + 11, // 2: game.RoleRsp.hero:type_name -> models.Hero
  596 + 9, // 3: game.RoleRsp.team:type_name -> models.Team
  597 + 12, // 4: game.RoleRsp.equipments:type_name -> models.Equipment
  598 + 10, // 5: game.RoleUpdatePropertyRsp.role:type_name -> models.Role
  599 + 6, // [6:6] is the sub-list for method output_type
  600 + 6, // [6:6] is the sub-list for method input_type
  601 + 6, // [6:6] is the sub-list for extension type_name
  602 + 6, // [6:6] is the sub-list for extension extendee
  603 + 0, // [0:6] is the sub-list for field type_name
519 604 }
520 605  
521 606 func init() { file_game_proto_init() }
... ... @@ -586,7 +671,7 @@ func file_game_proto_init() {
586 671 }
587 672 }
588 673 file_game_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
589   - switch v := v.(*RoleRsp); i {
  674 + switch v := v.(*HeroEquipReferReq); i {
590 675 case 0:
591 676 return &v.state
592 677 case 1:
... ... @@ -598,7 +683,7 @@ func file_game_proto_init() {
598 683 }
599 684 }
600 685 file_game_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
601   - switch v := v.(*RoleUpdatePropertyRsp); i {
  686 + switch v := v.(*RoleRsp); i {
602 687 case 0:
603 688 return &v.state
604 689 case 1:
... ... @@ -610,6 +695,18 @@ func file_game_proto_init() {
610 695 }
611 696 }
612 697 file_game_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
  698 + switch v := v.(*RoleUpdatePropertyRsp); i {
  699 + case 0:
  700 + return &v.state
  701 + case 1:
  702 + return &v.sizeCache
  703 + case 2:
  704 + return &v.unknownFields
  705 + default:
  706 + return nil
  707 + }
  708 + }
  709 + file_game_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
613 710 switch v := v.(*RoleUpdateItemsRsp); i {
614 711 case 0:
615 712 return &v.state
... ... @@ -628,7 +725,7 @@ func file_game_proto_init() {
628 725 GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
629 726 RawDescriptor: file_game_proto_rawDesc,
630 727 NumEnums: 0,
631   - NumMessages: 8,
  728 + NumMessages: 9,
632 729 NumExtensions: 0,
633 730 NumServices: 0,
634 731 },
... ...
pb/models.pb.go
  Show/Hide comments   View file @17fe96b
... ... @@ -94,7 +94,7 @@ type Hero struct {
94 94 Level int32 `protobuf:"varint,4,opt,name=level,proto3" json:"level,omitempty"`
95 95 ReinCount int32 `protobuf:"varint,5,opt,name=rein_count,json=reinCount,proto3" json:"rein_count,omitempty"`
96 96 ReinPoint int32 `protobuf:"varint,6,opt,name=rein_point,json=reinPoint,proto3" json:"rein_point,omitempty"`
97   - Equipments string `protobuf:"bytes,7,opt,name=equipments,proto3" json:"equipments,omitempty"`
  97 + Equipments string `protobuf:"bytes,7,opt,name=equipments,proto3" json:"equipments,omitempty"` //"id=type id1=type1"
98 98 }
99 99  
100 100 func (x *Hero) Reset() {
... ... @@ -185,9 +185,9 @@ type Equipment struct {
185 185  
186 186 Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" index:"unique" pri:"1"` // @inject_tag: index:"unique" pri:"1"
187 187 RoleId string `protobuf:"bytes,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"`
188   - Type int64 `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`
189   - Equip bool `protobuf:"varint,4,opt,name=equip,proto3" json:"equip,omitempty"`
190   - EnhanceLevel bool `protobuf:"varint,5,opt,name=enhance_level,json=enhanceLevel,proto3" json:"enhance_level,omitempty"`
  188 + Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
  189 + EnhanceLevel int32 `protobuf:"varint,4,opt,name=enhance_level,json=enhanceLevel,proto3" json:"enhance_level,omitempty"`
  190 + HeroId string `protobuf:"bytes,5,opt,name=hero_id,json=heroId,proto3" json:"hero_id,omitempty"`
191 191 }
192 192  
193 193 func (x *Equipment) Reset() {
... ... @@ -236,25 +236,25 @@ func (x *Equipment) GetRoleId() string {
236 236 return ""
237 237 }
238 238  
239   -func (x *Equipment) GetType() int64 {
  239 +func (x *Equipment) GetType() string {
240 240 if x != nil {
241 241 return x.Type
242 242 }
243   - return 0
  243 + return ""
244 244 }
245 245  
246   -func (x *Equipment) GetEquip() bool {
  246 +func (x *Equipment) GetEnhanceLevel() int32 {
247 247 if x != nil {
248   - return x.Equip
  248 + return x.EnhanceLevel
249 249 }
250   - return false
  250 + return 0
251 251 }
252 252  
253   -func (x *Equipment) GetEnhanceLevel() bool {
  253 +func (x *Equipment) GetHeroId() string {
254 254 if x != nil {
255   - return x.EnhanceLevel
  255 + return x.HeroId
256 256 }
257   - return false
  257 + return ""
258 258 }
259 259  
260 260 type Prop struct {
... ... @@ -463,7 +463,7 @@ type Role struct {
463 463 PayR string `protobuf:"bytes,12,opt,name=pay_r,json=payR,proto3" json:"pay_r,omitempty"`
464 464 Del bool `protobuf:"varint,13,opt,name=del,proto3" json:"del,omitempty"`
465 465 Incres map[string]uint32 `protobuf:"bytes,14,rep,name=incres,proto3" json:"incres,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
466   - Items string `protobuf:"bytes,15,opt,name=items,proto3" json:"items,omitempty"`
  466 + Items string `protobuf:"bytes,15,opt,name=items,proto3" json:"items,omitempty"` //物品 "id=count id2=count2"
467 467 }
468 468  
469 469 func (x *Role) Reset() {
... ... @@ -610,52 +610,53 @@ var file_models_proto_rawDesc = []byte{
610 610 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x69, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12,
611 611 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20,
612 612 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22,
613   - 0x83, 0x01, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a,
  613 + 0x86, 0x01, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a,
614 614 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a,
615 615 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
616 616 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
617   - 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71,
618   - 0x75, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70,
619   - 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x6e, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6c, 0x65, 0x76, 0x65,
620   - 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x65, 0x6e, 0x68, 0x61, 0x6e, 0x63, 0x65,
621   - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x2c, 0x0a, 0x04, 0x50, 0x72, 0x6f, 0x70, 0x12, 0x0e, 0x0a,
622   - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a,
623   - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f,
624   - 0x75, 0x6e, 0x74, 0x22, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x65, 0x61, 0x6d, 0x12, 0x0e, 0x0a, 0x02,
625   - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x07,
626   - 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
627   - 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64,
628   - 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x31,
629   - 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x32, 0x18, 0x04, 0x20, 0x01,
630   - 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x32, 0x12, 0x19, 0x0a, 0x08, 0x68,
631   - 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x33, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68,
632   - 0x65, 0x72, 0x6f, 0x49, 0x64, 0x33, 0x22, 0x2f, 0x0a, 0x09, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d,
633   - 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
634   - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01,
635   - 0x28, 0x03, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0xe2, 0x02, 0x0a, 0x04, 0x52, 0x6f, 0x6c, 0x65,
  617 + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x6e,
  618 + 0x68, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
  619 + 0x05, 0x52, 0x0c, 0x65, 0x6e, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12,
  620 + 0x17, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
  621 + 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x04, 0x50, 0x72, 0x6f, 0x70,
636 622 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
637   - 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
638   - 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01,
639   - 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x69,
640   - 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x69, 0x63, 0x6b, 0x12, 0x14,
641   - 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
642   - 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
643   - 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01,
644   - 0x28, 0x03, 0x52, 0x02, 0x68, 0x70, 0x12, 0x15, 0x0a, 0x06, 0x68, 0x70, 0x5f, 0x6d, 0x61, 0x78,
645   - 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x68, 0x70, 0x4d, 0x61, 0x78, 0x12, 0x13, 0x0a,
646   - 0x05, 0x62, 0x75, 0x79, 0x5f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x75,
647   - 0x79, 0x52, 0x12, 0x13, 0x0a, 0x05, 0x70, 0x61, 0x79, 0x5f, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28,
648   - 0x09, 0x52, 0x04, 0x70, 0x61, 0x79, 0x52, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x65, 0x6c, 0x18, 0x0d,
649   - 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x65, 0x6c, 0x12, 0x30, 0x0a, 0x06, 0x69, 0x6e, 0x63,
650   - 0x72, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65,
651   - 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x45, 0x6e,
652   - 0x74, 0x72, 0x79, 0x52, 0x06, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69,
653   - 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
654   - 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
655   - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
656   - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
657   - 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0a, 0x5a, 0x08,
658   - 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
  623 + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
  624 + 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x65, 0x61, 0x6d, 0x12,
  625 + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
  626 + 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
  627 + 0x52, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f,
  628 + 0x5f, 0x69, 0x64, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f,
  629 + 0x49, 0x64, 0x31, 0x12, 0x19, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x32, 0x18,
  630 + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x32, 0x12, 0x19,
  631 + 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x69, 0x64, 0x33, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
  632 + 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x33, 0x22, 0x2f, 0x0a, 0x09, 0x49, 0x6e, 0x63,
  633 + 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
  634 + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18,
  635 + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0xe2, 0x02, 0x0a, 0x04, 0x52,
  636 + 0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
  637 + 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
  638 + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18,
  639 + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a,
  640 + 0x04, 0x6e, 0x69, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x69, 0x63,
  641 + 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
  642 + 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06,
  643 + 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18,
  644 + 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x68, 0x70, 0x12, 0x15, 0x0a, 0x06, 0x68, 0x70, 0x5f,
  645 + 0x6d, 0x61, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x68, 0x70, 0x4d, 0x61, 0x78,
  646 + 0x12, 0x13, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x5f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
  647 + 0x04, 0x62, 0x75, 0x79, 0x52, 0x12, 0x13, 0x0a, 0x05, 0x70, 0x61, 0x79, 0x5f, 0x72, 0x18, 0x0c,
  648 + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x79, 0x52, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x65,
  649 + 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x65, 0x6c, 0x12, 0x30, 0x0a, 0x06,
  650 + 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d,
  651 + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x49, 0x6e, 0x63, 0x72, 0x65,
  652 + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x12, 0x14,
  653 + 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69,
  654 + 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x73, 0x45, 0x6e,
  655 + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
  656 + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
  657 + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42,
  658 + 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
  659 + 0x74, 0x6f, 0x33,
659 660 }
660 661  
661 662 var (
... ...
pb/protocode.pb.go
  Show/Hide comments   View file @17fe96b
... ... @@ -30,24 +30,26 @@ const (
30 30 ProtoCode_LoginReq ProtoCode = 4
31 31 ProtoCode_CreateReq ProtoCode = 5
32 32 ProtoCode_ChangeTeamReq ProtoCode = 6
33   - ProtoCode_RoleRsp ProtoCode = 7
34   - ProtoCode_RoleUpdatePropertyRsp ProtoCode = 8
35   - ProtoCode_RoleUpdateItemsRsp ProtoCode = 9
  33 + ProtoCode_HeroEquipReferReq ProtoCode = 7
  34 + ProtoCode_RoleRsp ProtoCode = 8
  35 + ProtoCode_RoleUpdatePropertyRsp ProtoCode = 9
  36 + ProtoCode_RoleUpdateItemsRsp ProtoCode = 10
36 37 )
37 38  
38 39 // Enum value maps for ProtoCode.
39 40 var (
40 41 ProtoCode_name = map[int32]string{
41   - 0: "UNKNOWN",
42   - 1: "LoginRsp",
43   - 2: "HeartReq",
44   - 3: "HeartRsp",
45   - 4: "LoginReq",
46   - 5: "CreateReq",
47   - 6: "ChangeTeamReq",
48   - 7: "RoleRsp",
49   - 8: "RoleUpdatePropertyRsp",
50   - 9: "RoleUpdateItemsRsp",
  42 + 0: "UNKNOWN",
  43 + 1: "LoginRsp",
  44 + 2: "HeartReq",
  45 + 3: "HeartRsp",
  46 + 4: "LoginReq",
  47 + 5: "CreateReq",
  48 + 6: "ChangeTeamReq",
  49 + 7: "HeroEquipReferReq",
  50 + 8: "RoleRsp",
  51 + 9: "RoleUpdatePropertyRsp",
  52 + 10: "RoleUpdateItemsRsp",
51 53 }
52 54 ProtoCode_value = map[string]int32{
53 55 "UNKNOWN": 0,
... ... @@ -57,9 +59,10 @@ var (
57 59 "LoginReq": 4,
58 60 "CreateReq": 5,
59 61 "ChangeTeamReq": 6,
60   - "RoleRsp": 7,
61   - "RoleUpdatePropertyRsp": 8,
62   - "RoleUpdateItemsRsp": 9,
  62 + "HeroEquipReferReq": 7,
  63 + "RoleRsp": 8,
  64 + "RoleUpdatePropertyRsp": 9,
  65 + "RoleUpdateItemsRsp": 10,
63 66 }
64 67 )
65 68  
... ... @@ -94,7 +97,7 @@ var File_protocode_proto protoreflect.FileDescriptor
94 97  
95 98 var file_protocode_proto_rawDesc = []byte{
96 99 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
97   - 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xb2, 0x01, 0x0a,
  100 + 0x6f, 0x12, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xc9, 0x01, 0x0a,
98 101 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e,
99 102 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e,
100 103 0x52, 0x73, 0x70, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x72, 0x74, 0x52, 0x65,
... ... @@ -102,12 +105,13 @@ var file_protocode_proto_rawDesc = []byte{
102 105 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x10, 0x04, 0x12,
103 106 0x0d, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x10, 0x05, 0x12, 0x11,
104 107 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x10,
105   - 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x10, 0x07, 0x12, 0x19,
106   - 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70,
107   - 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, 0x70, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c,
108   - 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x10,
109   - 0x09, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
110   - 0x72, 0x6f, 0x74, 0x6f, 0x33,
  108 + 0x06, 0x12, 0x15, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65,
  109 + 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65,
  110 + 0x52, 0x73, 0x70, 0x10, 0x08, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64,
  111 + 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x52, 0x73, 0x70, 0x10, 0x09,
  112 + 0x12, 0x16, 0x0a, 0x12, 0x52, 0x6f, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x74,
  113 + 0x65, 0x6d, 0x73, 0x52, 0x73, 0x70, 0x10, 0x0a, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70,
  114 + 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
111 115 }
112 116  
113 117 var (
... ...
1   -Subproject commit 55f842e18ed04c3b9841618400575e292aa5c1f3
  1 +Subproject commit 6cc8a5a6a18abe2e1f4ab3813d0cfea4fba91c28
... ...