防守阵容设置

modules/plunder/api_challengeover.go

@@ -39,6 +39,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
 		users       []string
 		update      map[string]interface{} //
 		newShip     map[string]*pb.ShipData
+		heros       []*pb.DBHero
+		hids        []string
 	)
 	update = make(map[string]interface{})
 	changExp = make(map[string]int32, 0)
@@ -115,6 +117,19 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
 	for _, v := range land.Uinfo {
 		users = append(users, v.Uid)
 	}
+	for _, v := range req.Report.Info.Redflist[0].Team {
+		hids = append(hids, v.Oid)
+	}
+
+	if heros, err = this.module.modelPlunder.queryUserHeros(session.GetUserId(), hids); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
 	_id := primitive.NewObjectID().Hex()
 	// 创建一条船的信息
 	shipData = &pb.ShipData{
@@ -128,8 +143,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha
 		Status: 0,
 		Cd:     0,
 		Client: false,
-		Defend: req.Report.Info.Buleflist,
+		Defend: &pb.DBPlayerBattleFormt{
+			Leadpos: req.Report.Info.Redflist[0].Leadpos,
+			Formt:   heros,
+		},
 	}
+
 	list.Count++
 	update["count"] = list.Count
 

modules/plunder/api_clienttag.go

@@ -0,0 +1,59 @@
+package plunder
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+func (this *apiComp) ClientTagCheck(session comm.IUserSession, req *pb.PlunderClientTagReq) (errdata *pb.ErrorData) {
+	return
+}
+
+// 获取基本信息
+func (this *apiComp) ClientTag(session comm.IUserSession, req *pb.PlunderClientTagReq) (errdata *pb.ErrorData) {
+	var (
+		err        error
+		list       *pb.DBPlunder
+		land       *pb.DBPlunderLand
+		changeShip map[string]*pb.ShipData
+	)
+	if errdata = this.ClientTagCheck(session, req); errdata != nil {
+		return
+	}
+	changeShip = make(map[string]*pb.ShipData)
+	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
+	}
+	for _, id := range req.Oid {
+		if _, ok := land.Ship[id]; !ok {
+			errdata = &pb.ErrorData{
+				Code: pb.ErrorCode_PlunderNotFoundShip,
+			}
+			return
+		} else {
+			land.Ship[id].Client = true
+			changeShip[id] = land.Ship[id]
+		}
+	}
+
+	this.module.modelLand.changePlunderLandData(session.GetUserId(), map[string]interface{}{
+		"ship": land.Ship,
+	})
+	session.SendMsg(string(this.module.GetType()), "clienttag", &pb.PlunderClientTagResp{
+		Ship: changeShip,
+	})
+
+	return
+}

modules/plunder/api_getlist.go

@@ -36,11 +36,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
 			}
 			return
 		}
-
 		list.Landid = land.Id
-		this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{
-			"landid": list.Landid,
-		})
 	} else {
 		if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
 			errdata = &pb.ErrorData{

modules/plunder/api_pvpchallenge.go

@@ -41,6 +41,7 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
 		lock       *redis.RedisMutex
 		users      []string
 		changeShip map[string]*pb.ShipData
+		heros      []*pb.DBHero
 	)
 	if errdata = this.PvpChallengeCheck(session, req); errdata != nil {
 		return
@@ -97,8 +98,8 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
 		}
 		return
 	}
-	// 状态校验
+	// 状态校验 状态 0 运输 1 正在被攻击 2 战败cd中 3 掠夺成功
-	if land.Ship[req.Oid].Status != 0 { // return
+	if land.Ship[req.Oid].Status == 0 { // return
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_PlunderNotFoundShip,
 			Title:   pb.ErrorCode_PlunderNotFoundShip.ToString(),
@@ -106,11 +107,28 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
 		}
 		return
 	}
