上传新捕养大赛

modules/capturesheep/api_changemts.go

@@ -0,0 +1,45 @@
+package capturesheep
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+//参数校验
+func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.CapturesheepChangeMtsReq) (errdata *pb.ErrorData) {
+	return
+}
+
+///更改坐骑
+func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.CapturesheepChangeMtsReq) (errdata *pb.ErrorData) {
+	var (
+		info   *pb.DBCaptureSheep
+		dragon *pb.DBDragon
+		err    error
+	)
+	if errdata = this.ChangeMtsCheck(session, req); errdata != nil {
+		return
+	}
+	if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
+	info.Defmts = dragon.Id
+	if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{
+		"defmts": info.Defmts,
+	}); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "changemts", &pb.CapturesheepChangeMtsResp{})
+	return
+}

modules/capturesheep/api_info.go

@@ -15,9 +15,11 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.CapturesheepIn
 // /获取自己的排行榜信息
 func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq) (errdata *pb.ErrorData) {
 	var (
-		info *pb.DBCaptureSheep
+		info    *pb.DBCaptureSheep
-		user *pb.DBUser
+		user    *pb.DBUser
-		err  error
+		dragons []*pb.DBDragon
+		update  map[string]interface{} = make(map[string]interface{})
+		err     error
 	)
 
 	if errdata = this.InfoCheck(session, req); errdata != nil {
@@ -40,17 +42,30 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq
 		}
 		return
 	}
+	if info.Defmts == "" { //没有默认坐骑
+		if dragons, err = this.module.dragon.GetDragonList(session.GetUserId()); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_DBError,
+				Title:   pb.ErrorCode_DBError.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		if len(dragons) > 0 {
+			info.Defmts = dragons[0].Id
+			update["defmts"] = dragons[0].Id
+		}
+	}
 
 	info.Lv = user.Lv
 	info.Name = user.Name
 	info.Sex = user.Gender
 	info.Skin = user.CurSkin
-	if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{
+	update["Lv"] = user.Lv
-		"name": info.Name,
+	update["Name"] = user.Name
-		"lv":   info.Lv,
+	update["Sex"] = user.Gender
-		"sex":  info.Sex,
+	update["Skin"] = user.CurSkin
-		"skin": info.Skin,
+	if err = this.module.modelCaptureSheep.Change(session.GetUserId(), update); err != nil {
-	}); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -58,7 +73,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq
 		}
 		return
 	}
-
 	session.SendMsg(string(this.module.GetType()), "info", &pb.CapturesheepInfoResp{Info: info})
 	return
 }

modules/capturesheep/api_matche.go

@@ -4,7 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
-	cfg "go_dreamfactory/sys/configure/structs"
 )
 
 //参数校验
@@ -17,9 +16,8 @@ func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.Capturesheep
 func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatcheReq) (errdata *pb.ErrorData) {
 	var (
 		info    *pb.DBCaptureSheep
-		active  *cfg.GameArenaActiveRewardData
+		players []*pb.CaptureSheepRaceMember
-		players []*pb.DBCaptureSheep
+		ais     []*pb.CaptureSheepRaceMember
-		ai      []*pb.DBCaptureSheep
 		err     error
 	)
 	if errdata = this.MatcheCheck(session, req); errdata != nil {
@@ -34,7 +32,7 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch
 		return
 	}
 
-	if players, err = this.module.modelCaptureSheep.matchePlayer(info.Uid, info.Dan, active.HumanNum); err != nil && err != mgo.MongodbNil {
+	if players, err = this.module.modelCaptureSheep.matchePlayer(info.Uid, info.Dan, 6); err != nil && err != mgo.MongodbNil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -42,9 +40,9 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch
 		}
 		return
 	}
-	if len(players) < 5 {
+	if len(players) < 6 {
-		num := 5 - len(players)
+		num := 6 - len(players)
-		if ai, err = this.module.modelCaptureSheep.matcheAI(info.Dan, int32(num)); err != nil && err != mgo.MongodbNil {
+		if ais, err = this.module.modelCaptureSheep.matcheAI(info.Dan, int32(num)); err != nil && err != mgo.MongodbNil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_DBError,
 				Title:   pb.ErrorCode_DBError.ToString(),
@@ -52,7 +50,7 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch
 			}
 			return
 		}
-		players = append(players, ai...)
+		players = append(players, ais...)
 	}
 	session.SendMsg(string(this.module.GetType()), "matche", &pb.CapturesheepMatcheResp{})
 	return

