Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/hero/model_hero.go

@@ -320,7 +320,7 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er
 		hero.EquipID = make([]string, 6)
 		hero.SuiteExtId = 0
 		newHero = this.CloneNewHero(hero)
-
+		hero.EquipID = make([]string, 6)
 		hero.SameCount = 1
 		hero.IsOverlying = false
 		update["isoverlying"] = false

modules/mainline/api_challenge.go

@@ -9,7 +9,7 @@ import (
 
 //参数校验
 func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MainlineChallengeReq) (code pb.ErrorCode) {
-	if req.MainlineId == 0 || req.ChapterObj == "" || req.Leadpos >= 5 || len(req.Teamids) > 5 || req.Leadpos < 0 {
+	if req.MainlineId == 0 || req.ChapterObj == "" || req.Leadpos >= 5 || len(req.Teamids) == 5 || req.Leadpos < 0 {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}

modules/mainline/api_getReward.go

@@ -29,7 +29,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MainlineGetRew
 		code = pb.ErrorCode_DBError
 		return
 	}
-	if _obj.AwaredID > 0 {
+	if _obj.AwaredID != 0 {
 		code = pb.ErrorCode_MainlineRepeatReward // 重复领奖
 		return
 	}
@@ -43,7 +43,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MainlineGetRew
 		code = pb.ErrorCode_MainlineCompleteReward // 通关才能领奖
 		return
 	}
-	_obj.AwaredID = 1
+	_obj.AwaredID = 1 // 设置领奖标记
 	update := map[string]interface{}{
 		"awaredID": _obj.AwaredID,
 	}

modules/viking/api.go

@@ -9,6 +9,7 @@ import (
 const (
 	VikingGetListResp       = "getlist"
 	VikingChallengeResp     = "challenge"
+	VikingChallengeOverResp = "challengeover"
 	VikingSkillLvResp       = "skilllv"
 	VikingGetRewardResp     = "getreward"
 	VikingBuyResp           = "buy"

modules/viking/api_challenge.go

@@ -3,14 +3,13 @@ package viking
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
 func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode) {
-	if req.BossType <= 0 && req.Difficulty > 0 {
+	if req.BossType <= 0 && req.Difficulty > 0 || req.Leadpos >= 5 || len(req.Teamids) == 5 || req.Leadpos < 0 {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -19,13 +18,6 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingCha
 
 ///挑战主线关卡
 func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode, data proto.Message) {
-	var (
-		mapData      map[string]interface{}
-		newChallenge bool // 新的关卡
-		reward       []*cfg.Gameatn
-	)
-	mapData = make(map[string]interface{}, 0)
-	reward = make([]*cfg.Gameatn, 0)
 	code = this.ChallengeCheck(session, req)
 	if code != pb.ErrorCode_Success {
 		return // 参数校验失败直接返回
@@ -41,8 +33,8 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 		code = pb.ErrorCode_VikingMaxChallengeCount
 		return
 	}
-	cfg := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty)
+	cfgData := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty)
-	if cfg == nil {
+	if cfgData == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
@@ -56,29 +48,25 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 			code = pb.ErrorCode_VikingLvErr
 			return
 		}
-		newChallenge = true
-	}
-	if newChallenge { // 新关卡挑战通过 发放首通奖励
-		if code = this.module.DispenseRes(session, cfg.Firstprize, true); code != pb.ErrorCode_Success {
-			return
-		}
-		viking.Boss[req.BossType] += 1
-		mapData["Boss"] = viking.Boss
-		// viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 // todo 耗时
-		// mapData["challengeTime"] = viking.ChallengeTime
-		this.module.modulerank.updateVikingRankList(session, req.Difficulty, req.BossType, 100)
-	}
-	// 耗时校验 当前战斗胜利时间消耗小于之前刷新数据
-
-	viking.ChallengeCount++
-	mapData["challengeCount"] = viking.ChallengeCount
-	code = this.module.ModifyVikingData(session.GetUserId(), mapData)
-	// 发放通关随机奖励
-	this.module.configure.GetDropReward(cfg.Drop, reward) // 获取掉落奖励
-	if code = this.module.DispenseRes(session, reward, true); code != pb.ErrorCode_Success {
-		return
 	}
 
-	session.SendMsg(string(this.module.GetType()), VikingChallengeResp, &pb.VikingChallengeResp{Data: viking})
+	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+		Ptype:   pb.PlayType_moonfantasy,
+		Leadpos: req.Leadpos,
+		Teamids: req.Teamids,
+		//Mformat: cfgData.,
+	})
+	if code != pb.ErrorCode_Success {
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), VikingChallengeResp, &pb.VikingChallengeResp{Info: &pb.BattleInfo{
+		Id:         record.Id,
+		Btype:      record.Btype,
+		Ptype:      record.Ptype,
+		RedCompId:  record.RedCompId,
+		Redflist:   record.Redflist,
+		BlueCompId: record.BlueCompId,
+		Buleflist:  record.Buleflist,
+	}})
 	return
 }

