From cbaeb72171886b8a75c0bf9418fa271cf0aa209a Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 17:04:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=9D=E7=AE=B1?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/wtask/api_accept.go | 17 +++
modules/wtask/configure.go | 25 ++++
modules/wtask/modelWTask.go | 1 +
pb/wtask_msg.pb.go | 249 +++++++++++++++++-------------------
4 files changed, 158 insertions(+), 134 deletions(-)
diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go
index 0907c9400..2f60a92bd 100644
--- a/modules/wtask/api_accept.go
+++ b/modules/wtask/api_accept.go
@@ -20,6 +20,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
conf *cfg.GameWorldTaskData
progress []*pb.DBWTaskItem
update map[string]interface{} = make(map[string]interface{})
+ boxs []int32
ok bool
err error
)
@@ -77,6 +78,22 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
}
return
}
+
+ if conf.Trigger == 1 { //触发宝箱
+ if boxs, err = this.module.configure.getGameSearchitemAll(conf.Key); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: fmt.Sprintf("getGameSearchitemAll uid:%s taskid:%v", session.GetUserId(), conf.Key),
+ }
+ return
+ }
+ wtask.Boxs[conf.Key] = &pb.DBWTaskBox{
+ Boxs: boxs,
+ }
+ session.SendMsg(string(this.module.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs})
+ }
+
if progress, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil {
return
}
diff --git a/modules/wtask/configure.go b/modules/wtask/configure.go
index fcc627725..0d59a27a0 100644
--- a/modules/wtask/configure.go
+++ b/modules/wtask/configure.go
@@ -191,3 +191,28 @@ func (this *configureComp) getGameWorldAll(id int32) (conf *cfg.GameWorldAllData
}
return
}
+
+func (this *configureComp) getGameSearchitemAll(id int32) (results []int32, err error) {
+ var (
+ v interface{}
+ conf *cfg.GameSearchitemAllData
+
+ weight []int
+ ok bool
+ )
+ if v, err = this.GetConfigure(gamesearchitemall); err != nil {
+ return
+ } else {
+ if conf, ok = v.(*cfg.GameSearchitemAll).GetDataMap()[id]; !ok {
+ err = comm.NewNotFoundConfErr(modulename, gameWorldTask, id)
+ this.module.Errorf("err:%v", err)
+ return
+ }
+ results = make([]int32, 0)
+ weight = comm.RandShuffle(len(conf.Pointweight))
+ for i := 0; i < int(conf.Pointnum); i++ {
+ results = append(results, conf.Point[weight[i]])
+ }
+ }
+ return
+}
diff --git a/modules/wtask/modelWTask.go b/modules/wtask/modelWTask.go
index 978126adc..663b21860 100644
--- a/modules/wtask/modelWTask.go
+++ b/modules/wtask/modelWTask.go
@@ -58,6 +58,7 @@ func (this *ModelWTask) updateUserWTasks(uid string, data *pb.DBWTask) (err erro
"accepts": data.Accepts,
"completes": data.Completes,
"groups": data.Groups,
+ "boxs": data.Boxs,
}); err != nil {
this.module.Error("更新用户任务数据 错误!", log.Field{Key: "err", Value: err.Error()})
return
diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go
index 3363fdbd0..1926fe607 100644
--- a/pb/wtask_msg.pb.go
+++ b/pb/wtask_msg.pb.go
@@ -169,10 +169,9 @@ type WTaskAcceptResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"`
- Activations []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
- Accepts []*DBWTaskItem `protobuf:"bytes,3,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
- Boxs map[int32]*DBWTaskBox `protobuf:"bytes,4,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱
+ Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"`
+ Activations []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+ Accepts []*DBWTaskItem `protobuf:"bytes,3,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
}
func (x *WTaskAcceptResp) Reset() {
@@ -228,13 +227,6 @@ func (x *WTaskAcceptResp) GetAccepts() []*DBWTaskItem {
return nil
}
-func (x *WTaskAcceptResp) GetBoxs() map[int32]*DBWTaskBox {
- if x != nil {
- return x.Boxs
- }
- return nil
-}
-
//完成子任务条件
type WTaskCompleteCondiReq struct {
state protoimpl.MessageState
@@ -955,98 +947,90 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d,
0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61,
0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0xe3, 0x01,
- 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
- 0x74, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61,
- 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73,
- 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
- 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x2e, 0x0a,
- 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x57, 0x54,
- 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42, 0x6f,
- 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a,
- 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42,
- 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x22, 0x49, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70,
- 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
- 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61,
- 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x74,
- 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43,
- 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
- 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
- 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x72,
- 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
- 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67,
- 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
- 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x57, 0x54, 0x61,
- 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
- 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21,
- 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
- 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
- 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03,
- 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12,
- 0x34, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x1c, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
- 0x70, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67,
- 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
- 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
- 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
- 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22,
- 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52,
- 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
- 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
- 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
- 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61,
- 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76,
- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
- 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
- 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
- 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61,
- 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
- 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65,
- 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x6d, 0x0a,
+ 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74,
+ 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+ 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
+ 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18,
+ 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49,
+ 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x49, 0x0a, 0x15,
+ 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e,
+ 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a,
+ 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+ 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x74, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b,
+ 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+ 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
+ 0x69, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49,
+ 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a,
+ 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12,
+ 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69,
+ 0x64, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73,
+ 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
+ 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f,
+ 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63,
+ 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75,
+ 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b,
+ 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70,
+ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39,
+ 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+ 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61,
+ 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
+ 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73,
+ 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72,
+ 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73,
+ 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57,
+ 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43,
+ 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74,
+ 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b,
+ 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57,
+ 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49,
+ 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13,
+ 0x57, 0x54, 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, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 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, 0x1f, 0x0a,
+ 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61,
+ 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e,
+ 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65,
+ 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
+ 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 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, 0x28,
- 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
- 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
- 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73,
- 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70,
- 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, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
- 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73,
- 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
- 0x70, 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, 0x22, 0x8d, 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42,
- 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04,
- 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61,
- 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e,
- 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a,
- 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
- 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x22, 0x8d,
+ 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67,
+ 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68,
+ 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
+ 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1061,7 +1045,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
return file_wtask_wtask_msg_proto_rawDescData
}
-var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
+var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskInfoReq)(nil), // 0: WTaskInfoReq
(*WTaskInfoResp)(nil), // 1: WTaskInfoResp
@@ -1080,38 +1064,35 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskBattleFinishReq)(nil), // 14: WTaskBattleFinishReq
(*WTaskBattleFinishResp)(nil), // 15: WTaskBattleFinishResp
(*WTaskBoxChangePush)(nil), // 16: WTaskBoxChangePush
- nil, // 17: WTaskAcceptResp.BoxsEntry
- nil, // 18: WTaskFinishResp.GroupsEntry
- nil, // 19: WTaskBoxChangePush.BoxsEntry
- (*DBWTask)(nil), // 20: DBWTask
- (*DBWTaskItem)(nil), // 21: DBWTaskItem
- (*UserAssets)(nil), // 22: UserAssets
- (*BattleFormation)(nil), // 23: BattleFormation
- (*BattleInfo)(nil), // 24: BattleInfo
- (*BattleReport)(nil), // 25: BattleReport
- (*DBWTaskBox)(nil), // 26: DBWTaskBox
+ nil, // 17: WTaskFinishResp.GroupsEntry
+ nil, // 18: WTaskBoxChangePush.BoxsEntry
+ (*DBWTask)(nil), // 19: DBWTask
+ (*DBWTaskItem)(nil), // 20: DBWTaskItem
+ (*UserAssets)(nil), // 21: UserAssets
+ (*BattleFormation)(nil), // 22: BattleFormation
+ (*BattleInfo)(nil), // 23: BattleInfo
+ (*BattleReport)(nil), // 24: BattleReport
+ (*DBWTaskBox)(nil), // 25: DBWTaskBox
}
var file_wtask_wtask_msg_proto_depIdxs = []int32{
- 20, // 0: WTaskInfoResp.info:type_name -> DBWTask
- 21, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
- 21, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
- 17, // 3: WTaskAcceptResp.boxs:type_name -> WTaskAcceptResp.BoxsEntry
- 21, // 4: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
- 22, // 5: WTaskFinishResp.award:type_name -> UserAssets
- 18, // 6: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
- 22, // 7: WTaskChapterRewardResp.award:type_name -> UserAssets
- 21, // 8: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
- 23, // 9: WTaskBattleStartReq.battle:type_name -> BattleFormation
- 24, // 10: WTaskBattleStartResp.info:type_name -> BattleInfo
- 25, // 11: WTaskBattleFinishReq.report:type_name -> BattleReport
- 19, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
- 26, // 13: WTaskAcceptResp.BoxsEntry.value:type_name -> DBWTaskBox
- 26, // 14: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
- 15, // [15:15] is the sub-list for method output_type
- 15, // [15:15] is the sub-list for method input_type
- 15, // [15:15] is the sub-list for extension type_name
- 15, // [15:15] is the sub-list for extension extendee
- 0, // [0:15] is the sub-list for field type_name
+ 19, // 0: WTaskInfoResp.info:type_name -> DBWTask
+ 20, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
+ 20, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
+ 20, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
+ 21, // 4: WTaskFinishResp.award:type_name -> UserAssets
+ 17, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
+ 21, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets
+ 20, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
+ 22, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation
+ 23, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo
+ 24, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport
+ 18, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
+ 25, // 12: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
+ 13, // [13:13] is the sub-list for method output_type
+ 13, // [13:13] is the sub-list for method input_type
+ 13, // [13:13] is the sub-list for extension type_name
+ 13, // [13:13] is the sub-list for extension extendee
+ 0, // [0:13] is the sub-list for field type_name
}
func init() { file_wtask_wtask_msg_proto_init() }
@@ -1334,7 +1315,7 @@ func file_wtask_wtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 20,
+ NumMessages: 19,
NumExtensions: 0,
NumServices: 0,
},
From 59e5ad137162bf2b5bdf474fd72fa4c7b111195f Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 17:36:28 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=96=E7=95=8C?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=9D=E7=AE=B1=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_searchitembox.json | 128 +++++++++++
modules/wtask/api_accept.go | 2 +-
modules/wtask/api_boxreceive.go | 96 ++++++++
modules/wtask/configure.go | 25 +-
modules/wtask/module.go | 26 ++-
pb/wtask_db.pb.go | 37 +--
pb/wtask_msg.pb.go | 217 +++++++++++++++---
sys/configure/structs/Game.SearchitemBox.go | 42 ++++
.../structs/Game.SearchitemBoxData.go | 54 +++++
sys/configure/structs/Tables.go | 7 +
10 files changed, 584 insertions(+), 50 deletions(-)
create mode 100644 bin/json/game_searchitembox.json
create mode 100644 modules/wtask/api_boxreceive.go
create mode 100644 sys/configure/structs/Game.SearchitemBox.go
create mode 100644 sys/configure/structs/Game.SearchitemBoxData.go
diff --git a/bin/json/game_searchitembox.json b/bin/json/game_searchitembox.json
new file mode 100644
index 000000000..35ef1f072
--- /dev/null
+++ b/bin/json/game_searchitembox.json
@@ -0,0 +1,128 @@
+[
+ {
+ "id": 1,
+ "name": [
+ "GameMain",
+ "位置1"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 2,
+ "name": [
+ "GameMain",
+ "位置2"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 3,
+ "name": [
+ "GameMain",
+ "位置3"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 4,
+ "name": [
+ "GameMain",
+ "位置4"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 5,
+ "name": [
+ "GameMain",
+ "位置5"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 6,
+ "name": [
+ "GameMain",
+ "位置6"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 7,
+ "name": [
+ "GameMain",
+ "位置7"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 8,
+ "name": [
+ "GameMain",
+ "位置8"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 9,
+ "name": [
+ "GameMain",
+ "位置9"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 10,
+ "name": [
+ "GameMain",
+ "位置10"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 11,
+ "name": [
+ "GameMain",
+ "位置11"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 12,
+ "name": [
+ "GameMain",
+ "位置12"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 13,
+ "name": [
+ "GameMain",
+ "位置13"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ },
+ {
+ "id": 14,
+ "name": [
+ "GameMain",
+ "位置14"
+ ],
+ "drown": 17111430,
+ "pointweight": 1000
+ }
+]
\ No newline at end of file
diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go
index 2f60a92bd..707a4dd6e 100644
--- a/modules/wtask/api_accept.go
+++ b/modules/wtask/api_accept.go
@@ -20,7 +20,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
conf *cfg.GameWorldTaskData
progress []*pb.DBWTaskItem
update map[string]interface{} = make(map[string]interface{})
- boxs []int32
+ boxs map[int32]int32
ok bool
err error
)
diff --git a/modules/wtask/api_boxreceive.go b/modules/wtask/api_boxreceive.go
new file mode 100644
index 000000000..11522de81
--- /dev/null
+++ b/modules/wtask/api_boxreceive.go
@@ -0,0 +1,96 @@
+package wtask
+
+import (
+ "fmt"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) BoxReceiveCheck(session comm.IUserSession, req *pb.WTaskBoxReceiveReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+// /获取系统公告
+func (this *apiComp) BoxReceive(session comm.IUserSession, req *pb.WTaskBoxReceiveReq) (errdata *pb.ErrorData) {
+ var (
+ wtask *pb.DBWTask
+ box *pb.DBWTaskBox
+ conf *cfg.GameSearchitemBoxData
+ prop []*cfg.Gameatn
+ award []*pb.UserAssets
+ ok bool
+ err error
+ )
+ if errdata = this.BoxReceiveCheck(session, req); errdata != nil {
+ return
+ }
+
+ if wtask, err = this.module.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if box, ok = wtask.Boxs[req.Tid]; !ok {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: fmt.Sprintf("no found taskbox:%d", req.Tid),
+ }
+ return
+ }
+ ok = false
+ for _, v := range box.Boxs {
+ if v == req.Boxid {
+ ok = true
+ }
+ }
+
+ if !ok {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: fmt.Sprintf("no found box:%d", req.Boxid),
+ }
+ return
+ }
+
+ if conf, err = this.module.configure.getGameSearchitemBox(req.Boxid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ user := this.module.ModuleUser.GetUser(session.GetUserId())
+ if prop = this.module.ModuleTools.GetGroupDataByLottery(conf.Drown, user.Vip, user.Lv); len(prop) == 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: fmt.Sprintf("掉落组未找到:%d", conf.Drown),
+ }
+ return
+ }
+ award = make([]*pb.UserAssets, 0)
+ for _, v := range prop {
+ award = append(award, &pb.UserAssets{
+ A: v.A,
+ T: v.T,
+ N: v.N,
+ })
+ }
+
+ if errdata = this.module.DispenseRes(session, prop, true); errdata != nil {
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "boxreceive", &pb.WTaskBoxReceiveResp{Tid: req.Tid, Boxid: req.Boxid, Award: award})
+ return
+}
diff --git a/modules/wtask/configure.go b/modules/wtask/configure.go
index 0d59a27a0..b4a95721a 100644
--- a/modules/wtask/configure.go
+++ b/modules/wtask/configure.go
@@ -17,6 +17,7 @@ const (
gameburiedCond = "game_buriedcondi.json"
gamerdtasknpc = "game_rdtasknpc.json"
gamesearchitemall = "game_searchitemall.json"
+ gamesearchitembox = "game_searchitembox.json"
)
type configureComp struct {
@@ -192,7 +193,7 @@ func (this *configureComp) getGameWorldAll(id int32) (conf *cfg.GameWorldAllData
return
}
-func (this *configureComp) getGameSearchitemAll(id int32) (results []int32, err error) {
+func (this *configureComp) getGameSearchitemAll(id int32) (results map[int32]int32, err error) {
var (
v interface{}
conf *cfg.GameSearchitemAllData
@@ -208,11 +209,29 @@ func (this *configureComp) getGameSearchitemAll(id int32) (results []int32, err
this.module.Errorf("err:%v", err)
return
}
- results = make([]int32, 0)
+ results = make(map[int32]int32)
weight = comm.RandShuffle(len(conf.Pointweight))
for i := 0; i < int(conf.Pointnum); i++ {
- results = append(results, conf.Point[weight[i]])
+ results[conf.Point[weight[i]]] = 0
}
}
return
}
+
+func (this *configureComp) getGameSearchitemBox(id int32) (conf *cfg.GameSearchitemBoxData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(gamesearchitembox); err != nil {
+ return
+ } else {
+ if conf, ok = v.(*cfg.GameSearchitemBox).GetDataMap()[id]; !ok {
+ err = comm.NewNotFoundConfErr(modulename, gameWorldTask, id)
+ this.module.Errorf("err:%v", err)
+ return
+ }
+
+ }
+ return
+}
diff --git a/modules/wtask/module.go b/modules/wtask/module.go
index f02b1c78f..45b9217ab 100644
--- a/modules/wtask/module.go
+++ b/modules/wtask/module.go
@@ -262,9 +262,17 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3
activations []int32 = make([]int32, 0)
accepts []int32 = make([]int32, 0)
completes []int32 = make([]int32, 0)
+ box map[int32]int32
err error
ok bool
+ boxchange bool
)
+
+ defer func() {
+ session.Push()
+ this.PutUserSession(session)
+ }()
+
results = make(map[int32][]int32)
for _, v := range this.configure.getdesTask(1) {
alltasks[v.Key] = v
@@ -313,15 +321,31 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3
results[v] = make([]int32, 0)
}
results[v] = append(results[v], task.Key)
+ if task.Trigger == 1 { //触发宝箱
+ if box, err = this.configure.getGameSearchitemAll(task.Key); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: fmt.Sprintf("getGameSearchitemAll uid:%s taskid:%v", session.GetUserId(), task.Key),
+ }
+ return
+ }
+ wtask.Boxs[task.Key] = &pb.DBWTaskBox{
+ Boxs: box,
+ }
+ boxchange = true
+ }
}
}
-
}
wtask.Activations = activations
wtask.Accepts = accepts
wtask.Completes = completes
//有新任务接取
this.pushtaskprogress(session, wtask, true)
+ if boxchange {
+ session.SendMsg(string(this.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs})
+ }
if err = this.modelwtask.updateUserWTasks(session.GetUserId(), wtask); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
diff --git a/pb/wtask_db.pb.go b/pb/wtask_db.pb.go
index 946b3c93e..986a26802 100644
--- a/pb/wtask_db.pb.go
+++ b/pb/wtask_db.pb.go
@@ -129,7 +129,7 @@ type DBWTaskBox struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Boxs []int32 `protobuf:"varint,1,rep,packed,name=boxs,proto3" json:"boxs"`
+ Boxs map[int32]int32 `protobuf:"bytes,1,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key:box id value: 0 未开 1 已开
}
func (x *DBWTaskBox) Reset() {
@@ -164,7 +164,7 @@ func (*DBWTaskBox) Descriptor() ([]byte, []int) {
return file_wtask_wtask_db_proto_rawDescGZIP(), []int{1}
}
-func (x *DBWTaskBox) GetBoxs() []int32 {
+func (x *DBWTaskBox) GetBoxs() map[int32]int32 {
if x != nil {
return x.Boxs
}
@@ -257,9 +257,14 @@ var file_wtask_wtask_db_proto_rawDesc = []byte{
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73,
0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
- 0x20, 0x0a, 0x0a, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x12, 0x12, 0x0a,
- 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6f, 0x78,
- 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d,
+ 0x70, 0x0a, 0x0a, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x12, 0x29, 0x0a,
+ 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42,
+ 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+ 0x01, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d,
0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74,
0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
@@ -279,25 +284,27 @@ func file_wtask_wtask_db_proto_rawDescGZIP() []byte {
return file_wtask_wtask_db_proto_rawDescData
}
-var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_wtask_wtask_db_proto_goTypes = []interface{}{
(*DBWTask)(nil), // 0: DBWTask
(*DBWTaskBox)(nil), // 1: DBWTaskBox
(*DBWTaskItem)(nil), // 2: DBWTaskItem
nil, // 3: DBWTask.GroupsEntry
nil, // 4: DBWTask.BoxsEntry
- (*ConIProgress)(nil), // 5: ConIProgress
+ nil, // 5: DBWTaskBox.BoxsEntry
+ (*ConIProgress)(nil), // 6: ConIProgress
}
var file_wtask_wtask_db_proto_depIdxs = []int32{
3, // 0: DBWTask.groups:type_name -> DBWTask.GroupsEntry
4, // 1: DBWTask.boxs:type_name -> DBWTask.BoxsEntry
- 5, // 2: DBWTaskItem.conlds:type_name -> ConIProgress
- 1, // 3: DBWTask.BoxsEntry.value:type_name -> DBWTaskBox
- 4, // [4:4] is the sub-list for method output_type
- 4, // [4:4] is the sub-list for method input_type
- 4, // [4:4] is the sub-list for extension type_name
- 4, // [4:4] is the sub-list for extension extendee
- 0, // [0:4] is the sub-list for field type_name
+ 5, // 2: DBWTaskBox.boxs:type_name -> DBWTaskBox.BoxsEntry
+ 6, // 3: DBWTaskItem.conlds:type_name -> ConIProgress
+ 1, // 4: DBWTask.BoxsEntry.value:type_name -> DBWTaskBox
+ 5, // [5:5] is the sub-list for method output_type
+ 5, // [5:5] is the sub-list for method input_type
+ 5, // [5:5] is the sub-list for extension type_name
+ 5, // [5:5] is the sub-list for extension extendee
+ 0, // [0:5] is the sub-list for field type_name
}
func init() { file_wtask_wtask_db_proto_init() }
@@ -350,7 +357,7 @@ func file_wtask_wtask_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 5,
+ NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go
index 1926fe607..8a9e661ba 100644
--- a/pb/wtask_msg.pb.go
+++ b/pb/wtask_msg.pb.go
@@ -931,6 +931,126 @@ func (x *WTaskBoxChangePush) GetBoxs() map[int32]*DBWTaskBox {
return nil
}
+//世界任务宝箱领取
+type WTaskBoxReceiveReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"`
+ Boxid int32 `protobuf:"varint,2,opt,name=boxid,proto3" json:"boxid"`
+}
+
+func (x *WTaskBoxReceiveReq) Reset() {
+ *x = WTaskBoxReceiveReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_wtask_wtask_msg_proto_msgTypes[17]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *WTaskBoxReceiveReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WTaskBoxReceiveReq) ProtoMessage() {}
+
+func (x *WTaskBoxReceiveReq) ProtoReflect() protoreflect.Message {
+ mi := &file_wtask_wtask_msg_proto_msgTypes[17]
+ 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 WTaskBoxReceiveReq.ProtoReflect.Descriptor instead.
+func (*WTaskBoxReceiveReq) Descriptor() ([]byte, []int) {
+ return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *WTaskBoxReceiveReq) GetTid() int32 {
+ if x != nil {
+ return x.Tid
+ }
+ return 0
+}
+
+func (x *WTaskBoxReceiveReq) GetBoxid() int32 {
+ if x != nil {
+ return x.Boxid
+ }
+ return 0
+}
+
+//世界任务宝箱领取回应
+type WTaskBoxReceiveResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"`
+ Boxid int32 `protobuf:"varint,2,opt,name=boxid,proto3" json:"boxid"`
+ Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *WTaskBoxReceiveResp) Reset() {
+ *x = WTaskBoxReceiveResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_wtask_wtask_msg_proto_msgTypes[18]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *WTaskBoxReceiveResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WTaskBoxReceiveResp) ProtoMessage() {}
+
+func (x *WTaskBoxReceiveResp) ProtoReflect() protoreflect.Message {
+ mi := &file_wtask_wtask_msg_proto_msgTypes[18]
+ 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 WTaskBoxReceiveResp.ProtoReflect.Descriptor instead.
+func (*WTaskBoxReceiveResp) Descriptor() ([]byte, []int) {
+ return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *WTaskBoxReceiveResp) GetTid() int32 {
+ if x != nil {
+ return x.Tid
+ }
+ return 0
+}
+
+func (x *WTaskBoxReceiveResp) GetBoxid() int32 {
+ if x != nil {
+ return x.Boxid
+ }
+ return 0
+}
+
+func (x *WTaskBoxReceiveResp) GetAward() []*UserAssets {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
var File_wtask_wtask_msg_proto protoreflect.FileDescriptor
var file_wtask_wtask_msg_proto_rawDesc = []byte{
@@ -1029,7 +1149,17 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
- 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06,
+ 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3c,
+ 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
+ 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x13,
+ 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61,
+ 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
+ 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
@@ -1045,7 +1175,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
return file_wtask_wtask_msg_proto_rawDescData
}
-var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskInfoReq)(nil), // 0: WTaskInfoReq
(*WTaskInfoResp)(nil), // 1: WTaskInfoResp
@@ -1064,35 +1194,38 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{
(*WTaskBattleFinishReq)(nil), // 14: WTaskBattleFinishReq
(*WTaskBattleFinishResp)(nil), // 15: WTaskBattleFinishResp
(*WTaskBoxChangePush)(nil), // 16: WTaskBoxChangePush
- nil, // 17: WTaskFinishResp.GroupsEntry
- nil, // 18: WTaskBoxChangePush.BoxsEntry
- (*DBWTask)(nil), // 19: DBWTask
- (*DBWTaskItem)(nil), // 20: DBWTaskItem
- (*UserAssets)(nil), // 21: UserAssets
- (*BattleFormation)(nil), // 22: BattleFormation
- (*BattleInfo)(nil), // 23: BattleInfo
- (*BattleReport)(nil), // 24: BattleReport
- (*DBWTaskBox)(nil), // 25: DBWTaskBox
+ (*WTaskBoxReceiveReq)(nil), // 17: WTaskBoxReceiveReq
+ (*WTaskBoxReceiveResp)(nil), // 18: WTaskBoxReceiveResp
+ nil, // 19: WTaskFinishResp.GroupsEntry
+ nil, // 20: WTaskBoxChangePush.BoxsEntry
+ (*DBWTask)(nil), // 21: DBWTask
+ (*DBWTaskItem)(nil), // 22: DBWTaskItem
+ (*UserAssets)(nil), // 23: UserAssets
+ (*BattleFormation)(nil), // 24: BattleFormation
+ (*BattleInfo)(nil), // 25: BattleInfo
+ (*BattleReport)(nil), // 26: BattleReport
+ (*DBWTaskBox)(nil), // 27: DBWTaskBox
}
var file_wtask_wtask_msg_proto_depIdxs = []int32{
- 19, // 0: WTaskInfoResp.info:type_name -> DBWTask
- 20, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
- 20, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
- 20, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
- 21, // 4: WTaskFinishResp.award:type_name -> UserAssets
- 17, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
- 21, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets
- 20, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
- 22, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation
- 23, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo
- 24, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport
- 18, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
- 25, // 12: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
- 13, // [13:13] is the sub-list for method output_type
- 13, // [13:13] is the sub-list for method input_type
- 13, // [13:13] is the sub-list for extension type_name
- 13, // [13:13] is the sub-list for extension extendee
- 0, // [0:13] is the sub-list for field type_name
+ 21, // 0: WTaskInfoResp.info:type_name -> DBWTask
+ 22, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
+ 22, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
+ 22, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
+ 23, // 4: WTaskFinishResp.award:type_name -> UserAssets
+ 19, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
+ 23, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets
+ 22, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
+ 24, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation
+ 25, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo
+ 26, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport
+ 20, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
+ 23, // 12: WTaskBoxReceiveResp.award:type_name -> UserAssets
+ 27, // 13: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
+ 14, // [14:14] is the sub-list for method output_type
+ 14, // [14:14] is the sub-list for method input_type
+ 14, // [14:14] is the sub-list for extension type_name
+ 14, // [14:14] is the sub-list for extension extendee
+ 0, // [0:14] is the sub-list for field type_name
}
func init() { file_wtask_wtask_msg_proto_init() }
@@ -1308,6 +1441,30 @@ func file_wtask_wtask_msg_proto_init() {
return nil
}
}
+ file_wtask_wtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*WTaskBoxReceiveReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_wtask_wtask_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*WTaskBoxReceiveResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -1315,7 +1472,7 @@ func file_wtask_wtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 19,
+ NumMessages: 21,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.SearchitemBox.go b/sys/configure/structs/Game.SearchitemBox.go
new file mode 100644
index 000000000..a5475fc96
--- /dev/null
+++ b/sys/configure/structs/Game.SearchitemBox.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameSearchitemBox struct {
+ _dataMap map[int32]*GameSearchitemBoxData
+ _dataList []*GameSearchitemBoxData
+}
+
+func NewGameSearchitemBox(_buf []map[string]interface{}) (*GameSearchitemBox, error) {
+ _dataList := make([]*GameSearchitemBoxData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSearchitemBoxData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSearchitemBoxData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSearchitemBox{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSearchitemBox) GetDataMap() map[int32]*GameSearchitemBoxData {
+ return table._dataMap
+}
+
+func (table *GameSearchitemBox) GetDataList() []*GameSearchitemBoxData {
+ return table._dataList
+}
+
+func (table *GameSearchitemBox) Get(key int32) *GameSearchitemBoxData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SearchitemBoxData.go b/sys/configure/structs/Game.SearchitemBoxData.go
new file mode 100644
index 000000000..1333d9efa
--- /dev/null
+++ b/sys/configure/structs/Game.SearchitemBoxData.go
@@ -0,0 +1,54 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameSearchitemBoxData struct {
+ Id int32
+ Name []string
+ Drown int32
+ Pointweight int32
+}
+
+const TypeId_GameSearchitemBoxData = 859150302
+
+func (*GameSearchitemBoxData) GetTypeId() int32 {
+ return 859150302
+}
+
+func (_v *GameSearchitemBoxData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["name"].([]interface{}); !_ok_ { err = errors.New("name error"); return }
+
+ _v.Name = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Name = append(_v.Name, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drown"].(float64); !_ok_ { err = errors.New("drown error"); return }; _v.Drown = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pointweight"].(float64); !_ok_ { err = errors.New("pointweight error"); return }; _v.Pointweight = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSearchitemBoxData(_buf map[string]interface{}) (*GameSearchitemBoxData, error) {
+ v := &GameSearchitemBoxData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index ae3bb37d8..b6f5b015c 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -195,6 +195,7 @@ type Tables struct {
AskAll *GameAskAll
AskLibrary *GameAskLibrary
SearchitemAll *GameSearchitemAll
+ SearchitemBox *GameSearchitemBox
GuildBoss *GameGuildBoss
GuildBossRoulette *GameGuildBossRoulette
GuildBossRank *GameGuildBossRank
@@ -1323,6 +1324,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.SearchitemAll, err = NewGameSearchitemAll(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_searchitembox") ; err != nil {
+ return nil, err
+ }
+ if tables.SearchitemBox, err = NewGameSearchitemBox(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_guildboss") ; err != nil {
return nil, err
}
From 50a72efde938e1901805a668a787ad2ce0ba0957 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 17:40:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=9D=E7=AE=B1?=
=?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/wtask/modelWTask.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/wtask/modelWTask.go b/modules/wtask/modelWTask.go
index 663b21860..37c2444bd 100644
--- a/modules/wtask/modelWTask.go
+++ b/modules/wtask/modelWTask.go
@@ -45,6 +45,7 @@ func (this *ModelWTask) getUserWTasks(uid string) (results *pb.DBWTask, err erro
Accepts: make([]int32, 0),
Completes: make([]int32, 0),
Groups: make(map[int32]int32),
+ Boxs: make(map[int32]*pb.DBWTaskBox),
}
err = this.Add(uid, results)
}
From b4033510387e75776e5c3c26102b848f56353065 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 17:49:46 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_buriedcondi.json | 4 +-
bin/json/game_eventlottery.json | 4 +-
bin/json/game_rdtasknpc.json | 3 +-
bin/json/game_roomlottery.json | 60 ++++++-------
bin/json/game_searchitemall.json | 5 --
bin/json/game_stoneevent.json | 10 +--
bin/json/game_stoneroom.json | 32 +++----
bin/json/game_stonestage.json | 148 +++++++++++++++++++++++++++++--
8 files changed, 199 insertions(+), 67 deletions(-)
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 4981e1440..3f0f16fa5 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -25086,9 +25086,7 @@
},
"NPC": 60071,
"value": 1,
- "filter": [
- 14020009
- ],
+ "filter": [],
"filter2": []
},
{
diff --git a/bin/json/game_eventlottery.json b/bin/json/game_eventlottery.json
index eba95b0d3..6abb1126c 100644
--- a/bin/json/game_eventlottery.json
+++ b/bin/json/game_eventlottery.json
@@ -1,7 +1,7 @@
[
{
"Id": 1,
- "GroupId": 16010101,
+ "GroupId": 16010100,
"GroupType": 2,
"SubGroupWt": 1000,
"SubGroupId": 1001,
@@ -12,7 +12,7 @@
},
{
"Id": 2,
- "GroupId": 16010101,
+ "GroupId": 16010100,
"GroupType": 0,
"SubGroupWt": 1000,
"SubGroupId": 1002,
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index cad1c9657..185ff0b3e 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -343,7 +343,8 @@
"901"
],
"event": [
- 0
+ 6,
+ 1001
],
"goto": 0
},
diff --git a/bin/json/game_roomlottery.json b/bin/json/game_roomlottery.json
index af451b128..f94ad89df 100644
--- a/bin/json/game_roomlottery.json
+++ b/bin/json/game_roomlottery.json
@@ -1,166 +1,166 @@
[
{
"Id": 1,
- "GroupId": 10110100,
+ "GroupId": 14110100,
"GroupType": 2,
"SubGroupWt": 1000,
"SubGroupId": 1001,
"SubGroupType": 1,
- "RoomID": 10110101,
+ "RoomID": 14110101,
"SubGroupNum": 1,
"RoomWt": 50
},
{
"Id": 2,
- "GroupId": 10110100,
+ "GroupId": 14110100,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110102,
+ "RoomID": 14110102,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 3,
- "GroupId": 10110100,
+ "GroupId": 14110100,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110103,
+ "RoomID": 14110103,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 4,
- "GroupId": 10110100,
+ "GroupId": 14110100,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110104,
+ "RoomID": 14110104,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 5,
- "GroupId": 10110200,
+ "GroupId": 14110200,
"GroupType": 2,
"SubGroupWt": 1000,
"SubGroupId": 1001,
"SubGroupType": 1,
- "RoomID": 10110101,
+ "RoomID": 14110101,
"SubGroupNum": 1,
"RoomWt": 50
},
{
"Id": 6,
- "GroupId": 10110200,
+ "GroupId": 14110200,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110102,
+ "RoomID": 14110102,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 7,
- "GroupId": 10110200,
+ "GroupId": 14110200,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110103,
+ "RoomID": 14110103,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 8,
- "GroupId": 10110200,
+ "GroupId": 14110200,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110104,
+ "RoomID": 14110104,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 9,
- "GroupId": 10110200,
+ "GroupId": 14110300,
"GroupType": 0,
"SubGroupWt": 500,
"SubGroupId": 1002,
"SubGroupType": 1,
- "RoomID": 10110101,
+ "RoomID": 14110101,
"SubGroupNum": 1,
"RoomWt": 50
},
{
"Id": 10,
- "GroupId": 10110200,
+ "GroupId": 14110300,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110102,
+ "RoomID": 14110102,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 11,
- "GroupId": 10110200,
+ "GroupId": 14110300,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110103,
+ "RoomID": 14110103,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 12,
- "GroupId": 10110200,
+ "GroupId": 14110300,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 10110104,
+ "RoomID": 14110104,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 13,
- "GroupId": 14110500,
+ "GroupId": 28110500,
"GroupType": 2,
"SubGroupWt": 1000,
"SubGroupId": 1001,
"SubGroupType": 1,
- "RoomID": 14110501,
+ "RoomID": 28110501,
"SubGroupNum": 1,
"RoomWt": 50
},
{
"Id": 14,
- "GroupId": 14110500,
+ "GroupId": 28110500,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 14110502,
+ "RoomID": 28110502,
"SubGroupNum": 0,
"RoomWt": 50
},
{
"Id": 15,
- "GroupId": 14110500,
+ "GroupId": 28110500,
"GroupType": 0,
"SubGroupWt": 0,
"SubGroupId": 0,
"SubGroupType": 0,
- "RoomID": 14110503,
+ "RoomID": 28110503,
"SubGroupNum": 0,
"RoomWt": 50
}
diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json
index eec664f6b..ebb65c514 100644
--- a/bin/json/game_searchitemall.json
+++ b/bin/json/game_searchitemall.json
@@ -13,7 +13,6 @@
2000,
2000,
2000,
- 2000,
2000
]
},
@@ -31,7 +30,6 @@
2000,
2000,
2000,
- 2000,
2000
]
},
@@ -49,7 +47,6 @@
2000,
2000,
2000,
- 2000,
2000
]
},
@@ -67,7 +64,6 @@
2000,
2000,
2000,
- 2000,
2000
]
},
@@ -85,7 +81,6 @@
2000,
2000,
2000,
- 2000,
2000
]
}
diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json
index 1d0746f12..8e16779b4 100644
--- a/bin/json/game_stoneevent.json
+++ b/bin/json/game_stoneevent.json
@@ -22,7 +22,7 @@
"text": "战斗"
},
"EventType": 14,
- "EventResource": "51004",
+ "EventResource": "event_battle_51004",
"Value1": 110101,
"Value2": 0,
"Value3": 0,
@@ -38,7 +38,7 @@
"text": "战斗"
},
"EventType": 14,
- "EventResource": "51002",
+ "EventResource": "event_battle_51002",
"Value1": 110102,
"Value2": 0,
"Value3": 0,
@@ -54,7 +54,7 @@
"text": "战斗"
},
"EventType": 14,
- "EventResource": "51003",
+ "EventResource": "event_battle_51003",
"Value1": 110103,
"Value2": 0,
"Value3": 0,
@@ -70,7 +70,7 @@
"text": "战斗"
},
"EventType": 14,
- "EventResource": "51005",
+ "EventResource": "event_battle_51005",
"Value1": 110104,
"Value2": 0,
"Value3": 0,
@@ -86,7 +86,7 @@
"text": "战斗"
},
"EventType": 14,
- "EventResource": "51001",
+ "EventResource": "event_battle_51002",
"Value1": 110105,
"Value2": 0,
"Value3": 0,
diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json
index 6ee8fcab5..5c09515be 100644
--- a/bin/json/game_stoneroom.json
+++ b/bin/json/game_stoneroom.json
@@ -1,13 +1,13 @@
[
{
- "RoomId": 10110101,
+ "RoomId": 14110101,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_1",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -18,14 +18,14 @@
]
},
{
- "RoomId": 10110102,
+ "RoomId": 14110102,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_2",
"text": "战斗"
},
- "SceneName": "scenesfight_secret_realm_02",
+ "SceneName": "scenesfight_secret_realm_01",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -36,14 +36,14 @@
]
},
{
- "RoomId": 10110103,
+ "RoomId": 14110103,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_3",
"text": "战斗"
},
- "SceneName": "scenesfight_secret_realm_03",
+ "SceneName": "scenesfight_secret_realm_01",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -54,14 +54,14 @@
]
},
{
- "RoomId": 10110104,
+ "RoomId": 14110104,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_4",
"text": "战斗"
},
"SceneName": "scenesfight_secret_realm_01",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 14110100,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -72,14 +72,14 @@
]
},
{
- "RoomId": 14110501,
+ "RoomId": 28110501,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_5",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_04",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 0,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -90,14 +90,14 @@
]
},
{
- "RoomId": 14110502,
+ "RoomId": 28110502,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_6",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_04",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 0,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
@@ -108,14 +108,14 @@
]
},
{
- "RoomId": 14110503,
+ "RoomId": 28110503,
"RoomName": {
"key": "stonehenge_roomconfig_RoomName_7",
"text": "首领"
},
"SceneName": "scenesfight_secret_realm_04",
"PortalName": "portal_1",
- "EventrewardGroup": 16010101,
+ "EventrewardGroup": 16010100,
"EventBattleGroup": 0,
"EventStoryNpcGroup": 0,
"EventTreasureGroup": 0,
diff --git a/bin/json/game_stonestage.json b/bin/json/game_stonestage.json
index 52d3164fe..98e4c08d6 100644
--- a/bin/json/game_stonestage.json
+++ b/bin/json/game_stonestage.json
@@ -8,8 +8,8 @@
"text": "石阵1"
},
"RoomId": 1,
- "RoomGroup": 10110100,
- "PortalGroup": 10110200,
+ "RoomGroup": 14110100,
+ "PortalGroup": 14110200,
"rewardpreview": [
{
"a": "attr",
@@ -51,11 +51,11 @@
"PreviouStage": 0,
"StageName": {
"key": "stonehenge_stageconfig_StageName_4",
- "text": "石阵2"
+ "text": "石阵1"
},
"RoomId": 2,
"RoomGroup": 0,
- "PortalGroup": 14110500,
+ "PortalGroup": 28110500,
"rewardpreview": [
{
"a": "attr",
@@ -97,7 +97,145 @@
"PreviouStage": 0,
"StageName": {
"key": "stonehenge_stageconfig_StageName_5",
- "text": "石阵3"
+ "text": "石阵1"
+ },
+ "RoomId": 3,
+ "RoomGroup": 0,
+ "PortalGroup": 99999,
+ "rewardpreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3
+ }
+ ],
+ "TreasurePreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3
+ }
+ ],
+ "FirstReward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3
+ }
+ ],
+ "WeeklyPointPreview": 0,
+ "WeeklyPoint": {
+ "a": "attr",
+ "t": "gold",
+ "n": 3
+ },
+ "TalentItem": {
+ "a": "attr",
+ "t": "gold",
+ "n": 3
+ },
+ "ReferenceLevel": 0,
+ "StageValue": 0
+ },
+ {
+ "Id": 4,
+ "StageId": 1002,
+ "PreviouStage": 0,
+ "StageName": {
+ "key": "stonehenge_stageconfig_StageName_1",
+ "text": "石阵2"
+ },
+ "RoomId": 1,
+ "RoomGroup": 14110100,
+ "PortalGroup": 14110200,
+ "rewardpreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ],
+ "TreasurePreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ],
+ "FirstReward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ],
+ "WeeklyPointPreview": 0,
+ "WeeklyPoint": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "TalentItem": {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ },
+ "ReferenceLevel": 0,
+ "StageValue": 0
+ },
+ {
+ "Id": 5,
+ "StageId": 1002,
+ "PreviouStage": 0,
+ "StageName": {
+ "key": "stonehenge_stageconfig_StageName_4",
+ "text": "石阵2"
+ },
+ "RoomId": 2,
+ "RoomGroup": 0,
+ "PortalGroup": 28110500,
+ "rewardpreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ }
+ ],
+ "TreasurePreview": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ }
+ ],
+ "FirstReward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ }
+ ],
+ "WeeklyPointPreview": 0,
+ "WeeklyPoint": {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ },
+ "TalentItem": {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ },
+ "ReferenceLevel": 0,
+ "StageValue": 0
+ },
+ {
+ "Id": 6,
+ "StageId": 1002,
+ "PreviouStage": 0,
+ "StageName": {
+ "key": "stonehenge_stageconfig_StageName_5",
+ "text": "石阵2"
},
"RoomId": 3,
"RoomGroup": 0,
From f3e53499d5db63d3f896dfe947c918ff09e777e7 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 18:48:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/const.go | 1 +
comm/imodule.go | 5 +
modules/guildgve/api_rank.go | 1 +
modules/guildgve/modelbattlerank.go | 2 +-
modules/guildgve/modelrank.go | 2 +-
modules/mainline/comp_configure.go | 4 +-
modules/mainline/module.go | 2 +-
pb/guildgve_db.pb.go | 70 +++++----
pb/guildgve_msg.pb.go | 224 ++++++++++++++++------------
services/worker/main.go | 2 +
10 files changed, 186 insertions(+), 127 deletions(-)
diff --git a/comm/const.go b/comm/const.go
index f62c123a4..90a5b9f0a 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -94,6 +94,7 @@ const (
ModuleGuildGve core.M_Modules = "guildgve" //工会boos战
ModuleDailytask core.M_Modules = "dailytask" //每日任务
ModuleQuestionnaire core.M_Modules = "questionnaire" //问卷调查
+ ModuleMainline core.M_Modules = "mainline" //主线模块
)
// 数据表名定义处
diff --git a/comm/imodule.go b/comm/imodule.go
index 98d97f4c5..9e01bccb8 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -594,4 +594,9 @@ type (
//任务组完成
TaskGroupComplete(session IUserSession, group int32)
}
+ //新主线
+ IMainline interface {
+ ///红点
+ IGetReddot
+ }
)
diff --git a/modules/guildgve/api_rank.go b/modules/guildgve/api_rank.go
index b375fa500..d99b21e0f 100644
--- a/modules/guildgve/api_rank.go
+++ b/modules/guildgve/api_rank.go
@@ -39,6 +39,7 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.GuildGveRankReq) (e
ranks = append(ranks, &pb.GuildGveRankItem{
Guildid: v.Id,
Name: v.Name,
+ Icon: v.Icon,
Rank: int32(i),
})
}
diff --git a/modules/guildgve/modelbattlerank.go b/modules/guildgve/modelbattlerank.go
index fcb90b42c..a4ddba251 100644
--- a/modules/guildgve/modelbattlerank.go
+++ b/modules/guildgve/modelbattlerank.go
@@ -46,7 +46,7 @@ func (this *Modelbattlerank) queryRankUser(boos int32) (ranks []string, err erro
return
}
ranks = make([]string, 0)
- for i := 0; i < len(result); i += 1 {
+ for i := 0; i < len(result); i += 2 {
ranks = append(ranks, result[i])
}
return
diff --git a/modules/guildgve/modelrank.go b/modules/guildgve/modelrank.go
index e9d096a59..0cb5b57dc 100644
--- a/modules/guildgve/modelrank.go
+++ b/modules/guildgve/modelrank.go
@@ -45,7 +45,7 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
return
}
ranks = make([]string, 0)
- for i := 0; i < len(result); i += 1 {
+ for i := 0; i < len(result); i += 2 {
ranks = append(ranks, result[i])
}
return
diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go
index 0922c1738..9cb5368ce 100644
--- a/modules/mainline/comp_configure.go
+++ b/modules/mainline/comp_configure.go
@@ -60,7 +60,7 @@ func (this *configureComp) updateMlineStage() {
err error
ok bool
)
- if v, err = this.GetConfigure(game_mainstage); err == nil {
+ if v, err = this.GetConfigure(game_mainstage); err != nil {
this.module.Errorln(err)
return
}
@@ -87,7 +87,7 @@ func (this *configureComp) updateMlineReward() {
err error
ok bool
)
- if v, err = this.GetConfigure(game_mainstarreward); err == nil {
+ if v, err = this.GetConfigure(game_mainstarreward); err != nil {
this.module.Errorln(err)
return
}
diff --git a/modules/mainline/module.go b/modules/mainline/module.go
index 2c104ad8c..20f71d6ae 100644
--- a/modules/mainline/module.go
+++ b/modules/mainline/module.go
@@ -21,7 +21,7 @@ func NewModule() core.IModule {
}
func (this *Mainline) GetType() core.M_Modules {
- return comm.ModuleMline
+ return comm.ModuleMainline
}
func (this *Mainline) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
diff --git a/pb/guildgve_db.pb.go b/pb/guildgve_db.pb.go
index 73a6ba3c1..6c0ab8a23 100644
--- a/pb/guildgve_db.pb.go
+++ b/pb/guildgve_db.pb.go
@@ -414,8 +414,10 @@ type DBGveRecord struct {
Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` //战斗发生时间
CaptainHeroId string `protobuf:"bytes,3,opt,name=captainHeroId,proto3" json:"captainHeroId"` //阵型中的队长
Formation []*DBSimpleHero `protobuf:"bytes,4,rep,name=formation,proto3" json:"formation"` //阵型
- Rating int32 `protobuf:"varint,5,opt,name=rating,proto3" json:"rating"` //评级配置ID
- Harm int32 `protobuf:"varint,6,opt,name=harm,proto3" json:"harm"` //伤害血量
+ FightTime int32 `protobuf:"varint,5,opt,name=fightTime,proto3" json:"fightTime"` //战斗时长
+ FightId string `protobuf:"bytes,6,opt,name=fightId,proto3" json:"fightId"` //战斗Id (回放)
+ Rating int32 `protobuf:"varint,7,opt,name=rating,proto3" json:"rating"` //评级配置ID
+ Harm int32 `protobuf:"varint,8,opt,name=harm,proto3" json:"harm"` //伤害血量
}
func (x *DBGveRecord) Reset() {
@@ -478,6 +480,20 @@ func (x *DBGveRecord) GetFormation() []*DBSimpleHero {
return nil
}
+func (x *DBGveRecord) GetFightTime() int32 {
+ if x != nil {
+ return x.FightTime
+ }
+ return 0
+}
+
+func (x *DBGveRecord) GetFightId() string {
+ if x != nil {
+ return x.FightId
+ }
+ return ""
+}
+
func (x *DBGveRecord) GetRating() int32 {
if x != nil {
return x.Rating
@@ -744,7 +760,7 @@ var file_guildgve_guildgve_db_proto_rawDesc = []byte{
0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x24,
0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65,
- 0x63, 0x6f, 0x72, 0x64, 0x22, 0xc3, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65,
+ 0x63, 0x6f, 0x72, 0x64, 0x22, 0xfb, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65,
0x63, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x73, 0x65,
0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18,
@@ -753,28 +769,32 @@ var file_guildgve_guildgve_db_proto_rawDesc = []byte{
0x28, 0x09, 0x52, 0x0d, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x48, 0x65, 0x72, 0x6f, 0x49,
0x64, 0x12, 0x2b, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x48,
- 0x65, 0x72, 0x6f, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16,
- 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x06,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x22, 0x72, 0x0a, 0x0c, 0x44, 0x42,
- 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
- 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
- 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03,
- 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x0e,
- 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x50,
- 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x16,
- 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04,
- 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72,
- 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74,
- 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61,
- 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
- 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,
- 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x72, 0x6f, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c,
+ 0x0a, 0x09, 0x66, 0x69, 0x67, 0x68, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x09, 0x66, 0x69, 0x67, 0x68, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
+ 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66,
+ 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67,
+ 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x12,
+ 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61,
+ 0x72, 0x6d, 0x22, 0x72, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x73,
+ 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
+ 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+ 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x50, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70,
+ 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14,
+ 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
+ 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76,
+ 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
+ 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+ 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61,
+ 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/guildgve_msg.pb.go b/pb/guildgve_msg.pb.go
index c3626fc95..f1bfc0c2e 100644
--- a/pb/guildgve_msg.pb.go
+++ b/pb/guildgve_msg.pb.go
@@ -26,7 +26,7 @@ type GuildGveInfoReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
}
func (x *GuildGveInfoReq) Reset() {
@@ -129,7 +129,7 @@ type GuildGveSetFireReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
Notice string `protobuf:"bytes,3,opt,name=notice,proto3" json:"notice"`
}
@@ -232,7 +232,7 @@ type GuildGveRankReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
}
func (x *GuildGveRankReq) Reset() {
@@ -280,9 +280,12 @@ type GuildGveRankItem struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
- Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
- Rank int32 `protobuf:"varint,3,opt,name=rank,proto3" json:"rank"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
+ Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon"`
+ Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
+ KillCount int32 `protobuf:"varint,4,opt,name=killCount,proto3" json:"killCount"`
+ LastKillTime int64 `protobuf:"varint,5,opt,name=lastKillTime,proto3" json:"lastKillTime"`
+ Rank int32 `protobuf:"varint,6,opt,name=rank,proto3" json:"rank"`
}
func (x *GuildGveRankItem) Reset() {
@@ -324,6 +327,13 @@ func (x *GuildGveRankItem) GetGuildid() string {
return ""
}
+func (x *GuildGveRankItem) GetIcon() string {
+ if x != nil {
+ return x.Icon
+ }
+ return ""
+}
+
func (x *GuildGveRankItem) GetName() string {
if x != nil {
return x.Name
@@ -331,6 +341,20 @@ func (x *GuildGveRankItem) GetName() string {
return ""
}
+func (x *GuildGveRankItem) GetKillCount() int32 {
+ if x != nil {
+ return x.KillCount
+ }
+ return 0
+}
+
+func (x *GuildGveRankItem) GetLastKillTime() int64 {
+ if x != nil {
+ return x.LastKillTime
+ }
+ return 0
+}
+
func (x *GuildGveRankItem) GetRank() int32 {
if x != nil {
return x.Rank
@@ -392,7 +416,7 @@ type GuildGveRouletteReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
}
func (x *GuildGveRouletteReq) Reset() {
@@ -496,7 +520,7 @@ type GuildGveChallengeReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
Battle *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"` //战斗类型
}
@@ -560,7 +584,7 @@ type GuildGveChallengeResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` //战斗信息
Boosticket int32 `protobuf:"varint,4,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
@@ -632,7 +656,7 @@ type GuildGveChallengeFinishReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
}
@@ -696,7 +720,7 @@ type GuildGveChallengeFinishResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Guildid string `protobuf:"bytes,1,opt,name=Guildid,proto3" json:"Guildid"`
+ Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
Efficient bool `protobuf:"varint,4,opt,name=efficient,proto3" json:"efficient"` //是否有效
@@ -1100,106 +1124,112 @@ var file_guildgve_guildgve_msg_proto_rawDesc = []byte{
0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
- 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x53, 0x0a, 0x10, 0x47,
+ 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x53, 0x0a, 0x10, 0x47,
0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
0x22, 0x5e, 0x0a, 0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
- 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
+ 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69,
0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65,
0x22, 0x15, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46,
0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64,
- 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75,
- 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69,
- 0x6c, 0x64, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
- 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c,
- 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64,
- 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x75,
- 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25,
- 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x47,
- 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52,
- 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76,
- 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
- 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47,
- 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
- 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
- 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64,
- 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77,
- 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47,
- 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75,
- 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a,
- 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
- 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c,
- 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62,
- 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f,
- 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
- 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b,
- 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69,
- 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
- 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
- 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+ 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75,
+ 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69,
+ 0x6c, 0x64, 0x69, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76,
+ 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69,
+ 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c,
+ 0x64, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+ 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73,
+ 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a,
+ 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e,
+ 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e,
+ 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61,
+ 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13,
+ 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65,
+ 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, 0x0a,
+ 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
+ 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47, 0x75,
+ 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52,
+ 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f,
- 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
- 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x1b,
- 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
- 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x47,
- 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x75,
- 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a,
- 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
- 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
- 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14,
- 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
- 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b,
- 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69,
- 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
- 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f,
- 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44,
- 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
- 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65,
- 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e,
- 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69,
- 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x47,
- 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67,
+ 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
+ 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x8a,
+ 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+ 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c,
+ 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64,
+ 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e,
+ 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62,
+ 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
+ 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69,
+ 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c,
+ 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72,
+ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
+ 0x72, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43,
+ 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+ 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f,
+ 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73,
+ 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63,
+ 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69,
+ 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62,
+ 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67,
0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
- 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
- 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
- 0x50, 0x75, 0x73, 0x68, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x6f,
- 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65,
- 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
- 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
- 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x71, 0x75, 0x65, 0x72,
- 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x71, 0x75, 0x65,
- 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
- 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73,
- 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65,
- 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
- 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
- 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18,
- 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63,
- 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
- 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
+ 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73,
+ 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e,
+ 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f,
+ 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a,
+ 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74,
+ 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2e, 0x0a, 0x06, 0x72,
+ 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42,
+ 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63,
+ 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47,
+ 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65,
+ 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12,
+ 0x1c, 0x0a, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a,
+ 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07,
+ 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64,
+ 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06,
+ 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
+ 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f,
+ 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
}
var (
diff --git a/services/worker/main.go b/services/worker/main.go
index 6f9ed477f..0ed15695a 100644
--- a/services/worker/main.go
+++ b/services/worker/main.go
@@ -30,6 +30,7 @@ import (
"go_dreamfactory/modules/library"
"go_dreamfactory/modules/linestory"
"go_dreamfactory/modules/mail"
+ "go_dreamfactory/modules/mainline"
"go_dreamfactory/modules/mline"
"go_dreamfactory/modules/moonfantasy"
"go_dreamfactory/modules/notify"
@@ -140,6 +141,7 @@ func main() {
stonehenge.NewModule(),
dailytask.NewModule(),
questionnaire.NewModule(),
+ mainline.NewModule(),
)
}
From 15ebfe80946b4417a33fb995f1f13a913e061e77 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 19:16:27 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/imodule.go | 2 +-
modules/dailytask/module.go | 2 +-
modules/mainline/api_challenge.go | 30 +++++----
modules/wtask/module.go | 39 ++++++++++-
pb/wtask_msg.pb.go | 103 +++++++++++++++++-------------
5 files changed, 114 insertions(+), 62 deletions(-)
diff --git a/comm/imodule.go b/comm/imodule.go
index 9e01bccb8..1f8c71651 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -573,7 +573,7 @@ type (
// bingo任务
BingoJumpTask(session IUserSession, rtaskId int32) (errdata *pb.ErrorData)
//重置日常任务
- ResetDailytaskTask(session IUserSession, groupId ...int32) (task map[int32][]int32, errdata *pb.ErrorData)
+ ResetDailytaskTask(session IUserSession, dailytaskid int32, groupId ...int32) (results map[int32][]int32, errdata *pb.ErrorData)
//查询任务进度
InquireTaskProgress(session IUserSession, tasks ...int32) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData)
//查询完成列表
diff --git a/modules/dailytask/module.go b/modules/dailytask/module.go
index 030848cec..d6007dafe 100644
--- a/modules/dailytask/module.go
+++ b/modules/dailytask/module.go
@@ -84,7 +84,7 @@ func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
this.Errorln(err)
return
}
- if tasks, errdata = this.wtask.ResetDailytaskTask(session.Clone(), group...); errdata != nil {
+ if tasks, errdata = this.wtask.ResetDailytaskTask(session.Clone(), key, group...); errdata != nil {
this.Errorln(errdata)
return
}
diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go
index 3808ac490..1dc938667 100644
--- a/modules/mainline/api_challenge.go
+++ b/modules/mainline/api_challenge.go
@@ -20,26 +20,25 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MainlineC
// /挑战主线关卡
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChallengeReq) (errdata *pb.ErrorData) {
var (
- curChapter *pb.DBMline // 当前章节信息
- ps int32 // 消耗的体力
- psAnt *cfg.Gameatn
- stageConf *cfg.GameMainStageData // 当前章节数据
- err error
+ info *pb.DBMainline // 当前章节信息
+ ps int32 // 消耗的体力
+ psAnt *cfg.Gameatn
+ stageConf *cfg.GameMainStageData // 当前章节数据
+ err error
)
if errdata = this.ChallengeCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
- if stageConf, err = this.module.configure.GetMainStageConf(req.Level); err != nil { // 配置文件校验
+ if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_MainlineNotFindChapter,
- Title: pb.ErrorCode_MainlineNotFindChapter.ToString(),
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
- return
}
- if v1, ok := curChapter.Ps[req.Level]; !ok || v1 == 0 {
+ if v1, ok := info.Ps[req.Level]; !ok || v1 == 0 {
for _, v := range stageConf.PsConsume {
if v.A == "attr" && v.T == "ps" {
ps += v.N
@@ -58,8 +57,17 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil {
return
}
- curChapter.Ps[req.Level] = ps
+ info.Ps[req.Level] = ps
+ if err = this.module.modelMline.updateMainlineData(session.GetUserId(), info); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
}
+
errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Ptype: pb.PlayType_mainline,
Title: "",
diff --git a/modules/wtask/module.go b/modules/wtask/module.go
index 45b9217ab..c050c7ed4 100644
--- a/modules/wtask/module.go
+++ b/modules/wtask/module.go
@@ -253,7 +253,7 @@ func (this *WTask) AcceptCaravanTask(session comm.IUserSession, groupId int32) (
}
// 重置日常任务
-func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int32) (results map[int32][]int32, errdata *pb.ErrorData) {
+func (this *WTask) ResetDailytaskTask(session comm.IUserSession, dailytaskid int32, groupId ...int32) (results map[int32][]int32, errdata *pb.ErrorData) {
var (
alltasks map[int32]*cfg.GameWorldTaskData = make(map[int32]*cfg.GameWorldTaskData)
groupTasks map[int32][]*cfg.GameWorldTaskData
@@ -262,6 +262,8 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3
activations []int32 = make([]int32, 0)
accepts []int32 = make([]int32, 0)
completes []int32 = make([]int32, 0)
+ condiIds []int32 = make([]int32, 0)
+ progress []*pb.DBWTaskItem
box map[int32]int32
err error
ok bool
@@ -316,6 +318,7 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3
}
for _, task := range tasks {
if task.Ontxe == 0 {
+ condiIds = append(condiIds, task.Completetask...)
accepts = append(accepts, task.Key)
if _, ok = results[v]; !ok {
results[v] = make([]int32, 0)
@@ -341,8 +344,23 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, groupId ...int3
wtask.Activations = activations
wtask.Accepts = accepts
wtask.Completes = completes
+
+ if len(condiIds) > 0 {
+ if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ExternalModule,
+ Title: pb.ErrorCode_ExternalModule.ToString(),
+ Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds),
+ }
+ return
+ }
+ }
+
//有新任务接取
- this.pushtaskprogress(session, wtask, true)
+ if progress, errdata = this.pushtaskprogress(session, wtask, false); errdata != nil {
+ return
+ }
+ session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: progress, Dailytaskgroup: dailytaskid})
if boxchange {
session.SendMsg(string(this.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs})
}
@@ -690,6 +708,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
acceptsMap map[int32]struct{} = make(map[int32]struct{})
completeMap map[int32]struct{} = make(map[int32]struct{})
opencmdMap map[string]struct{} = make(map[string]struct{})
+ condiIds []int32 = make([]int32, 0)
ok bool
changeActiva bool
changeAccept bool
@@ -728,7 +747,13 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断
continue
}
- if v.Des == 5 || v.Des == 1 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中
+ if v.Des == 5 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中
+ continue
+ }
+ if v.Des == 1 {
+ changeAccept = true
+ wtask.Accepts = append(wtask.Activations, v.Key)
+ condiIds = append(condiIds, v.Completetask...)
continue
}
wtask.Activations = append(wtask.Activations, v.Key)
@@ -747,6 +772,14 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
}
if changeAccept {
+ if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ExternalModule,
+ Title: pb.ErrorCode_ExternalModule.ToString(),
+ Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds),
+ }
+ return
+ }
progress, errdata = this.pushtaskprogress(session, wtask, ispush)
}
return
diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go
index 8a9e661ba..c9ec202c1 100644
--- a/pb/wtask_msg.pb.go
+++ b/pb/wtask_msg.pb.go
@@ -625,7 +625,8 @@ type WTaskAcceptChangePush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Accepts []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
+ Accepts []*DBWTaskItem `protobuf:"bytes,1,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
+ Dailytaskgroup int32 `protobuf:"varint,2,opt,name=dailytaskgroup,proto3" json:"dailytaskgroup"` //日常任务组id
}
func (x *WTaskAcceptChangePush) Reset() {
@@ -667,6 +668,13 @@ func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
return nil
}
+func (x *WTaskAcceptChangePush) GetDailytaskgroup() int32 {
+ if x != nil {
+ return x.Dailytaskgroup
+ }
+ return 0
+}
+
//战斗 请求
type WTaskBattleStartReq struct {
state protoimpl.MessageState
@@ -1114,53 +1122,56 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43,
0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74,
0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b,
- 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57,
+ 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x67, 0x0a, 0x15, 0x57,
0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18,
- 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49,
- 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13,
- 0x57, 0x54, 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, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 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, 0x1f, 0x0a,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61,
- 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e,
- 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65,
- 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
- 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 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, 0x22, 0x8d,
- 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67,
- 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68,
- 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74,
- 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
- 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3c,
- 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
- 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x13,
- 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61,
- 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
- 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
- 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49,
+ 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0e,
+ 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67,
+ 0x72, 0x6f, 0x75, 0x70, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, 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,
+ 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+ 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61,
+ 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73,
+ 0x70, 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, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72,
+ 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61,
+ 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
+ 0x73, 0x70, 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, 0x22, 0x8d, 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b,
+ 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a,
+ 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54,
+ 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
+ 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73,
+ 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+ 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
+ 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3c, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42,
+ 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
+ 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14,
+ 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62,
+ 0x6f, 0x78, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78,
+ 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a,
+ 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f,
+ 0x78, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
+ 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (