From 7c3e85aa597d68b3185db03ac9157f2007e1bf56 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 12 Oct 2024 13:33:31 +0800
Subject: [PATCH] 1

---
 server/matchserver/common/types.go      | 14 ++++++++++++++
 server/matchserver/proto/cs_proto.proto |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/matchserver/common/types.go b/server/matchserver/common/types.go
index 34ff19b9..44f9fb93 100644
--- a/server/matchserver/common/types.go
+++ b/server/matchserver/common/types.go
@@ -10,6 +10,11 @@ import (
 	proto "github.com/golang/protobuf/proto"
 )
 
+type BattleItem struct {
+	ItemId int32 `json:"item_id"`
+	ItemNum int32 `json:"item_num"`
+}
+
 type LoginRsp struct {
 	Errcode int    `json:"errcode"`
 	Errmsg  string `json:"errmsg"`
@@ -25,6 +30,9 @@ type LoginRsp struct {
 			TotalLucky   interface{} `json:"total_lucky"`
 			AdmissionItemNum   interface{} `json:"admission_item_num"`
 			CircuitScore   interface{} `json:"circuit_score"`
+			VipLv interface{} `json:"vip_lv"`
+			VipExp interface{} `json:"vip_exp"`
+			HasVipLucky interface{} `json:"has_vip_lucky"`
 		} `json:"user_info"`
 		HeroInfo struct {
 			HeroUniId string `json:"hero_uniid"`
@@ -56,6 +64,9 @@ type UserRsp struct {
 			TotalLucky   interface{} `json:"total_lucky"`
 			AdmissionItemNum   interface{} `json:"admission_item_num"`
 			CircuitScore   interface{} `json:"circuit_score"`
+			VipLv interface{} `json:"vip_lv"`
+			VipExp interface{} `json:"vip_exp"`
+			HasVipLucky interface{} `json:"has_vip_lucky"`
 		} `json:"user_info"`
 		HeroInfo struct {
 			HeroUniId string `json:"hero_uniid"`
@@ -105,6 +116,9 @@ type UpdateBattleInfoRsp struct {
 			TotalLucky   interface{} `json:"total_lucky"`
 			AdmissionItemNum   interface{} `json:"admission_item_num"`
 			CircuitScore   interface{} `json:"circuit_score"`
+			VipLv interface{} `json:"vip_lv"`
+			VipExp interface{} `json:"vip_exp"`
+			HasVipLucky interface{} `json:"has_vip_lucky"`
 		} `json:"user_info"`
 		HeroInfo struct {
 			HeroUniId string `json:"hero_uniid"`
diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto
index 1c933c60..5f27ac97 100644
--- a/server/matchserver/proto/cs_proto.proto
+++ b/server/matchserver/proto/cs_proto.proto
@@ -149,8 +149,8 @@ message MFTeamMember
     optional int32 battling = 15; //是否战斗中
     optional int32 circuit_score = 16; //循回赛积分
     optional int32 vip_lv = 17; //vip等级
-    optional int32 vip_exp = 18; //vip经验
-    optional int64 has_vip_lucky = 19; //是否有vip幸运值加成
+    optional int64 vip_exp = 18; //vip经验
+    optional int32 has_vip_lucky = 19; //是否有vip幸运值加成
     repeated MFBattleItem battle_items = 20; //带入战斗的道具
 }