From 92e122015042646806e80c279be846a4c479cba0 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 18 Jan 2024 17:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A0=E5=A4=BApvp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                         |   3 +
 modules/battle/modelBattle.go           |  52 ++
 modules/battle/module.go                |  33 +
 modules/entertainment/xxlPlat.go        | 178 ++++--
 modules/plunder/api_challenge.go        |   4 +-
 modules/plunder/api_challengeover.go    | 164 +++++
 modules/plunder/api_pvpchallenge.go     |  90 +++
 modules/plunder/api_pvpchallengeover.go |  60 ++
 pb/arena_db.pb.go                       | 535 +++++++---------
 pb/battle_db.pb.go                      |  24 +-
 pb/battle_msg.pb.go                     | 177 +++++-
 pb/battle_struct.pb.go                  | 809 +++++++++++++-----------
 pb/errorcode.pb.go                      |  12 +-
 pb/plunder_db.pb.go                     | 180 +++---
 pb/plunder_msg.pb.go                    | 607 +++++++++++++-----
 15 files changed, 1906 insertions(+), 1022 deletions(-)
 create mode 100644 modules/plunder/api_challengeover.go
 create mode 100644 modules/plunder/api_pvpchallenge.go
 create mode 100644 modules/plunder/api_pvpchallengeover.go

diff --git a/comm/imodule.go b/comm/imodule.go
index 8899e6c09..1f90219bf 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -338,6 +338,9 @@ type (
 		CreateDebuffBattle(session IUserSession, req *pb.BattlePVEReq, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
 		// 跑服务端战斗
 		RunServerBattle(session IUserSession, req *pb.BattleRunReq) (errdata *pb.ErrorData, record *pb.BattleRunResp)
+
+		///创建掠夺pvp战斗
+		CreatePlunderPvpBattle(session IUserSession, req *pb.BattlePVEPlunderReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
 	}
 	IGm interface {
 		CreateCmd(session IUserSession, cmd string) (errdata *pb.ErrorData)
diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index f579d8ae5..dbab0a0f2 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -1342,3 +1342,55 @@ func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag
 
 	return
 }
+
+// 创建pvp 战斗请求
+func (this *modelBattleComp) createPlunderpvp(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEPlunderReq, conf *cfg.GameBattleReadyData) (record *pb.DBBattleRecord, errdata *pb.ErrorData) {
+	var (
+		heros []*pb.DBHero = make([]*pb.DBHero, 5)
+	)
+	record = &pb.DBBattleRecord{
+		Id:        primitive.NewObjectID().Hex(),
+		Title:     req.Title,
+		Btype:     btype,
+		Ptype:     req.Ptype,
+		State:     pb.BBattleState_in,
+		RedCompId: session.GetUserId(),
+		Redflist:  make([]*pb.DBBattleFormt, 1),
+		//BlueCompId: req.Buleformat.Uid,
+		//Buleflist:  make([]*pb.DBBattleFormt, 1),
+	}
+
+	record.Redflist[0] = &pb.DBBattleFormt{
+		Leadpos: req.Format.Leadpos,
+		Team:    make([]*pb.BattleRole, len(req.Format.Format)),
+	}
+	model := db.NewDBModel(session.GetServiecTag(), comm.TableHero, conn)
+	for i, v := range req.Format.Format {
+		if v != "" {
+			heros[i] = &pb.DBHero{}
+			if err := model.GetListObj(session.GetUserId(), v, heros[i]); err != nil {
+				errdata = &pb.ErrorData{
+					Code:  pb.ErrorCode_HeroNoExist,
+					Title: pb.ErrorCode_HeroNoExist.ToString(),
+				}
+				return
+			}
+			tid := 100 + i
+			if record.Redflist[0].Team[i], errdata = this.createBattleRole(heros[i], 0, tid, i); errdata != nil {
+				return
+			}
+		} else {
+			record.Redflist[0].Team[i] = nil
+		}
+	}
+
+	if ok := this.checkBattlereadyCapskill(req.Format.Leadpos, heros); !ok {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_BattleCapskillCheckFailed,
+			Title: pb.ErrorCode_BattleCapskillCheckFailed.ToString(),
+		}
+		return
+	}
+
+	return
+}
diff --git a/modules/battle/module.go b/modules/battle/module.go
index 467c12bd7..8d4b495b0 100644
--- a/modules/battle/module.go
+++ b/modules/battle/module.go
@@ -731,3 +731,36 @@ func (this *Battle) RunServerBattle(session comm.IUserSession, req *pb.BattleRun
 	}
 	return
 }
+func (this *Battle) CreatePlunderPvpBattle(session comm.IUserSession, req *pb.BattlePVEPlunderReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
+	var (
+		conf *cfg.GameBattleReadyData
+		conn *db.DBConn
+		err  error
+	)
+	if !this.IsCross() {
+		conn, err = db.Local()
+	} else {
+		conn, err = db.ServerDBConn(session.GetServiecTag())
+	}
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		this.Errorf("session:%v err:", session, err)
+		return
+	}
+	if conf, err = this.configure.GetBattleReady(req.Rulesid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if record, errdata = this.modelBattle.createPlunderpvp(session, conn, pb.BattleType_pvp, req, conf); errdata != nil {
+		return
+	}
+	return
+}
diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go
index 80aa44456..133fae180 100644
--- a/modules/entertainment/xxlPlat.go
+++ b/modules/entertainment/xxlPlat.go
@@ -81,11 +81,11 @@ func (this *MapData) SetMap() {
 	sz2 := []int32{
 		3, 1, 2, 2, 1, 3, 1,
 		5, 1, 2, 4, 1, 2, 2,
-		2, 4, 3, 1, 1, 1, 6,
-		1, 3, 4, 1, 4, 3, 6,
-		1, 1, 1, 1, 6, 1, 4,
-		1, 6, 3, 26, 3, 1, 3,
-		3, 3, 1, 1, 1, 1, 5,
+		2, 4, 3, 1, 3, 1, 6,
+		1, 3, 4, 5, 1, 3, 6,
+		2, 1, 1, 2, 1, 1, 4,
+		1, 6, 3, 26, 3, 4, 3,
+		3, 3, 1, 2, 1, 1, 5,
 	}
 	var pos int
 	for index := Width - 1; index >= 0; index-- {
@@ -146,6 +146,7 @@ func (this *MapData) InitMap(module *Entertainment, iType int32) {
 	}
 
 	this.SetIndelibilityPlat()
+	//this.SetMap()
 	//	this.Plat = this.GetPalatData()
 }
 
@@ -470,6 +471,7 @@ func (this *MapData) CheckMap(color int32, bSkill bool) (szMap []*pb.MapData, xc
 		energy   int32
 		new      map[int]int
 		x        map[int]struct{}
+		s        map[int]int
 	)
 
 	for {
@@ -478,66 +480,82 @@ func (this *MapData) CheckMap(color int32, bSkill bool) (szMap []*pb.MapData, xc
 		tXiaochu = make(map[int]struct{})
 		curScore = 0
 		energy = 0
-		if bEliminate, xiaochu, s := this.Check5X(); bEliminate {
-			for _, v := range xiaochu {
-				tXiaochu[v] = struct{}{}
-			}
+		s = make(map[int]int)
+		for i := 1; i <= 6; i++ {
+			tXiaochu, s = this.CheckElem(int32(i))
 			for k, v := range s {
 				new[k] = v
 			}
-			xc = true // 只要有 4x 5x 就标记ture
-		}
-		if bEliminate, xiaochu, s := this.Check4X(); bEliminate {
-			for _, v := range xiaochu {
-				tXiaochu[v] = struct{}{}
-			}
-			for k, v := range s {
-				new[k] = v
-			}
-			xc = true // 只要有 4x 5x 就标记ture
-		}
-		if bEliminate, xiaochu := this.Check3X(); bEliminate {
-			for _, v := range xiaochu {
-				tXiaochu[v] = struct{}{}
-			}
-		}
 
-		for id := range tXiaochu {
-			if _, ok := new[id]; ok {
-				if this.Plat[id].Color == color {
-					energy++
-				}
-				curScore += this.Plat[id].Score
-				this.oid++              // 生成一个新的类型元素
-				if this.module == nil { // 稍后删掉 方便测试
-					this.Plat[id] = &pb.GirdeData{
-						Oid:     this.oid,
-						Color:   this.Plat[id].Color,
-						Cid:     2*(this.Plat[id].Color-1) + 6 + int32(new[id]),
-						Score:   1,
-						Special: int32(new[id]),
+			// if bEliminate, xiaochu, s := this.Check5X(); bEliminate {
+			// 	for _, v := range xiaochu {
+			// 		tXiaochu[v] = struct{}{}
+			// 	}
+			// 	for k, v := range s {
+			// 		new[k] = v
+			// 	}
+			// 	xc = true // 只要有 4x 5x 就标记ture
+			// }
+			// if bEliminate, xiaochu, s := this.Check4X(); bEliminate {
+			// 	for _, v := range xiaochu {
+			// 		tXiaochu[v] = struct{}{}
+			// 	}
+			// 	for k, v := range s {
+			// 		new[k] = v
+			// 	}
+			// 	xc = true // 只要有 4x 5x 就标记ture
+			// }
+			// if bEliminate, xiaochu := this.Check3X(); bEliminate {
+			// 	for _, v := range xiaochu {
+			// 		tXiaochu[v] = struct{}{}
+			// 	}
+			// }
+
+			for id := range tXiaochu {
+				if _, ok := new[id]; ok {
+					if this.Plat[id].Color == color {
+						energy++
 					}
-				} else {
-					if conf, err := this.module.configure.GetGameBlock(this.Plat[id].Color, int32(new[id])); err == nil {
+					curScore += this.Plat[id].Score
+					this.oid++              // 生成一个新的类型元素
+					if this.module == nil { // 稍后删掉 方便测试
 						this.Plat[id] = &pb.GirdeData{
 							Oid:     this.oid,
 							Color:   this.Plat[id].Color,
-							Cid:     conf.Key,
-							Score:   conf.Score,
-							Special: conf.Type,
+							Cid:     2*(this.Plat[id].Color-1) + 6 + int32(new[id]),
+							Score:   1,
+							Special: int32(new[id]),
+						}
+					} else {
+
+						if s := this.Plat[id].Special; s != 0 {
+							for key := range this.SpecialElem(id, s) {
+								x[key] = struct{}{}
+							}
+							x[id] = struct{}{}
+						}
+
+						if conf, err := this.module.configure.GetGameBlock(this.Plat[id].Color, int32(new[id])); err == nil {
+							this.Plat[id] = &pb.GirdeData{
+								Oid:     this.oid,
+								Color:   this.Plat[id].Color,
+								Cid:     conf.Key,
+								Score:   conf.Score,
+								Special: conf.Type,
+							}
 						}
 					}
-				}
-				continue
-			}
-
-			if s := this.Plat[id].Special; s != 0 {
-				for key := range this.SpecialElem(id, s) {
-					x[key] = struct{}{}
+					continue
 				}
 
+				if s := this.Plat[id].Special; s != 0 {
+					for key := range this.SpecialElem(id, s) {
+						x[key] = struct{}{}
+					}
+
+				}
+				x[id] = struct{}{}
 			}
-			x[id] = struct{}{}
 		}
 		for id := range x {
 			if this.Plat[id].Color == color {
@@ -1077,10 +1095,17 @@ func (this *MapData) SetIndelibilityPlat() {
 			}
 		}
 	}
-	if b, _ := this.Check3X(); b {
-		fmt.Printf("plat init\n")
-		this.CheckMap(0, false)
+	for {
+		if b, _ := this.Check3X(); b {
+			fmt.Printf("plat init\n")
+			if _, xc := this.CheckMap(0, false); !xc {
+				break
+			}
+		} else {
+			break
+		}
 	}
+
 	this.Plat = this.GetPalatData()
 }
 
@@ -1397,12 +1422,25 @@ func (this *MapData) HitCrossElem(color int32, curid int32) (szMap []*pb.MapData
 	return
 }
 
+func (this *MapData) checkSp(e []int) (oid int32) {
+	oid = -1
+	for _, v := range this.operElem {
+		for _, v1 := range e {
+			if v == int32(v1) {
+				oid = v
+				break
+			}
+		}
+	}
+	return
+}
+
 // 检测一个元素
 func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]int) {
 	var (
 		w  [14][]int32
-		s1 [][]int
-		s2 [][]int
+		s1 [][]int // heng
+		s2 [][]int // shu
 	)
 	mtmp = make(map[int]struct{}, 0)
 	sp = make(map[int]int)
@@ -1464,15 +1502,25 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i
 						s = append(s, (i-7)*7+j+2)
 						s = append(s, (i-7)*7+j+3)
 						s1 = append(s1, s)
-
+						oid := this.checkSp(s)
+						if 0 < oid {
+							sp[int(oid)] = FourUType
+						} else {
+							sp[(i-7)*7+j+1] = FourUType
+						}
 					} else {
 						s = append(s, (j)*7+i)
 						s = append(s, (j+1)*7+i)
 						s = append(s, (j+2)*7+i)
 						s = append(s, (j+3)*7+i)
 						s2 = append(s2, s)
+						oid := this.checkSp(s)
+						if 0 < oid {
+							sp[int(oid)] = FourLType
+						} else {
+							sp[(j+1)*7+i] = FourLType
+						}
 					}
-
 					break
 				}
 			}
@@ -1500,7 +1548,7 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i
 
 	for _, v := range s1 {
 		for _, vs1 := range v {
-			t := CheckInSlice(vs1, s2)
+			t := CheckInSlice(vs1, s2) // 横竖相交
 			if len(t) > 0 {
 				for _, vs1 := range v {
 					t[vs1] = struct{}{}
@@ -1520,6 +1568,16 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i
 			}
 		}
 	}
+	for _, v := range s1 {
+		for _, v1 := range v {
+			mtmp[v1] = struct{}{}
+		}
+	}
+	for _, v := range s2 {
+		for _, v1 := range v {
+			mtmp[v1] = struct{}{}
+		}
+	}
 	return
 }
 func CheckInSlice(index int, sz [][]int) (m map[int]struct{}) {
diff --git a/modules/plunder/api_challenge.go b/modules/plunder/api_challenge.go
index fc6547bbe..a6180be11 100644
--- a/modules/plunder/api_challenge.go
+++ b/modules/plunder/api_challenge.go
@@ -65,7 +65,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
 	}
 	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
 		Rulesid: battleConf.BattleReadyID,
-		Ptype:   pb.PlayType_mainline,
+		Ptype:   pb.PlayType_plunder,
 		Title:   "",
 		Format:  req.Battle,
 		Mformat: battleConf.FormatList,
@@ -74,8 +74,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PlunderChallen
 		return
 	}
 	session.SendMsg(string(this.module.GetType()), "challenge", &pb.PlunderChallengeResp{
-		Line: []*pb.PlunderLine{},
-		Ship: map[string]*pb.ShipData{},
 		Info: &pb.BattleInfo{Id: record.Id, Title: record.Title, Rulesid: battleConf.BattleReadyID, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, Tasks: record.Tasks},
 	})
 	return
diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go
new file mode 100644
index 000000000..d064bde6d
--- /dev/null
+++ b/modules/plunder/api_challengeover.go
@@ -0,0 +1,164 @@
+package plunder
+
+import (
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"go_dreamfactory/sys/configure"
+	cfg "go_dreamfactory/sys/configure/structs"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+// 参数校验
+func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.PlunderChallengeOverReq) (errdata *pb.ErrorData) {
+	if req.Report == nil {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
+	return
+}
+
+// /挑战主线关卡
+func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderChallengeOverReq) (errdata *pb.ErrorData) {
+	var (
+		conf        *cfg.GamePlunderData
+		err         error
+		list        *pb.DBPlunder
+		isWin       bool
+		changExp    map[string]int32
+		heroupaward []*cfg.Gameatn
+		battleConf  *cfg.GamePlunderBattleData
+		atno        []*pb.UserAtno    // atno 类型
+		res         []*cfg.Gameatn    // 最后获得的资源
+		land        *pb.DBPlunderLand // 岛屿数据
+		shipData    *pb.ShipData      // 船
+		users       []string
+	)
+	changExp = make(map[string]int32, 0)
+	if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
+		return // 参数校验失败直接返回
+	}
+	if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+	if len(list.Source) > int(req.Index) { // 数组长度校验
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Title:   pb.ErrorCode_ReqParameterError.ToString(),
+			Message: fmt.Sprintf("list.Source len:%d,req.index:%d", len(list.Source), req.Index),
+		}
+		return
+	}
+	// 配置校验
+	if conf, err = this.module.configure.getGamePlunderDataById(list.Source[req.Index]); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if battleConf, err = this.module.configure.getGamePlunderBattleById(conf.Battleid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	// 校验通过
+	errdata, isWin = this.module.battle.CheckBattleReport(session, req.Report)
+	if errdata != nil {
+		return
+	}
+	if !isWin { // 战斗失败直接返回
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_BattleValidationFailed,
+			Title:   pb.ErrorCode_BattleValidationFailed.ToString(),
+			Message: "battle is defeated",
+		}
+		return
+	}
+	if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+	for _, v := range land.Uinfo {
+		users = append(users, v.Uid)
+	}
+	_id := primitive.NilObjectID.Hex()
+	// 创建一条船的信息
+	shipData = &pb.ShipData{
+		Uid: session.GetUserId(),
+		Line: &pb.PlunderLine{
+			Itype:     0,
+			Etime:     configure.Now().Unix() + int64(conf.Extime),
+			Cid:       conf.Id,
+			Oid:       _id,
+			Closetime: 0,
+		},
+		Status: 0,
+		Cd:     0,
+		Client: false,
+		Defend: req.Report.Info.Buleflist,
+	}
+	// 此处需要redis 锁
+	land.Ship[_id] = shipData // 一条新船
+
+	this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{
+		"ship": land.Ship,
+	})
+	// 通知大家
+	this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{
+		Ship: land.Ship,
+	}, users...)
+	if battleConf.Carexe > 0 {
+		var heroObjs []string
+		if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
+			for _, v := range req.Report.Info.Redflist[0].Team {
+				if v.HeroID != "" {
+					if !v.Ishelp { // 助战英雄不加经验
+						heroObjs = append(heroObjs, v.Oid)
+					}
+				}
+			}
+		}
+		if changExp, heroupaward, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, battleConf.Carexe); errdata != nil {
+			return
+		}
+		res = append(res, heroupaward...)
+	}
+	res = append(res, battleConf.Playexp)
+	res = append(res, battleConf.Exreward...)
+	if battleConf.Reward > 0 {
+		if user, err := this.module.GetUserForSession(session); err == nil {
+			reward := this.module.ModuleTools.GetGroupDataByLottery(battleConf.Reward, user.Vip, user.Lv)
+			res = append(res, reward...)
+		}
+	}
+
+	if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "challengeover", &pb.PlunderChallengeOverResp{
+		Line:    []*pb.PlunderLine{},
+		Ship:    map[string]*pb.ShipData{},
+		Atno:    atno,
+		Heroexp: changExp,
+	})
+	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+		this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno)
+	})
+	return
+}
diff --git a/modules/plunder/api_pvpchallenge.go b/modules/plunder/api_pvpchallenge.go
new file mode 100644
index 000000000..279687884
--- /dev/null
+++ b/modules/plunder/api_pvpchallenge.go
@@ -0,0 +1,90 @@
+package plunder
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+// 参数校验
+func (this *apiComp) PvpChallengeCheck(session comm.IUserSession, req *pb.PlunderPvpChallengeReq) (errdata *pb.ErrorData) {
+	if req.Oid == "" || req.Battle.Format == nil || len(req.Battle.Format) != 5 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
+
+	for _, v := range req.Battle.Format {
+		if v != "" {
+			return
+		}
+	}
+	errdata = &pb.ErrorData{ //没有英雄
+		Code:    pb.ErrorCode_ReqParameterError,
+		Title:   pb.ErrorCode_ReqParameterError.ToString(),
+		Message: "no hero",
+	}
+	return
+}
+
+// /挑战
+func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpChallengeReq) (errdata *pb.ErrorData) {
+	var (
+		record *pb.DBBattleRecord
+		err    error
+		land   *pb.DBPlunderLand // 岛屿数据
+		list   *pb.DBPlunder
+	)
+	if errdata = this.PvpChallengeCheck(session, req); errdata != nil {
+		return
+	}
+
+	if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+
+	// 校验oid
+	if _, ok := land.Ship[req.Oid]; !ok {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_PlunderNotFoundShip,
+			Title: pb.ErrorCode_PlunderNotFoundShip.ToString(),
+		}
+		return
+	}
+
+	if errdata, record = this.module.battle.CreatePlunderPvpBattle(session, &pb.BattlePVEPlunderReq{
+		Ptype:   pb.PlayType_plunderpvp,
+		Title:   "",
+		Rulesid: 105,
+		Format:  req.Battle,
+	}); errdata != nil {
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Info: &pb.BattleInfo{
+		Id:         record.Id,
+		Title:      record.Title,
+		Rulesid:    105,
+		Btype:      record.Btype,
+		Ptype:      record.Ptype,
+		RedCompId:  record.RedCompId,
+		Redflist:   record.Redflist,
+		BlueCompId: land.Ship[req.Oid].Uid,
+		Buleflist:  land.Ship[req.Oid].Defend,
+		Tasks:      record.Tasks,
+	}})
+
+	return
+}
diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go
new file mode 100644
index 000000000..dc5ec6b64
--- /dev/null
+++ b/modules/plunder/api_pvpchallengeover.go
@@ -0,0 +1,60 @@
+package plunder
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+// 参数校验
+func (this *apiComp) PvpChallengeOverCheck(session comm.IUserSession, req *pb.PlunderPvpChallengeOverReq) (errdata *pb.ErrorData) {
+	if req.Report == nil {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
+	return
+}
+
+// /挑战
+func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.PlunderPvpChallengeOverReq) (errdata *pb.ErrorData) {
+	var (
+		err  error
+		land *pb.DBPlunderLand // 岛屿数据
+		list *pb.DBPlunder
+	)
+	if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil {
+		return
+	}
+
+	if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+
+	// 校验oid
+	if _, ok := land.Ship[req.Oid]; !ok {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_PlunderNotFoundShip,
+			Title: pb.ErrorCode_PlunderNotFoundShip.ToString(),
+		}
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
+		Atno: []*pb.UserAtno{},
+	})
+
+	return
+}
diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go
index 4494e12cb..8240488a2 100644
--- a/pb/arena_db.pb.go
+++ b/pb/arena_db.pb.go
@@ -84,62 +84,6 @@ func (BattleRecordState) EnumDescriptor() ([]byte, []int) {
 	return file_arena_arena_db_proto_rawDescGZIP(), []int{0}
 }
 
