随机任务支持bingo

cmd/v2/ui/views/bingoview.go

@@ -7,6 +7,7 @@ import (
 	"go_dreamfactory/cmd/v2/model"
 	"go_dreamfactory/cmd/v2/service"
 	"go_dreamfactory/pb"
+	"strings"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
@@ -45,7 +46,7 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject {
 	aSel = &widget.Select{}
 	gridContainer = container.NewGridWithColumns(3, aSel, tEntry, nEntry)
 
-	aSel.Options = []string{"选择", "attr", "item", "hero", "equi","mapid","pataid"}
+	aSel.Options = []string{"选择", "attr", "item", "hero", "equi", "mapid", "pataid", "rtask"}
 	aSel.SetSelected("选择")
 	aSel.OnChanged = func(s string) {
 		if s == "attr" {
@@ -79,7 +80,29 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject {
 		attrSel.SetSelected("")
 		nEntry.SetText("")
 		tEntry.SetText("")
-
 	}
-	return this.form
+
+	bingoEntry := widget.NewEntry()
+	bingoEntry.PlaceHolder = "bingo:item,10001,1"
+
+	customForm := widget.NewForm(widget.NewFormItem("bingo", bingoEntry))
+	customForm.OnSubmit = func() {
+		if bingoEntry.Text == "" || strings.HasPrefix(bingoEntry.Text, "bingo:") {
+			dialog.ShowError(errors.New("请填写完整并加上bingo:前缀"), this.w)
+			return
+		}
+		bingo := fmt.Sprintf("bingo:%s", bingoEntry.Text)
+		if err := service.GetPttService().SendToClient(
+			t.MainType,
+			t.SubType,
+			&pb.GMCmdReq{Cmod: bingo},
+		); err != nil {
+			logrus.Error(err)
+			return
+		}
+	}
+	customForm.SubmitText = common.BUTTON_OK
+
+	c := container.NewVBox(this.form, customForm)
+	return c
 }

comm/imodule.go

@@ -127,6 +127,8 @@ type (
 		InitCondiData(uid string) error
 		// 获取任务条件记录
 		GetCondiData(uid string) *pb.DBRtaskRecord
+		// bingo任务
+		BingoRtask(session IUserSession, groupId, rtaskId int32) error
 	}
 
 	//好友

modules/rtask/module.go

@@ -8,6 +8,8 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"go_dreamfactory/utils"
+	"sort"
 
 	"github.com/pkg/errors"
 )
@@ -263,3 +265,60 @@ func (this *ModuleRtask) InitCondiData(uid string) error {
 func (this *ModuleRtask) GetCondiData(uid string) *pb.DBRtaskRecord {
 	return this.modelRtaskRecord.getRecord(uid)
 }
+
+func (this *ModuleRtask) BingoRtask(session comm.IUserSession, groupId, rtaskId int32) error {
+	rtask := &pb.DBRtask{}
+	if err := this.modelRtask.Get(session.GetUserId(), rtask); err != nil {
+		return err
+	}
+
+	var (
+		frtaskArr *pb.FrtaskIds //完成的任务
+		ok        bool
+	)
+
+	// 查找任务组
+	if frtaskArr, ok = rtask.FrtaskIds[groupId]; !ok {
+		frtaskArr = &pb.FrtaskIds{}
+	}
+
+	gr, err := this.configure.getRtaskCfg()
+	if err != nil {
+		return err
+	}
+
+	var rgs []*cfg.GameRdtaskData
+	for _, v := range gr.GetDataList() {
+		if v.Group == groupId {
+			rgs = append(rgs, v)
+		}
+	}
+	sort.SliceStable(rgs, func(i, j int) bool {
+		return rgs[i].Id < rgs[j].Id
+	})
+
+	for _, v := range rgs {
+		if v.Id <= rtaskId {
+			if _, ok := utils.Findx(frtaskArr.RtaskIds, v.Id); !ok {
+				frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, v.Id)
+			}
+		}
+	}
+
+	if rtask.FrtaskIds == nil {
+		rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
+	}
+	rtask.FrtaskIds[groupId] = frtaskArr
+	update := map[string]interface{}{
+		"frtaskIds": rtask.FrtaskIds,
+	}
+	if err := this.modelRtask.Change(session.GetUserId(), update); err != nil {
+		return err
+	}
+
+	if err := session.SendMsg(string(this.GetType()), "FinishIds",
+		&pb.RtaskFinishIdsPush{RtaskId: frtaskArr.RtaskIds, GroupId: groupId}); err != nil {
+		return err
+	}
+	return nil
+}

pb/rtask_msg.pb.go

@@ -401,6 +401,62 @@ func (x *RtaskFinishPush) GetRtaskId() int32 {
 	return 0
 }
 
+// 当前完成的任务列表推送
+type RtaskFinishIdsPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RtaskId []int32 `protobuf:"varint,1,rep,packed,name=rtaskId,proto3" json:"rtaskId"`
+	GroupId int32   `protobuf:"varint,2,opt,name=groupId,proto3" json:"groupId"`
+}
+
+func (x *RtaskFinishIdsPush) Reset() {
+	*x = RtaskFinishIdsPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rtask_rtask_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RtaskFinishIdsPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RtaskFinishIdsPush) ProtoMessage() {}
+
+func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message {
+	mi := &file_rtask_rtask_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RtaskFinishIdsPush.ProtoReflect.Descriptor instead.
+func (*RtaskFinishIdsPush) Descriptor() ([]byte, []int) {
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *RtaskFinishIdsPush) GetRtaskId() []int32 {
+	if x != nil {
+		return x.RtaskId
+	}
+	return nil
+}
+
+func (x *RtaskFinishIdsPush) GetGroupId() int32 {
+	if x != nil {
+		return x.GroupId
+	}
+	return 0
+}
+
 // 领奖
 type RtaskGetRewardReq struct {
 	state         protoimpl.MessageState
@@ -414,7 +470,7 @@ type RtaskGetRewardReq struct {
 func (x *RtaskGetRewardReq) Reset() {
 	*x = RtaskGetRewardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[7]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -427,7 +483,7 @@ func (x *RtaskGetRewardReq) String() string {
 func (*RtaskGetRewardReq) ProtoMessage() {}
 
 func (x *RtaskGetRewardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[7]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -440,7 +496,7 @@ func (x *RtaskGetRewardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskGetRewardReq.ProtoReflect.Descriptor instead.
 func (*RtaskGetRewardReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *RtaskGetRewardReq) GetRtaskId() int32 {
@@ -469,7 +525,7 @@ type RtaskGetRewardResp struct {
 func (x *RtaskGetRewardResp) Reset() {
 	*x = RtaskGetRewardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[8]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -482,7 +538,7 @@ func (x *RtaskGetRewardResp) String() string {
 func (*RtaskGetRewardResp) ProtoMessage() {}
 
 func (x *RtaskGetRewardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[8]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -495,7 +551,7 @@ func (x *RtaskGetRewardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskGetRewardResp.ProtoReflect.Descriptor instead.
 func (*RtaskGetRewardResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *RtaskGetRewardResp) GetRtaskId() int32 {
@@ -526,7 +582,7 @@ type RtaskBattleStartReq struct {
 func (x *RtaskBattleStartReq) Reset() {
 	*x = RtaskBattleStartReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -539,7 +595,7 @@ func (x *RtaskBattleStartReq) String() string {
 func (*RtaskBattleStartReq) ProtoMessage() {}
 
 func (x *RtaskBattleStartReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -552,7 +608,7 @@ func (x *RtaskBattleStartReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleStartReq.ProtoReflect.Descriptor instead.
 func (*RtaskBattleStartReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *RtaskBattleStartReq) GetBattleConfId() int32 {
@@ -587,7 +643,7 @@ type RtaskBattleStartResp struct {
 func (x *RtaskBattleStartResp) Reset() {
 	*x = RtaskBattleStartResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -600,7 +656,7 @@ func (x *RtaskBattleStartResp) String() string {
 func (*RtaskBattleStartResp) ProtoMessage() {}
 
 func (x *RtaskBattleStartResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -613,7 +669,7 @@ func (x *RtaskBattleStartResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleStartResp.ProtoReflect.Descriptor instead.
 func (*RtaskBattleStartResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *RtaskBattleStartResp) GetInfo() *BattleInfo {
@@ -637,7 +693,7 @@ type RtaskBattleFinishReq struct {
 func (x *RtaskBattleFinishReq) Reset() {
 	*x = RtaskBattleFinishReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[11]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -650,7 +706,7 @@ func (x *RtaskBattleFinishReq) String() string {
 func (*RtaskBattleFinishReq) ProtoMessage() {}
 
 func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[11]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -663,7 +719,7 @@ func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleFinishReq.ProtoReflect.Descriptor instead.
 func (*RtaskBattleFinishReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *RtaskBattleFinishReq) GetRtaskId() int32 {
@@ -699,7 +755,7 @@ type RtaskBattleFinishResp struct {
 func (x *RtaskBattleFinishResp) Reset() {
 	*x = RtaskBattleFinishResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[12]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -712,7 +768,7 @@ func (x *RtaskBattleFinishResp) String() string {
 func (*RtaskBattleFinishResp) ProtoMessage() {}
 
 func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[12]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -725,7 +781,7 @@ func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleFinishResp.ProtoReflect.Descriptor instead.
 func (*RtaskBattleFinishResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *RtaskBattleFinishResp) GetRtaskId() int32 {
@@ -752,7 +808,7 @@ type RtaskGetrecordReq struct {
 func (x *RtaskGetrecordReq) Reset() {
 	*x = RtaskGetrecordReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[13]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -765,7 +821,7 @@ func (x *RtaskGetrecordReq) String() string {
 func (*RtaskGetrecordReq) ProtoMessage() {}
 
 func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[13]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -778,7 +834,7 @@ func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskGetrecordReq.ProtoReflect.Descriptor instead.
 func (*RtaskGetrecordReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14}
 }
 
 type RtaskGetrecordResp struct {
@@ -792,7 +848,7 @@ type RtaskGetrecordResp struct {
 func (x *RtaskGetrecordResp) Reset() {
 	*x = RtaskGetrecordResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[14]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -805,7 +861,7 @@ func (x *RtaskGetrecordResp) String() string {
 func (*RtaskGetrecordResp) ProtoMessage() {}
 
 func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[14]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -818,7 +874,7 @@ func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskGetrecordResp.ProtoReflect.Descriptor instead.
 func (*RtaskGetrecordResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord {
@@ -844,7 +900,7 @@ type RtaskTestReq struct {
 func (x *RtaskTestReq) Reset() {
 	*x = RtaskTestReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[15]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -857,7 +913,7 @@ func (x *RtaskTestReq) String() string {
 func (*RtaskTestReq) ProtoMessage() {}
 
 func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[15]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -870,7 +926,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead.
 func (*RtaskTestReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{15}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *RtaskTestReq) GetRtaskType() int32 {
@@ -920,7 +976,7 @@ type RtaskTestResp struct {
 func (x *RtaskTestResp) Reset() {
 	*x = RtaskTestResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[16]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -933,7 +989,7 @@ func (x *RtaskTestResp) String() string {
 func (*RtaskTestResp) ProtoMessage() {}
 
 func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[16]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -946,7 +1002,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead.
 func (*RtaskTestResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{16}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *RtaskTestResp) GetFlag() bool {
@@ -1000,59 +1056,64 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{
 	0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22,
 	0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
 	0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12,
-	0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75,
-	0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
+	0x03, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67,
-	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52,
+	0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47,
-	0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
+	0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72,
-	0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
-	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52,
-	0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
-	0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
-	0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74,
-	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
-	0x6e, 0x66, 0x6f, 0x22, 0x6c, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72,
 	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74,
 	0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75,
 	0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x53, 0x75, 0x62, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49,
+	0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49,
+	0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72,
-	0x64, 0x22, 0x51, 0x0a, 0x15, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74,
-	0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74,
+	0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75,
-	0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61,
+	0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62,
+	0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61,
-	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53,
+	0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c,
-	0x75, 0x62, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61,
+	0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
-	0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65,
-	0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
+	0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61,
-	0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x94, 0x01, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73,
+	0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74,
-	0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73,
+	0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04,
-	0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
-	0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
+	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6c, 0x0a,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18,
+	0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69,
-	0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12,
-	0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x05,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x12,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x3f,
+	0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x52,
-	0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66,
+	0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
-	0x6c, 0x61, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x13,
+	0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63,
+	0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x22, 0x94, 0x01, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52,
+	0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
+	0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
+	0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+	0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x3f, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73,
+	0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x1a, 0x0a,
+	0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1067,7 +1128,7 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte {
 	return file_rtask_rtask_msg_proto_rawDescData
 }
 
-var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
+var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
 var file_rtask_rtask_msg_proto_goTypes = []interface{}{
 	(*RtaskApplyReq)(nil),         // 0: RtaskApplyReq
 	(*RtaskApplyResp)(nil),        // 1: RtaskApplyResp
@@ -1076,22 +1137,23 @@ var file_rtask_rtask_msg_proto_goTypes = []interface{}{
 	(*RtaskChooseReq)(nil),        // 4: RtaskChooseReq
 	(*RtaskChooseResp)(nil),       // 5: RtaskChooseResp
 	(*RtaskFinishPush)(nil),       // 6: RtaskFinishPush
-	(*RtaskGetRewardReq)(nil),     // 7: RtaskGetRewardReq
+	(*RtaskFinishIdsPush)(nil),    // 7: RtaskFinishIdsPush
-	(*RtaskGetRewardResp)(nil),    // 8: RtaskGetRewardResp
+	(*RtaskGetRewardReq)(nil),     // 8: RtaskGetRewardReq
-	(*RtaskBattleStartReq)(nil),   // 9: RtaskBattleStartReq
+	(*RtaskGetRewardResp)(nil),    // 9: RtaskGetRewardResp
-	(*RtaskBattleStartResp)(nil),  // 10: RtaskBattleStartResp
+	(*RtaskBattleStartReq)(nil),   // 10: RtaskBattleStartReq
-	(*RtaskBattleFinishReq)(nil),  // 11: RtaskBattleFinishReq
+	(*RtaskBattleStartResp)(nil),  // 11: RtaskBattleStartResp
-	(*RtaskBattleFinishResp)(nil), // 12: RtaskBattleFinishResp
+	(*RtaskBattleFinishReq)(nil),  // 12: RtaskBattleFinishReq
-	(*RtaskGetrecordReq)(nil),     // 13: RtaskGetrecordReq
+	(*RtaskBattleFinishResp)(nil), // 13: RtaskBattleFinishResp
-	(*RtaskGetrecordResp)(nil),    // 14: RtaskGetrecordResp
+	(*RtaskGetrecordReq)(nil),     // 14: RtaskGetrecordReq
-	(*RtaskTestReq)(nil),          // 15: RtaskTestReq
+	(*RtaskGetrecordResp)(nil),    // 15: RtaskGetrecordResp
-	(*RtaskTestResp)(nil),         // 16: RtaskTestResp
+	(*RtaskTestReq)(nil),          // 16: RtaskTestReq
-	(*BattleInfo)(nil),            // 17: BattleInfo
+	(*RtaskTestResp)(nil),         // 17: RtaskTestResp
-	(*DBRtaskRecord)(nil),         // 18: DBRtaskRecord
+	(*BattleInfo)(nil),            // 18: BattleInfo
+	(*DBRtaskRecord)(nil),         // 19: DBRtaskRecord
 }
 var file_rtask_rtask_msg_proto_depIdxs = []int32{
-	17, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
+	18, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
-	18, // 1: RtaskGetrecordResp.record:type_name -> DBRtaskRecord
+	19, // 1: RtaskGetrecordResp.record:type_name -> DBRtaskRecord
 	2,  // [2:2] is the sub-list for method output_type
 	2,  // [2:2] is the sub-list for method input_type
 	2,  // [2:2] is the sub-list for extension type_name
@@ -1192,7 +1254,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskGetRewardReq); i {
+			switch v := v.(*RtaskFinishIdsPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1204,7 +1266,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskGetRewardResp); i {
+			switch v := v.(*RtaskGetRewardReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1216,7 +1278,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleStartReq); i {
+			switch v := v.(*RtaskGetRewardResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1228,7 +1290,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleStartResp); i {
+			switch v := v.(*RtaskBattleStartReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1240,7 +1302,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleFinishReq); i {
+			switch v := v.(*RtaskBattleStartResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1252,7 +1314,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleFinishResp); i {
+			switch v := v.(*RtaskBattleFinishReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1264,7 +1326,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskGetrecordReq); i {
+			switch v := v.(*RtaskBattleFinishResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1276,7 +1338,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskGetrecordResp); i {
+			switch v := v.(*RtaskGetrecordReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1288,7 +1350,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskTestReq); i {
+			switch v := v.(*RtaskGetrecordResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1300,6 +1362,18 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RtaskTestReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rtask_rtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RtaskTestResp); i {
 			case 0:
 				return &v.state
@@ -1318,7 +1392,7 @@ func file_rtask_rtask_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_rtask_rtask_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   17,
+			NumMessages:   18,
 			NumExtensions: 0,
 			NumServices:   0,
 		},