Merge branch 'master' of http://git.legu.cc/zhaochangyuan/airobot

busi/arena.go

@@ -24,20 +24,17 @@ func (f *ArenaScene) Info() lib.SceneInfo {
 
 func (f *ArenaScene) Run(ai lib.IRobot) (err error) {
 	var (
-		code        pb.ErrorCode
+		code      pb.ErrorCode
-		matche      *pb.ArenaMatcheResp    = &pb.ArenaMatcheResp{}
+		matche    *pb.ArenaMatcheResp    = &pb.ArenaMatcheResp{}
-		challenge   *pb.ArenaChallengeResp = &pb.ArenaChallengeResp{}
+		challenge *pb.ArenaChallengeResp = &pb.ArenaChallengeResp{}
-		herolistrsp *pb.HeroListResp
 	)
-	if herolist := ai.Get("hero.list"); herolist == nil {
+	f.AddHero(ai, "25001") // 加阿宝
+	Sleep(time.Second*0, time.Second*1)
+	herolistreq := &pb.HeroListReq{}
+	herolistresp := &pb.HeroListResp{}
+	if code = ai.SendMsg("hero", "list", herolistreq, herolistresp); code != pb.ErrorCode_Success {
 		ai.Stop()
 		return
-	} else {
-		herolistrsp = herolist.(*pb.HeroListResp)
-		if herolistrsp.List == nil || len(herolistrsp.List) == 0 {
-			ai.Stop()
-			return
-		}
 	}
 	if code = ai.SendMsg("arena", "info", &pb.ArenaInfoReq{}, &pb.ArenaInfoResp{}); code != pb.ErrorCode_Success {
 		ai.Stop()
@@ -56,7 +53,7 @@ func (f *ArenaScene) Run(ai lib.IRobot) (err error) {
 			MformatId: v.Mformatid,
 			Battle: &pb.BattleFormation{
 				Leadpos: 0,
-				Format:  []string{herolistrsp.List[0].Id},
+				Format:  []string{herolistresp.List[0].Id},
 			},
 		}, challenge); code != pb.ErrorCode_Success {
 			ai.Stop()
@@ -71,14 +68,33 @@ func (f *ArenaScene) Run(ai lib.IRobot) (err error) {
 			Report: &pb.BattleReport{
 				Info:         challenge.Info,
 				Costtime:     1,
-				Process:      []byte{123},
+				Incmd:        make([]*pb.BattleCmd, 0),
+				Outcmd:       make([]*pb.BattleCmd, 0),
 				Completetask: []int32{},
 			},
-		}, challenge); code != pb.ErrorCode_Success {
+		}, &pb.ArenaChallengeRewardResp{}); code != pb.ErrorCode_Success {
 			ai.Stop()
 			return
 		}
 		Sleep(time.Second*1, time.Second*3)
+		break
 	}
 	return
 }
+
+// 加英雄
+func (f *ArenaScene) AddHero(robot lib.IRobot, cid string) error {
+	var (
+		code pb.ErrorCode
+	)
+	req := &pb.GMCmdReq{
+		Cmod: "bingo:hero," + cid + ",1",
+	}
+	rsp := &pb.GMCmdResp{}
+	code = robot.SendMsg("gm", "cmd", req, rsp)
+	if code != pb.ErrorCode_Success {
+		return nil
+	}
+
+	return nil
+}

busi/mfantasy.go

@@ -66,7 +66,8 @@ func (f *MfantasyScene) Run(ai lib.IRobot) (err error) {
 			Report: &pb.BattleReport{
 				Info:         battlereq.Info,
 				Costtime:     1,
-				Process:      []byte{123},
+				Incmd:        make([]*pb.BattleCmd, 0),
+				Outcmd:       make([]*pb.BattleCmd, 0),
 				Completetask: []int32{},
 			},
 		}, &pb.MoonfantasyReceiveResp{}); code != pb.ErrorCode_Success {
@@ -74,6 +75,7 @@ func (f *MfantasyScene) Run(ai lib.IRobot) (err error) {
 			return
 		}
 		Sleep(time.Second, time.Second*3)
+		break
 	}
 
 	return

busi/reddot.go

@@ -30,6 +30,6 @@ func (f *ReddotScene) Run(ai lib.IRobot) (err error) {
 		ai.Stop()
 		return
 	}
-	time.Sleep(time.Second)
+	Sleep(time.Second*0, time.Second*1)
 	return
 }

busi/shop.go

@@ -48,6 +48,7 @@ func (f *ShopScene) Run(ai lib.IRobot) (err error) {
 				BuyNum:   1,
 			}, &pb.ShopBuyResp{})
 			Sleep(time.Second*0, time.Second*1)
+			break
 		}
 	}
 	return nil

main.go

@@ -67,7 +67,7 @@ func setupLogger() (err error) {
 		// FullTimestamp: true,
 	})
 
-	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetLevel(logrus.ErrorLevel)
 	logrus.SetOutput(os.Stdout)
 
 	file, err := os.OpenFile("robot.log", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)

pb/battle_msg.pb.go

@@ -556,22 +556,78 @@ func (x *BattleInfo) GetTasks() []int32 {
 	return nil
 }
 