-//玩家战斗阵型
-type DBPlayerBattleFormt struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Leadpos int32     `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
-	Formt   []*DBHero `protobuf:"bytes,2,rep,name=formt,proto3" json:"formt"`
-}
-
-func (x *DBPlayerBattleFormt) Reset() {
-	*x = DBPlayerBattleFormt{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DBPlayerBattleFormt) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBPlayerBattleFormt) ProtoMessage() {}
-
-func (x *DBPlayerBattleFormt) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[0]
-	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 DBPlayerBattleFormt.ProtoReflect.Descriptor instead.
-func (*DBPlayerBattleFormt) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DBPlayerBattleFormt) GetLeadpos() int32 {
-	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *DBPlayerBattleFormt) GetFormt() []*DBHero {
-	if x != nil {
-		return x.Formt
-	}
-	return nil
-}
-
 //玩家基本信息
 type ArenaPlayer struct {
 	state         protoimpl.MessageState
@@ -160,7 +104,7 @@ type ArenaPlayer struct {
 func (x *ArenaPlayer) Reset() {
 	*x = ArenaPlayer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[1]
+		mi := &file_arena_arena_db_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -173,7 +117,7 @@ func (x *ArenaPlayer) String() string {
 func (*ArenaPlayer) ProtoMessage() {}
 
 func (x *ArenaPlayer) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[1]
+	mi := &file_arena_arena_db_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -186,7 +130,7 @@ func (x *ArenaPlayer) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaPlayer.ProtoReflect.Descriptor instead.
 func (*ArenaPlayer) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{1}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ArenaPlayer) GetUinfo() *BaseUserInfo {
@@ -273,7 +217,7 @@ type DBHeroBase struct {
 func (x *DBHeroBase) Reset() {
 	*x = DBHeroBase{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[2]
+		mi := &file_arena_arena_db_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -286,7 +230,7 @@ func (x *DBHeroBase) String() string {
 func (*DBHeroBase) ProtoMessage() {}
 
 func (x *DBHeroBase) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[2]
+	mi := &file_arena_arena_db_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -299,7 +243,7 @@ func (x *DBHeroBase) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBHeroBase.ProtoReflect.Descriptor instead.
 func (*DBHeroBase) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{2}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *DBHeroBase) GetOid() string {
@@ -400,7 +344,7 @@ type DBArenaBattleRecord struct {
 func (x *DBArenaBattleRecord) Reset() {
 	*x = DBArenaBattleRecord{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[3]
+		mi := &file_arena_arena_db_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -413,7 +357,7 @@ func (x *DBArenaBattleRecord) String() string {
 func (*DBArenaBattleRecord) ProtoMessage() {}
 
 func (x *DBArenaBattleRecord) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[3]
+	mi := &file_arena_arena_db_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -426,7 +370,7 @@ func (x *DBArenaBattleRecord) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBArenaBattleRecord.ProtoReflect.Descriptor instead.
 func (*DBArenaBattleRecord) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{3}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DBArenaBattleRecord) GetBid() string {
@@ -533,7 +477,7 @@ type DBArenaUser struct {
 func (x *DBArenaUser) Reset() {
 	*x = DBArenaUser{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[4]
+		mi := &file_arena_arena_db_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -546,7 +490,7 @@ func (x *DBArenaUser) String() string {
 func (*DBArenaUser) ProtoMessage() {}
 
 func (x *DBArenaUser) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[4]
+	mi := &file_arena_arena_db_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -559,7 +503,7 @@ func (x *DBArenaUser) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBArenaUser.ProtoReflect.Descriptor instead.
 func (*DBArenaUser) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{4}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *DBArenaUser) GetId() string {
@@ -737,7 +681,7 @@ type DBNpc struct {
 func (x *DBNpc) Reset() {
 	*x = DBNpc{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[5]
+		mi := &file_arena_arena_db_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -750,7 +694,7 @@ func (x *DBNpc) String() string {
 func (*DBNpc) ProtoMessage() {}
 
 func (x *DBNpc) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[5]
+	mi := &file_arena_arena_db_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -763,7 +707,7 @@ func (x *DBNpc) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBNpc.ProtoReflect.Descriptor instead.
 func (*DBNpc) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{5}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *DBNpc) GetId() int32 {
@@ -800,7 +744,7 @@ type RPCModifyIntegralReq struct {
 func (x *RPCModifyIntegralReq) Reset() {
 	*x = RPCModifyIntegralReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[6]
+		mi := &file_arena_arena_db_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -813,7 +757,7 @@ func (x *RPCModifyIntegralReq) String() string {
 func (*RPCModifyIntegralReq) ProtoMessage() {}
 
 func (x *RPCModifyIntegralReq) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[6]
+	mi := &file_arena_arena_db_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -826,7 +770,7 @@ func (x *RPCModifyIntegralReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCModifyIntegralReq.ProtoReflect.Descriptor instead.
 func (*RPCModifyIntegralReq) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{6}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *RPCModifyIntegralReq) GetUid() string {
@@ -847,177 +791,172 @@ var File_arena_arena_db_proto protoreflect.FileDescriptor
 
 var file_arena_arena_db_proto_rawDesc = []byte{
 	0x0a, 0x14, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x64, 0x62,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72,
-	0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4e, 0x0a, 0x13, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a,
-	0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
-	0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0x92, 0x02, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x64,
-	0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a,
-	0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e,
-	0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x2c, 0x0a,
-	0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
-	0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69,
-	0x73, 0x61, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12,
-	0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x12, 0x26, 0x0a,
-	0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x8e, 0x07, 0x0a, 0x0a,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
-	0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74,
-	0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x6c, 0x76, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73,
-	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x3e, 0x0a, 0x0b, 0x61, 0x64, 0x64,
-	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x50,
-	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64,
-	0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x41, 0x0a, 0x0c, 0x6a, 0x75, 0x65,
-	0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x4a, 0x75, 0x65,
-	0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c,
-	0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x47, 0x0a, 0x0e,
-	0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x08,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73,
-	0x65, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x50, 0x0a, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f,
-	0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x48, 0x6f,
-	0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50,
-	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65,
-	0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
-	0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x0b, 0x6e,
-	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f,
-	0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e,
-	0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f,
-	0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 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,
-	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xae, 0x02, 0x0a,
-	0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73,
-	0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e,
-	0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72,
-	0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21,
-	0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d,
-	0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9d, 0x06,
-	0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 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,
-	0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
-	0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75,
-	0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
-	0x61, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
-	0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
-	0x72, 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61,
-	0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
-	0x72, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66, 0x65,
-	0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x0e,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75,
-	0x79, 0x6e, 0x75, 0x6d, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x6e,
-	0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x10, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74,
-	0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72,
-	0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x74,
-	0x74, 0x61, 0x63, 0x6b, 0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0c, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x12, 0x26,
-	0x0a, 0x0e, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d,
-	0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
-	0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x65,
-	0x66, 0x65, 0x6e, 0x64, 0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x65,
-	0x66, 0x65, 0x6e, 0x64, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x18, 0x15, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75,
-	0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63, 0x18, 0x16, 0x20, 0x03, 0x28, 0x01, 0x52,
-	0x03, 0x6c, 0x6f, 0x63, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x64, 0x65, 0x66, 0x18, 0x17, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x64, 0x65, 0x66, 0x12, 0x27, 0x0a, 0x03, 0x6e, 0x70,
-	0x63, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03,
-	0x6e, 0x70, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x65, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x64, 0x65,
-	0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65,
-	0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x1a, 0x3e, 0x0a,
-	0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e,
-	0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d, 0x0a,
-	0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x44, 0x0a, 0x14,
-	0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
-	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
-	0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x61, 0x63,
-	0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e,
-	0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e,
-	0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x61, 0x69, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x52,
-	0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x05, 0x12, 0x14,
-	0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, 0x65, 0x64,
-	0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x45,
-	0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x92,
+	0x02, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x23,
+	0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69,
+	0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66,
+	0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69,
+	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a,
+	0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
+	0x74, 0x6c, 0x65, 0x22, 0x8e, 0x07, 0x0a, 0x0a, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61,
+	0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44,
+	0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x12, 0x3e, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42,
+	0x61, 0x73, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x12, 0x41, 0x0a, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
+	0x42, 0x61, 0x73, 0x65, 0x2e, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x79, 0x12, 0x47, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44,
+	0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
+	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74,
+	0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x50, 0x0a,
+	0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68, 0x6f,
+	0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12,
+	0x32, 0x0a, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x46, 0x65,
+	0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74,
+	0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69,
+	0x6c, 0x6c, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+	0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c,
+	0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e,
+	0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f,
+	0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x05, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74,
+	0x65, 0x72, 0x73, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0xae, 0x02, 0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69,
+	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65,
+	0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65,
+	0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c,
+	0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c,
+	0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x18,
+	0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61,
+	0x73, 0x65, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x64,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
+	0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9d, 0x06, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e,
+	0x61, 0x55, 0x73, 0x65, 0x72, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74,
+	0x74, 0x61, 0x63, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74,
+	0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65,
+	0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06,
+	0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e,
+	0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e,
+	0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61,
+	0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65,
+	0x63, 0x6f, 0x72, 0x64, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74,
+	0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, 0x69,
+	0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x77, 0x69, 0x6e, 0x75,
+	0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
+	0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e,
+	0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x12, 0x22,
+	0x0a, 0x0c, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x77, 0x69, 0x6e, 0x75, 0x75, 0x6d, 0x18, 0x14,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x77, 0x69, 0x6e, 0x75,
+	0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x74, 0x6f, 0x74, 0x61,
+	0x6c, 0x75, 0x75, 0x6d, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x65,
+	0x6e, 0x64, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x75, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f,
+	0x63, 0x18, 0x16, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x12, 0x14, 0x0a, 0x05,
+	0x69, 0x73, 0x64, 0x65, 0x66, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x64,
+	0x65, 0x66, 0x12, 0x27, 0x0a, 0x03, 0x6e, 0x70, 0x63, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x15, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x4e, 0x70,
+	0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x70,
+	0x72, 0x65, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x54, 0x69, 0x74, 0x6c, 0x65, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d, 0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e,
+	0x0a, 0x02, 0x63, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14,
+	0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x22, 0x44, 0x0a, 0x14, 0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66,
+	0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a,
+	0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x0d, 0x0a, 0x09, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12,
+	0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12,
+	0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12,
+	0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12,
+	0x12, 0x0a, 0x0e, 0x57, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67,
+	0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61,
+	0x69, 0x6c, 0x65, 0x64, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67,
+	0x65, 0x53, 0x75, 0x63, 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a,
+	0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1033,51 +972,49 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte {
 }
 
 var file_arena_arena_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_arena_arena_db_proto_goTypes = []interface{}{
 	(BattleRecordState)(0),       // 0: BattleRecordState
-	(*DBPlayerBattleFormt)(nil),  // 1: DBPlayerBattleFormt
-	(*ArenaPlayer)(nil),          // 2: ArenaPlayer
-	(*DBHeroBase)(nil),           // 3: DBHeroBase
-	(*DBArenaBattleRecord)(nil),  // 4: DBArenaBattleRecord
-	(*DBArenaUser)(nil),          // 5: DBArenaUser
-	(*DBNpc)(nil),                // 6: DBNpc
-	(*RPCModifyIntegralReq)(nil), // 7: RPCModifyIntegralReq
-	nil,                          // 8: DBHeroBase.PropertyEntry
-	nil,                          // 9: DBHeroBase.AddPropertyEntry
-	nil,                          // 10: DBHeroBase.JuexPropertyEntry
-	nil,                          // 11: DBHeroBase.TalentPropertyEntry
-	nil,                          // 12: DBHeroBase.HoroscopePropertyEntry
-	nil,                          // 13: DBHeroBase.FettersEntry
-	nil,                          // 14: DBArenaUser.NpcEntry
-	(*DBHero)(nil),               // 15: DBHero
-	(*BaseUserInfo)(nil),         // 16: BaseUserInfo
-	(*SkillData)(nil),            // 17: SkillData
+	(*ArenaPlayer)(nil),          // 1: ArenaPlayer
+	(*DBHeroBase)(nil),           // 2: DBHeroBase
+	(*DBArenaBattleRecord)(nil),  // 3: DBArenaBattleRecord
+	(*DBArenaUser)(nil),          // 4: DBArenaUser
+	(*DBNpc)(nil),                // 5: DBNpc
+	(*RPCModifyIntegralReq)(nil), // 6: RPCModifyIntegralReq
+	nil,                          // 7: DBHeroBase.PropertyEntry
+	nil,                          // 8: DBHeroBase.AddPropertyEntry
+	nil,                          // 9: DBHeroBase.JuexPropertyEntry
+	nil,                          // 10: DBHeroBase.TalentPropertyEntry
+	nil,                          // 11: DBHeroBase.HoroscopePropertyEntry
+	nil,                          // 12: DBHeroBase.FettersEntry
+	nil,                          // 13: DBArenaUser.NpcEntry
+	(*BaseUserInfo)(nil),         // 14: BaseUserInfo
+	(*DBPlayerBattleFormt)(nil),  // 15: DBPlayerBattleFormt
+	(*SkillData)(nil),            // 16: SkillData
 }
 var file_arena_arena_db_proto_depIdxs = []int32{
-	15, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
-	16, // 1: ArenaPlayer.uinfo:type_name -> BaseUserInfo
-	1,  // 2: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt
-	8,  // 3: DBHeroBase.property:type_name -> DBHeroBase.PropertyEntry
-	9,  // 4: DBHeroBase.addProperty:type_name -> DBHeroBase.AddPropertyEntry
-	10, // 5: DBHeroBase.juexProperty:type_name -> DBHeroBase.JuexPropertyEntry
-	11, // 6: DBHeroBase.talentProperty:type_name -> DBHeroBase.TalentPropertyEntry
-	12, // 7: DBHeroBase.horoscopeProperty:type_name -> DBHeroBase.HoroscopePropertyEntry
-	13, // 8: DBHeroBase.fetters:type_name -> DBHeroBase.FettersEntry
-	17, // 9: DBHeroBase.normalSkill:type_name -> SkillData
-	3,  // 10: DBArenaBattleRecord.formt:type_name -> DBHeroBase
-	0,  // 11: DBArenaBattleRecord.State:type_name -> BattleRecordState
-	16, // 12: DBArenaUser.uinfo:type_name -> BaseUserInfo
-	1,  // 13: DBArenaUser.attack:type_name -> DBPlayerBattleFormt
-	1,  // 14: DBArenaUser.defend:type_name -> DBPlayerBattleFormt
-	4,  // 15: DBArenaUser.record:type_name -> DBArenaBattleRecord
-	14, // 16: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry
-	6,  // 17: DBArenaUser.NpcEntry.value:type_name -> DBNpc
-	18, // [18:18] is the sub-list for method output_type
-	18, // [18:18] is the sub-list for method input_type
-	18, // [18:18] is the sub-list for extension type_name
-	18, // [18:18] is the sub-list for extension extendee
-	0,  // [0:18] is the sub-list for field type_name
+	14, // 0: ArenaPlayer.uinfo:type_name -> BaseUserInfo
+	15, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt
+	7,  // 2: DBHeroBase.property:type_name -> DBHeroBase.PropertyEntry
+	8,  // 3: DBHeroBase.addProperty:type_name -> DBHeroBase.AddPropertyEntry
+	9,  // 4: DBHeroBase.juexProperty:type_name -> DBHeroBase.JuexPropertyEntry
+	10, // 5: DBHeroBase.talentProperty:type_name -> DBHeroBase.TalentPropertyEntry
+	11, // 6: DBHeroBase.horoscopeProperty:type_name -> DBHeroBase.HoroscopePropertyEntry
+	12, // 7: DBHeroBase.fetters:type_name -> DBHeroBase.FettersEntry
+	16, // 8: DBHeroBase.normalSkill:type_name -> SkillData
+	2,  // 9: DBArenaBattleRecord.formt:type_name -> DBHeroBase
+	0,  // 10: DBArenaBattleRecord.State:type_name -> BattleRecordState
+	14, // 11: DBArenaUser.uinfo:type_name -> BaseUserInfo
+	15, // 12: DBArenaUser.attack:type_name -> DBPlayerBattleFormt
+	15, // 13: DBArenaUser.defend:type_name -> DBPlayerBattleFormt
+	3,  // 14: DBArenaUser.record:type_name -> DBArenaBattleRecord
+	13, // 15: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry
+	5,  // 16: DBArenaUser.NpcEntry.value:type_name -> DBNpc
+	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
+	17, // [17:17] is the sub-list for extension extendee
+	0,  // [0:17] is the sub-list for field type_name
 }
 
 func init() { file_arena_arena_db_proto_init() }
@@ -1085,22 +1022,10 @@ func file_arena_arena_db_proto_init() {
 	if File_arena_arena_db_proto != nil {
 		return
 	}
-	file_hero_hero_db_proto_init()
 	file_comm_proto_init()
+	file_battle_battle_struct_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_arena_arena_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DBPlayerBattleFormt); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_arena_arena_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ArenaPlayer); i {
 			case 0:
 				return &v.state
@@ -1112,7 +1037,7 @@ func file_arena_arena_db_proto_init() {
 				return nil
 			}
 		}
-		file_arena_arena_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_arena_arena_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBHeroBase); i {
 			case 0:
 				return &v.state
@@ -1124,7 +1049,7 @@ func file_arena_arena_db_proto_init() {
 				return nil
 			}
 		}
-		file_arena_arena_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_arena_arena_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBArenaBattleRecord); i {
 			case 0:
 				return &v.state
@@ -1136,7 +1061,7 @@ func file_arena_arena_db_proto_init() {
 				return nil
 			}
 		}
-		file_arena_arena_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_arena_arena_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBArenaUser); i {
 			case 0:
 				return &v.state
@@ -1148,7 +1073,7 @@ func file_arena_arena_db_proto_init() {
 				return nil
 			}
 		}
-		file_arena_arena_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_arena_arena_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBNpc); i {
 			case 0:
 				return &v.state
@@ -1160,7 +1085,7 @@ func file_arena_arena_db_proto_init() {
 				return nil
 			}
 		}
-		file_arena_arena_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_arena_arena_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RPCModifyIntegralReq); i {
 			case 0:
 				return &v.state
@@ -1179,7 +1104,7 @@ func file_arena_arena_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_arena_arena_db_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   14,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index 247fd92af..39cf039ad 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -107,6 +107,8 @@ const (
 	PlayType_expboos      PlayType = 19 //经验副本
 	PlayType_isLand       PlayType = 20 //海岛
 	PlayType_integral     PlayType = 21 //积分boss
+	PlayType_plunder      PlayType = 22 // 掠夺
+	PlayType_plunderpvp   PlayType = 23 // 掠夺pvp
 )
 
 // Enum value maps for PlayType.
@@ -134,6 +136,8 @@ var (
 		19: "expboos",
 		20: "isLand",
 		21: "integral",
+		22: "plunder",
+		23: "plunderpvp",
 	}
 	PlayType_value = map[string]int32{
 		"null":         0,
@@ -158,6 +162,8 @@ var (
 		"expboos":      19,
 		"isLand":       20,
 		"integral":     21,
+		"plunder":      22,
+		"plunderpvp":   23,
 	}
 )
 
@@ -831,7 +837,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a,
 	0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12,
 	0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76,
-	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xaa, 0x02,
+	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xc7, 0x02,
 	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75,
 	0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
 	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09,
@@ -850,13 +856,15 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e,
 	0x65, 0x10, 0x12, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x62, 0x6f, 0x6f, 0x73, 0x10, 0x13,
 	0x12, 0x0a, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x0c, 0x0a, 0x08,
-	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x10, 0x15, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e,
-	0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44,
-	0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64,
-	0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08,
-	0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x10, 0x15, 0x12, 0x0b, 0x0a, 0x07, 0x70, 0x6c,
+	0x75, 0x6e, 0x64, 0x65, 0x72, 0x10, 0x16, 0x12, 0x0e, 0x0a, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64,
+	0x65, 0x72, 0x70, 0x76, 0x70, 0x10, 0x17, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12,
+	0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77,
+	0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62,
+	0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go
index 1b812f7c7..b51d62a69 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -2105,6 +2105,85 @@ func (x *StroneBattleReq) GetBattleEvents() int32 {
 	return 0
 }
 
+type BattlePVEPlunderReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Ptype     PlayType         `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
+	Title     string           `protobuf:"bytes,2,opt,name=title,proto3" json:"title"`                //战斗标题
+	Rulesid   int32            `protobuf:"varint,3,opt,name=rulesid,proto3" json:"rulesid"`           //规则id
+	Format    *BattleFormation `protobuf:"bytes,4,opt,name=format,proto3" json:"format"`              //布阵信息
+	Defformat *BattleFormation `protobuf:"bytes,5,opt,name=defformat,proto3" json:"defformat"`        //敌方布阵信息
+}
+
+func (x *BattlePVEPlunderReq) Reset() {
+	*x = BattlePVEPlunderReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_battle_battle_msg_proto_msgTypes[30]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BattlePVEPlunderReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BattlePVEPlunderReq) ProtoMessage() {}
+
+func (x *BattlePVEPlunderReq) ProtoReflect() protoreflect.Message {
+	mi := &file_battle_battle_msg_proto_msgTypes[30]
+	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 BattlePVEPlunderReq.ProtoReflect.Descriptor instead.
+func (*BattlePVEPlunderReq) Descriptor() ([]byte, []int) {
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{30}
+}
+
+func (x *BattlePVEPlunderReq) GetPtype() PlayType {
+	if x != nil {
+		return x.Ptype
+	}
+	return PlayType_null
+}
+
+func (x *BattlePVEPlunderReq) GetTitle() string {
+	if x != nil {
+		return x.Title
+	}
+	return ""
+}
+
+func (x *BattlePVEPlunderReq) GetRulesid() int32 {
+	if x != nil {
+		return x.Rulesid
+	}
+	return 0
+}
+
+func (x *BattlePVEPlunderReq) GetFormat() *BattleFormation {
+	if x != nil {
+		return x.Format
+	}
+	return nil
+}
+
+func (x *BattlePVEPlunderReq) GetDefformat() *BattleFormation {
+	if x != nil {
+		return x.Defformat
+	}
+	return nil
+}
+
 var File_battle_battle_msg_proto protoreflect.FileDescriptor
 
 var file_battle_battle_msg_proto_rawDesc = []byte{
@@ -2355,8 +2434,20 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05,
 	0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45,
 	0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79,
+	0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65,
+	0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73,
+	0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x09,
+	0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2371,7 +2462,7 @@ 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, 30)
+var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
 var file_battle_battle_msg_proto_goTypes = []interface{}{
 	(*LineData)(nil),               // 0: LineData
 	(*LineUp)(nil),                 // 1: LineUp
@@ -2403,43 +2494,44 @@ var file_battle_battle_msg_proto_goTypes = []interface{}{
 	(*BattleConcedeResp)(nil),      // 27: BattleConcedeResp
 	(*BattleStateInfo)(nil),        // 28: BattleStateInfo
 	(*StroneBattleReq)(nil),        // 29: StroneBattleReq
-	(PlayType)(0),                  // 30: PlayType
-	(*DBHero)(nil),                 // 31: DBHero
-	(*BattleRole)(nil),             // 32: BattleRole
-	(BattleType)(0),                // 33: BattleType
-	(*DBBattleFormt)(nil),          // 34: DBBattleFormt
-	(*anypb.Any)(nil),              // 35: google.protobuf.Any
-	(*DySkillData)(nil),            // 36: DySkillData
+	(*BattlePVEPlunderReq)(nil),    // 30: BattlePVEPlunderReq
+	(PlayType)(0),                  // 31: PlayType
+	(*DBHero)(nil),                 // 32: DBHero
+	(*BattleRole)(nil),             // 33: BattleRole
+	(BattleType)(0),                // 34: BattleType
+	(*DBBattleFormt)(nil),          // 35: DBBattleFormt
+	(*anypb.Any)(nil),              // 36: google.protobuf.Any
+	(*DySkillData)(nil),            // 37: DySkillData
 }
 var file_battle_battle_msg_proto_depIdxs = []int32{
 	1,  // 0: LineData.line:type_name -> LineUp
-	30, // 1: BattleEVEReq.ptype:type_name -> PlayType
+	31, // 1: BattleEVEReq.ptype:type_name -> PlayType
 	2,  // 2: BattleEVEReq.format:type_name -> BattleFormation
-	30, // 3: BattlePVEReq.ptype:type_name -> PlayType
+	31, // 3: BattlePVEReq.ptype:type_name -> PlayType
 	2,  // 4: BattlePVEReq.format:type_name -> BattleFormation
-	30, // 5: BattleHeroPVEReq.ptype:type_name -> PlayType
+	31, // 5: BattleHeroPVEReq.ptype:type_name -> PlayType
 	6,  // 6: BattleHeroPVEReq.redformat:type_name -> PVPFormation
-	31, // 7: PVPFormation.format:type_name -> DBHero
-	30, // 8: BattlePVPReq.ptype:type_name -> PlayType
+	32, // 7: PVPFormation.format:type_name -> DBHero
+	31, // 8: BattlePVPReq.ptype:type_name -> PlayType
 	6,  // 9: BattlePVPReq.redformat:type_name -> PVPFormation
 	6,  // 10: BattlePVPReq.buleformat:type_name -> PVPFormation
-	30, // 11: BattleRTPVPReq.ptype:type_name -> PlayType
+	31, // 11: BattleRTPVPReq.ptype:type_name -> PlayType
 	2,  // 12: BattleRTPVPReq.redformat:type_name -> BattleFormation
 	2,  // 13: BattleRTPVPReq.bulefformat:type_name -> BattleFormation
-	30, // 14: BattleLPVEReq.ptype:type_name -> PlayType
+	31, // 14: BattleLPVEReq.ptype:type_name -> PlayType
 	2,  // 15: BattleLPVEReq.format:type_name -> BattleFormation
-	32, // 16: BattleLPVEReq.monsters:type_name -> BattleRole
-	30, // 17: BattlePVBReq.ptype:type_name -> PlayType
+	33, // 16: BattleLPVEReq.monsters:type_name -> BattleRole
+	31, // 17: BattlePVBReq.ptype:type_name -> PlayType
 	2,  // 18: BattlePVBReq.format:type_name -> BattleFormation
-	33, // 19: BattleInfo.btype:type_name -> BattleType
-	30, // 20: BattleInfo.ptype:type_name -> PlayType
-	34, // 21: BattleInfo.redflist:type_name -> DBBattleFormt
-	34, // 22: BattleInfo.buleflist:type_name -> DBBattleFormt
+	34, // 19: BattleInfo.btype:type_name -> BattleType
+	31, // 20: BattleInfo.ptype:type_name -> PlayType
+	35, // 21: BattleInfo.redflist:type_name -> DBBattleFormt
+	35, // 22: BattleInfo.buleflist:type_name -> DBBattleFormt
 	11, // 23: BattleReport.info:type_name -> BattleInfo
 	12, // 24: BattleReport.incmd:type_name -> BattleCmd
 	12, // 25: BattleReport.outcmd:type_name -> BattleCmd
-	32, // 26: BattleReport.alive:type_name -> BattleRole
-	35, // 27: BattleRpcMessage.data:type_name -> google.protobuf.Any
+	33, // 26: BattleReport.alive:type_name -> BattleRole
+	36, // 27: BattleRpcMessage.data:type_name -> google.protobuf.Any
 	11, // 28: BattleRunReq.info:type_name -> BattleInfo
 	13, // 29: BattleRunResp.reports:type_name -> BattleReport
 	28, // 30: BattleGetInfoResp.info:type_name -> BattleStateInfo
@@ -2450,15 +2542,18 @@ var file_battle_battle_msg_proto_depIdxs = []int32{
 	11, // 35: BattleStateInfo.info:type_name -> BattleInfo
 	12, // 36: BattleStateInfo.outCmds:type_name -> BattleCmd
 	12, // 37: BattleStateInfo.inputCmds:type_name -> BattleCmd
-	36, // 38: StroneBattleReq.diBuff:type_name -> DySkillData
-	32, // 39: StroneBattleReq.role:type_name -> BattleRole
-	33, // 40: StroneBattleReq.Btype:type_name -> BattleType
-	30, // 41: StroneBattleReq.Ptype:type_name -> PlayType
-	42, // [42:42] is the sub-list for method output_type
-	42, // [42:42] is the sub-list for method input_type
-	42, // [42:42] is the sub-list for extension type_name
-	42, // [42:42] is the sub-list for extension extendee
-	0,  // [0:42] is the sub-list for field type_name
+	37, // 38: StroneBattleReq.diBuff:type_name -> DySkillData
+	33, // 39: StroneBattleReq.role:type_name -> BattleRole
+	34, // 40: StroneBattleReq.Btype:type_name -> BattleType
+	31, // 41: StroneBattleReq.Ptype:type_name -> PlayType
+	31, // 42: BattlePVEPlunderReq.ptype:type_name -> PlayType
+	2,  // 43: BattlePVEPlunderReq.format:type_name -> BattleFormation
+	2,  // 44: BattlePVEPlunderReq.defformat:type_name -> BattleFormation
+	45, // [45:45] is the sub-list for method output_type
+	45, // [45:45] is the sub-list for method input_type
+	45, // [45:45] is the sub-list for extension type_name
+	45, // [45:45] is the sub-list for extension extendee
+	0,  // [0:45] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_msg_proto_init() }
@@ -2829,6 +2924,18 @@ func file_battle_battle_msg_proto_init() {
 				return nil
 			}
 		}
+		file_battle_battle_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BattlePVEPlunderReq); 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{
@@ -2836,7 +2943,7 @@ func file_battle_battle_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_battle_battle_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   30,
+			NumMessages:   31,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go
index 40fd567db..bbb50b9b1 100644
--- a/pb/battle_struct.pb.go
+++ b/pb/battle_struct.pb.go
@@ -48,6 +48,7 @@ const (
 	EffectTipsType_StealGain     EffectTipsType = 22 //偷取增益
 	EffectTipsType_ShiftDebuff   EffectTipsType = 23 //嫁接减益
 	EffectTipsType_Rebirth       EffectTipsType = 24 //复活
+	EffectTipsType_Broil         EffectTipsType = 25 //灼热
 )
 
 // Enum value maps for EffectTipsType.
@@ -78,6 +79,7 @@ var (
 		22: "StealGain",
 		23: "ShiftDebuff",
 		24: "Rebirth",
+		25: "Broil",
 	}
 	EffectTipsType_value = map[string]int32{
 		"Eff_Success":   0,
@@ -105,6 +107,7 @@ var (
 		"StealGain":     22,
 		"ShiftDebuff":   23,
 		"Rebirth":       24,
+		"Broil":         25,
 	}
 )
 
@@ -135,6 +138,62 @@ func (EffectTipsType) EnumDescriptor() ([]byte, []int) {
 	return file_battle_battle_struct_proto_rawDescGZIP(), []int{0}
 }
 
+//玩家战斗阵型
+type DBPlayerBattleFormt struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Leadpos int32     `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
+	Formt   []*DBHero `protobuf:"bytes,2,rep,name=formt,proto3" json:"formt"`
+}
+
+func (x *DBPlayerBattleFormt) Reset() {
+	*x = DBPlayerBattleFormt{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_battle_battle_struct_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBPlayerBattleFormt) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBPlayerBattleFormt) ProtoMessage() {}
+
+func (x *DBPlayerBattleFormt) ProtoReflect() protoreflect.Message {
+	mi := &file_battle_battle_struct_proto_msgTypes[0]
+	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 DBPlayerBattleFormt.ProtoReflect.Descriptor instead.
+func (*DBPlayerBattleFormt) Descriptor() ([]byte, []int) {
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBPlayerBattleFormt) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *DBPlayerBattleFormt) GetFormt() []*DBHero {
+	if x != nil {
+		return x.Formt
+	}
+	return nil
+}
+
 //修改行动值
 type ComModifyOperate struct {
 	state         protoimpl.MessageState
@@ -149,7 +208,7 @@ type ComModifyOperate struct {
 func (x *ComModifyOperate) Reset() {
 	*x = ComModifyOperate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[0]
+		mi := &file_battle_battle_struct_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -162,7 +221,7 @@ func (x *ComModifyOperate) String() string {
 func (*ComModifyOperate) ProtoMessage() {}
 
 func (x *ComModifyOperate) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[0]
+	mi := &file_battle_battle_struct_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -175,7 +234,7 @@ func (x *ComModifyOperate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComModifyOperate.ProtoReflect.Descriptor instead.
 func (*ComModifyOperate) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{0}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ComModifyOperate) GetTo() int32 {
@@ -211,7 +270,7 @@ type ComStartFight struct {
 func (x *ComStartFight) Reset() {
 	*x = ComStartFight{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[1]
+		mi := &file_battle_battle_struct_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -224,7 +283,7 @@ func (x *ComStartFight) String() string {
 func (*ComStartFight) ProtoMessage() {}
 
 func (x *ComStartFight) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[1]
+	mi := &file_battle_battle_struct_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -237,7 +296,7 @@ func (x *ComStartFight) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComStartFight.ProtoReflect.Descriptor instead.
 func (*ComStartFight) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{1}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ComStartFight) GetReserve() int32 {
@@ -263,7 +322,7 @@ type ComInitFight struct {
 func (x *ComInitFight) Reset() {
 	*x = ComInitFight{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[2]
+		mi := &file_battle_battle_struct_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -276,7 +335,7 @@ func (x *ComInitFight) String() string {
 func (*ComInitFight) ProtoMessage() {}
 
 func (x *ComInitFight) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[2]
+	mi := &file_battle_battle_struct_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -289,7 +348,7 @@ func (x *ComInitFight) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComInitFight.ProtoReflect.Descriptor instead.
 func (*ComInitFight) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{2}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ComInitFight) GetCurWave() int32 {
@@ -339,7 +398,7 @@ type ComDeleteRole struct {
 func (x *ComDeleteRole) Reset() {
 	*x = ComDeleteRole{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[3]
+		mi := &file_battle_battle_struct_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -352,7 +411,7 @@ func (x *ComDeleteRole) String() string {
 func (*ComDeleteRole) ProtoMessage() {}
 
 func (x *ComDeleteRole) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[3]
+	mi := &file_battle_battle_struct_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -365,7 +424,7 @@ func (x *ComDeleteRole) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComDeleteRole.ProtoReflect.Descriptor instead.
 func (*ComDeleteRole) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{3}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ComDeleteRole) GetTo() int32 {
@@ -391,7 +450,7 @@ type ComEndFight struct {
 func (x *ComEndFight) Reset() {
 	*x = ComEndFight{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[4]
+		mi := &file_battle_battle_struct_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -404,7 +463,7 @@ func (x *ComEndFight) String() string {
 func (*ComEndFight) ProtoMessage() {}
 
 func (x *ComEndFight) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[4]
+	mi := &file_battle_battle_struct_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -417,7 +476,7 @@ func (x *ComEndFight) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComEndFight.ProtoReflect.Descriptor instead.
 func (*ComEndFight) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{4}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *ComEndFight) GetFightId() string {
@@ -472,7 +531,7 @@ type ComSkillInfo struct {
 func (x *ComSkillInfo) Reset() {
 	*x = ComSkillInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[5]
+		mi := &file_battle_battle_struct_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -485,7 +544,7 @@ func (x *ComSkillInfo) String() string {
 func (*ComSkillInfo) ProtoMessage() {}
 
 func (x *ComSkillInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[5]
+	mi := &file_battle_battle_struct_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -498,7 +557,7 @@ func (x *ComSkillInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComSkillInfo.ProtoReflect.Descriptor instead.
 func (*ComSkillInfo) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{5}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ComSkillInfo) GetSkillId() int32 {
@@ -559,7 +618,7 @@ type ComStartAction struct {
 func (x *ComStartAction) Reset() {
 	*x = ComStartAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[6]
+		mi := &file_battle_battle_struct_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -572,7 +631,7 @@ func (x *ComStartAction) String() string {
 func (*ComStartAction) ProtoMessage() {}
 
 func (x *ComStartAction) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[6]
+	mi := &file_battle_battle_struct_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -585,7 +644,7 @@ func (x *ComStartAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComStartAction.ProtoReflect.Descriptor instead.
 func (*ComStartAction) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{6}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ComStartAction) GetFrom() int32 {
@@ -636,7 +695,7 @@ type ComSkillCDAction struct {
 func (x *ComSkillCDAction) Reset() {
 	*x = ComSkillCDAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[7]
+		mi := &file_battle_battle_struct_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -649,7 +708,7 @@ func (x *ComSkillCDAction) String() string {
 func (*ComSkillCDAction) ProtoMessage() {}
 
 func (x *ComSkillCDAction) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[7]
+	mi := &file_battle_battle_struct_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -662,7 +721,7 @@ func (x *ComSkillCDAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComSkillCDAction.ProtoReflect.Descriptor instead.
 func (*ComSkillCDAction) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{7}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ComSkillCDAction) GetFrom() int32 {
@@ -691,7 +750,7 @@ type ComStopAction struct {
 func (x *ComStopAction) Reset() {
 	*x = ComStopAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[8]
+		mi := &file_battle_battle_struct_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -704,7 +763,7 @@ func (x *ComStopAction) String() string {
 func (*ComStopAction) ProtoMessage() {}
 
 func (x *ComStopAction) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[8]
+	mi := &file_battle_battle_struct_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -717,7 +776,7 @@ func (x *ComStopAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComStopAction.ProtoReflect.Descriptor instead.
 func (*ComStopAction) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{8}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *ComStopAction) GetFrom() int32 {
@@ -743,7 +802,7 @@ type ComWaitInputSkill struct {
 func (x *ComWaitInputSkill) Reset() {
 	*x = ComWaitInputSkill{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[9]
+		mi := &file_battle_battle_struct_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -756,7 +815,7 @@ func (x *ComWaitInputSkill) String() string {
 func (*ComWaitInputSkill) ProtoMessage() {}
 
 func (x *ComWaitInputSkill) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[9]
+	mi := &file_battle_battle_struct_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -769,7 +828,7 @@ func (x *ComWaitInputSkill) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComWaitInputSkill.ProtoReflect.Descriptor instead.
 func (*ComWaitInputSkill) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{9}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *ComWaitInputSkill) GetAuto() bool {
@@ -825,7 +884,7 @@ type ComSkillAtk struct {
 func (x *ComSkillAtk) Reset() {
 	*x = ComSkillAtk{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[10]
+		mi := &file_battle_battle_struct_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -838,7 +897,7 @@ func (x *ComSkillAtk) String() string {
 func (*ComSkillAtk) ProtoMessage() {}
 
 func (x *ComSkillAtk) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[10]
+	mi := &file_battle_battle_struct_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -851,7 +910,7 @@ func (x *ComSkillAtk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComSkillAtk.ProtoReflect.Descriptor instead.
 func (*ComSkillAtk) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{10}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ComSkillAtk) GetFrom() int32 {
@@ -918,7 +977,7 @@ type ComSkillAfterAtk struct {
 func (x *ComSkillAfterAtk) Reset() {
 	*x = ComSkillAfterAtk{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[11]
+		mi := &file_battle_battle_struct_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -931,7 +990,7 @@ func (x *ComSkillAfterAtk) String() string {
 func (*ComSkillAfterAtk) ProtoMessage() {}
 
 func (x *ComSkillAfterAtk) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[11]
+	mi := &file_battle_battle_struct_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -944,7 +1003,7 @@ func (x *ComSkillAfterAtk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComSkillAfterAtk.ProtoReflect.Descriptor instead.
 func (*ComSkillAfterAtk) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{11}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *ComSkillAfterAtk) GetSkillid() int32 {
@@ -992,7 +1051,7 @@ type ComMondifyBuff struct {
 func (x *ComMondifyBuff) Reset() {
 	*x = ComMondifyBuff{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[12]
+		mi := &file_battle_battle_struct_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1005,7 +1064,7 @@ func (x *ComMondifyBuff) String() string {
 func (*ComMondifyBuff) ProtoMessage() {}
 
 func (x *ComMondifyBuff) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[12]
+	mi := &file_battle_battle_struct_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1018,7 +1077,7 @@ func (x *ComMondifyBuff) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComMondifyBuff.ProtoReflect.Descriptor instead.
 func (*ComMondifyBuff) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{12}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *ComMondifyBuff) GetTo() int32 {
@@ -1077,7 +1136,7 @@ type ComRebirth struct {
 func (x *ComRebirth) Reset() {
 	*x = ComRebirth{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[13]
+		mi := &file_battle_battle_struct_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1090,7 +1149,7 @@ func (x *ComRebirth) String() string {
 func (*ComRebirth) ProtoMessage() {}
 
 func (x *ComRebirth) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[13]
+	mi := &file_battle_battle_struct_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1103,7 +1162,7 @@ func (x *ComRebirth) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComRebirth.ProtoReflect.Descriptor instead.
 func (*ComRebirth) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{13}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *ComRebirth) GetTo() int32 {
@@ -1149,7 +1208,7 @@ type ComModifyHealth struct {
 func (x *ComModifyHealth) Reset() {
 	*x = ComModifyHealth{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[14]
+		mi := &file_battle_battle_struct_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1162,7 +1221,7 @@ func (x *ComModifyHealth) String() string {
 func (*ComModifyHealth) ProtoMessage() {}
 
 func (x *ComModifyHealth) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[14]
+	mi := &file_battle_battle_struct_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1175,7 +1234,7 @@ func (x *ComModifyHealth) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComModifyHealth.ProtoReflect.Descriptor instead.
 func (*ComModifyHealth) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{14}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *ComModifyHealth) GetTo() int32 {
@@ -1268,7 +1327,7 @@ type ComTeachTask struct {
 func (x *ComTeachTask) Reset() {
 	*x = ComTeachTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[15]
+		mi := &file_battle_battle_struct_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1281,7 +1340,7 @@ func (x *ComTeachTask) String() string {
 func (*ComTeachTask) ProtoMessage() {}
 
 func (x *ComTeachTask) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[15]
+	mi := &file_battle_battle_struct_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1294,7 +1353,7 @@ func (x *ComTeachTask) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComTeachTask.ProtoReflect.Descriptor instead.
 func (*ComTeachTask) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{15}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *ComTeachTask) GetId() int32 {
@@ -1324,7 +1383,7 @@ type ComStory struct {
 func (x *ComStory) Reset() {
 	*x = ComStory{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[16]
+		mi := &file_battle_battle_struct_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1337,7 +1396,7 @@ func (x *ComStory) String() string {
 func (*ComStory) ProtoMessage() {}
 
 func (x *ComStory) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[16]
+	mi := &file_battle_battle_struct_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1350,7 +1409,7 @@ func (x *ComStory) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComStory.ProtoReflect.Descriptor instead.
 func (*ComStory) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{16}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *ComStory) GetId() int32 {
@@ -1380,7 +1439,7 @@ type ComGuide struct {
 func (x *ComGuide) Reset() {
 	*x = ComGuide{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[17]
+		mi := &file_battle_battle_struct_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1393,7 +1452,7 @@ func (x *ComGuide) String() string {
 func (*ComGuide) ProtoMessage() {}
 
 func (x *ComGuide) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[17]
+	mi := &file_battle_battle_struct_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1406,7 +1465,7 @@ func (x *ComGuide) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComGuide.ProtoReflect.Descriptor instead.
 func (*ComGuide) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{17}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *ComGuide) GetId() int32 {
@@ -1438,7 +1497,7 @@ type ComCreateRoles struct {
 func (x *ComCreateRoles) Reset() {
 	*x = ComCreateRoles{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[18]
+		mi := &file_battle_battle_struct_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1451,7 +1510,7 @@ func (x *ComCreateRoles) String() string {
 func (*ComCreateRoles) ProtoMessage() {}
 
 func (x *ComCreateRoles) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[18]
+	mi := &file_battle_battle_struct_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1464,7 +1523,7 @@ func (x *ComCreateRoles) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComCreateRoles.ProtoReflect.Descriptor instead.
 func (*ComCreateRoles) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{18}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *ComCreateRoles) GetSide() int32 {
@@ -1508,7 +1567,7 @@ type ComPlayEffect struct {
 func (x *ComPlayEffect) Reset() {
 	*x = ComPlayEffect{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[19]
+		mi := &file_battle_battle_struct_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1521,7 +1580,7 @@ func (x *ComPlayEffect) String() string {
 func (*ComPlayEffect) ProtoMessage() {}
 
 func (x *ComPlayEffect) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[19]
+	mi := &file_battle_battle_struct_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1534,7 +1593,7 @@ func (x *ComPlayEffect) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComPlayEffect.ProtoReflect.Descriptor instead.
 func (*ComPlayEffect) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{19}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *ComPlayEffect) GetEffectName() string {
@@ -1563,7 +1622,7 @@ type ComEmitCountdown struct {
 func (x *ComEmitCountdown) Reset() {
 	*x = ComEmitCountdown{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[20]
+		mi := &file_battle_battle_struct_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1576,7 +1635,7 @@ func (x *ComEmitCountdown) String() string {
 func (*ComEmitCountdown) ProtoMessage() {}
 
 func (x *ComEmitCountdown) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[20]
+	mi := &file_battle_battle_struct_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1589,7 +1648,7 @@ func (x *ComEmitCountdown) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComEmitCountdown.ProtoReflect.Descriptor instead.
 func (*ComEmitCountdown) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{20}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *ComEmitCountdown) GetReserve() int32 {
@@ -1612,7 +1671,7 @@ type ComEffectTips struct {
 func (x *ComEffectTips) Reset() {
 	*x = ComEffectTips{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[21]
+		mi := &file_battle_battle_struct_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1625,7 +1684,7 @@ func (x *ComEffectTips) String() string {
 func (*ComEffectTips) ProtoMessage() {}
 
 func (x *ComEffectTips) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[21]
+	mi := &file_battle_battle_struct_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1638,7 +1697,7 @@ func (x *ComEffectTips) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComEffectTips.ProtoReflect.Descriptor instead.
 func (*ComEffectTips) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{21}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *ComEffectTips) GetType() EffectTipsType {
@@ -1667,7 +1726,7 @@ type ComChainEffect struct {
 func (x *ComChainEffect) Reset() {
 	*x = ComChainEffect{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[22]
+		mi := &file_battle_battle_struct_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1680,7 +1739,7 @@ func (x *ComChainEffect) String() string {
 func (*ComChainEffect) ProtoMessage() {}
 
 func (x *ComChainEffect) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[22]
+	mi := &file_battle_battle_struct_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1693,7 +1752,7 @@ func (x *ComChainEffect) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComChainEffect.ProtoReflect.Descriptor instead.
 func (*ComChainEffect) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{22}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *ComChainEffect) GetRoles() []int32 {
@@ -1717,7 +1776,7 @@ type ComShieldInfo struct {
 func (x *ComShieldInfo) Reset() {
 	*x = ComShieldInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[23]
+		mi := &file_battle_battle_struct_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1730,7 +1789,7 @@ func (x *ComShieldInfo) String() string {
 func (*ComShieldInfo) ProtoMessage() {}
 
 func (x *ComShieldInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[23]
+	mi := &file_battle_battle_struct_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1743,7 +1802,7 @@ func (x *ComShieldInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComShieldInfo.ProtoReflect.Descriptor instead.
 func (*ComShieldInfo) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{23}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *ComShieldInfo) GetRid() int32 {
@@ -1780,7 +1839,7 @@ type ComBuffEffect struct {
 func (x *ComBuffEffect) Reset() {
 	*x = ComBuffEffect{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[24]
+		mi := &file_battle_battle_struct_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1793,7 +1852,7 @@ func (x *ComBuffEffect) String() string {
 func (*ComBuffEffect) ProtoMessage() {}
 
 func (x *ComBuffEffect) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[24]
+	mi := &file_battle_battle_struct_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1806,7 +1865,7 @@ func (x *ComBuffEffect) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComBuffEffect.ProtoReflect.Descriptor instead.
 func (*ComBuffEffect) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{24}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *ComBuffEffect) GetRid() int32 {
@@ -1834,7 +1893,7 @@ type ComSwitchScene struct {
 func (x *ComSwitchScene) Reset() {
 	*x = ComSwitchScene{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[25]
+		mi := &file_battle_battle_struct_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1847,7 +1906,7 @@ func (x *ComSwitchScene) String() string {
 func (*ComSwitchScene) ProtoMessage() {}
 
 func (x *ComSwitchScene) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[25]
+	mi := &file_battle_battle_struct_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1860,7 +1919,7 @@ func (x *ComSwitchScene) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComSwitchScene.ProtoReflect.Descriptor instead.
 func (*ComSwitchScene) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{25}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *ComSwitchScene) GetScene() string {
@@ -1882,7 +1941,7 @@ type ComReplaceSkill struct {
 func (x *ComReplaceSkill) Reset() {
 	*x = ComReplaceSkill{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[26]
+		mi := &file_battle_battle_struct_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1895,7 +1954,7 @@ func (x *ComReplaceSkill) String() string {
 func (*ComReplaceSkill) ProtoMessage() {}
 
 func (x *ComReplaceSkill) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[26]
+	mi := &file_battle_battle_struct_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1908,7 +1967,7 @@ func (x *ComReplaceSkill) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComReplaceSkill.ProtoReflect.Descriptor instead.
 func (*ComReplaceSkill) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{26}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *ComReplaceSkill) GetTo() int32 {
@@ -1940,7 +1999,7 @@ type ComExtraEffect struct {
 func (x *ComExtraEffect) Reset() {
 	*x = ComExtraEffect{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[27]
+		mi := &file_battle_battle_struct_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1953,7 +2012,7 @@ func (x *ComExtraEffect) String() string {
 func (*ComExtraEffect) ProtoMessage() {}
 
 func (x *ComExtraEffect) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[27]
+	mi := &file_battle_battle_struct_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1966,7 +2025,7 @@ func (x *ComExtraEffect) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComExtraEffect.ProtoReflect.Descriptor instead.
 func (*ComExtraEffect) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{27}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *ComExtraEffect) GetFrom() int32 {
@@ -2010,7 +2069,7 @@ type ComTriggerPassive struct {
 func (x *ComTriggerPassive) Reset() {
 	*x = ComTriggerPassive{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_struct_proto_msgTypes[28]
+		mi := &file_battle_battle_struct_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2023,7 +2082,7 @@ func (x *ComTriggerPassive) String() string {
 func (*ComTriggerPassive) ProtoMessage() {}
 
 func (x *ComTriggerPassive) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_struct_proto_msgTypes[28]
+	mi := &file_battle_battle_struct_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2036,7 +2095,7 @@ func (x *ComTriggerPassive) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComTriggerPassive.ProtoReflect.Descriptor instead.
 func (*ComTriggerPassive) Descriptor() ([]byte, []int) {
-	return file_battle_battle_struct_proto_rawDescGZIP(), []int{28}
+	return file_battle_battle_struct_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *ComTriggerPassive) GetFrom() int32 {
@@ -2060,210 +2119,216 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
 	0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x61,
 	0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x48, 0x0a,
-	0x10, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74,
-	0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x6e, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x02, 0x6e,
-	0x76, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x05, 0x72, 0x65, 0x73, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x74,
-	0x61, 0x72, 0x74, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x22, 0xad, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x69, 0x74, 0x46, 0x69,
-	0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x57, 0x61, 0x76, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x57, 0x61, 0x76, 0x65, 0x12, 0x20, 0x0a,
-	0x0b, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12,
-	0x22, 0x0a, 0x0c, 0x62, 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
-	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c,
-	0x65, 0x73, 0x22, 0x1f, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52,
-	0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x02, 0x74, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45, 0x6e, 0x64, 0x46, 0x69,
-	0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a,
-	0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c,
-	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74,
-	0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x64, 0x44, 0x65,
-	0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x65, 0x64, 0x44, 0x65,
-	0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x61, 0x74, 0x68,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x61, 0x74,
-	0x68, 0x22, 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e,
-	0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02,
-	0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05,
-	0x6d, 0x61, 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78,
-	0x43, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x63, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65,
-	0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x22, 0x9d, 0x01, 0x0a,
-	0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66,
-	0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63,
-	0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63,
-	0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74,
-	0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x12,
-	0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x10,
-	0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x44, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x66, 0x72, 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66,
-	0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69,
-	0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66,
-	0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x70, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x57, 0x61,
-	0x69, 0x74, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04,
-	0x61, 0x75, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f,
-	0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75,
-	0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75,
-	0x6e, 0x64, 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41,
-	0x74, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64,
-	0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
-	0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2b,
-	0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x11, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41,
-	0x74, 0x6b, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61,
-	0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e,
-	0x69, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c,
-	0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69,
-	0x6c, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c,
-	0x6c, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68,
+	0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x22, 0x4e, 0x0a, 0x13, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64,
+	0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70,
+	0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d,
+	0x74, 0x22, 0x48, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x4f, 0x70,
+	0x65, 0x72, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x6e, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x02, 0x52, 0x02, 0x6e, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x73, 0x65, 0x74, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x73, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0d, 0x43,
+	0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07,
+	0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72,
+	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0xad, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x49, 0x6e,
+	0x69, 0x74, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x57, 0x61,
+	0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x57, 0x61, 0x76,
+	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x75, 0x6c, 0x65, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
+	0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45,
+	0x6e, 0x64, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49,
+	0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74,
+	0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52,
+	0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52,
+	0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44,
+	0x65, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65,
+	0x44, 0x65, 0x61, 0x74, 0x68, 0x22, 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69,
+	0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64,
+	0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
+	0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x02, 0x63, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66,
+	0x66, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77,
+	0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69,
+	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74,
+	0x22, 0x9d, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
-	0x24, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x63, 0x6f,
-	0x6d, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e,
-	0x64, 0x69, 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75,
-	0x66, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e,
-	0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x02, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x65, 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68,
-	0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f,
-	0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e,
-	0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x6d, 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05,
-	0x62, 0x61, 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x61, 0x6f,
-	0x6a, 0x69, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67, 0x12, 0x1e, 0x0a, 0x0a,
-	0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03,
-	0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x10,
-	0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70,
-	0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d,
-	0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d,
-	0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67, 0x12, 0x23, 0x0a, 0x04,
-	0x74, 0x69, 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66,
-	0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x69, 0x70,
-	0x73, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73,
-	0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74,
-	0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a,
-	0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69,
-	0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64,
-	0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72,
-	0x6f, 0x6c, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45,
-	0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63,
-	0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74,
-	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74,
-	0x68, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x45, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22,
-	0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73,
-	0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f,
-	0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69,
-	0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a,
-	0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10,
-	0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x45, 0x66, 0x66,
-	0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x22, 0x26, 0x0a,
-	0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x73, 0x63, 0x65, 0x6e, 0x65, 0x22, 0x4e, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c,
-	0x61, 0x63, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63,
+	0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x6e,
+	0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c,
+	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f,
+	0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x44, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c,
 	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
 	0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c,
-	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72,
-	0x61, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61,
-	0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e,
-	0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a,
-	0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69,
-	0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x2a, 0x88, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63,
-	0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66,
-	0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f,
-	0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49,
-	0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73,
-	0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69,
-	0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72,
-	0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75,
-	0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f,
-	0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d,
-	0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09,
-	0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42,
-	0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65,
-	0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10,
-	0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10,
-	0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69,
-	0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69,
-	0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75,
-	0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10,
-	0x18, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x70,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x43,
+	0x6f, 0x6d, 0x57, 0x61, 0x69, 0x74, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+	0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04,
+	0x61, 0x75, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c,
+	0x6c, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75,
+	0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75,
+	0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x53, 0x6b,
+	0x69, 0x6c, 0x6c, 0x41, 0x74, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b,
+	0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69,
+	0x6c, 0x6c, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67,
+	0x65, 0x74, 0x12, 0x2b, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66,
+	0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12,
+	0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, 0x10, 0x43, 0x6f, 0x6d,
+	0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x12, 0x18, 0x0a,
+	0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x12, 0x24, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
+	0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x43, 0x6f,
+	0x6d, 0x4d, 0x6f, 0x6e, 0x64, 0x69, 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, 0x12, 0x0e, 0x0a, 0x02,
+	0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03,
+	0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16,
+	0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61,
+	0x70, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72,
+	0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x07,
+	0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x62,
+	0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6d,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02,
+	0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04,
+	0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d,
+	0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d,
+	0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67,
+	0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x6e,
+	0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x12, 0x10,
+	0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67,
+	0x12, 0x23, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f,
+	0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63,
+	0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x34, 0x0a, 0x08, 0x43,
+	0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49,
+	0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a,
+	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a,
+	0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61,
+	0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61,
+	0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c,
+	0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x50,
+	0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x66, 0x66,
+	0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65,
+	0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64,
+	0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64,
+	0x65, 0x50, 0x61, 0x74, 0x68, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x45, 0x6d, 0x69, 0x74,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
+	0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d,
+	0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72,
+	0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65,
+	0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75,
+	0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75,
+	0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66,
+	0x66, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66,
+	0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49,
+	0x64, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x63,
+	0x65, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x22, 0x4e, 0x0a, 0x0f, 0x43, 0x6f, 0x6d,
+	0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02,
+	0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x2b, 0x0a, 0x09,
+	0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09,
+	0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, 0x0e, 0x43, 0x6f, 0x6d,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66,
+	0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12,
+	0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
+	0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50,
+	0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45,
+	0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a,
+	0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f,
+	0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12,
+	0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a,
+	0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74,
+	0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69,
+	0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e,
+	0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f,
+	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62,
+	0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74,
+	0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65,
+	0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64,
+	0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a,
+	0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42,
+	0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73,
+	0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48,
+	0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74,
+	0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69,
+	0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61,
+	0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74,
+	0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69,
+	0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2279,56 +2344,59 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte {
 }
 
 var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
+var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
 var file_battle_battle_struct_proto_goTypes = []interface{}{
-	(EffectTipsType)(0),       // 0: EffectTipsType
-	(*ComModifyOperate)(nil),  // 1: ComModifyOperate
-	(*ComStartFight)(nil),     // 2: ComStartFight
-	(*ComInitFight)(nil),      // 3: ComInitFight
-	(*ComDeleteRole)(nil),     // 4: ComDeleteRole
-	(*ComEndFight)(nil),       // 5: ComEndFight
-	(*ComSkillInfo)(nil),      // 6: ComSkillInfo
-	(*ComStartAction)(nil),    // 7: ComStartAction
-	(*ComSkillCDAction)(nil),  // 8: ComSkillCDAction
-	(*ComStopAction)(nil),     // 9: ComStopAction
-	(*ComWaitInputSkill)(nil), // 10: ComWaitInputSkill
-	(*ComSkillAtk)(nil),       // 11: ComSkillAtk
-	(*ComSkillAfterAtk)(nil),  // 12: ComSkillAfterAtk
-	(*ComMondifyBuff)(nil),    // 13: ComMondifyBuff
-	(*ComRebirth)(nil),        // 14: ComRebirth
-	(*ComModifyHealth)(nil),   // 15: ComModifyHealth
-	(*ComTeachTask)(nil),      // 16: ComTeachTask
-	(*ComStory)(nil),          // 17: ComStory
-	(*ComGuide)(nil),          // 18: ComGuide
-	(*ComCreateRoles)(nil),    // 19: ComCreateRoles
-	(*ComPlayEffect)(nil),     // 20: ComPlayEffect
-	(*ComEmitCountdown)(nil),  // 21: ComEmitCountdown
-	(*ComEffectTips)(nil),     // 22: ComEffectTips
-	(*ComChainEffect)(nil),    // 23: ComChainEffect
-	(*ComShieldInfo)(nil),     // 24: ComShieldInfo
-	(*ComBuffEffect)(nil),     // 25: ComBuffEffect
-	(*ComSwitchScene)(nil),    // 26: ComSwitchScene
-	(*ComReplaceSkill)(nil),   // 27: ComReplaceSkill
-	(*ComExtraEffect)(nil),    // 28: ComExtraEffect
-	(*ComTriggerPassive)(nil), // 29: ComTriggerPassive
-	(*BattleRole)(nil),        // 30: BattleRole
-	(*BattleCmd)(nil),         // 31: BattleCmd
+	(EffectTipsType)(0),         // 0: EffectTipsType
+	(*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt
+	(*ComModifyOperate)(nil),    // 2: ComModifyOperate
+	(*ComStartFight)(nil),       // 3: ComStartFight
+	(*ComInitFight)(nil),        // 4: ComInitFight
+	(*ComDeleteRole)(nil),       // 5: ComDeleteRole
+	(*ComEndFight)(nil),         // 6: ComEndFight
+	(*ComSkillInfo)(nil),        // 7: ComSkillInfo
+	(*ComStartAction)(nil),      // 8: ComStartAction
+	(*ComSkillCDAction)(nil),    // 9: ComSkillCDAction
+	(*ComStopAction)(nil),       // 10: ComStopAction
+	(*ComWaitInputSkill)(nil),   // 11: ComWaitInputSkill
+	(*ComSkillAtk)(nil),         // 12: ComSkillAtk
+	(*ComSkillAfterAtk)(nil),    // 13: ComSkillAfterAtk
+	(*ComMondifyBuff)(nil),      // 14: ComMondifyBuff
+	(*ComRebirth)(nil),          // 15: ComRebirth
+	(*ComModifyHealth)(nil),     // 16: ComModifyHealth
+	(*ComTeachTask)(nil),        // 17: ComTeachTask
+	(*ComStory)(nil),            // 18: ComStory
+	(*ComGuide)(nil),            // 19: ComGuide
+	(*ComCreateRoles)(nil),      // 20: ComCreateRoles
+	(*ComPlayEffect)(nil),       // 21: ComPlayEffect
+	(*ComEmitCountdown)(nil),    // 22: ComEmitCountdown
+	(*ComEffectTips)(nil),       // 23: ComEffectTips
+	(*ComChainEffect)(nil),      // 24: ComChainEffect
+	(*ComShieldInfo)(nil),       // 25: ComShieldInfo
+	(*ComBuffEffect)(nil),       // 26: ComBuffEffect
+	(*ComSwitchScene)(nil),      // 27: ComSwitchScene
+	(*ComReplaceSkill)(nil),     // 28: ComReplaceSkill
+	(*ComExtraEffect)(nil),      // 29: ComExtraEffect
+	(*ComTriggerPassive)(nil),   // 30: ComTriggerPassive
+	(*DBHero)(nil),              // 31: DBHero
+	(*BattleRole)(nil),          // 32: BattleRole
+	(*BattleCmd)(nil),           // 33: BattleCmd
 }
 var file_battle_battle_struct_proto_depIdxs = []int32{
-	30, // 0: ComInitFight.roles:type_name -> BattleRole
-	6,  // 1: ComStartAction.skillInfo:type_name -> ComSkillInfo
-	6,  // 2: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo
-	12, // 3: ComSkillAtk.comList:type_name -> ComSkillAfterAtk
-	31, // 4: ComSkillAfterAtk.comList:type_name -> BattleCmd
-	0,  // 5: ComModifyHealth.tips:type_name -> EffectTipsType
-	30, // 6: ComCreateRoles.roles:type_name -> BattleRole
-	0,  // 7: ComEffectTips.type:type_name -> EffectTipsType
-	6,  // 8: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo
-	9,  // [9:9] is the sub-list for method output_type
-	9,  // [9:9] is the sub-list for method input_type
-	9,  // [9:9] is the sub-list for extension type_name
-	9,  // [9:9] is the sub-list for extension extendee
-	0,  // [0:9] is the sub-list for field type_name
+	31, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
+	32, // 1: ComInitFight.roles:type_name -> BattleRole
+	7,  // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo
+	7,  // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo
+	13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk
+	33, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd
+	0,  // 6: ComModifyHealth.tips:type_name -> EffectTipsType
+	32, // 7: ComCreateRoles.roles:type_name -> BattleRole
+	0,  // 8: ComEffectTips.type:type_name -> EffectTipsType
+	7,  // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_struct_proto_init() }
@@ -2338,9 +2406,10 @@ func file_battle_battle_struct_proto_init() {
 	}
 	file_battle_battle_db_proto_init()
 	file_battle_battle_msg_proto_init()
+	file_hero_hero_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_battle_battle_struct_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComModifyOperate); i {
+			switch v := v.(*DBPlayerBattleFormt); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2352,7 +2421,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComStartFight); i {
+			switch v := v.(*ComModifyOperate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2364,7 +2433,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComInitFight); i {
+			switch v := v.(*ComStartFight); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2376,7 +2445,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComDeleteRole); i {
+			switch v := v.(*ComInitFight); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2388,7 +2457,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComEndFight); i {
+			switch v := v.(*ComDeleteRole); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2400,7 +2469,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComSkillInfo); i {
+			switch v := v.(*ComEndFight); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2412,7 +2481,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComStartAction); i {
+			switch v := v.(*ComSkillInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2424,7 +2493,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComSkillCDAction); i {
+			switch v := v.(*ComStartAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2436,7 +2505,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComStopAction); i {
+			switch v := v.(*ComSkillCDAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2448,7 +2517,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComWaitInputSkill); i {
+			switch v := v.(*ComStopAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2460,7 +2529,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComSkillAtk); i {
+			switch v := v.(*ComWaitInputSkill); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2472,7 +2541,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComSkillAfterAtk); i {
+			switch v := v.(*ComSkillAtk); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2484,7 +2553,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComMondifyBuff); i {
+			switch v := v.(*ComSkillAfterAtk); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2496,7 +2565,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComRebirth); i {
+			switch v := v.(*ComMondifyBuff); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2508,7 +2577,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComModifyHealth); i {
+			switch v := v.(*ComRebirth); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2520,7 +2589,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComTeachTask); i {
+			switch v := v.(*ComModifyHealth); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2532,7 +2601,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComStory); i {
+			switch v := v.(*ComTeachTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2544,7 +2613,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComGuide); i {
+			switch v := v.(*ComStory); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2556,7 +2625,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComCreateRoles); i {
+			switch v := v.(*ComGuide); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2568,7 +2637,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComPlayEffect); i {
+			switch v := v.(*ComCreateRoles); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2580,7 +2649,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComEmitCountdown); i {
+			switch v := v.(*ComPlayEffect); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2592,7 +2661,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComEffectTips); i {
+			switch v := v.(*ComEmitCountdown); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2604,7 +2673,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComChainEffect); i {
+			switch v := v.(*ComEffectTips); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2616,7 +2685,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComShieldInfo); i {
+			switch v := v.(*ComChainEffect); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2628,7 +2697,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComBuffEffect); i {
+			switch v := v.(*ComShieldInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2640,7 +2709,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComSwitchScene); i {
+			switch v := v.(*ComBuffEffect); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2652,7 +2721,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComReplaceSkill); i {
+			switch v := v.(*ComSwitchScene); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2664,7 +2733,7 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComExtraEffect); i {
+			switch v := v.(*ComReplaceSkill); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2676,6 +2745,18 @@ func file_battle_battle_struct_proto_init() {
 			}
 		}
 		file_battle_battle_struct_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ComExtraEffect); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_battle_battle_struct_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ComTriggerPassive); i {
 			case 0:
 				return &v.state
@@ -2694,7 +2775,7 @@ func file_battle_battle_struct_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_battle_battle_struct_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   29,
+			NumMessages:   30,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 87c5363f9..45ef88b66 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -471,6 +471,8 @@ const (
 	ErrorCode_EntertainNoSkillCard      ErrorCode = 5212 //技能卡不足
 	// integral
 	ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限
+	//plunder
+	ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据
 )
 
 // Enum value maps for ErrorCode.
@@ -878,6 +880,7 @@ var (
 		5211: "EntertainNoGamePlayering",
 		5212: "EntertainNoSkillCard",
 		5301: "TntegralDayMaxChallenge",
+		5401: "PlunderNotFoundShip",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1282,6 +1285,7 @@ var (
 		"EntertainNoGamePlayering":      5211,
 		"EntertainNoSkillCard":          5212,
 		"TntegralDayMaxChallenge":       5301,
+		"PlunderNotFoundShip":           5401,
 	}
 )
 
@@ -1316,7 +1320,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, 0xfa, 0x4a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x94, 0x4b, 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, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1915,8 +1919,10 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x10, 0xdb, 0x28, 0x12, 0x19, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
 	0x69, 0x6e, 0x4e, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x10, 0xdc, 0x28,
 	0x12, 0x1c, 0x0a, 0x17, 0x54, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x61, 0x79, 0x4d,
-	0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x42, 0x06,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x18,
+	0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
+	0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go
index 1acd1bec2..f377155c4 100644
--- a/pb/plunder_db.pb.go
+++ b/pb/plunder_db.pb.go
@@ -226,12 +226,13 @@ type ShipData struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid    string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
-	Line   *PlunderLine         `protobuf:"bytes,2,opt,name=line,proto3" json:"line"`
-	Hero   map[string]*LineData `protobuf:"bytes,3,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息
-	Status int32                `protobuf:"varint,4,opt,name=status,proto3" json:"status"`                                                                                    // 状态 0 运输 1 正在被攻击 2 战败cd中 3 掠夺成功
-	Cd     int64                `protobuf:"varint,5,opt,name=cd,proto3" json:"cd"`                                                                                            //cd 结束时间
-	Client bool                 `protobuf:"varint,7,opt,name=client,proto3" json:"client"`                                                                                    // 客户端状态 服务器不用
+	Uid  string       `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Line *PlunderLine `protobuf:"bytes,2,opt,name=line,proto3" json:"line"`
+	//map<string,LineData> hero = 3; // 英雄信息
+	Status int32            `protobuf:"varint,4,opt,name=status,proto3" json:"status"` // 状态 0 运输 1 正在被攻击 2 战败cd中 3 掠夺成功
+	Cd     int64            `protobuf:"varint,5,opt,name=cd,proto3" json:"cd"`         //cd 结束时间
+	Client bool             `protobuf:"varint,7,opt,name=client,proto3" json:"client"` // 客户端状态 服务器不用
+	Defend []*DBBattleFormt `protobuf:"bytes,8,rep,name=defend,proto3" json:"defend"`  //防守
 }
 
 func (x *ShipData) Reset() {
@@ -280,13 +281,6 @@ func (x *ShipData) GetLine() *PlunderLine {
 	return nil
 }
 
-func (x *ShipData) GetHero() map[string]*LineData {
-	if x != nil {
-		return x.Hero
-	}
-	return nil
-}
-
 func (x *ShipData) GetStatus() int32 {
 	if x != nil {
 		return x.Status
@@ -308,6 +302,13 @@ func (x *ShipData) GetClient() bool {
 	return false
 }
 
+func (x *ShipData) GetDefend() []*DBBattleFormt {
+	if x != nil {
+		return x.Defend
+	}
+	return nil
+}
+
 // 掠夺岛
 type DBPlunderLand struct {
 	state         protoimpl.MessageState
@@ -384,67 +385,62 @@ var File_plunder_plunder_db_proto protoreflect.FileDescriptor
 
 var file_plunder_plunder_db_proto_rawDesc = []byte{
 	0x0a, 0x18, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65,
-	0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xf3, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 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,
-	0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c,
-	0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75,
-	0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74, 0x12,
-	0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69,
-	0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x7b, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
-	0x4c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
-	0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
-	0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63,
-	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69,
-	0x6d, 0x65, 0x22, 0xeb, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
-	0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c,
-	0x69, 0x6e, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x13, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x48, 0x65, 0x72,
-	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x1a, 0x42, 0x0a, 0x09,
-	0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e,
-	0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61,
-	0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e,
-	0x64, 0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69,
-	0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e,
-	0x64, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69,
-	0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
-	0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 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,
+	0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3,
+	0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 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, 0x16,
+	0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69,
+	0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16,
+	0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74,
+	0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74, 0x12, 0x18,
+	0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d,
+	0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
+	0x63, 0x6f, 0x72, 0x65, 0x22, 0x7b, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c,
+	0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69,
+	0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d,
+	0x65, 0x22, 0xa6, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c,
+	0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69,
+	0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
+	0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1, 0x02, 0x0a, 0x0d, 0x44,
+	0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x05,
+	0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42,
+	0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x55, 0x69, 0x6e, 0x66,
+	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a,
+	0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
+	0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x68, 0x69, 0x70,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d,
+	0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68,
+	0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44,
+	0x61, 0x74, 0x61, 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 (
@@ -459,32 +455,30 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte {
 	return file_plunder_plunder_db_proto_rawDescData
 }
 
-var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_plunder_plunder_db_proto_goTypes = []interface{}{
 	(*DBPlunder)(nil),     // 0: DBPlunder
 	(*PlunderLine)(nil),   // 1: PlunderLine
 	(*ShipData)(nil),      // 2: ShipData
 	(*DBPlunderLand)(nil), // 3: DBPlunderLand
-	nil,                   // 4: ShipData.HeroEntry
-	nil,                   // 5: DBPlunderLand.UinfoEntry
-	nil,                   // 6: DBPlunderLand.ShipEntry
-	(*LineData)(nil),      // 7: LineData
-	(*BaseUserInfo)(nil),  // 8: BaseUserInfo
+	nil,                   // 4: DBPlunderLand.UinfoEntry
+	nil,                   // 5: DBPlunderLand.ShipEntry
+	(*DBBattleFormt)(nil), // 6: DBBattleFormt
+	(*BaseUserInfo)(nil),  // 7: BaseUserInfo
 }
 var file_plunder_plunder_db_proto_depIdxs = []int32{
 	1, // 0: DBPlunder.line:type_name -> PlunderLine
 	1, // 1: ShipData.line:type_name -> PlunderLine
-	4, // 2: ShipData.hero:type_name -> ShipData.HeroEntry
-	5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
-	6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
-	7, // 5: ShipData.HeroEntry.value:type_name -> LineData
-	8, // 6: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
-	2, // 7: DBPlunderLand.ShipEntry.value:type_name -> ShipData
-	8, // [8:8] is the sub-list for method output_type
-	8, // [8:8] is the sub-list for method input_type
-	8, // [8:8] is the sub-list for extension type_name
-	8, // [8:8] is the sub-list for extension extendee
-	0, // [0:8] is the sub-list for field type_name
+	6, // 2: ShipData.defend:type_name -> DBBattleFormt
+	4, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
+	5, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
+	7, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
+	2, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData
+	7, // [7:7] is the sub-list for method output_type
+	7, // [7:7] is the sub-list for method input_type
+	7, // [7:7] is the sub-list for extension type_name
+	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_plunder_plunder_db_proto_init() }
@@ -492,7 +486,7 @@ func file_plunder_plunder_db_proto_init() {
 	if File_plunder_plunder_db_proto != nil {
 		return
 	}
-	file_battle_battle_msg_proto_init()
+	file_battle_battle_db_proto_init()
 	file_comm_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_plunder_plunder_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
@@ -550,7 +544,7 @@ func file_plunder_plunder_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_plunder_plunder_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go
index c17b7e4c2..8c5f36547 100644
--- a/pb/plunder_msg.pb.go
+++ b/pb/plunder_msg.pb.go
@@ -269,9 +269,9 @@ type PlunderChallengeResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Line []*PlunderLine       `protobuf:"bytes,1,rep,name=line,proto3" json:"line"`                                                                                         // 运输队列
-	Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //   运输的船 key 唯一id
-	Info *BattleInfo          `protobuf:"bytes,3,opt,name=info,proto3" json:"info"`
+	Index int32       `protobuf:"varint,1,opt,name=index,proto3" json:"index"` // source  货源列表对应的下标
+	Pos   int32       `protobuf:"varint,2,opt,name=pos,proto3" json:"pos"`     // 队列的位置
+	Info  *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"`
 }
 
 func (x *PlunderChallengeResp) Reset() {
@@ -306,18 +306,18 @@ func (*PlunderChallengeResp) Descriptor() ([]byte, []int) {
 	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *PlunderChallengeResp) GetLine() []*PlunderLine {
+func (x *PlunderChallengeResp) GetIndex() int32 {
 	if x != nil {
-		return x.Line
+		return x.Index
 	}
-	return nil
+	return 0
 }
 
-func (x *PlunderChallengeResp) GetShip() map[string]*ShipData {
+func (x *PlunderChallengeResp) GetPos() int32 {
 	if x != nil {
-		return x.Ship
+		return x.Pos
 	}
-	return nil
+	return 0
 }
 
 func (x *PlunderChallengeResp) GetInfo() *BattleInfo {
@@ -333,9 +333,10 @@ type PlunderChallengeOverReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Cid    int32         `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"`
+	Index  int32         `protobuf:"varint,1,opt,name=index,proto3" json:"index"`  // source  货源列表对应的下标
 	Pos    int32         `protobuf:"varint,2,opt,name=pos,proto3" json:"pos"`      // 队列的位置
-	Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
+	Itype  int32         `protobuf:"varint,3,opt,name=itype,proto3" json:"itype"`  //  运输品质
+	Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报
 }
 
 func (x *PlunderChallengeOverReq) Reset() {
@@ -370,9 +371,9 @@ func (*PlunderChallengeOverReq) Descriptor() ([]byte, []int) {
 	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *PlunderChallengeOverReq) GetCid() int32 {
+func (x *PlunderChallengeOverReq) GetIndex() int32 {
 	if x != nil {
-		return x.Cid
+		return x.Index
 	}
 	return 0
 }
@@ -384,6 +385,13 @@ func (x *PlunderChallengeOverReq) GetPos() int32 {
 	return 0
 }
 
+func (x *PlunderChallengeOverReq) GetItype() int32 {
+	if x != nil {
+		return x.Itype
+	}
+	return 0
+}
+
 func (x *PlunderChallengeOverReq) GetReport() *BattleReport {
 	if x != nil {
 		return x.Report
@@ -396,9 +404,10 @@ type PlunderChallengeOverResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Line []*PlunderLine       `protobuf:"bytes,1,rep,name=line,proto3" json:"line"`                                                                                         // 运输队列
-	Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //   运输的船 key 唯一id
-	Atno []*UserAtno          `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"`                                                                                         //  奖励
+	Line    []*PlunderLine       `protobuf:"bytes,1,rep,name=line,proto3" json:"line"`                                                                                                // 运输队列
+	Ship    map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`        //   运输的船 key 唯一id
+	Atno    []*UserAtno          `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"`                                                                                                //  奖励
+	Heroexp map[string]int32     `protobuf:"bytes,4,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验
 }
 
 func (x *PlunderChallengeOverResp) Reset() {
@@ -454,6 +463,227 @@ func (x *PlunderChallengeOverResp) GetAtno() []*UserAtno {
 	return nil
 }
 
+func (x *PlunderChallengeOverResp) GetHeroexp() map[string]int32 {
+	if x != nil {
+		return x.Heroexp
+	}
+	return nil
+}
+
+// pvp 战斗
+type PlunderPvpChallengeReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Oid    string           `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"`
+	Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
+}
+
+func (x *PlunderPvpChallengeReq) Reset() {
+	*x = PlunderPvpChallengeReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderPvpChallengeReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderPvpChallengeReq) ProtoMessage() {}
+
+func (x *PlunderPvpChallengeReq) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[8]
+	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 PlunderPvpChallengeReq.ProtoReflect.Descriptor instead.
+func (*PlunderPvpChallengeReq) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *PlunderPvpChallengeReq) GetOid() string {
+	if x != nil {
+		return x.Oid
+	}
+	return ""
+}
+
+func (x *PlunderPvpChallengeReq) GetBattle() *BattleFormation {
+	if x != nil {
+		return x.Battle
+	}
+	return nil
+}
+
+type PlunderPvpChallengeResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Oid  string      `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"`
+	Info *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"`
+}
+
+func (x *PlunderPvpChallengeResp) Reset() {
+	*x = PlunderPvpChallengeResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderPvpChallengeResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderPvpChallengeResp) ProtoMessage() {}
+
+func (x *PlunderPvpChallengeResp) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[9]
+	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 PlunderPvpChallengeResp.ProtoReflect.Descriptor instead.
+func (*PlunderPvpChallengeResp) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *PlunderPvpChallengeResp) GetOid() string {
+	if x != nil {
+		return x.Oid
+	}
+	return ""
+}
+
+func (x *PlunderPvpChallengeResp) GetInfo() *BattleInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+// pvp 战斗 结束
+type PlunderPvpChallengeOverReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Oid    string        `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"`
+	Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报
+}
+
+func (x *PlunderPvpChallengeOverReq) Reset() {
+	*x = PlunderPvpChallengeOverReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderPvpChallengeOverReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderPvpChallengeOverReq) ProtoMessage() {}
+
+func (x *PlunderPvpChallengeOverReq) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[10]
+	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 PlunderPvpChallengeOverReq.ProtoReflect.Descriptor instead.
+func (*PlunderPvpChallengeOverReq) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *PlunderPvpChallengeOverReq) GetOid() string {
+	if x != nil {
+		return x.Oid
+	}
+	return ""
+}
+
+func (x *PlunderPvpChallengeOverReq) GetReport() *BattleReport {
+	if x != nil {
+		return x.Report
+	}
+	return nil
+}
+
+type PlunderPvpChallengeOverResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Atno []*UserAtno `protobuf:"bytes,1,rep,name=atno,proto3" json:"atno"` //  奖励
+}
+
+func (x *PlunderPvpChallengeOverResp) Reset() {
+	*x = PlunderPvpChallengeOverResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderPvpChallengeOverResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderPvpChallengeOverResp) ProtoMessage() {}
+
+func (x *PlunderPvpChallengeOverResp) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[11]
+	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 PlunderPvpChallengeOverResp.ProtoReflect.Descriptor instead.
+func (*PlunderPvpChallengeOverResp) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *PlunderPvpChallengeOverResp) GetAtno() []*UserAtno {
+	if x != nil {
+		return x.Atno
+	}
+	return nil
+}
+
 // 船到达
 type PlunderReachReq struct {
 	state         protoimpl.MessageState
@@ -466,7 +696,7 @@ type PlunderReachReq struct {
 func (x *PlunderReachReq) Reset() {
 	*x = PlunderReachReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_plunder_plunder_msg_proto_msgTypes[8]
+		mi := &file_plunder_plunder_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -479,7 +709,7 @@ func (x *PlunderReachReq) String() string {
 func (*PlunderReachReq) ProtoMessage() {}
 
 func (x *PlunderReachReq) ProtoReflect() protoreflect.Message {
-	mi := &file_plunder_plunder_msg_proto_msgTypes[8]
+	mi := &file_plunder_plunder_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -492,7 +722,7 @@ func (x *PlunderReachReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlunderReachReq.ProtoReflect.Descriptor instead.
 func (*PlunderReachReq) Descriptor() ([]byte, []int) {
-	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{8}
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *PlunderReachReq) GetOid() []string {
@@ -514,7 +744,7 @@ type PlunderReachResp struct {
 func (x *PlunderReachResp) Reset() {
 	*x = PlunderReachResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_plunder_plunder_msg_proto_msgTypes[9]
+		mi := &file_plunder_plunder_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -527,7 +757,7 @@ func (x *PlunderReachResp) String() string {
 func (*PlunderReachResp) ProtoMessage() {}
 
 func (x *PlunderReachResp) ProtoReflect() protoreflect.Message {
-	mi := &file_plunder_plunder_msg_proto_msgTypes[9]
+	mi := &file_plunder_plunder_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -540,7 +770,7 @@ func (x *PlunderReachResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlunderReachResp.ProtoReflect.Descriptor instead.
 func (*PlunderReachResp) Descriptor() ([]byte, []int) {
-	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{9}
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *PlunderReachResp) GetLine() []*PlunderLine {
@@ -569,7 +799,7 @@ type PlunderClientTagReq struct {
 func (x *PlunderClientTagReq) Reset() {
 	*x = PlunderClientTagReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_plunder_plunder_msg_proto_msgTypes[10]
+		mi := &file_plunder_plunder_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -582,7 +812,7 @@ func (x *PlunderClientTagReq) String() string {
 func (*PlunderClientTagReq) ProtoMessage() {}
 
 func (x *PlunderClientTagReq) ProtoReflect() protoreflect.Message {
-	mi := &file_plunder_plunder_msg_proto_msgTypes[10]
+	mi := &file_plunder_plunder_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -595,7 +825,7 @@ func (x *PlunderClientTagReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlunderClientTagReq.ProtoReflect.Descriptor instead.
 func (*PlunderClientTagReq) Descriptor() ([]byte, []int) {
-	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{10}
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *PlunderClientTagReq) GetOid() []string {
@@ -616,7 +846,7 @@ type PlunderClientTagResp struct {
 func (x *PlunderClientTagResp) Reset() {
 	*x = PlunderClientTagResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_plunder_plunder_msg_proto_msgTypes[11]
+		mi := &file_plunder_plunder_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -629,7 +859,7 @@ func (x *PlunderClientTagResp) String() string {
 func (*PlunderClientTagResp) ProtoMessage() {}
 
 func (x *PlunderClientTagResp) ProtoReflect() protoreflect.Message {
-	mi := &file_plunder_plunder_msg_proto_msgTypes[11]
+	mi := &file_plunder_plunder_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -642,7 +872,7 @@ func (x *PlunderClientTagResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlunderClientTagResp.ProtoReflect.Descriptor instead.
 func (*PlunderClientTagResp) Descriptor() ([]byte, []int) {
-	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{11}
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *PlunderClientTagResp) GetShip() map[string]*ShipData {
@@ -664,7 +894,7 @@ type PlunderChangePush struct {
 func (x *PlunderChangePush) Reset() {
 	*x = PlunderChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_plunder_plunder_msg_proto_msgTypes[12]
+		mi := &file_plunder_plunder_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -677,7 +907,7 @@ func (x *PlunderChangePush) String() string {
 func (*PlunderChangePush) ProtoMessage() {}
 
 func (x *PlunderChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_plunder_plunder_msg_proto_msgTypes[12]
+	mi := &file_plunder_plunder_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -690,7 +920,7 @@ func (x *PlunderChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlunderChangePush.ProtoReflect.Descriptor instead.
 func (*PlunderChangePush) Descriptor() ([]byte, []int) {
-	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{12}
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *PlunderChangePush) GetShip() map[string]*ShipData {
@@ -726,75 +956,96 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x06, 0x62,
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
 	0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0xd2, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
-	0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20,
-	0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50,
-	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65,
-	0x12, 0x33, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f,
-	0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5f, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
+	0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x64, 0x0a, 0x17, 0x50, 0x6c,
-	0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76,
-	0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
-	0x22, 0xd8, 0x01, 0x0a, 0x18, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c,
-	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a,
-	0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c,
-	0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12,
-	0x37, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e,
-	0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
-	0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
-	0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0f, 0x50,
-	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10,
-	0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64,
-	0x22, 0xa9, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63,
-	0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e,
-	0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52,
-	0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13,
-	0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
-	0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33,
-	0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50,
-	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52,
-	0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73,
-	0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e,
-	0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a,
-	0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c,
-	0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e,
-	0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a,
+	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7e, 0x0a, 0x17, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
+	0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06,
+	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x18, 0x50, 0x6c, 0x75, 0x6e, 0x64,
+	0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52,
+	0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x37, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61,
+	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53,
+	0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d,
+	0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
+	0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x12, 0x40, 0x0a,
+	0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26,
+	0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+	0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a,
 	0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
 	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f,
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
 	0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 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,
+	0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x54, 0x0a, 0x16, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61,
+	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4c, 0x0a, 0x17, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
+	0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f,
+	0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
+	0x6e, 0x66, 0x6f, 0x22, 0x55, 0x0a, 0x1a, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76,
+	0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6f, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3c, 0x0a, 0x1b, 0x50, 0x6c,
+	0x75, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x76, 0x70, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+	0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e,
+	0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
+	0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e,
+	0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0xa9, 0x01,
+	0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04,
+	0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63,
+	0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x6c, 0x75,
+	0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71,
+	0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f,
+	0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33, 0x0a, 0x04, 0x73,
+	0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50, 0x6c, 0x75, 0x6e,
+	0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70,
+	0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70,
+	0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
+	0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
+	0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a, 0x04, 0x73, 0x68,
+	0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64,
+	0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x53, 0x68, 0x69,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09,
+	0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69,
+	0x70, 0x44, 0x61, 0x74, 0x61, 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 (
@@ -809,60 +1060,66 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte {
 	return file_plunder_plunder_msg_proto_rawDescData
 }
 
-var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_plunder_plunder_msg_proto_goTypes = []interface{}{
-	(*PlunderGetListReq)(nil),        // 0: PlunderGetListReq
-	(*PlunderGetListResp)(nil),       // 1: PlunderGetListResp
-	(*PlunderRefreshReq)(nil),        // 2: PlunderRefreshReq
-	(*PlunderRefreshResp)(nil),       // 3: PlunderRefreshResp
-	(*PlunderChallengeReq)(nil),      // 4: PlunderChallengeReq
-	(*PlunderChallengeResp)(nil),     // 5: PlunderChallengeResp
-	(*PlunderChallengeOverReq)(nil),  // 6: PlunderChallengeOverReq
-	(*PlunderChallengeOverResp)(nil), // 7: PlunderChallengeOverResp
-	(*PlunderReachReq)(nil),          // 8: PlunderReachReq
-	(*PlunderReachResp)(nil),         // 9: PlunderReachResp
-	(*PlunderClientTagReq)(nil),      // 10: PlunderClientTagReq
-	(*PlunderClientTagResp)(nil),     // 11: PlunderClientTagResp
-	(*PlunderChangePush)(nil),        // 12: PlunderChangePush
-	nil,                              // 13: PlunderChallengeResp.ShipEntry
-	nil,                              // 14: PlunderChallengeOverResp.ShipEntry
-	nil,                              // 15: PlunderReachResp.ShipEntry
-	nil,                              // 16: PlunderClientTagResp.ShipEntry
-	nil,                              // 17: PlunderChangePush.ShipEntry
-	(*DBPlunder)(nil),                // 18: DBPlunder
-	(*DBPlunderLand)(nil),            // 19: DBPlunderLand
-	(*BattleFormation)(nil),          // 20: BattleFormation
-	(*PlunderLine)(nil),              // 21: PlunderLine
-	(*BattleInfo)(nil),               // 22: BattleInfo
-	(*BattleReport)(nil),             // 23: BattleReport
-	(*UserAtno)(nil),                 // 24: UserAtno
-	(*ShipData)(nil),                 // 25: ShipData
+	(*PlunderGetListReq)(nil),           // 0: PlunderGetListReq
+	(*PlunderGetListResp)(nil),          // 1: PlunderGetListResp
+	(*PlunderRefreshReq)(nil),           // 2: PlunderRefreshReq
+	(*PlunderRefreshResp)(nil),          // 3: PlunderRefreshResp
+	(*PlunderChallengeReq)(nil),         // 4: PlunderChallengeReq
+	(*PlunderChallengeResp)(nil),        // 5: PlunderChallengeResp
+	(*PlunderChallengeOverReq)(nil),     // 6: PlunderChallengeOverReq
+	(*PlunderChallengeOverResp)(nil),    // 7: PlunderChallengeOverResp
+	(*PlunderPvpChallengeReq)(nil),      // 8: PlunderPvpChallengeReq
+	(*PlunderPvpChallengeResp)(nil),     // 9: PlunderPvpChallengeResp
+	(*PlunderPvpChallengeOverReq)(nil),  // 10: PlunderPvpChallengeOverReq
+	(*PlunderPvpChallengeOverResp)(nil), // 11: PlunderPvpChallengeOverResp
+	(*PlunderReachReq)(nil),             // 12: PlunderReachReq
+	(*PlunderReachResp)(nil),            // 13: PlunderReachResp
+	(*PlunderClientTagReq)(nil),         // 14: PlunderClientTagReq
+	(*PlunderClientTagResp)(nil),        // 15: PlunderClientTagResp
+	(*PlunderChangePush)(nil),           // 16: PlunderChangePush
+	nil,                                 // 17: PlunderChallengeOverResp.ShipEntry
+	nil,                                 // 18: PlunderChallengeOverResp.HeroexpEntry
+	nil,                                 // 19: PlunderReachResp.ShipEntry
+	nil,                                 // 20: PlunderClientTagResp.ShipEntry
+	nil,                                 // 21: PlunderChangePush.ShipEntry
+	(*DBPlunder)(nil),                   // 22: DBPlunder
+	(*DBPlunderLand)(nil),               // 23: DBPlunderLand
+	(*BattleFormation)(nil),             // 24: BattleFormation
+	(*BattleInfo)(nil),                  // 25: BattleInfo
+	(*BattleReport)(nil),                // 26: BattleReport
+	(*PlunderLine)(nil),                 // 27: PlunderLine
+	(*UserAtno)(nil),                    // 28: UserAtno
+	(*ShipData)(nil),                    // 29: ShipData
 }
 var file_plunder_plunder_msg_proto_depIdxs = []int32{
-	18, // 0: PlunderGetListResp.list:type_name -> DBPlunder
-	19, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
-	20, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
-	21, // 3: PlunderChallengeResp.line:type_name -> PlunderLine
-	13, // 4: PlunderChallengeResp.ship:type_name -> PlunderChallengeResp.ShipEntry
-	22, // 5: PlunderChallengeResp.info:type_name -> BattleInfo
-	23, // 6: PlunderChallengeOverReq.report:type_name -> BattleReport
-	21, // 7: PlunderChallengeOverResp.line:type_name -> PlunderLine
-	14, // 8: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
-	24, // 9: PlunderChallengeOverResp.atno:type_name -> UserAtno
-	21, // 10: PlunderReachResp.line:type_name -> PlunderLine
-	15, // 11: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
-	16, // 12: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
-	17, // 13: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
-	25, // 14: PlunderChallengeResp.ShipEntry.value:type_name -> ShipData
-	25, // 15: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
-	25, // 16: PlunderReachResp.ShipEntry.value:type_name -> ShipData
-	25, // 17: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
-	25, // 18: PlunderChangePush.ShipEntry.value:type_name -> ShipData
-	19, // [19:19] is the sub-list for method output_type
-	19, // [19:19] is the sub-list for method input_type
-	19, // [19:19] is the sub-list for extension type_name
-	19, // [19:19] is the sub-list for extension extendee
-	0,  // [0:19] is the sub-list for field type_name
+	22, // 0: PlunderGetListResp.list:type_name -> DBPlunder
+	23, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
+	24, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
+	25, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
+	26, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
+	27, // 5: PlunderChallengeOverResp.line:type_name -> PlunderLine
+	17, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
+	28, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
+	18, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
+	24, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation
+	25, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
+	26, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
+	28, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
+	27, // 13: PlunderReachResp.line:type_name -> PlunderLine
+	19, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
+	20, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
+	21, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
+	29, // 17: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
+	29, // 18: PlunderReachResp.ShipEntry.value:type_name -> ShipData
+	29, // 19: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
+	29, // 20: PlunderChangePush.ShipEntry.value:type_name -> ShipData
+	21, // [21:21] is the sub-list for method output_type
+	21, // [21:21] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
 }
 
 func init() { file_plunder_plunder_msg_proto_init() }
@@ -971,7 +1228,7 @@ func file_plunder_plunder_msg_proto_init() {
 			}
 		}
 		file_plunder_plunder_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlunderReachReq); i {
+			switch v := v.(*PlunderPvpChallengeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -983,7 +1240,7 @@ func file_plunder_plunder_msg_proto_init() {
 			}
 		}
 		file_plunder_plunder_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlunderReachResp); i {
+			switch v := v.(*PlunderPvpChallengeResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -995,7 +1252,7 @@ func file_plunder_plunder_msg_proto_init() {
 			}
 		}
 		file_plunder_plunder_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlunderClientTagReq); i {
+			switch v := v.(*PlunderPvpChallengeOverReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1007,7 +1264,7 @@ func file_plunder_plunder_msg_proto_init() {
 			}
 		}
 		file_plunder_plunder_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlunderClientTagResp); i {
+			switch v := v.(*PlunderPvpChallengeOverResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1019,6 +1276,54 @@ func file_plunder_plunder_msg_proto_init() {
 			}
 		}
 		file_plunder_plunder_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderReachReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_plunder_plunder_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderReachResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_plunder_plunder_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderClientTagReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_plunder_plunder_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderClientTagResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_plunder_plunder_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PlunderChangePush); i {
 			case 0:
 				return &v.state
@@ -1037,7 +1342,7 @@ func file_plunder_plunder_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_plunder_plunder_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   18,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   0,
 		},