-	if errdata, record = this.module.battle.CreatePlunderPvpBattle(session, &pb.BattlePVEPlunderReq{
+	if land.Ship[req.Oid].Status == 2 && land.Ship[req.Oid].Cd >= configure.Now().Unix() { // cd
-		Ptype:   pb.PlayType_plunderpvp,
+		errdata = &pb.ErrorData{
-		Title:   "",
+			Code:    pb.ErrorCode_PlundeShipCDIng,
-		Rulesid: 105,
+			Title:   pb.ErrorCode_PlundeShipCDIng.ToString(),
-		Format:  req.Battle,
+			Message: fmt.Sprintf("ErrorCode_PlundeShipCDIng :%d", land.Ship[req.Oid].Cd),
+		}
+		return
+	}
+	if heros, err = this.module.modelPlunder.queryUserHeros(session.GetUserId(), req.Battle.Format); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if errdata, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{
+		Rulesid:    105,
+		Ptype:      pb.PlayType_arena,
+		Redformat:  &pb.PVPFormation{Uid: session.GetUserId(), Leadpos: req.Battle.Leadpos, Format: heros},
+		Buleformat: &pb.PVPFormation{Uid: land.Ship[req.Oid].Uid, Leadpos: land.Ship[req.Oid].Defend.Leadpos, Format: land.Ship[req.Oid].Defend.Formt},
 	}); errdata != nil {
 		return
 	}
@@ -129,8 +147,8 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
 			Ptype:      record.Ptype,
 			RedCompId:  record.RedCompId,
 			Redflist:   record.Redflist,
-			BlueCompId: land.Ship[req.Oid].Uid,
+			BlueCompId: record.BlueCompId,
-			Buleflist:  land.Ship[req.Oid].Defend,
+			Buleflist:  record.Buleflist,
 			Tasks:      record.Tasks,
 		},
 	})

modules/plunder/api_pvpchallengeover.go

@@ -93,6 +93,9 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder
 		this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{
 			Ship: changeShip,
 		}, users...)
+		session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{
+			Atno: []*pb.UserAtno{},
+		})
 		return
 	}
 	land.Ship[req.Oid].Status = 3

modules/plunder/model_land.go

@@ -53,7 +53,6 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
 		uids      []string
 		users     []*pb.DBUser
 		info      []*pb.DBPlunder
-		join      map[string]struct{}
 		curUids   []string // 过滤后的玩家
 		uInfos    []*pb.BaseUserInfo
 	)
@@ -66,11 +65,11 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
 	if user, err = this.module.ModuleUser.GetUser(uid); err != nil {
 		return
 	}
-	uInfos = append(uInfos, comm.GetUserBaseInfo(user))
 	limtSocre = user.Plunder - 100
 	if limtSocre < 0 {
 		limtSocre = 0
 	}
+	uids = append(uids, uid) // 优先加入自己
 	cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"gold": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30)))
 	for cur.Next(context.TODO()) {
 		tmp := &pb.DBUser{}
@@ -80,34 +79,20 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
 			}
 		}
 	}
-	join = make(map[string]struct{})
+	info, _ = this.module.modelPlunder.queryPlunderInfos(uids, land.Id)
-	// 批量查 是否有加入海岛的
+
-	info, _ = this.module.modelPlunder.getPlunderDataByUids(uids)
 	for _, v := range info {
 		if v.Landid != "" { // 过滤
-			join[v.Uid] = struct{}{}
+			curUids = append(curUids, v.Uid)
 		}
 	}
 
-	for _, v := range uids { // 过滤已经加入海岛的玩家
-		if _, ok := join[v]; !ok {
-			curUids = append(curUids, v)
-		}
-	}
 	if users, err = this.module.ModuleUser.GetUsers(curUids); err == nil {
 		for _, v := range users {
 			uInfos = append(uInfos, comm.GetUserBaseInfo(v))
 			if len(uInfos) >= 20 {
 				break
 			}
-			if list, err := this.module.modelPlunder.getPlunderData(v.Uid); err == nil {
-				if list.Landid == "" {
-					list.Landid = land.Id
-					this.module.modelPlunder.changePlunderData(v.Uid, map[string]interface{}{
-						"landid": land.Id,
-					})
-				}
-			}
 		}
 	}
 

modules/plunder/model_plunder.go