+type BattleCmd struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Cmdtype string `protobuf:"bytes,1,opt,name=cmdtype,proto3" json:"cmdtype"`
+	Value   []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value"`
+}
+
+func (x *BattleCmd) Reset() {
+	*x = BattleCmd{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_battle_battle_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BattleCmd) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BattleCmd) ProtoMessage() {}
+
+func (x *BattleCmd) ProtoReflect() protoreflect.Message {
+	mi := &file_battle_battle_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BattleCmd.ProtoReflect.Descriptor instead.
+func (*BattleCmd) Descriptor() ([]byte, []int) {
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *BattleCmd) GetCmdtype() string {
+	if x != nil {
+		return x.Cmdtype
+	}
+	return ""
+}
+
+func (x *BattleCmd) GetValue() []byte {
+	if x != nil {
+		return x.Value
+	}
+	return nil
+}
+
 //战报数据
 type BattleReport struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Info         *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+	Info         *BattleInfo  `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-	Costtime     int32       `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"`                //战斗时长 单位ms
+	Costtime     int32        `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"`                //战斗时长 单位ms
-	Process      []byte      `protobuf:"bytes,3,opt,name=process,proto3" json:"process"`                   //战斗过程数据
+	Incmd        []*BattleCmd `protobuf:"bytes,3,rep,name=incmd,proto3" json:"incmd"`                       //输入指令
-	Completetask []int32     `protobuf:"varint,4,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
+	Outcmd       []*BattleCmd `protobuf:"bytes,4,rep,name=outcmd,proto3" json:"outcmd"`                     //输出指令
+	Completetask []int32      `protobuf:"varint,5,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
 }
 
 func (x *BattleReport) Reset() {
 	*x = BattleReport{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[7]
+		mi := &file_battle_battle_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -584,7 +640,7 @@ func (x *BattleReport) String() string {
 func (*BattleReport) ProtoMessage() {}
 
 func (x *BattleReport) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[7]
+	mi := &file_battle_battle_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -597,7 +653,7 @@ func (x *BattleReport) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleReport.ProtoReflect.Descriptor instead.
 func (*BattleReport) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *BattleReport) GetInfo() *BattleInfo {
@@ -614,9 +670,16 @@ func (x *BattleReport) GetCosttime() int32 {
 	return 0
 }
 
-func (x *BattleReport) GetProcess() []byte {
+func (x *BattleReport) GetIncmd() []*BattleCmd {
 	if x != nil {
-		return x.Process
+		return x.Incmd
+	}
+	return nil
+}
+
+func (x *BattleReport) GetOutcmd() []*BattleCmd {
+	if x != nil {
+		return x.Outcmd
 	}
 	return nil
 }
@@ -636,13 +699,13 @@ type BattleRpcMessage struct {
 
 	Rid    uint64     `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"`      //服务回调id
 	Method string     `protobuf:"bytes,2,opt,name=method,proto3" json:"method"` //方法名
-	Data   *anypb.Any `protobuf:"bytes,3,opt,name=Data,proto3" json:"Data"`
+	Data   *anypb.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data"`     //战斗消息对象
 }
 
 func (x *BattleRpcMessage) Reset() {
 	*x = BattleRpcMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[8]
+		mi := &file_battle_battle_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -655,7 +718,7 @@ func (x *BattleRpcMessage) String() string {
 func (*BattleRpcMessage) ProtoMessage() {}
 
 func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[8]
+	mi := &file_battle_battle_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -668,7 +731,7 @@ func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleRpcMessage.ProtoReflect.Descriptor instead.
 func (*BattleRpcMessage) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *BattleRpcMessage) GetRid() uint64 {
@@ -692,32 +755,32 @@ func (x *BattleRpcMessage) GetData() *anypb.Any {
 	return nil
 }
 
-type BattleTestMessage struct {
+//战斗校验结果
+type BattleCheckResults struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id  string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`
+	Ischeck bool `protobuf:"varint,1,opt,name=ischeck,proto3" json:"ischeck"` //是否校验成功
-	Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"`
 }
 
-func (x *BattleTestMessage) Reset() {
+func (x *BattleCheckResults) Reset() {
-	*x = BattleTestMessage{}
+	*x = BattleCheckResults{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[9]
+		mi := &file_battle_battle_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
 }
 
-func (x *BattleTestMessage) String() string {
+func (x *BattleCheckResults) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*BattleTestMessage) ProtoMessage() {}
+func (*BattleCheckResults) ProtoMessage() {}
 
-func (x *BattleTestMessage) ProtoReflect() protoreflect.Message {
+func (x *BattleCheckResults) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[9]
+	mi := &file_battle_battle_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -728,23 +791,16 @@ func (x *BattleTestMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BattleTestMessage.ProtoReflect.Descriptor instead.
+// Deprecated: Use BattleCheckResults.ProtoReflect.Descriptor instead.
-func (*BattleTestMessage) Descriptor() ([]byte, []int) {
+func (*BattleCheckResults) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *BattleTestMessage) GetId() string {
+func (x *BattleCheckResults) GetIscheck() bool {
 	if x != nil {
-		return x.Id
+		return x.Ischeck
 	}
-	return ""
+	return false
-}
-
-func (x *BattleTestMessage) GetMsg() string {
-	if x != nil {
-		return x.Msg
-	}
-	return ""
 }
 
 var File_battle_battle_msg_proto protoreflect.FileDescriptor
@@ -823,26 +879,32 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74,
 	0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74,
 	0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
+	0x73, 0x22, 0x3b, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18,
-	0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
+	0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb5,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12,
+	0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12,
-	0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c,
+	0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x66, 0x0a,
+	0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x05,
-	0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03,
+	0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22,
-	0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20,
+	0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x44,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63,
-	0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52,
+	0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x35, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54,
+	0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
-	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x42, 0x06, 0x5a, 0x04,
+	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e,
+	0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -857,44 +919,47 @@ func file_battle_battle_msg_proto_rawDescGZIP() []byte {
 	return file_battle_battle_msg_proto_rawDescData
 }
 
-var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_battle_battle_msg_proto_goTypes = []interface{}{
-	(*LineUp)(nil),            // 0: LineUp
+	(*LineUp)(nil),             // 0: LineUp
-	(*BattleFormation)(nil),   // 1: BattleFormation
+	(*BattleFormation)(nil),    // 1: BattleFormation
-	(*BattleEVEReq)(nil),      // 2: BattleEVEReq
+	(*BattleEVEReq)(nil),       // 2: BattleEVEReq
-	(*BattlePVEReq)(nil),      // 3: BattlePVEReq
+	(*BattlePVEReq)(nil),       // 3: BattlePVEReq
-	(*PVPFormation)(nil),      // 4: PVPFormation
+	(*PVPFormation)(nil),       // 4: PVPFormation
-	(*BattlePVPReq)(nil),      // 5: BattlePVPReq
+	(*BattlePVPReq)(nil),       // 5: BattlePVPReq
-	(*BattleInfo)(nil),        // 6: BattleInfo
+	(*BattleInfo)(nil),         // 6: BattleInfo
-	(*BattleReport)(nil),      // 7: BattleReport
+	(*BattleCmd)(nil),          // 7: BattleCmd
-	(*BattleRpcMessage)(nil),  // 8: BattleRpcMessage
+	(*BattleReport)(nil),       // 8: BattleReport
-	(*BattleTestMessage)(nil), // 9: BattleTestMessage
+	(*BattleRpcMessage)(nil),   // 9: BattleRpcMessage
-	(PlayType)(0),             // 10: PlayType
+	(*BattleCheckResults)(nil), // 10: BattleCheckResults
-	(*DBHero)(nil),            // 11: DBHero
+	(PlayType)(0),              // 11: PlayType
-	(BattleType)(0),           // 12: BattleType
+	(*DBHero)(nil),             // 12: DBHero
-	(*DBBattleFormt)(nil),     // 13: DBBattleFormt
+	(BattleType)(0),            // 13: BattleType
-	(*anypb.Any)(nil),         // 14: google.protobuf.Any
+	(*DBBattleFormt)(nil),      // 14: DBBattleFormt
+	(*anypb.Any)(nil),          // 15: google.protobuf.Any
 }
 var file_battle_battle_msg_proto_depIdxs = []int32{
-	10, // 0: BattleEVEReq.ptype:type_name -> PlayType
+	11, // 0: BattleEVEReq.ptype:type_name -> PlayType
 	1,  // 1: BattleEVEReq.format:type_name -> BattleFormation
-	10, // 2: BattlePVEReq.ptype:type_name -> PlayType
+	11, // 2: BattlePVEReq.ptype:type_name -> PlayType
 	1,  // 3: BattlePVEReq.format:type_name -> BattleFormation
-	11, // 4: PVPFormation.format:type_name -> DBHero
+	12, // 4: PVPFormation.format:type_name -> DBHero
-	10, // 5: BattlePVPReq.ptype:type_name -> PlayType
+	11, // 5: BattlePVPReq.ptype:type_name -> PlayType
 	4,  // 6: BattlePVPReq.redformat:type_name -> PVPFormation
 	4,  // 7: BattlePVPReq.buleformat:type_name -> PVPFormation
-	12, // 8: BattleInfo.btype:type_name -> BattleType
+	13, // 8: BattleInfo.btype:type_name -> BattleType
-	10, // 9: BattleInfo.ptype:type_name -> PlayType
+	11, // 9: BattleInfo.ptype:type_name -> PlayType
-	13, // 10: BattleInfo.redflist:type_name -> DBBattleFormt
+	14, // 10: BattleInfo.redflist:type_name -> DBBattleFormt
-	13, // 11: BattleInfo.buleflist:type_name -> DBBattleFormt
+	14, // 11: BattleInfo.buleflist:type_name -> DBBattleFormt
 	6,  // 12: BattleReport.info:type_name -> BattleInfo
-	14, // 13: BattleRpcMessage.Data:type_name -> google.protobuf.Any
+	7,  // 13: BattleReport.incmd:type_name -> BattleCmd
-	14, // [14:14] is the sub-list for method output_type
+	7,  // 14: BattleReport.outcmd:type_name -> BattleCmd
-	14, // [14:14] is the sub-list for method input_type
+	15, // 15: BattleRpcMessage.data:type_name -> google.protobuf.Any
-	14, // [14:14] is the sub-list for extension type_name
+	16, // [16:16] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for extension extendee
+	16, // [16:16] is the sub-list for method input_type
-	0,  // [0:14] is the sub-list for field type_name
+	16, // [16:16] is the sub-list for extension type_name
+	16, // [16:16] is the sub-list for extension extendee
+	0,  // [0:16] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_msg_proto_init() }
@@ -990,7 +1055,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleReport); i {
+			switch v := v.(*BattleCmd); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1002,7 +1067,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleRpcMessage); i {
+			switch v := v.(*BattleReport); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1014,7 +1079,19 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleTestMessage); i {
+			switch v := v.(*BattleRpcMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_battle_battle_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BattleCheckResults); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1032,7 +1109,7 @@ func file_battle_battle_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_battle_battle_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   10,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/errorcode.pb.go

@@ -261,6 +261,9 @@ const (
 	// privileges
 	ErrorCode_PrivilegeNotFound  ErrorCode = 3501 // 特权没激活
 	ErrorCode_PrivilegeRenewTime ErrorCode = 3502 // 特权续费时间没到
+	ErrorCode_VipLvError         ErrorCode = 3503 // Vip等级不足
+	ErrorCode_VipGiftError       ErrorCode = 3504 // Vip礼包购买失败
+	ErrorCode_VipBuyRepeat       ErrorCode = 3505 // Vip礼包重复购买
 	// growtask
 	ErrorCode_GrowtaskReceive    ErrorCode = 3601 //子任务奖励领取失败
 	ErrorCode_GrowtaskAdvReceive ErrorCode = 3602 //进阶奖励领取失败
@@ -494,6 +497,9 @@ var (
 		3402:  "HoroscopeRestCDNoEnd",
 		3501:  "PrivilegeNotFound",
 		3502:  "PrivilegeRenewTime",
+		3503:  "VipLvError",
+		3504:  "VipGiftError",
+		3505:  "VipBuyRepeat",
 		3601:  "GrowtaskReceive",
 		3602:  "GrowtaskAdvReceive",
 		3701:  "PayBuyNumNotEnough",
@@ -720,6 +726,9 @@ var (
 		"HoroscopeRestCDNoEnd":        3402,
 		"PrivilegeNotFound":           3501,
 		"PrivilegeRenewTime":          3502,
+		"VipLvError":                  3503,
+		"VipGiftError":                3504,
+		"VipBuyRepeat":                3505,
 		"GrowtaskReceive":             3601,
 		"GrowtaskAdvReceive":          3602,
 		"PayBuyNumNotEnough":          3701,
@@ -765,7 +774,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xfc, 0x27, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb3, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -1067,25 +1076,29 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69,
 	0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad,
 	0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65,
-	0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72,
+	0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69,
-	0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c,
+	0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56,
-	0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52,
+	0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11,
-	0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79,
+	0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1,
-	0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
+	0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63,
-	0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69,
+	0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74,
-	0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c,
+	0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c,
-	0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19,
+	0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74,
-	0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74,
+	0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79,
-	0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72,
+	0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12,
-	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb,
+	0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
-	0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
+	0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
-	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57,
+	0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d,
-	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10,
+	0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41,
-	0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c,
+	0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c,
-	0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10,
-	0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e,
+	0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46,
-	0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e,
+	0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65,
+	0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+	0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/pagoda_msg.pb.go

@@ -715,14 +715,14 @@ func (x *PagodaActivateResp) GetData() *DBPagoda {
 }
 
 // 领取战令奖励
-type PagodaPassCheckReq struct {
+type PagodaWarOrderReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *PagodaPassCheckReq) Reset() {
+func (x *PagodaWarOrderReq) Reset() {
-	*x = PagodaPassCheckReq{}
+	*x = PagodaWarOrderReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_pagoda_pagoda_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -730,13 +730,13 @@ func (x *PagodaPassCheckReq) Reset() {
 	}
 }
 
-func (x *PagodaPassCheckReq) String() string {
+func (x *PagodaWarOrderReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*PagodaPassCheckReq) ProtoMessage() {}
+func (*PagodaWarOrderReq) ProtoMessage() {}
 
-func (x *PagodaPassCheckReq) ProtoReflect() protoreflect.Message {
+func (x *PagodaWarOrderReq) ProtoReflect() protoreflect.Message {
 	mi := &file_pagoda_pagoda_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -748,12 +748,12 @@ func (x *PagodaPassCheckReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PagodaPassCheckReq.ProtoReflect.Descriptor instead.
+// Deprecated: Use PagodaWarOrderReq.ProtoReflect.Descriptor instead.
-func (*PagodaPassCheckReq) Descriptor() ([]byte, []int) {
+func (*PagodaWarOrderReq) Descriptor() ([]byte, []int) {
 	return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{14}
 }
 
-type PagodaPassCheckResp struct {
+type PagodaWarOrderResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -762,8 +762,8 @@ type PagodaPassCheckResp struct {
 	Itmes []*UserAssets `protobuf:"bytes,2,rep,name=itmes,proto3" json:"itmes"` // 获得的奖励
 }
 
-func (x *PagodaPassCheckResp) Reset() {
+func (x *PagodaWarOrderResp) Reset() {
-	*x = PagodaPassCheckResp{}
+	*x = PagodaWarOrderResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_pagoda_pagoda_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -771,13 +771,13 @@ func (x *PagodaPassCheckResp) Reset() {
 	}
 }
 
-func (x *PagodaPassCheckResp) String() string {
+func (x *PagodaWarOrderResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*PagodaPassCheckResp) ProtoMessage() {}
+func (*PagodaWarOrderResp) ProtoMessage() {}
 
-func (x *PagodaPassCheckResp) ProtoReflect() protoreflect.Message {
+func (x *PagodaWarOrderResp) ProtoReflect() protoreflect.Message {
 	mi := &file_pagoda_pagoda_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -789,19 +789,19 @@ func (x *PagodaPassCheckResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PagodaPassCheckResp.ProtoReflect.Descriptor instead.
+// Deprecated: Use PagodaWarOrderResp.ProtoReflect.Descriptor instead.
-func (*PagodaPassCheckResp) Descriptor() ([]byte, []int) {
+func (*PagodaWarOrderResp) Descriptor() ([]byte, []int) {
 	return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *PagodaPassCheckResp) GetData() *DBPagoda {
+func (x *PagodaWarOrderResp) GetData() *DBPagoda {
 	if x != nil {
 		return x.Data
 	}
 	return nil
 }
 
-func (x *PagodaPassCheckResp) GetItmes() []*UserAssets {
+func (x *PagodaWarOrderResp) GetItmes() []*UserAssets {
 	if x != nil {
 		return x.Itmes
 	}
@@ -871,14 +871,14 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{
 	0x67, 0x6f, 0x64, 0x61, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
 	0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
 	0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
-	0x14, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x50, 0x61, 0x73, 0x73, 0x43, 0x68, 0x65,
+	0x13, 0x0a, 0x11, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x57, 0x61, 0x72, 0x4f, 0x72, 0x64, 0x65,
-	0x63, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x57, 0x0a, 0x13, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x50,
+	0x72, 0x52, 0x65, 0x71, 0x22, 0x56, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x57, 0x61,
-	0x61, 0x73, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04,
+	0x72, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67,
-	0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x69,
+	0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x6d,
-	0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
+	0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x42, 0x06,
+	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -909,8 +909,8 @@ var file_pagoda_pagoda_msg_proto_goTypes = []interface{}{
 	(*PagodaQueryRecordResp)(nil),   // 11: PagodaQueryRecordResp
 	(*PagodaActivateReq)(nil),       // 12: PagodaActivateReq
 	(*PagodaActivateResp)(nil),      // 13: PagodaActivateResp
-	(*PagodaPassCheckReq)(nil),      // 14: PagodaPassCheckReq
+	(*PagodaWarOrderReq)(nil),       // 14: PagodaWarOrderReq
-	(*PagodaPassCheckResp)(nil),     // 15: PagodaPassCheckResp
+	(*PagodaWarOrderResp)(nil),      // 15: PagodaWarOrderResp
 	(*DBPagoda)(nil),                // 16: DBPagoda
 	(*BattleFormation)(nil),         // 17: BattleFormation
 	(*BattleInfo)(nil),              // 18: BattleInfo
@@ -928,8 +928,8 @@ var file_pagoda_pagoda_msg_proto_depIdxs = []int32{
 	20, // 6: PagodaRankListResp.ranks:type_name -> DBPagodaRecord
 	20, // 7: PagodaQueryRecordResp.data:type_name -> DBPagodaRecord
 	16, // 8: PagodaActivateResp.data:type_name -> DBPagoda
-	16, // 9: PagodaPassCheckResp.data:type_name -> DBPagoda
+	16, // 9: PagodaWarOrderResp.data:type_name -> DBPagoda
-	21, // 10: PagodaPassCheckResp.itmes:type_name -> UserAssets
+	21, // 10: PagodaWarOrderResp.itmes:type_name -> UserAssets
 	11, // [11:11] is the sub-list for method output_type
 	11, // [11:11] is the sub-list for method input_type
 	11, // [11:11] is the sub-list for extension type_name
@@ -1115,7 +1115,7 @@ func file_pagoda_pagoda_msg_proto_init() {
 			}
 		}
 		file_pagoda_pagoda_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PagodaPassCheckReq); i {
+			switch v := v.(*PagodaWarOrderReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1127,7 +1127,7 @@ func file_pagoda_pagoda_msg_proto_init() {
 			}
 		}
 		file_pagoda_pagoda_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PagodaPassCheckResp); i {
+			switch v := v.(*PagodaWarOrderResp); i {
 			case 0:
 				return &v.state
 			case 1:

pb/privilege_db.pb.go

@@ -26,13 +26,12 @@ type DBPrivilege struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          string  `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                   //ID
+	Id         string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                         //ID
-	Uid         string  `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                 //用户ID
+	Uid        string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                       //用户ID
-	CId         string  `protobuf:"bytes,3,opt,name=cId,proto3" json:"cId" bson:"cId"`                                 //计费点数ID
+	CId        string `protobuf:"bytes,3,opt,name=cId,proto3" json:"cId" bson:"cId"`                       //计费点数ID
-	PrivilegeID []int32 `protobuf:"varint,4,rep,packed,name=privilegeID,proto3" json:"privilegeID" bson:"privilegeID"` //特权ID
+	CTime      int64  `protobuf:"varint,4,opt,name=cTime,proto3" json:"cTime" bson:"cTime"`                ////购买时间
-	CTime       int64   `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"`                          ////购买时间
+	ETime      int64  `protobuf:"varint,5,opt,name=eTime,proto3" json:"eTime" bson:"eTime"`                ////到期时间
-	ETime       int64   `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"`                          ////到期时间
+	RewardTime int64  `protobuf:"varint,6,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"` //每日奖励时间
-	RewardTime  int64   `protobuf:"varint,7,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"`           //每日奖励时间
 }
 
 func (x *DBPrivilege) Reset() {
@@ -88,13 +87,6 @@ func (x *DBPrivilege) GetCId() string {
 	return ""
 }
 
-func (x *DBPrivilege) GetPrivilegeID() []int32 {
-	if x != nil {
-		return x.PrivilegeID
-	}
-	return nil
-}
-
 func (x *DBPrivilege) GetCTime() int64 {
 	if x != nil {
 		return x.CTime
@@ -116,23 +108,179 @@ func (x *DBPrivilege) GetRewardTime() int64 {
 	return 0
 }
 
+type PrivilegeList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PrivilegeID []int32 `protobuf:"varint,1,rep,packed,name=privilegeID,proto3" json:"privilegeID" bson:"privilegeID"` //特权ID
+}
+
+func (x *PrivilegeList) Reset() {
+	*x = PrivilegeList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivilegeList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivilegeList) ProtoMessage() {}
+
+func (x *PrivilegeList) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_db_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PrivilegeList.ProtoReflect.Descriptor instead.
+func (*PrivilegeList) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *PrivilegeList) GetPrivilegeID() []int32 {
+	if x != nil {
+		return x.PrivilegeID
+	}
+	return nil
+}
+
+type DBVip struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id         string                   `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                                              //ID
+	Uid        string                   `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                            //用户ID
+	Reward     map[int32]bool           `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`                       // key vip 等级
+	Privilege  map[int32]*PrivilegeList `protobuf:"bytes,4,rep,name=privilege,proto3" json:"privilege" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"privilege"` //特权ID
+	CTime      int64                    `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"`                                                                                                     ////购买时间
+	RewardTime int64                    `protobuf:"varint,6,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"`                                                                                      //每日奖励时间
+}
+
+func (x *DBVip) Reset() {
+	*x = DBVip{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_db_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBVip) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBVip) ProtoMessage() {}
+
+func (x *DBVip) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_db_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DBVip.ProtoReflect.Descriptor instead.
+func (*DBVip) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBVip) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *DBVip) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *DBVip) GetReward() map[int32]bool {
+	if x != nil {
+		return x.Reward
+	}
+	return nil
+}
+
+func (x *DBVip) GetPrivilege() map[int32]*PrivilegeList {
+	if x != nil {
+		return x.Privilege
+	}
+	return nil
+}
+
+func (x *DBVip) GetCTime() int64 {
+	if x != nil {
+		return x.CTime
+	}
+	return 0
+}
+
+func (x *DBVip) GetRewardTime() int64 {
+	if x != nil {
+		return x.RewardTime
+	}
+	return 0
+}
+
 var File_privilege_privilege_db_proto protoreflect.FileDescriptor
 
 var file_privilege_privilege_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x2f, 0x70, 0x72, 0x69, 0x76,
-	0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaf,
+	0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d,
 	0x01, 0x0a, 0x0b, 0x44, 0x42, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x0e,
 	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
 	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
 	0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63,
-	0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49,
+	0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x44, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
+	0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d,
-	0x67, 0x65, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54,
+	0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65,
+	0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x31,
-	0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07,
+	0x0a, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65,
+	0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x44, 0x18, 0x01,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49,
+	0x44, 0x22, 0xc9, 0x02, 0x0a, 0x05, 0x44, 0x42, 0x56, 0x69, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a,
+	0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x44, 0x42, 0x56, 0x69, 0x70, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a, 0x09, 0x70, 0x72, 0x69,
+	0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44,
+	0x42, 0x56, 0x69, 0x70, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
+	0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69,
+	0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x54, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x4c, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -147,16 +295,23 @@ func file_privilege_privilege_db_proto_rawDescGZIP() []byte {
 	return file_privilege_privilege_db_proto_rawDescData
 }
 
-var file_privilege_privilege_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_privilege_privilege_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_privilege_privilege_db_proto_goTypes = []interface{}{
-	(*DBPrivilege)(nil), // 0: DBPrivilege
+	(*DBPrivilege)(nil),   // 0: DBPrivilege
+	(*PrivilegeList)(nil), // 1: PrivilegeList
+	(*DBVip)(nil),         // 2: DBVip
+	nil,                   // 3: DBVip.RewardEntry
+	nil,                   // 4: DBVip.PrivilegeEntry
 }
 var file_privilege_privilege_db_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
+	3, // 0: DBVip.reward:type_name -> DBVip.RewardEntry
-	0, // [0:0] is the sub-list for method input_type
+	4, // 1: DBVip.privilege:type_name -> DBVip.PrivilegeEntry
-	0, // [0:0] is the sub-list for extension type_name
+	1, // 2: DBVip.PrivilegeEntry.value:type_name -> PrivilegeList
-	0, // [0:0] is the sub-list for extension extendee
+	3, // [3:3] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for field type_name
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_privilege_privilege_db_proto_init() }
@@ -177,6 +332,30 @@ func file_privilege_privilege_db_proto_init() {
 				return nil
 			}
 		}
+		file_privilege_privilege_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PrivilegeList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_privilege_privilege_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBVip); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -184,7 +363,7 @@ func file_privilege_privilege_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_privilege_privilege_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   1,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/privilege_msg.pb.go

@@ -202,6 +202,185 @@ func (x *PrivilegeBuyYuekaResp) GetData() []*DBPrivilege {
 	return nil
 }
 
+type PrivilegeBuyGiftReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	VipLv int32 `protobuf:"varint,1,opt,name=vipLv,proto3" json:"vipLv"` // vip 等级
+}
+
+func (x *PrivilegeBuyGiftReq) Reset() {
+	*x = PrivilegeBuyGiftReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_msg_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivilegeBuyGiftReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivilegeBuyGiftReq) ProtoMessage() {}
+
+func (x *PrivilegeBuyGiftReq) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_msg_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PrivilegeBuyGiftReq.ProtoReflect.Descriptor instead.
+func (*PrivilegeBuyGiftReq) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *PrivilegeBuyGiftReq) GetVipLv() int32 {
+	if x != nil {
+		return x.VipLv
+	}
+	return 0
+}
+
+type PrivilegeBuyGiftResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBVip `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *PrivilegeBuyGiftResp) Reset() {
+	*x = PrivilegeBuyGiftResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivilegeBuyGiftResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivilegeBuyGiftResp) ProtoMessage() {}
+
+func (x *PrivilegeBuyGiftResp) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PrivilegeBuyGiftResp.ProtoReflect.Descriptor instead.
+func (*PrivilegeBuyGiftResp) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *PrivilegeBuyGiftResp) GetData() *DBVip {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
+type PrivilegeVipListReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PrivilegeVipListReq) Reset() {
+	*x = PrivilegeVipListReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivilegeVipListReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivilegeVipListReq) ProtoMessage() {}
+
+func (x *PrivilegeVipListReq) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_msg_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PrivilegeVipListReq.ProtoReflect.Descriptor instead.
+func (*PrivilegeVipListReq) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_msg_proto_rawDescGZIP(), []int{6}
+}
+
+type PrivilegeVipListResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBVip `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *PrivilegeVipListResp) Reset() {
+	*x = PrivilegeVipListResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_privilege_privilege_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PrivilegeVipListResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PrivilegeVipListResp) ProtoMessage() {}
+
+func (x *PrivilegeVipListResp) ProtoReflect() protoreflect.Message {
+	mi := &file_privilege_privilege_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PrivilegeVipListResp.ProtoReflect.Descriptor instead.
+func (*PrivilegeVipListResp) Descriptor() ([]byte, []int) {
+	return file_privilege_privilege_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *PrivilegeVipListResp) GetData() *DBVip {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_privilege_privilege_msg_proto protoreflect.FileDescriptor
 
 var file_privilege_privilege_msg_proto_rawDesc = []byte{
@@ -220,8 +399,18 @@ var file_privilege_privilege_msg_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x59, 0x75, 0x65, 0x6b, 0x61, 0x52, 0x65, 0x73,
 	0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
 	0x0c, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x74, 0x6f, 0x33,
+	0x42, 0x75, 0x79, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69,
+	0x70, 0x4c, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76,
+	0x22, 0x32, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79,
+	0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
+	0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x14, 0x50,
+	0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -236,22 +425,29 @@ func file_privilege_privilege_msg_proto_rawDescGZIP() []byte {
 	return file_privilege_privilege_msg_proto_rawDescData
 }
 
-var file_privilege_privilege_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_privilege_privilege_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_privilege_privilege_msg_proto_goTypes = []interface{}{
 	(*PrivilegeGetListReq)(nil),   // 0: PrivilegeGetListReq
 	(*PrivilegeGetListResp)(nil),  // 1: PrivilegeGetListResp
 	(*PrivilegeBuyYuekaReq)(nil),  // 2: PrivilegeBuyYuekaReq
 	(*PrivilegeBuyYuekaResp)(nil), // 3: PrivilegeBuyYuekaResp
-	(*DBPrivilege)(nil),           // 4: DBPrivilege
+	(*PrivilegeBuyGiftReq)(nil),   // 4: PrivilegeBuyGiftReq
+	(*PrivilegeBuyGiftResp)(nil),  // 5: PrivilegeBuyGiftResp
+	(*PrivilegeVipListReq)(nil),   // 6: PrivilegeVipListReq
+	(*PrivilegeVipListResp)(nil),  // 7: PrivilegeVipListResp
+	(*DBPrivilege)(nil),           // 8: DBPrivilege
+	(*DBVip)(nil),                 // 9: DBVip
 }
 var file_privilege_privilege_msg_proto_depIdxs = []int32{
-	4, // 0: PrivilegeGetListResp.data:type_name -> DBPrivilege
+	8, // 0: PrivilegeGetListResp.data:type_name -> DBPrivilege
-	4, // 1: PrivilegeBuyYuekaResp.data:type_name -> DBPrivilege
+	8, // 1: PrivilegeBuyYuekaResp.data:type_name -> DBPrivilege
-	2, // [2:2] is the sub-list for method output_type
+	9, // 2: PrivilegeBuyGiftResp.data:type_name -> DBVip
-	2, // [2:2] is the sub-list for method input_type
+	9, // 3: PrivilegeVipListResp.data:type_name -> DBVip
-	2, // [2:2] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for extension extendee
+	4, // [4:4] is the sub-list for method input_type
-	0, // [0:2] is the sub-list for field type_name
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_privilege_privilege_msg_proto_init() }
@@ -309,6 +505,54 @@ func file_privilege_privilege_msg_proto_init() {
 				return nil
 			}
 		}
+		file_privilege_privilege_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PrivilegeBuyGiftReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_privilege_privilege_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PrivilegeBuyGiftResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_privilege_privilege_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PrivilegeVipListReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_privilege_privilege_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PrivilegeVipListResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -316,7 +560,7 @@ func file_privilege_privilege_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_privilege_privilege_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/user_db.pb.go

@@ -122,7 +122,7 @@ type DBUser struct {
 	Starcoin    int64  `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"`          //星座图币
 	Created     bool   `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"`             //创角
 	Lv          int32  `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"`                            //等级
-	Vip         int32  `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"`                         // vip
+	Vip         int32  `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"`                         // vip等级
 	Diamond     int64  `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"`             // 钻石
 	Title       int32  `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"`                   //头衔
 	Offlinetime int64  `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间

pb/user_msg.pb.go

@@ -1663,6 +1663,70 @@ func (x *UserLvChangedPush) GetLv() int32 {
 	return 0
 }
 
+// vip 等级变化
+type UserVipChangedPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid    string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	VipExp int64  `protobuf:"varint,2,opt,name=vipExp,proto3" json:"vipExp"`
+	VipLv  int32  `protobuf:"varint,3,opt,name=vipLv,proto3" json:"vipLv"`
+}
+
+func (x *UserVipChangedPush) Reset() {
+	*x = UserVipChangedPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_user_user_msg_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UserVipChangedPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UserVipChangedPush) ProtoMessage() {}
+
+func (x *UserVipChangedPush) ProtoReflect() protoreflect.Message {
+	mi := &file_user_user_msg_proto_msgTypes[32]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UserVipChangedPush.ProtoReflect.Descriptor instead.
+func (*UserVipChangedPush) Descriptor() ([]byte, []int) {
+	return file_user_user_msg_proto_rawDescGZIP(), []int{32}
+}
+
+func (x *UserVipChangedPush) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *UserVipChangedPush) GetVipExp() int64 {
+	if x != nil {
+		return x.VipExp
+	}
+	return 0
+}
+
+func (x *UserVipChangedPush) GetVipLv() int32 {
+	if x != nil {
+		return x.VipLv
+	}
+	return 0
+}
+
 // 用户签名
 type UserModifysignReq struct {
 	state         protoimpl.MessageState
@@ -1675,7 +1739,7 @@ type UserModifysignReq struct {
 func (x *UserModifysignReq) Reset() {
 	*x = UserModifysignReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[32]
+		mi := &file_user_user_msg_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1688,7 +1752,7 @@ func (x *UserModifysignReq) String() string {
 func (*UserModifysignReq) ProtoMessage() {}
 
 func (x *UserModifysignReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[32]
+	mi := &file_user_user_msg_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1701,7 +1765,7 @@ func (x *UserModifysignReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifysignReq.ProtoReflect.Descriptor instead.
 func (*UserModifysignReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{32}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *UserModifysignReq) GetSign() string {
@@ -1722,7 +1786,7 @@ type UserModifysignResp struct {
 func (x *UserModifysignResp) Reset() {
 	*x = UserModifysignResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[33]
+		mi := &file_user_user_msg_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1735,7 +1799,7 @@ func (x *UserModifysignResp) String() string {
 func (*UserModifysignResp) ProtoMessage() {}
 
 func (x *UserModifysignResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[33]
+	mi := &file_user_user_msg_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1748,7 +1812,7 @@ func (x *UserModifysignResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifysignResp.ProtoReflect.Descriptor instead.
 func (*UserModifysignResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{33}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *UserModifysignResp) GetUid() string {
@@ -1770,7 +1834,7 @@ type UserBattlerecordReq struct {
 func (x *UserBattlerecordReq) Reset() {
 	*x = UserBattlerecordReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[34]
+		mi := &file_user_user_msg_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1783,7 +1847,7 @@ func (x *UserBattlerecordReq) String() string {
 func (*UserBattlerecordReq) ProtoMessage() {}
 
 func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[34]
+	mi := &file_user_user_msg_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1796,7 +1860,7 @@ func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserBattlerecordReq.ProtoReflect.Descriptor instead.
 func (*UserBattlerecordReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{34}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *UserBattlerecordReq) GetUid() string {
@@ -1821,7 +1885,7 @@ type UserBattlerecordResp struct {
 func (x *UserBattlerecordResp) Reset() {
 	*x = UserBattlerecordResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[35]
+		mi := &file_user_user_msg_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1834,7 +1898,7 @@ func (x *UserBattlerecordResp) String() string {
 func (*UserBattlerecordResp) ProtoMessage() {}
 
 func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[35]
+	mi := &file_user_user_msg_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1847,7 +1911,7 @@ func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserBattlerecordResp.ProtoReflect.Descriptor instead.
 func (*UserBattlerecordResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{35}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *UserBattlerecordResp) GetData() *DBUser {
@@ -1897,7 +1961,7 @@ type UserSettingteamReq struct {
 func (x *UserSettingteamReq) Reset() {
 	*x = UserSettingteamReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[36]
+		mi := &file_user_user_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1910,7 +1974,7 @@ func (x *UserSettingteamReq) String() string {
 func (*UserSettingteamReq) ProtoMessage() {}
 
 func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[36]
+	mi := &file_user_user_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1923,7 +1987,7 @@ func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSettingteamReq.ProtoReflect.Descriptor instead.
 func (*UserSettingteamReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{36}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *UserSettingteamReq) GetHeroObjIds() []string {
@@ -1944,7 +2008,7 @@ type UserSettingteamResp struct {
 func (x *UserSettingteamResp) Reset() {
 	*x = UserSettingteamResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[37]
+		mi := &file_user_user_msg_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1957,7 +2021,7 @@ func (x *UserSettingteamResp) String() string {
 func (*UserSettingteamResp) ProtoMessage() {}
 
 func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[37]
+	mi := &file_user_user_msg_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1970,7 +2034,7 @@ func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSettingteamResp.ProtoReflect.Descriptor instead.
 func (*UserSettingteamResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{37}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *UserSettingteamResp) GetUid() string {
@@ -1990,7 +2054,7 @@ type UserShowteamReq struct {
 func (x *UserShowteamReq) Reset() {
 	*x = UserShowteamReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[38]
+		mi := &file_user_user_msg_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2003,7 +2067,7 @@ func (x *UserShowteamReq) String() string {
 func (*UserShowteamReq) ProtoMessage() {}
 
 func (x *UserShowteamReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[38]
+	mi := &file_user_user_msg_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2016,7 +2080,7 @@ func (x *UserShowteamReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserShowteamReq.ProtoReflect.Descriptor instead.
 func (*UserShowteamReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{38}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{39}
 }
 
 type UserShowteamResp struct {
@@ -2030,7 +2094,7 @@ type UserShowteamResp struct {
 func (x *UserShowteamResp) Reset() {
 	*x = UserShowteamResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[39]
+		mi := &file_user_user_msg_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2043,7 +2107,7 @@ func (x *UserShowteamResp) String() string {
 func (*UserShowteamResp) ProtoMessage() {}
 
 func (x *UserShowteamResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[39]
+	mi := &file_user_user_msg_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2056,7 +2120,7 @@ func (x *UserShowteamResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserShowteamResp.ProtoReflect.Descriptor instead.
 func (*UserShowteamResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{39}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *UserShowteamResp) GetHeroObjIds() []string {
@@ -2078,7 +2142,7 @@ type UserOnlineResp struct {
 func (x *UserOnlineResp) Reset() {
 	*x = UserOnlineResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[40]
+		mi := &file_user_user_msg_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2091,7 +2155,7 @@ func (x *UserOnlineResp) String() string {
 func (*UserOnlineResp) ProtoMessage() {}
 
 func (x *UserOnlineResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[40]
+	mi := &file_user_user_msg_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2104,7 +2168,7 @@ func (x *UserOnlineResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserOnlineResp.ProtoReflect.Descriptor instead.
 func (*UserOnlineResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{40}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *UserOnlineResp) GetUsers() []*CacheUser {
@@ -2126,7 +2190,7 @@ type UserDataListResp struct {
 func (x *UserDataListResp) Reset() {
 	*x = UserDataListResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[41]
+		mi := &file_user_user_msg_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2139,7 +2203,7 @@ func (x *UserDataListResp) String() string {
 func (*UserDataListResp) ProtoMessage() {}
 
 func (x *UserDataListResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[41]
+	mi := &file_user_user_msg_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2152,7 +2216,7 @@ func (x *UserDataListResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserDataListResp.ProtoReflect.Descriptor instead.
 func (*UserDataListResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{41}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *UserDataListResp) GetUsers() []*DBUser {
@@ -2171,7 +2235,7 @@ type UserGetServerDataReq struct {
 func (x *UserGetServerDataReq) Reset() {
 	*x = UserGetServerDataReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[42]
+		mi := &file_user_user_msg_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2184,7 +2248,7 @@ func (x *UserGetServerDataReq) String() string {
 func (*UserGetServerDataReq) ProtoMessage() {}
 
 func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[42]
+	mi := &file_user_user_msg_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2197,7 +2261,7 @@ func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetServerDataReq.ProtoReflect.Descriptor instead.
 func (*UserGetServerDataReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{42}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{43}
 }
 
 type UserGetServerDataResp struct {
@@ -2211,7 +2275,7 @@ type UserGetServerDataResp struct {
 func (x *UserGetServerDataResp) Reset() {
 	*x = UserGetServerDataResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[43]
+		mi := &file_user_user_msg_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2224,7 +2288,7 @@ func (x *UserGetServerDataResp) String() string {
 func (*UserGetServerDataResp) ProtoMessage() {}
 
 func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[43]
+	mi := &file_user_user_msg_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2237,7 +2301,7 @@ func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetServerDataResp.ProtoReflect.Descriptor instead.
 func (*UserGetServerDataResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{43}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *UserGetServerDataResp) GetData() *DBServerData {
@@ -2256,7 +2320,7 @@ type UserSignReq struct {
 func (x *UserSignReq) Reset() {
 	*x = UserSignReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[44]
+		mi := &file_user_user_msg_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2269,7 +2333,7 @@ func (x *UserSignReq) String() string {
 func (*UserSignReq) ProtoMessage() {}
 
 func (x *UserSignReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[44]
+	mi := &file_user_user_msg_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2282,7 +2346,7 @@ func (x *UserSignReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSignReq.ProtoReflect.Descriptor instead.
 func (*UserSignReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{44}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{45}
 }
 
 // 推送签到信息
@@ -2298,7 +2362,7 @@ type UserSignResp struct {
 func (x *UserSignResp) Reset() {
 	*x = UserSignResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[45]
+		mi := &file_user_user_msg_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2311,7 +2375,7 @@ func (x *UserSignResp) String() string {
 func (*UserSignResp) ProtoMessage() {}
 
 func (x *UserSignResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[45]
+	mi := &file_user_user_msg_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2324,7 +2388,7 @@ func (x *UserSignResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSignResp.ProtoReflect.Descriptor instead.
 func (*UserSignResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{45}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *UserSignResp) GetData() *DBSign {
@@ -2468,58 +2532,63 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
 	0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65,
 	0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x6c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
+	0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61,
-	0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18,
+	0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69,
-	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45,
-	0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72,
-	0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a,
+	0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67,
-	0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72,
+	0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65,
-	0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+	0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
-	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f,
+	0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64,
-	0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61,
+	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73,
-	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02,
-	0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
-	0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68,
+	0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64,
-	0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c,
+	0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
-	0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03,
+	0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c,
-	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
+	0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d,
-	0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22,
+	0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20,
-	0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65,
+	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f,
-	0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f,
-	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
+	0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
-	0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
+	0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
-	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
+	0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68,
-	0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55,
-	0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
-	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73,
+	0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73,
+	0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65,
+	0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68,
-	0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44,
+	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55,
-	0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14,
+	0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a,
-	0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74,
+	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43,
-	0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53,
+	0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a,
+	0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65,
-	0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22,
+	0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72,
-	0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73,
-	0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e,
+	0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06,
+	0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65,
+	0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61,
-	0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2534,7 +2603,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte {
 	return file_user_user_msg_proto_rawDescData
 }
 
-var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 46)
+var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 47)
 var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserLoginReq)(nil),           // 0: UserLoginReq
 	(*UserLoginResp)(nil),          // 1: UserLoginResp
@@ -2568,49 +2637,50 @@ var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserGetTujianReq)(nil),       // 29: UserGetTujianReq
 	(*UserGetTujianResp)(nil),      // 30: UserGetTujianResp
 	(*UserLvChangedPush)(nil),      // 31: UserLvChangedPush
-	(*UserModifysignReq)(nil),      // 32: UserModifysignReq
+	(*UserVipChangedPush)(nil),     // 32: UserVipChangedPush
-	(*UserModifysignResp)(nil),     // 33: UserModifysignResp
+	(*UserModifysignReq)(nil),      // 33: UserModifysignReq
-	(*UserBattlerecordReq)(nil),    // 34: UserBattlerecordReq
+	(*UserModifysignResp)(nil),     // 34: UserModifysignResp
-	(*UserBattlerecordResp)(nil),   // 35: UserBattlerecordResp
+	(*UserBattlerecordReq)(nil),    // 35: UserBattlerecordReq
-	(*UserSettingteamReq)(nil),     // 36: UserSettingteamReq
+	(*UserBattlerecordResp)(nil),   // 36: UserBattlerecordResp
-	(*UserSettingteamResp)(nil),    // 37: UserSettingteamResp
+	(*UserSettingteamReq)(nil),     // 37: UserSettingteamReq
-	(*UserShowteamReq)(nil),        // 38: UserShowteamReq
+	(*UserSettingteamResp)(nil),    // 38: UserSettingteamResp
-	(*UserShowteamResp)(nil),       // 39: UserShowteamResp
+	(*UserShowteamReq)(nil),        // 39: UserShowteamReq
-	(*UserOnlineResp)(nil),         // 40: UserOnlineResp
+	(*UserShowteamResp)(nil),       // 40: UserShowteamResp
-	(*UserDataListResp)(nil),       // 41: UserDataListResp
+	(*UserOnlineResp)(nil),         // 41: UserOnlineResp
-	(*UserGetServerDataReq)(nil),   // 42: UserGetServerDataReq
+	(*UserDataListResp)(nil),       // 42: UserDataListResp
-	(*UserGetServerDataResp)(nil),  // 43: UserGetServerDataResp
+	(*UserGetServerDataReq)(nil),   // 43: UserGetServerDataReq
-	(*UserSignReq)(nil),            // 44: UserSignReq
+	(*UserGetServerDataResp)(nil),  // 44: UserGetServerDataResp
-	(*UserSignResp)(nil),           // 45: UserSignResp
+	(*UserSignReq)(nil),            // 45: UserSignReq
-	(*DBUser)(nil),                 // 46: DBUser
+	(*UserSignResp)(nil),           // 46: UserSignResp
-	(*DBUserExpand)(nil),           // 47: DBUserExpand
+	(*DBUser)(nil),                 // 47: DBUser
-	(ErrorCode)(0),                 // 48: ErrorCode
+	(*DBUserExpand)(nil),           // 48: DBUserExpand
-	(*CacheUser)(nil),              // 49: CacheUser
+	(ErrorCode)(0),                 // 49: ErrorCode
-	(*DBUserSetting)(nil),          // 50: DBUserSetting
+	(*CacheUser)(nil),              // 50: CacheUser
-	(*DBPagodaRecord)(nil),         // 51: DBPagodaRecord
+	(*DBUserSetting)(nil),          // 51: DBUserSetting
-	(*DBHuntingRank)(nil),          // 52: DBHuntingRank
+	(*DBPagodaRecord)(nil),         // 52: DBPagodaRecord
-	(*DBVikingRank)(nil),           // 53: DBVikingRank
+	(*DBHuntingRank)(nil),          // 53: DBHuntingRank
-	(*DBServerData)(nil),           // 54: DBServerData
+	(*DBVikingRank)(nil),           // 54: DBVikingRank
-	(*DBSign)(nil),                 // 55: DBSign
+	(*DBServerData)(nil),           // 55: DBServerData
+	(*DBSign)(nil),                 // 56: DBSign
 }
 var file_user_user_msg_proto_depIdxs = []int32{
-	46, // 0: UserLoginResp.data:type_name -> DBUser
+	47, // 0: UserLoginResp.data:type_name -> DBUser
-	47, // 1: UserLoginResp.ex:type_name -> DBUserExpand
+	48, // 1: UserLoginResp.ex:type_name -> DBUserExpand
-	46, // 2: UserInfoResp.data:type_name -> DBUser
+	47, // 2: UserInfoResp.data:type_name -> DBUser
-	47, // 3: UserInfoResp.ex:type_name -> DBUserExpand
+	48, // 3: UserInfoResp.ex:type_name -> DBUserExpand
-	48, // 4: UserRegisterResp.Code:type_name -> ErrorCode
+	49, // 4: UserRegisterResp.Code:type_name -> ErrorCode
-	49, // 5: UserLoadResp.data:type_name -> CacheUser
+	50, // 5: UserLoadResp.data:type_name -> CacheUser
-	50, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
+	51, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
-	50, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
+	51, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
-	46, // 8: UserBattlerecordResp.data:type_name -> DBUser
+	47, // 8: UserBattlerecordResp.data:type_name -> DBUser
-	47, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
+	48, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
-	51, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
+	52, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
-	52, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
+	53, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
-	53, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
+	54, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
-	49, // 13: UserOnlineResp.users:type_name -> CacheUser
+	50, // 13: UserOnlineResp.users:type_name -> CacheUser
-	46, // 14: UserDataListResp.users:type_name -> DBUser
+	47, // 14: UserDataListResp.users:type_name -> DBUser
-	54, // 15: UserGetServerDataResp.data:type_name -> DBServerData
+	55, // 15: UserGetServerDataResp.data:type_name -> DBServerData
-	55, // 16: UserSignResp.data:type_name -> DBSign
+	56, // 16: UserSignResp.data:type_name -> DBSign
 	17, // [17:17] is the sub-list for method output_type
 	17, // [17:17] is the sub-list for method input_type
 	17, // [17:17] is the sub-list for extension type_name
@@ -3016,7 +3086,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifysignReq); i {
+			switch v := v.(*UserVipChangedPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3028,7 +3098,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifysignResp); i {
+			switch v := v.(*UserModifysignReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3040,7 +3110,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserBattlerecordReq); i {
+			switch v := v.(*UserModifysignResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3052,7 +3122,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserBattlerecordResp); i {
+			switch v := v.(*UserBattlerecordReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3064,7 +3134,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSettingteamReq); i {
+			switch v := v.(*UserBattlerecordResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3076,7 +3146,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSettingteamResp); i {
+			switch v := v.(*UserSettingteamReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3088,7 +3158,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserShowteamReq); i {
+			switch v := v.(*UserSettingteamResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3100,7 +3170,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserShowteamResp); i {
+			switch v := v.(*UserShowteamReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3112,7 +3182,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserOnlineResp); i {
+			switch v := v.(*UserShowteamResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3124,7 +3194,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserDataListResp); i {
+			switch v := v.(*UserOnlineResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3136,7 +3206,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetServerDataReq); i {
+			switch v := v.(*UserDataListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3148,7 +3218,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetServerDataResp); i {
+			switch v := v.(*UserGetServerDataReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3160,7 +3230,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSignReq); i {
+			switch v := v.(*UserGetServerDataResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3172,6 +3242,18 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UserSignReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_user_user_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserSignResp); i {
 			case 0:
 				return &v.state
@@ -3190,7 +3272,7 @@ func file_user_user_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_user_user_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   46,
+			NumMessages:   47,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

test/robot_test.go

@@ -6,23 +6,22 @@ import (
 	"testing"
 
 	"github.com/Pallinder/go-randomdata"
-	"legu.airobot/busi/friend"
 	"legu.airobot/lib"
 	"legu.airobot/storage"
 )
 
 func TestAction(t *testing.T) {
-	aip := lib.AIParam{}
+	// aip := lib.AIParam{}
-	ai, _ := lib.NewAI(aip)
+	// ai, _ := lib.NewAI(aip)
 
-	// 创建场景
+	// // 创建场景
-	scene := lib.NewScene(ai, lib.SceneParam{
+	// scene := lib.NewScene(ai, lib.SceneParam{
-		Name: "场景1",
+	// 	Name: "场景1",
-		Desc: "好友",
+	// 	Desc: "好友",
-	})
+	// })
 
-	//为场景选择caller
+	// //为场景选择caller
-	scene.AddCaller(&friend.FriendRecommend{})
+	// scene.AddCaller(&friend.FriendRecommend{})
 
 	//加机器人
 	// ai.AddRobot(scene)