1

server/matchserver/cs/cs.auto_gen.go

@@ -49,6 +49,7 @@ type MsgHandler interface {
         CMChooseHero(*f5.MsgHdr, *CMChooseHero)
         CMChooseMap(*f5.MsgHdr, *CMChooseMap)
         CMRefreshUser(*f5.MsgHdr, *CMRefreshUser)
+        CMChooseBattleItem(*f5.MsgHdr, *CMChooseBattleItem)
         CMGrantInvitePermission(*f5.MsgHdr, *CMGrantInvitePermission)
 }
 
@@ -94,6 +95,9 @@ func (this *MsgHandlerImpl) CMChooseMap(hdr *f5.MsgHdr, msg *CMChooseMap) {
 func (this *MsgHandlerImpl) CMRefreshUser(hdr *f5.MsgHdr, msg *CMRefreshUser) {
 }
 
+func (this *MsgHandlerImpl) CMChooseBattleItem(hdr *f5.MsgHdr, msg *CMChooseBattleItem) {
+}
+
 func (this *MsgHandlerImpl) CMGrantInvitePermission(hdr *f5.MsgHdr, msg *CMGrantInvitePermission) {
 }
 
@@ -213,6 +217,14 @@ func (this *SMRefreshUser) GetNetMsgId() uint16 {
         return uint16(SMMessageIdE__SMRefreshUser)
 }
 
+func (this *CMChooseBattleItem) GetNetMsgId() uint16 {
+        return uint16(CMMessageIdE__CMChooseBattleItem)
+}
+
+func (this *SMChooseBattleItem) GetNetMsgId() uint16 {
+        return uint16(SMMessageIdE__SMChooseBattleItem)
+}
+
 func (this *CMGrantInvitePermission) GetNetMsgId() uint16 {
         return uint16(CMMessageIdE__CMGrantInvitePermission)
 }
@@ -313,6 +325,12 @@ func (this *SMChooseMap) Err(errCode int32, errMsg string) *SMChooseMap {
         return this
 }
 
+func (this *SMChooseBattleItem) Err(errCode int32, errMsg string) *SMChooseBattleItem {
+        this.Errcode = proto.Int32(errCode)
+        this.Errmsg = proto.String(errMsg)
+        return this
+}
+
 func (this *SMGrantInvitePermission) Err(errCode int32, errMsg string) *SMGrantInvitePermission {
         this.Errcode = proto.Int32(errCode)
         this.Errmsg = proto.String(errMsg)
@@ -489,6 +507,18 @@ func init() {
                 },
         }
 
+        handlers[int(CMMessageIdE__CMChooseBattleItem)] = &CsNetMsgHandler{
+                MsgId: int(CMMessageIdE__CMChooseBattleItem),
+                ParseCb: func (data []byte) interface{} {
+                        msg := &CMChooseBattleItem{}
+                        proto.Unmarshal(data, msg)
+                        return msg
+                },
+                Cb: func (hdr *f5.MsgHdr, handler MsgHandler) {
+                        handler.CMChooseBattleItem(hdr, hdr.Msg.(*CMChooseBattleItem))
+                },
+        }
+
         handlers[int(CMMessageIdE__CMGrantInvitePermission)] = &CsNetMsgHandler{
                 MsgId: int(CMMessageIdE__CMGrantInvitePermission),
                 ParseCb: func (data []byte) interface{} {

server/matchserver/proto/cs_msgid.proto

@@ -21,6 +21,7 @@ enum CMMessageId_e
     _CMChooseHero = 116;
     _CMChooseMap = 117;
     _CMRefreshUser = 118;
+    _CMChooseBattleItem = 119;
 }
 
 enum SMMessageId_e
@@ -41,6 +42,7 @@ enum SMMessageId_e
     _SMChooseHero = 116;
     _SMChooseMap = 117;
     _SMRefreshUser = 118;
+    _SMChooseBattleItem = 120;
 
     _SMTeamUpdateNotify = 1001;
     _SMTeamStateNotify = 1002;

server/matchserver/proto/cs_proto.proto

@@ -122,6 +122,12 @@ message MFJoinMsg
     optional string payload = 2; //透传数据
 }
 
+//带入战斗的道具
+message MFBattleItem
+{
+    optional int32 item_id = 5; //item_id
+}
+
 //队伍成员
 message MFTeamMember
 {
@@ -141,6 +147,10 @@ message MFTeamMember
     optional int32 admission_item_num = 14;  //门票数
     optional int32 battling = 15; //是否战斗中
     optional int32 circuit_score = 16; //循回赛积分
+    optional int32 vip_lv = 17; //vip等级
+    optional int32 vip_exp = 18; //vip经验
+    optional int64 vip_lucky = 19; //vip幸运值加成
+    repeated MFBattleItem battle_items = 20; //带入战斗的道具
 }
 
 //队伍信息
@@ -332,6 +342,18 @@ message SMRefreshUser
 {
 }
 
+//选择带入战斗的道具
+message CMChooseBattleItem
+{
+    optional int32 item_id = 1; //道具id
+}
+
+message SMChooseBattleItem
+{
+    optional int32 errcode = 1; //错误码 0：成功
+    optional string errmsg = 2; //错误描述
+}
+
 //授予邀请队友权限
 message CMGrantInvitePermission
 {