@@ -8,6 +8,7 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"go_dreamfactory/sys/db"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -89,3 +90,87 @@ func (this *modelPlunder) refreshGoodsInfo() (cids []int32, err error) {
 	}
 	return
 }
+
+func (this *modelPlunder) queryUserHeros(uid string, heroids []string) (results []*pb.DBHero, err error) {
+	var (
+		model       *db.DBModel
+		ids         []string
+		resultstemp []*pb.DBHero
+	)
+
+	if model, err = this.module.GetDBModelByUid(uid, comm.TableHero); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	for _, v := range heroids {
+		if v != "" {
+			ids = append(ids, v)
+		}
+	}
+
+	resultstemp = make([]*pb.DBHero, 0)
+	if err = model.GetListObjs(uid, ids, &resultstemp); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	results = make([]*pb.DBHero, len(heroids))
+	for i1, v1 := range resultstemp {
+		for i2, _ := range results {
+			if i1 == i2 {
+				results[i2] = v1
+			}
+		}
+	}
+	return
+}
+func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data []*pb.DBPlunder, err error) {
+	results := make([]*pb.DBPlunder, 0)
+	var (
+		onfound []string
+		newdata map[string]interface{} = make(map[string]interface{})
+	)
+	if onfound, err = this.Gets(uids, &results); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+
+	for _, v := range onfound {
+		temp := &pb.DBPlunder{
+			Id:     primitive.NewObjectID().Hex(),
+			Uid:    v,
+			Ctime:  configure.Now().Unix(),
+			Landid: landid,
+		}
+
+		for i := 0; i < 3; i++ { // 队列固定三条
+			temp.Line = append(temp.Line, &pb.TransportLine{})
+		}
+		temp.Line = append(temp.Line, &pb.TransportLine{
+			Closetime: -1, // 需要手动解锁
+		})
+		newdata[v] = temp
+		data = append(data, temp)
+		if len(newdata) >= 20 {
+			break
+		}
+	}
+
+	if err = this.Adds(newdata); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+
+	for _, v := range results {
+		if v.Landid == "" {
+			this.Change(v.Uid, map[string]interface{}{
+				"landid": landid,
+			})
+			data = append(data, v)
+			if len(newdata) >= 20 {
+				break
+			}
+		}
+	}
+
+	return
+}

pb/errorcode.pb.go

@@ -477,6 +477,7 @@ const (
 	ErrorCode_PlundeRepleteRecive ErrorCode = 5403 // 重复接取
 	ErrorCode_PlundeShipReach     ErrorCode = 5404 //船已经达到不能被掠夺
 	ErrorCode_PlundeNormalShip    ErrorCode = 5405 //普通船不能被掠夺
+	ErrorCode_PlundeShipCDIng     ErrorCode = 5406 //掠夺cd中
 )
 
 // Enum value maps for ErrorCode.
@@ -889,6 +890,7 @@ var (
 		5403: "PlundeRepleteRecive",
 		5404: "PlundeShipReach",
 		5405: "PlundeNormalShip",
+		5406: "PlundeShipCDIng",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1298,6 +1300,7 @@ var (
 		"PlundeRepleteRecive":           5403,
 		"PlundeShipReach":               5404,
 		"PlundeNormalShip":              5405,
+		"PlundeShipCDIng":               5406,
 	}
 )
 
@@ -1332,7 +1335,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, 0xf3, 0x4b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x89, 0x4c, 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,
@@ -1939,8 +1942,9 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c,
 	0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a,
 	0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c,
-	0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/plunder_db.pb.go