modules/capturesheep/modelCaptureSheep.go

@@ -43,8 +43,7 @@ func (this *ModelCaptureSheep) queryInfo(uid string) (results *pb.DBCaptureSheep
 	}
 	if err == mgo.MongodbNil {
 		results = &pb.DBCaptureSheep{
-			Uid:      uid,
+			Uid: uid,
-			Integral: 1,
 		}
 		err = this.Add(uid, results)
 	}
@@ -52,11 +51,11 @@ func (this *ModelCaptureSheep) queryInfo(uid string) (results *pb.DBCaptureSheep
 }
 
 // 获取目标去陪数据
-func (this *ModelCaptureSheep) matchePlayer(uid string, dan, num int32) (results []*pb.DBCaptureSheep, err error) {
+func (this *ModelCaptureSheep) matchePlayer(uid string, dan, num int32) (results []*pb.CaptureSheepRaceMember, err error) {
 	var (
 		cursor *mongo.Cursor
 	)
-	results = make([]*pb.DBCaptureSheep, 0)
+	results = make([]*pb.CaptureSheepRaceMember, 0)
 	port := []float64{float64(dan), float64(rand.Int31n(100)) / 1000.0}
 	if cursor, err = this.DBModel.DB.Find(comm.TableArena, bson.M{
 		"isdef": true,
@@ -78,30 +77,31 @@ func (this *ModelCaptureSheep) matchePlayer(uid string, dan, num int32) (results
 				this.module.Errorln(err)
 				return
 			}
-			results = append(results, temp)
+			results = append(results, &pb.CaptureSheepRaceMember{
+				Uid:  temp.Uid,
+				Name: temp.Name,
+				Skin: temp.Skin,
+			})
 		}
 	}
 	return
 }
 
 // 匹配机器人
-func (this *ModelCaptureSheep) matcheAI(dan, num int32) (results []*pb.DBCaptureSheep, err error) {
+func (this *ModelCaptureSheep) matcheAI(dan, num int32) (results []*pb.CaptureSheepRaceMember, err error) {
 	var (
 		robots []*cfg.GameRobotData
 	)
-	results = make([]*pb.DBCaptureSheep, num)
+	results = make([]*pb.CaptureSheepRaceMember, num)
 	if robots, err = this.module.ModuleTools.RandRobotConfig(num); err != nil {
 		return
 	}
 	for i, v := range robots {
-		results[i] = &pb.DBCaptureSheep{
+		results[i] = &pb.CaptureSheepRaceMember{
 			Uid:  fmt.Sprintf("ai_%s", id.NewXId()),
 			Name: v.Name,
-			Lv:   v.Lvshow,
 			Sex:  v.Sex,
 			Skin: v.Showid,
-			Dan:  dan,
-			Isai: true,
 		}
 	}
 	return

pb/capturesheep_db.pb.go

@@ -20,23 +20,68 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+type CaptureSheepRaceType int32
+
+const (
+	CaptureSheepRaceType_train  CaptureSheepRaceType = 0 //训练模式
+	CaptureSheepRaceType_ranked CaptureSheepRaceType = 1 //排位模式
+)
+
+// Enum value maps for CaptureSheepRaceType.
+var (
+	CaptureSheepRaceType_name = map[int32]string{
+		0: "train",
+		1: "ranked",
+	}
+	CaptureSheepRaceType_value = map[string]int32{
+		"train":  0,
+		"ranked": 1,
+	}
+)
+
+func (x CaptureSheepRaceType) Enum() *CaptureSheepRaceType {
+	p := new(CaptureSheepRaceType)
+	*p = x
+	return p
+}
+
+func (x CaptureSheepRaceType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (CaptureSheepRaceType) Descriptor() protoreflect.EnumDescriptor {
+	return file_capturesheep_capturesheep_db_proto_enumTypes[0].Descriptor()
+}
+
+func (CaptureSheepRaceType) Type() protoreflect.EnumType {
+	return &file_capturesheep_capturesheep_db_proto_enumTypes[0]
+}
+
+func (x CaptureSheepRaceType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CaptureSheepRaceType.Descriptor instead.
+func (CaptureSheepRaceType) EnumDescriptor() ([]byte, []int) {
+	return file_capturesheep_capturesheep_db_proto_rawDescGZIP(), []int{0}
+}
+
 //玩家基本信息
 type DBCaptureSheep struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid       string    `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Uid      string    `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`            //用户id
-	Name      string    `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
+	Name     string    `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`          //名字
-	Lv        int32     `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"`      //等级
+	Lv       int32     `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"`             //等级
-	Sex       int32     `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`              //性别
+	Sex      int32     `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`           //性别
-	Skin      string    `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"`             //时装
+	Skin     string    `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"`          //时装
-	Dan       int32     `protobuf:"varint,7,opt,name=dan,proto3" json:"dan"`              //段位
+	Dan      int32     `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"`           //段位
-	Integral  int32     `protobuf:"varint,8,opt,name=integral,proto3" json:"integral"`    //当前积分
+	Integral int32     `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分
-	Rank      int32     `protobuf:"varint,9,opt,name=rank,proto3" json:"rank"`            //排名
+	Rank     int32     `protobuf:"varint,8,opt,name=rank,proto3" json:"rank"`         //排名
-	Isai      bool      `protobuf:"varint,11,opt,name=isai,proto3" json:"isai"`           //是否是ai
+	Defmts   string    `protobuf:"bytes,9,opt,name=defmts,proto3" json:"defmts"`      //默认坐骑
-	Mformatid int32     `protobuf:"varint,12,opt,name=mformatid,proto3" json:"mformatid"` // AIId
+	Loc      []float64 `protobuf:"fixed64,13,rep,packed,name=loc,proto3" json:"loc"`  //地图索引 匹配系统使用
-	Loc       []float64 `protobuf:"fixed64,13,rep,packed,name=loc,proto3" json:"loc"`     //地图索引 匹配系统使用
 }
 
 func (x *DBCaptureSheep) Reset() {
@@ -127,18 +172,11 @@ func (x *DBCaptureSheep) GetRank() int32 {
 	return 0
 }
 
-func (x *DBCaptureSheep) GetIsai() bool {
+func (x *DBCaptureSheep) GetDefmts() string {
 	if x != nil {
-		return x.Isai
+		return x.Defmts
 	}
-	return false
+	return ""
-}
-
-func (x *DBCaptureSheep) GetMformatid() int32 {
-	if x != nil {
-		return x.Mformatid
-	}
-	return 0
 }
 
 func (x *DBCaptureSheep) GetLoc() []float64 {
@@ -148,28 +186,229 @@ func (x *DBCaptureSheep) GetLoc() []float64 {
 	return nil
 }
 
+type CaptureSheepRaceMember struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid    string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`        //用户id
+	Name   string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`      //用户名称
+	Skin   string `protobuf:"bytes,3,opt,name=skin,proto3" json:"skin"`      //皮肤
+	Sex    int32  `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`       //性别
+	Mount  string `protobuf:"bytes,5,opt,name=mount,proto3" json:"mount"`    //上阵坐骑 配置id
+	Maxhp  int32  `protobuf:"varint,6,opt,name=maxhp,proto3" json:"maxhp"`   //初始血量
+	Currhp int32  `protobuf:"varint,7,opt,name=currhp,proto3" json:"currhp"` //当前血量
+}
+
+func (x *CaptureSheepRaceMember) Reset() {
+	*x = CaptureSheepRaceMember{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_capturesheep_capturesheep_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CaptureSheepRaceMember) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CaptureSheepRaceMember) ProtoMessage() {}
+
+func (x *CaptureSheepRaceMember) ProtoReflect() protoreflect.Message {
+	mi := &file_capturesheep_capturesheep_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 CaptureSheepRaceMember.ProtoReflect.Descriptor instead.
+func (*CaptureSheepRaceMember) Descriptor() ([]byte, []int) {
+	return file_capturesheep_capturesheep_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *CaptureSheepRaceMember) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *CaptureSheepRaceMember) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CaptureSheepRaceMember) GetSkin() string {
+	if x != nil {
+		return x.Skin
+	}
+	return ""
+}
+
+func (x *CaptureSheepRaceMember) GetSex() int32 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
+func (x *CaptureSheepRaceMember) GetMount() string {
+	if x != nil {
+		return x.Mount
+	}
+	return ""
+}
+
+func (x *CaptureSheepRaceMember) GetMaxhp() int32 {
+	if x != nil {
+		return x.Maxhp
+	}
+	return 0
+}
+
+func (x *CaptureSheepRaceMember) GetCurrhp() int32 {
+	if x != nil {
+		return x.Currhp
+	}
+	return 0
+}
+
+//捕养比赛
+type DBCaptureSheepRace struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id         string                    `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
+	Rtype      CaptureSheepRaceType      `protobuf:"varint,3,opt,name=rtype,proto3,enum=CaptureSheepRaceType" json:"rtype"` //比赛类型
+	Trackid    int32                     `protobuf:"varint,4,opt,name=trackid,proto3" json:"trackid"`                       //赛道id
+	Redmember  []*CaptureSheepRaceMember `protobuf:"bytes,6,rep,name=redmember,proto3" json:"redmember"`                    //红方队伍
+	Bulemember []*CaptureSheepRaceMember `protobuf:"bytes,7,rep,name=bulemember,proto3" json:"bulemember"`                  //蓝方队伍
+}
+
+func (x *DBCaptureSheepRace) Reset() {
+	*x = DBCaptureSheepRace{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_capturesheep_capturesheep_db_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBCaptureSheepRace) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCaptureSheepRace) ProtoMessage() {}
+
+func (x *DBCaptureSheepRace) ProtoReflect() protoreflect.Message {
+	mi := &file_capturesheep_capturesheep_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 DBCaptureSheepRace.ProtoReflect.Descriptor instead.
+func (*DBCaptureSheepRace) Descriptor() ([]byte, []int) {
+	return file_capturesheep_capturesheep_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBCaptureSheepRace) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *DBCaptureSheepRace) GetRtype() CaptureSheepRaceType {
+	if x != nil {
+		return x.Rtype
+	}
+	return CaptureSheepRaceType_train
+}
+
+func (x *DBCaptureSheepRace) GetTrackid() int32 {
+	if x != nil {
+		return x.Trackid
+	}
+	return 0
+}
+
+func (x *DBCaptureSheepRace) GetRedmember() []*CaptureSheepRaceMember {
+	if x != nil {
+		return x.Redmember
+	}
+	return nil
+}
+
+func (x *DBCaptureSheepRace) GetBulemember() []*CaptureSheepRaceMember {
+	if x != nil {
+		return x.Bulemember
+	}
+	return nil
+}
+
 var File_capturesheep_capturesheep_db_proto protoreflect.FileDescriptor
 
 var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63,
 	0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf2, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
 	0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a,
-	0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a,
+	0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a,
-	0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12,
+	0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12,
-	0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
-	0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+	0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x0b, 0x20,
+	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x6f,
+	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a,
-	0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x66,
+	0x03, 0x6c, 0x6f, 0x63, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63, 0x18, 0x0d,
+	0xa8, 0x01, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70,
-	0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78,
+	0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x22, 0xdb, 0x01, 0x0a, 0x12, 0x44,
+	0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63,
+	0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
+	0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x6d,
+	0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61,
+	0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12,
+	0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x07, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65,
+	0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75,
+	0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74,
+	0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x72,
+	0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -184,16 +423,23 @@ func file_capturesheep_capturesheep_db_proto_rawDescGZIP() []byte {
 	return file_capturesheep_capturesheep_db_proto_rawDescData
 }
 
-var file_capturesheep_capturesheep_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_capturesheep_capturesheep_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_capturesheep_capturesheep_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_capturesheep_capturesheep_db_proto_goTypes = []interface{}{
-	(*DBCaptureSheep)(nil), // 0: DBCaptureSheep
+	(CaptureSheepRaceType)(0),      // 0: CaptureSheepRaceType
+	(*DBCaptureSheep)(nil),         // 1: DBCaptureSheep
+	(*CaptureSheepRaceMember)(nil), // 2: CaptureSheepRaceMember
+	(*DBCaptureSheepRace)(nil),     // 3: DBCaptureSheepRace
 }
 var file_capturesheep_capturesheep_db_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
+	0, // 0: DBCaptureSheepRace.rtype:type_name -> CaptureSheepRaceType
-	0, // [0:0] is the sub-list for method input_type
+	2, // 1: DBCaptureSheepRace.redmember:type_name -> CaptureSheepRaceMember
-	0, // [0:0] is the sub-list for extension type_name
+	2, // 2: DBCaptureSheepRace.bulemember:type_name -> CaptureSheepRaceMember
-	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_capturesheep_capturesheep_db_proto_init() }
@@ -214,19 +460,44 @@ func file_capturesheep_capturesheep_db_proto_init() {
 				return nil
 			}
 		}
+		file_capturesheep_capturesheep_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CaptureSheepRaceMember); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_capturesheep_capturesheep_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBCaptureSheepRace); 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{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_capturesheep_capturesheep_db_proto_rawDesc,
-			NumEnums:      0,
+			NumEnums:      1,
-			NumMessages:   1,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
 		GoTypes:           file_capturesheep_capturesheep_db_proto_goTypes,
 		DependencyIndexes: file_capturesheep_capturesheep_db_proto_depIdxs,
+		EnumInfos:         file_capturesheep_capturesheep_db_proto_enumTypes,
 		MessageInfos:      file_capturesheep_capturesheep_db_proto_msgTypes,
 	}.Build()
 	File_capturesheep_capturesheep_db_proto = out.File

pb/capturesheep_msg.pb.go

@@ -107,16 +107,106 @@ func (x *CapturesheepInfoResp) GetInfo() *DBCaptureSheep {
 	return nil
 }
 
-type CapturesheepMatcheReq struct {
+//捕养 更换坐骑
+type CapturesheepChangeMtsReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"` //坐骑id
+}
+
+func (x *CapturesheepChangeMtsReq) Reset() {
+	*x = CapturesheepChangeMtsReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CapturesheepChangeMtsReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CapturesheepChangeMtsReq) ProtoMessage() {}
+
+func (x *CapturesheepChangeMtsReq) ProtoReflect() protoreflect.Message {
+	mi := &file_capturesheep_capturesheep_msg_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 CapturesheepChangeMtsReq.ProtoReflect.Descriptor instead.
+func (*CapturesheepChangeMtsReq) Descriptor() ([]byte, []int) {
+	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *CapturesheepChangeMtsReq) GetMid() string {
+	if x != nil {
+		return x.Mid
+	}
+	return ""
+}
+
+//捕养 更换坐骑
+type CapturesheepChangeMtsResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
+func (x *CapturesheepChangeMtsResp) Reset() {
+	*x = CapturesheepChangeMtsResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CapturesheepChangeMtsResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CapturesheepChangeMtsResp) ProtoMessage() {}
+
+func (x *CapturesheepChangeMtsResp) ProtoReflect() protoreflect.Message {
+	mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[3]
+	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 CapturesheepChangeMtsResp.ProtoReflect.Descriptor instead.
+func (*CapturesheepChangeMtsResp) Descriptor() ([]byte, []int) {
+	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{3}
+}
+
+type CapturesheepMatcheReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Rtype   CaptureSheepRaceType `protobuf:"varint,1,opt,name=rtype,proto3,enum=CaptureSheepRaceType" json:"rtype"` //比赛类型
+	Trackid int32                `protobuf:"varint,2,opt,name=trackid,proto3" json:"trackid"`                       //赛道id
+}
+
 func (x *CapturesheepMatcheReq) Reset() {
 	*x = CapturesheepMatcheReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[2]
+		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -129,7 +219,7 @@ func (x *CapturesheepMatcheReq) String() string {
 func (*CapturesheepMatcheReq) ProtoMessage() {}
 
 func (x *CapturesheepMatcheReq) ProtoReflect() protoreflect.Message {
-	mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[2]
+	mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -142,7 +232,21 @@ func (x *CapturesheepMatcheReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CapturesheepMatcheReq.ProtoReflect.Descriptor instead.
 func (*CapturesheepMatcheReq) Descriptor() ([]byte, []int) {
-	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{2}
+	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *CapturesheepMatcheReq) GetRtype() CaptureSheepRaceType {
+	if x != nil {
+		return x.Rtype
+	}
+	return CaptureSheepRaceType_train
+}
+
+func (x *CapturesheepMatcheReq) GetTrackid() int32 {
+	if x != nil {
+		return x.Trackid
+	}
+	return 0
 }
 
 //竞技场信息 回应
@@ -151,14 +255,14 @@ type CapturesheepMatcheResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Red  []*DBCaptureSheep `protobuf:"bytes,1,rep,name=red,proto3" json:"red"`
+	Matchetime int32               `protobuf:"varint,1,opt,name=matchetime,proto3" json:"matchetime"` //匹配时间
-	Blue []*DBCaptureSheep `protobuf:"bytes,2,rep,name=blue,proto3" json:"blue"`
+	Race       *DBCaptureSheepRace `protobuf:"bytes,2,opt,name=race,proto3" json:"race"`              //比赛数据
 }
 
 func (x *CapturesheepMatcheResp) Reset() {
 	*x = CapturesheepMatcheResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[3]
+		mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -171,7 +275,7 @@ func (x *CapturesheepMatcheResp) String() string {
 func (*CapturesheepMatcheResp) ProtoMessage() {}
 
 func (x *CapturesheepMatcheResp) ProtoReflect() protoreflect.Message {
-	mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[3]
+	mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -184,19 +288,19 @@ func (x *CapturesheepMatcheResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CapturesheepMatcheResp.ProtoReflect.Descriptor instead.
 func (*CapturesheepMatcheResp) Descriptor() ([]byte, []int) {
-	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{3}
+	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *CapturesheepMatcheResp) GetRed() []*DBCaptureSheep {
+func (x *CapturesheepMatcheResp) GetMatchetime() int32 {
 	if x != nil {
-		return x.Red
+		return x.Matchetime
 	}
-	return nil
+	return 0
 }
 
-func (x *CapturesheepMatcheResp) GetBlue() []*DBCaptureSheep {
+func (x *CapturesheepMatcheResp) GetRace() *DBCaptureSheepRace {
 	if x != nil {
-		return x.Blue
+		return x.Race
 	}
 	return nil
 }
@@ -213,16 +317,25 @@ var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{
 	0x22, 0x3b, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70,
 	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75,
-	0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x17, 0x0a,
+	0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a,
-	0x15, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74,
+	0x18, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61,
-	0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72,
+	0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64,
-	0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x43,
-	0x12, 0x21, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
+	0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67,
-	0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x03,
+	0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61, 0x70, 0x74,
-	0x72, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65,
-	0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65,
+	0x71, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x65, 0x70, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69,
+	0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
+	0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -237,18 +350,22 @@ func file_capturesheep_capturesheep_msg_proto_rawDescGZIP() []byte {
 	return file_capturesheep_capturesheep_msg_proto_rawDescData
 }
 
-var file_capturesheep_capturesheep_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_capturesheep_capturesheep_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_capturesheep_capturesheep_msg_proto_goTypes = []interface{}{
-	(*CapturesheepInfoReq)(nil),    // 0: CapturesheepInfoReq
+	(*CapturesheepInfoReq)(nil),       // 0: CapturesheepInfoReq
-	(*CapturesheepInfoResp)(nil),   // 1: CapturesheepInfoResp
+	(*CapturesheepInfoResp)(nil),      // 1: CapturesheepInfoResp
-	(*CapturesheepMatcheReq)(nil),  // 2: CapturesheepMatcheReq
+	(*CapturesheepChangeMtsReq)(nil),  // 2: CapturesheepChangeMtsReq
-	(*CapturesheepMatcheResp)(nil), // 3: CapturesheepMatcheResp
+	(*CapturesheepChangeMtsResp)(nil), // 3: CapturesheepChangeMtsResp
-	(*DBCaptureSheep)(nil),         // 4: DBCaptureSheep
+	(*CapturesheepMatcheReq)(nil),     // 4: CapturesheepMatcheReq
+	(*CapturesheepMatcheResp)(nil),    // 5: CapturesheepMatcheResp
+	(*DBCaptureSheep)(nil),            // 6: DBCaptureSheep
+	(CaptureSheepRaceType)(0),         // 7: CaptureSheepRaceType
+	(*DBCaptureSheepRace)(nil),        // 8: DBCaptureSheepRace
 }
 var file_capturesheep_capturesheep_msg_proto_depIdxs = []int32{
-	4, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep
+	6, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep
-	4, // 1: CapturesheepMatcheResp.red:type_name -> DBCaptureSheep
+	7, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType
-	4, // 2: CapturesheepMatcheResp.blue:type_name -> DBCaptureSheep
+	8, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace
 	3, // [3:3] is the sub-list for method output_type
 	3, // [3:3] is the sub-list for method input_type
 	3, // [3:3] is the sub-list for extension type_name
@@ -288,7 +405,7 @@ func file_capturesheep_capturesheep_msg_proto_init() {
 			}
 		}
 		file_capturesheep_capturesheep_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CapturesheepMatcheReq); i {
+			switch v := v.(*CapturesheepChangeMtsReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -300,6 +417,30 @@ func file_capturesheep_capturesheep_msg_proto_init() {
 			}
 		}
 		file_capturesheep_capturesheep_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CapturesheepChangeMtsResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_capturesheep_capturesheep_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CapturesheepMatcheReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_capturesheep_capturesheep_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CapturesheepMatcheResp); i {
 			case 0:
 				return &v.state
@@ -318,7 +459,7 @@ func file_capturesheep_capturesheep_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_capturesheep_capturesheep_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},