modules/viking/api_challengeover.go

@@ -0,0 +1,84 @@
+package viking
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode) {
+	if req.BossType <= 0 && req.Difficulty > 0 {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	return
+}
+
+///挑战完成
+func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		mapData      map[string]interface{}
+		newChallenge bool // 新的关卡
+		reward       []*cfg.Gameatn
+	)
+	mapData = make(map[string]interface{}, 0)
+	reward = make([]*cfg.Gameatn, 0)
+	code = this.ChallengeOverCheck(session, req)
+	if code != pb.ErrorCode_Success {
+		return // 参数校验失败直接返回
+	}
+
+	viking, err := this.module.modelViking.getVikingList(session.GetUserId())
+	if err != nil {
+		code = pb.ErrorCode_VikingBoosType
+		return
+	}
+
+	if viking.ChallengeCount > this.module.configure.GetGlobalConf().VikingNum+viking.BuyCount {
+		code = pb.ErrorCode_VikingMaxChallengeCount
+		return
+	}
+	cfg := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty)
+	if cfg == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	value, ok := viking.Boss[req.BossType]
+	if !ok { // 类型校验
+		viking.Boss[req.BossType] = 0
+	}
+	if value < req.Difficulty {
+		if value+1 != req.Difficulty {
+			code = pb.ErrorCode_VikingLvErr
+			return
+		}
+		newChallenge = true
+	}
+	if newChallenge { // 新关卡挑战通过 发放首通奖励
+		if code = this.module.DispenseRes(session, cfg.Firstprize, true); code != pb.ErrorCode_Success {
+			return
+		}
+		viking.Boss[req.BossType] += 1
+		mapData["Boss"] = viking.Boss
+		// viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 // todo 耗时
+		// mapData["challengeTime"] = viking.ChallengeTime
+		this.module.modulerank.updateVikingRankList(session, req.Difficulty, req.BossType, 100)
+	}
+	// 耗时校验 当前战斗胜利时间消耗小于之前刷新数据
+
+	viking.ChallengeCount++
+	mapData["challengeCount"] = viking.ChallengeCount
+	code = this.module.ModifyVikingData(session.GetUserId(), mapData)
+	// 发放通关随机奖励
+	this.module.configure.GetDropReward(cfg.Drop, reward) // 获取掉落奖励
+	if code = this.module.DispenseRes(session, reward, true); code != pb.ErrorCode_Success {
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{Data: viking})
+	return
+}

modules/viking/module.go

@@ -7,6 +7,7 @@ package viking
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/base"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
@@ -18,6 +19,8 @@ type Viking struct {
 	api         *apiComp
 	configure   *configureComp
 	modulerank  *ModelRank
+	battle      comm.IBattle
+	service     base.IRPCXService
 }
 
 func NewModule() core.IModule {
@@ -30,7 +33,7 @@ func (this *Viking) GetType() core.M_Modules {
 
 func (this *Viking) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
 	err = this.ModuleBase.Init(service, module, options)
-
+	this.service = service.(base.IRPCXService)
 	return
 }
 
@@ -50,3 +53,13 @@ func (this *Viking) ModifyVikingData(uid string, data map[string]interface{}) (c
 	}
 	return
 }
+func (this *Viking) Start() (err error) {
+	err = this.ModuleBase.Start()
+	var module core.IModule
+	if module, err = this.service.GetModule(comm.ModuleBattle); err != nil {
+		return
+	}
+
+	this.battle = module.(comm.IBattle)
+	return
+}

pb/mainline_db.pb.go

@@ -30,7 +30,7 @@ type DBMainline struct {
 	ChapterId  int32   `protobuf:"varint,3,opt,name=chapterId,proto3" json:"chapterId" bson:"chapterId"`     //章节ID
 	MainlineId int32   `protobuf:"varint,4,opt,name=mainlineId,proto3" json:"mainlineId" bson:"mainlineId"`  //主线关卡ID
 	AwaredID   int32   `protobuf:"varint,5,opt,name=awaredID,proto3" json:"awaredID" bson:"awaredID"`        //是否领奖(设置int是考虑后续扩展有多个宝箱情况)
-	BranchID   []int32 `protobuf:"varint,6,rep,packed,name=branchID,proto3" json:"branchID" bson:"branchID"` //
+	BranchID   []int32 `protobuf:"varint,6,rep,packed,name=branchID,proto3" json:"branchID" bson:"branchID"` // 记录所有通关的关卡数据
 	Intensity  int32   `protobuf:"varint,7,opt,name=intensity,proto3" json:"intensity"`                      // 难度
 }
 

pb/viking_msg.pb.go

@@ -113,6 +113,8 @@ type VikingChallengeReq struct {
 
 	BossType   int32    `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"`     // boos 类型
 	Difficulty int32    `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+	Leadpos    int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`       //队长位置
+	Teamids    []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`        //阵容信息
 }
 
 func (x *VikingChallengeReq) Reset() {
@@ -161,12 +163,26 @@ func (x *VikingChallengeReq) GetDifficulty() int32 {
 	return 0
 }
 
+func (x *VikingChallengeReq) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *VikingChallengeReq) GetTeamids() []string {
+	if x != nil {
+		return x.Teamids
+	}
+	return nil
+}
+
 type VikingChallengeResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data *DBViking `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+	Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
 }
 
 func (x *VikingChallengeResp) Reset() {
@@ -201,7 +217,118 @@ func (*VikingChallengeResp) Descriptor() ([]byte, []int) {
 	return file_viking_viking_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *VikingChallengeResp) GetData() *DBViking {
+func (x *VikingChallengeResp) GetInfo() *BattleInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+type VikingChallengeOverReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	BossType   int32         `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"`     // boos 类型
+	Difficulty int32         `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+	Report     *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"`          //战报
+}
+
+func (x *VikingChallengeOverReq) Reset() {
+	*x = VikingChallengeOverReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_viking_viking_msg_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *VikingChallengeOverReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*VikingChallengeOverReq) ProtoMessage() {}
+
+func (x *VikingChallengeOverReq) ProtoReflect() protoreflect.Message {
+	mi := &file_viking_viking_msg_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use VikingChallengeOverReq.ProtoReflect.Descriptor instead.
+func (*VikingChallengeOverReq) Descriptor() ([]byte, []int) {
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *VikingChallengeOverReq) GetBossType() int32 {
+	if x != nil {
+		return x.BossType
+	}
+	return 0
+}
+
+func (x *VikingChallengeOverReq) GetDifficulty() int32 {
+	if x != nil {
+		return x.Difficulty
+	}
+	return 0
+}
+
+func (x *VikingChallengeOverReq) GetReport() *BattleReport {
+	if x != nil {
+		return x.Report
+	}
+	return nil
+}
+
+// 客户端通知服务器打赢了
+type VikingChallengeOverResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBViking `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *VikingChallengeOverResp) Reset() {
+	*x = VikingChallengeOverResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_viking_viking_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *VikingChallengeOverResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*VikingChallengeOverResp) ProtoMessage() {}
+
+func (x *VikingChallengeOverResp) ProtoReflect() protoreflect.Message {
+	mi := &file_viking_viking_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use VikingChallengeOverResp.ProtoReflect.Descriptor instead.
+func (*VikingChallengeOverResp) Descriptor() ([]byte, []int) {
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *VikingChallengeOverResp) GetData() *DBViking {
 	if x != nil {
 		return x.Data
 	}
@@ -220,7 +347,7 @@ type VikingBuyReq struct {
 func (x *VikingBuyReq) Reset() {
 	*x = VikingBuyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_viking_viking_msg_proto_msgTypes[4]
+		mi := &file_viking_viking_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -233,7 +360,7 @@ func (x *VikingBuyReq) String() string {
 func (*VikingBuyReq) ProtoMessage() {}
 
 func (x *VikingBuyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_viking_viking_msg_proto_msgTypes[4]
+	mi := &file_viking_viking_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -246,7 +373,7 @@ func (x *VikingBuyReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VikingBuyReq.ProtoReflect.Descriptor instead.
 func (*VikingBuyReq) Descriptor() ([]byte, []int) {
-	return file_viking_viking_msg_proto_rawDescGZIP(), []int{4}
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *VikingBuyReq) GetCount() int32 {
@@ -267,7 +394,7 @@ type VikingBuyResp struct {
 func (x *VikingBuyResp) Reset() {
 	*x = VikingBuyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_viking_viking_msg_proto_msgTypes[5]
+		mi := &file_viking_viking_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -280,7 +407,7 @@ func (x *VikingBuyResp) String() string {
 func (*VikingBuyResp) ProtoMessage() {}
 
 func (x *VikingBuyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_viking_viking_msg_proto_msgTypes[5]
+	mi := &file_viking_viking_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -293,7 +420,7 @@ func (x *VikingBuyResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VikingBuyResp.ProtoReflect.Descriptor instead.
 func (*VikingBuyResp) Descriptor() ([]byte, []int) {
-	return file_viking_viking_msg_proto_rawDescGZIP(), []int{5}
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *VikingBuyResp) GetData() *DBViking {
@@ -316,7 +443,7 @@ type VikingRankListReq struct {
 func (x *VikingRankListReq) Reset() {
 	*x = VikingRankListReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_viking_viking_msg_proto_msgTypes[6]
+		mi := &file_viking_viking_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -329,7 +456,7 @@ func (x *VikingRankListReq) String() string {
 func (*VikingRankListReq) ProtoMessage() {}
 
 func (x *VikingRankListReq) ProtoReflect() protoreflect.Message {
-	mi := &file_viking_viking_msg_proto_msgTypes[6]
+	mi := &file_viking_viking_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -342,7 +469,7 @@ func (x *VikingRankListReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VikingRankListReq.ProtoReflect.Descriptor instead.
 func (*VikingRankListReq) Descriptor() ([]byte, []int) {
-	return file_viking_viking_msg_proto_rawDescGZIP(), []int{6}
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *VikingRankListReq) GetBoosType() int32 {
@@ -370,7 +497,7 @@ type VikingRankListResp struct {
 func (x *VikingRankListResp) Reset() {
 	*x = VikingRankListResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_viking_viking_msg_proto_msgTypes[7]
+		mi := &file_viking_viking_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -383,7 +510,7 @@ func (x *VikingRankListResp) String() string {
 func (*VikingRankListResp) ProtoMessage() {}
 
 func (x *VikingRankListResp) ProtoReflect() protoreflect.Message {
-	mi := &file_viking_viking_msg_proto_msgTypes[7]
+	mi := &file_viking_viking_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -396,7 +523,7 @@ func (x *VikingRankListResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VikingRankListResp.ProtoReflect.Descriptor instead.
 func (*VikingRankListResp) Descriptor() ([]byte, []int) {
-	return file_viking_viking_msg_proto_rawDescGZIP(), []int{7}
+	return file_viking_viking_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *VikingRankListResp) GetRanks() []*DBVikingRank {
@@ -412,34 +539,51 @@ var file_viking_viking_msg_proto_rawDesc = []byte{
 	0x0a, 0x17, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x5f,
 	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x76, 0x69, 0x6b, 0x69, 0x6e,
 	0x67, 0x2f, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0x12, 0x0a, 0x10, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69,
+	0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x47,
+	0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x56, 0x69,
-	0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
+	0x6b, 0x69, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32,
-	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
+	0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x50, 0x0a, 0x12, 0x56, 0x69, 0x6b,
+	0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12,
+	0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
-	0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x74, 0x61, 0x22, 0x84, 0x01, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61,
-	0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64,
+	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73,
-	0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73,
-	0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x34, 0x0a, 0x13, 0x56,
+	0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
-	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65,
+	0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
-	0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
-	0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12,
-	0x61, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65,
+	0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09,
-	0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x36, 0x0a, 0x13, 0x56, 0x69, 0x6b,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+	0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66,
-	0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+	0x6f, 0x22, 0x7b, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62,
-	0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62,
-	0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65,
+	0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
-	0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66,
-	0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69,
+	0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
-	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18,
+	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
+	0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x38,
-	0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69,
+	0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69,
+	0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e,
+	0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47,
+	0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+	0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
+	0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e,
+	0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -454,29 +598,35 @@ func file_viking_viking_msg_proto_rawDescGZIP() []byte {
 	return file_viking_viking_msg_proto_rawDescData
 }
 
-var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_viking_viking_msg_proto_goTypes = []interface{}{
 	(*VikingGetListReq)(nil),        // 0: VikingGetListReq
 	(*VikingGetListResp)(nil),       // 1: VikingGetListResp
 	(*VikingChallengeReq)(nil),      // 2: VikingChallengeReq
 	(*VikingChallengeResp)(nil),     // 3: VikingChallengeResp
-	(*VikingBuyReq)(nil),        // 4: VikingBuyReq
+	(*VikingChallengeOverReq)(nil),  // 4: VikingChallengeOverReq
-	(*VikingBuyResp)(nil),       // 5: VikingBuyResp
+	(*VikingChallengeOverResp)(nil), // 5: VikingChallengeOverResp
-	(*VikingRankListReq)(nil),   // 6: VikingRankListReq
+	(*VikingBuyReq)(nil),            // 6: VikingBuyReq
-	(*VikingRankListResp)(nil),  // 7: VikingRankListResp
+	(*VikingBuyResp)(nil),           // 7: VikingBuyResp
-	(*DBViking)(nil),            // 8: DBViking
+	(*VikingRankListReq)(nil),       // 8: VikingRankListReq
-	(*DBVikingRank)(nil),        // 9: DBVikingRank
+	(*VikingRankListResp)(nil),      // 9: VikingRankListResp
+	(*DBViking)(nil),                // 10: DBViking
+	(*BattleInfo)(nil),              // 11: BattleInfo
+	(*BattleReport)(nil),            // 12: BattleReport
+	(*DBVikingRank)(nil),            // 13: DBVikingRank
 }
 var file_viking_viking_msg_proto_depIdxs = []int32{
-	8, // 0: VikingGetListResp.data:type_name -> DBViking
+	10, // 0: VikingGetListResp.data:type_name -> DBViking
-	8, // 1: VikingChallengeResp.data:type_name -> DBViking
+	11, // 1: VikingChallengeResp.info:type_name -> BattleInfo
-	8, // 2: VikingBuyResp.data:type_name -> DBViking
+	12, // 2: VikingChallengeOverReq.report:type_name -> BattleReport
-	9, // 3: VikingRankListResp.ranks:type_name -> DBVikingRank
+	10, // 3: VikingChallengeOverResp.data:type_name -> DBViking
-	4, // [4:4] is the sub-list for method output_type
+	10, // 4: VikingBuyResp.data:type_name -> DBViking
-	4, // [4:4] is the sub-list for method input_type
+	13, // 5: VikingRankListResp.ranks:type_name -> DBVikingRank
-	4, // [4:4] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for extension extendee
+	6,  // [6:6] is the sub-list for method input_type
-	0, // [0:4] is the sub-list for field type_name
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_viking_viking_msg_proto_init() }
@@ -485,6 +635,7 @@ func file_viking_viking_msg_proto_init() {
 		return
 	}
 	file_viking_viking_db_proto_init()
+	file_battle_battle_msg_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_viking_viking_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*VikingGetListReq); i {
@@ -535,7 +686,7 @@ func file_viking_viking_msg_proto_init() {
 			}
 		}
 		file_viking_viking_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VikingBuyReq); i {
+			switch v := v.(*VikingChallengeOverReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -547,7 +698,7 @@ func file_viking_viking_msg_proto_init() {
 			}
 		}
 		file_viking_viking_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VikingBuyResp); i {
+			switch v := v.(*VikingChallengeOverResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -559,7 +710,7 @@ func file_viking_viking_msg_proto_init() {
 			}
 		}
 		file_viking_viking_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VikingRankListReq); i {
+			switch v := v.(*VikingBuyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -571,6 +722,30 @@ func file_viking_viking_msg_proto_init() {
 			}
 		}
 		file_viking_viking_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*VikingBuyResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_viking_viking_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*VikingRankListReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_viking_viking_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*VikingRankListResp); i {
 			case 0:
 				return &v.state
@@ -589,7 +764,7 @@ func file_viking_viking_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_viking_viking_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   0,
 		},