@@ -276,10 +276,10 @@ type ShipData struct {
 	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 掠夺成功
+	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 结束时间
+	Cd     int64                `protobuf:"varint,5,opt,name=cd,proto3" json:"cd"`         //cd 结束时间
-	Client bool             `protobuf:"varint,7,opt,name=client,proto3" json:"client"` // 客户端状态 服务器不用
+	Client bool                 `protobuf:"varint,7,opt,name=client,proto3" json:"client"` // 客户端状态 服务器不用
-	Defend []*DBBattleFormt `protobuf:"bytes,8,rep,name=defend,proto3" json:"defend"`  //防守
+	Defend *DBPlayerBattleFormt `protobuf:"bytes,8,opt,name=defend,proto3" json:"defend"`  //防守
 }
 
 func (x *ShipData) Reset() {
@@ -349,7 +349,7 @@ func (x *ShipData) GetClient() bool {
 	return false
 }
 
-func (x *ShipData) GetDefend() []*DBBattleFormt {
+func (x *ShipData) GetDefend() *DBPlayerBattleFormt {
 	if x != nil {
 		return x.Defend
 	}
@@ -432,65 +432,65 @@ 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, 0x16, 0x62, 0x61, 0x74, 0x74,
+	0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
+	0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf5,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
-	0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
+	0x74, 0x6f, 0x22, 0xf5, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
-	0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x04,
+	0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
+	0x6e, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f,
+	0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14,
-	0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06,
-	0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x74, 0x6f,
+	0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x75, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x74, 0x6f, 0x75, 0x74,
+	0x73, 0x65, 0x74, 0x6f, 0x75, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x74, 0x6f, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18,
-	0x05, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74,
+	0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x14,
-	0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65,
+	0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
-	0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20,
-	0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72,
-	0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01,
+	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a,
-	0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c,
+	0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
-	0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64,
+	0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50,
-	0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65,
-	0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69,
+	0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x03, 0x20,
-	0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18,
-	0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0xa6, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0xac, 0x01, 0x0a, 0x08, 0x53,
-	0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e,
-	0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
-	0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73,
-	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12,
+	0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20,
-	0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x06, 0x64,
-	0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
+	0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
-	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
-	0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e,
+	0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42,
-	0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75,
-	0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50,
-	0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e,
+	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f,
-	0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04,
-	0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64,
+	0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50,
-	0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70,
+	0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45,
-	0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
-	0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45,
+	0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
+	0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05,
-	0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61,
-	0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a,
-	0x74, 0x6f, 0x33,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -507,20 +507,20 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte {
 
 var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_plunder_plunder_db_proto_goTypes = []interface{}{
-	(*DBPlunder)(nil),     // 0: DBPlunder
+	(*DBPlunder)(nil),           // 0: DBPlunder
-	(*TransportLine)(nil), // 1: TransportLine
+	(*TransportLine)(nil),       // 1: TransportLine
-	(*PlunderLine)(nil),   // 2: PlunderLine
+	(*PlunderLine)(nil),         // 2: PlunderLine
-	(*ShipData)(nil),      // 3: ShipData
+	(*ShipData)(nil),            // 3: ShipData
-	(*DBPlunderLand)(nil), // 4: DBPlunderLand
+	(*DBPlunderLand)(nil),       // 4: DBPlunderLand
-	nil,                   // 5: DBPlunderLand.UinfoEntry
+	nil,                         // 5: DBPlunderLand.UinfoEntry
-	nil,                   // 6: DBPlunderLand.ShipEntry
+	nil,                         // 6: DBPlunderLand.ShipEntry
-	(*DBBattleFormt)(nil), // 7: DBBattleFormt
+	(*DBPlayerBattleFormt)(nil), // 7: DBPlayerBattleFormt
-	(*BaseUserInfo)(nil),  // 8: BaseUserInfo
+	(*BaseUserInfo)(nil),        // 8: BaseUserInfo
 }
 var file_plunder_plunder_db_proto_depIdxs = []int32{
 	1, // 0: DBPlunder.line:type_name -> TransportLine
 	2, // 1: ShipData.line:type_name -> PlunderLine
-	7, // 2: ShipData.defend:type_name -> DBBattleFormt
+	7, // 2: ShipData.defend:type_name -> DBPlayerBattleFormt
 	5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
 	6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
 	8, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
@@ -537,7 +537,7 @@ func file_plunder_plunder_db_proto_init() {
 	if File_plunder_plunder_db_proto != nil {
 		return
 	}
-	file_battle_battle_db_proto_init()
+	file_battle_battle_struct_proto_init()
 	file_comm_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_plunder_plunder_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {