From 044ba74bd410402211daac6f75aa9fb49baf9dda Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 12 Oct 2022 11:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/library/comp_configure.go | 28 ++- pb/errorcode.pb.go | 41 ++-- pb/moonfantasy_db.pb.go | 277 +++++----------------- pb/moonfantasy_msg.pb.go | 376 +++++++++++------------------- 4 files changed, 226 insertions(+), 496 deletions(-) diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index dcca4b8d5..6b9f12e19 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -15,6 +15,7 @@ const ( game_libraryhistory = "game_libraryhistory.json" // 往事id 对应的奖励 game_libraryfavor = "game_libraryfavor.json" // 英雄好感度升级所需的经验 game_librarystory = "game_librarystory.json" // 羁绊id对应剧情奖励 + game_favornum = "game_favornum.json" // 羁绊id对应经验 ) ///配置管理基础组件 @@ -31,16 +32,17 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp game_libraryhistory: cfg.NewGameLibraryHistory, game_libraryfavor: cfg.NewGameLibraryFavor, game_librarystory: cfg.NewGameLibraryStory, + game_favornum: cfg.NewGameFavorNum, }) this.fetter = make(map[int64]*cfg.GameLibraryFetterData, 0) configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFetter) - // _data := this.GetLibraryStory(101) - // fmt.Printf("%v", _data) - // _data1 := this.GetLibraryFavor(2) - // fmt.Printf("%v", _data1) + _data := this.GetFavorNum("10016") + fmt.Printf("%v", _data) + _data1 := this.GetLibraryFavor(3) + fmt.Printf("%v", _data1) // _data2 := this.GetLibraryHistory("350011") // fmt.Printf("%v", _data2) return @@ -90,10 +92,12 @@ func (this *configureComp) GetLibraryHero(hid string) (data *cfg.GameLibraryHero return } -func (this *configureComp) GetLibraryFavor(id int32) (data *cfg.GameLibraryFavorData) { +func (this *configureComp) GetLibraryFavor(star int32) (data []int32) { if v, err := this.GetConfigure(game_libraryfavor); err == nil { if configure, ok := v.(*cfg.GameLibraryFavor); ok { - data = configure.Get(id) + for _, v := range configure.GetDataList() { + data = append(data, v.Expneed) + } } } else { log.Errorf("GetLibraryFavor conf err:%v", err) @@ -122,3 +126,15 @@ func (this *configureComp) GetLibraryStory(fid int32) (data *cfg.GameLibraryStor } return } + +// 获取羁绊英雄经验数据 +func (this *configureComp) GetFavorNum(cid string) (data *cfg.GameFavorNumData) { + if v, err := this.GetConfigure(game_favornum); err == nil { + if configure, ok := v.(*cfg.GameFavorNum); ok { + data = configure.Get(cid) + } + } else { + log.Errorf("GetLibraryStory conf err:%v", err) + } + return +} diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 94b0253bb..a05fba2a9 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -177,7 +177,6 @@ const ( ErrorCode_MoonfantasyDareUp ErrorCode = 2403 // boos 挑战次数已达上限 ErrorCode_MoonfantasyBattleNoEnd ErrorCode = 2404 // boos 战斗未结束 ErrorCode_MoonfantasyBattleNoWin ErrorCode = 2405 // boos 战斗魏未胜利 - ErrorCode_MoonfantasyNoJoin ErrorCode = 2406 // boos 未加入战斗序列 ErrorCode_BattleNoFoundRecord ErrorCode = 2501 // 未找到记录 ErrorCode_LinestoryTaskFinished ErrorCode = 2601 //任务已完成 ErrorCode_LinestorySubTaskFinished ErrorCode = 2602 //子任务已完成 @@ -332,7 +331,6 @@ var ( 2403: "MoonfantasyDareUp", 2404: "MoonfantasyBattleNoEnd", 2405: "MoonfantasyBattleNoWin", - 2406: "MoonfantasyNoJoin", 2501: "BattleNoFoundRecord", 2601: "LinestoryTaskFinished", 2602: "LinestorySubTaskFinished", @@ -483,7 +481,6 @@ var ( "MoonfantasyDareUp": 2403, "MoonfantasyBattleNoEnd": 2404, "MoonfantasyBattleNoWin": 2405, - "MoonfantasyNoJoin": 2406, "BattleNoFoundRecord": 2501, "LinestoryTaskFinished": 2601, "LinestorySubTaskFinished": 2602, @@ -527,7 +524,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xee, 0x19, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xd6, 0x19, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -717,25 +714,23 @@ var file_errorcode_proto_rawDesc = []byte{ 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, - 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, - 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, - 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, 0x62, - 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12, - 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, - 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, - 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xac, - 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, - 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, - 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, - 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, - 0x90, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0xe5, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, + 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e, 0x65, + 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, + 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, + 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xac, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, + 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, + 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, + 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, + 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, + 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/moonfantasy_db.pb.go b/pb/moonfantasy_db.pb.go index d13255428..a7da27966 100644 --- a/pb/moonfantasy_db.pb.go +++ b/pb/moonfantasy_db.pb.go @@ -20,18 +20,23 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type UserInfo struct { +type DBMoonfantasy struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //昵称 - Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar"` // 头像 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //英雄id + Ctime int64 `protobuf:"varint,4,opt,name=ctime,proto3" json:"ctime"` //创建时间 + Joinnum int32 `protobuf:"varint,5,opt,name=joinnum,proto3" json:"joinnum"` //参与人数 + Numup int32 `protobuf:"varint,6,opt,name=numup,proto3" json:"numup"` //人数上限 + Unitmup int32 `protobuf:"varint,7,opt,name=unitmup,proto3" json:"unitmup"` //单人可挑战次数 + Record map[string]int32 `protobuf:"bytes,8,rep,name=record,proto3" json:"record" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //挑战记录 } -func (x *UserInfo) Reset() { - *x = UserInfo{} +func (x *DBMoonfantasy) Reset() { + *x = DBMoonfantasy{} if protoimpl.UnsafeEnabled { mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -39,13 +44,13 @@ func (x *UserInfo) Reset() { } } -func (x *UserInfo) String() string { +func (x *DBMoonfantasy) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UserInfo) ProtoMessage() {} +func (*DBMoonfantasy) ProtoMessage() {} -func (x *UserInfo) ProtoReflect() protoreflect.Message { +func (x *DBMoonfantasy) ProtoReflect() protoreflect.Message { mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -57,234 +62,91 @@ func (x *UserInfo) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UserInfo.ProtoReflect.Descriptor instead. -func (*UserInfo) Descriptor() ([]byte, []int) { +// Deprecated: Use DBMoonfantasy.ProtoReflect.Descriptor instead. +func (*DBMoonfantasy) Descriptor() ([]byte, []int) { return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{0} } -func (x *UserInfo) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *UserInfo) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *UserInfo) GetAvatar() string { - if x != nil { - return x.Avatar - } - return "" -} - -//月之秘境 -type DBMoonFantasy struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //怪物id - Ctime int64 `protobuf:"varint,4,opt,name=ctime,proto3" json:"ctime"` //创建时间 - Join []*UserInfo `protobuf:"bytes,5,rep,name=join,proto3" json:"join"` //参与人数 - Numup int32 `protobuf:"varint,6,opt,name=numup,proto3" json:"numup"` //人数上限 - Unitmup int32 `protobuf:"varint,7,opt,name=unitmup,proto3" json:"unitmup"` //单人可挑战次数 - Record map[string]int32 `protobuf:"bytes,8,rep,name=record,proto3" json:"record" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //挑战记录 -} - -func (x *DBMoonFantasy) Reset() { - *x = DBMoonFantasy{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBMoonFantasy) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBMoonFantasy) ProtoMessage() {} - -func (x *DBMoonFantasy) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] - 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 DBMoonFantasy.ProtoReflect.Descriptor instead. -func (*DBMoonFantasy) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{1} -} - -func (x *DBMoonFantasy) GetId() string { +func (x *DBMoonfantasy) GetId() string { if x != nil { return x.Id } return "" } -func (x *DBMoonFantasy) GetUid() string { +func (x *DBMoonfantasy) GetUid() string { if x != nil { return x.Uid } return "" } -func (x *DBMoonFantasy) GetMonster() string { +func (x *DBMoonfantasy) GetMonster() string { if x != nil { return x.Monster } return "" } -func (x *DBMoonFantasy) GetCtime() int64 { +func (x *DBMoonfantasy) GetCtime() int64 { if x != nil { return x.Ctime } return 0 } -func (x *DBMoonFantasy) GetJoin() []*UserInfo { +func (x *DBMoonfantasy) GetJoinnum() int32 { if x != nil { - return x.Join + return x.Joinnum } - return nil + return 0 } -func (x *DBMoonFantasy) GetNumup() int32 { +func (x *DBMoonfantasy) GetNumup() int32 { if x != nil { return x.Numup } return 0 } -func (x *DBMoonFantasy) GetUnitmup() int32 { +func (x *DBMoonfantasy) GetUnitmup() int32 { if x != nil { return x.Unitmup } return 0 } -func (x *DBMoonFantasy) GetRecord() map[string]int32 { +func (x *DBMoonfantasy) GetRecord() map[string]int32 { if x != nil { return x.Record } return nil } -//用户参与的月之秘境列表 -type DBUserMFantasy struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Mfantasys []string `protobuf:"bytes,3,rep,name=mfantasys,proto3" json:"mfantasys"` //月之秘境列表 -} - -func (x *DBUserMFantasy) Reset() { - *x = DBUserMFantasy{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBUserMFantasy) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBUserMFantasy) ProtoMessage() {} - -func (x *DBUserMFantasy) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] - 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 DBUserMFantasy.ProtoReflect.Descriptor instead. -func (*DBUserMFantasy) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{2} -} - -func (x *DBUserMFantasy) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBUserMFantasy) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBUserMFantasy) GetMfantasys() []string { - if x != nil { - return x.Mfantasys - } - return nil -} - var File_moonfantasy_moonfantasy_db_proto protoreflect.FileDescriptor var file_moonfantasy_moonfantasy_db_proto_rawDesc = []byte{ 0x0a, 0x20, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2f, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x48, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x9f, 0x02, 0x0a, - 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x12, 0x1d, 0x0a, 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x12, - 0x14, 0x0a, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, 0x12, - 0x32, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2e, - 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x50, - 0x0a, 0x0e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, - 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x22, 0x9a, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, + 0x74, 0x61, 0x73, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, + 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75, + 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6a, 0x6f, 0x69, 0x6e, 0x6e, 0x75, 0x6d, + 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, + 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, + 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, + 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -299,21 +161,18 @@ func file_moonfantasy_moonfantasy_db_proto_rawDescGZIP() []byte { return file_moonfantasy_moonfantasy_db_proto_rawDescData } -var file_moonfantasy_moonfantasy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_moonfantasy_moonfantasy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_moonfantasy_moonfantasy_db_proto_goTypes = []interface{}{ - (*UserInfo)(nil), // 0: UserInfo - (*DBMoonFantasy)(nil), // 1: DBMoonFantasy - (*DBUserMFantasy)(nil), // 2: DBUserMFantasy - nil, // 3: DBMoonFantasy.RecordEntry + (*DBMoonfantasy)(nil), // 0: DBMoonfantasy + nil, // 1: DBMoonfantasy.RecordEntry } var file_moonfantasy_moonfantasy_db_proto_depIdxs = []int32{ - 0, // 0: DBMoonFantasy.join:type_name -> UserInfo - 3, // 1: DBMoonFantasy.record:type_name -> DBMoonFantasy.RecordEntry - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 1, // 0: DBMoonfantasy.record:type_name -> DBMoonfantasy.RecordEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_moonfantasy_moonfantasy_db_proto_init() } @@ -323,31 +182,7 @@ func file_moonfantasy_moonfantasy_db_proto_init() { } if !protoimpl.UnsafeEnabled { file_moonfantasy_moonfantasy_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBMoonFantasy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBUserMFantasy); i { + switch v := v.(*DBMoonfantasy); i { case 0: return &v.state case 1: @@ -365,7 +200,7 @@ func file_moonfantasy_moonfantasy_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_moonfantasy_moonfantasy_db_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/moonfantasy_msg.pb.go b/pb/moonfantasy_msg.pb.go index 6d0be3a25..04265dbcb 100644 --- a/pb/moonfantasy_msg.pb.go +++ b/pb/moonfantasy_msg.pb.go @@ -20,93 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//获取装备列表请求 -type MoonfantasyGetListReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MoonfantasyGetListReq) Reset() { - *x = MoonfantasyGetListReq{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MoonfantasyGetListReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MoonfantasyGetListReq) ProtoMessage() {} - -func (x *MoonfantasyGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MoonfantasyGetListReq.ProtoReflect.Descriptor instead. -func (*MoonfantasyGetListReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{0} -} - -//获取装备列表请求 回应 -type MoonfantasyGetListResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Dfantasys []*DBMoonFantasy `protobuf:"bytes,1,rep,name=dfantasys,proto3" json:"dfantasys"` //秘境列表 -} - -func (x *MoonfantasyGetListResp) Reset() { - *x = MoonfantasyGetListResp{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MoonfantasyGetListResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MoonfantasyGetListResp) ProtoMessage() {} - -func (x *MoonfantasyGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[1] - 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 MoonfantasyGetListResp.ProtoReflect.Descriptor instead. -func (*MoonfantasyGetListResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *MoonfantasyGetListResp) GetDfantasys() []*DBMoonFantasy { - if x != nil { - return x.Dfantasys - } - return nil -} - ///触发秘境 type MoonfantasyTriggerReq struct { state protoimpl.MessageState @@ -121,7 +34,7 @@ type MoonfantasyTriggerReq struct { func (x *MoonfantasyTriggerReq) Reset() { *x = MoonfantasyTriggerReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -134,7 +47,7 @@ func (x *MoonfantasyTriggerReq) String() string { func (*MoonfantasyTriggerReq) ProtoMessage() {} func (x *MoonfantasyTriggerReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -147,7 +60,7 @@ func (x *MoonfantasyTriggerReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyTriggerReq.ProtoReflect.Descriptor instead. func (*MoonfantasyTriggerReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{2} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{0} } func (x *MoonfantasyTriggerReq) GetAvatar() string { @@ -185,7 +98,7 @@ type MoonfantasyTriggerResp struct { func (x *MoonfantasyTriggerResp) Reset() { *x = MoonfantasyTriggerResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -198,7 +111,7 @@ func (x *MoonfantasyTriggerResp) String() string { func (*MoonfantasyTriggerResp) ProtoMessage() {} func (x *MoonfantasyTriggerResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -211,7 +124,7 @@ func (x *MoonfantasyTriggerResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyTriggerResp.ProtoReflect.Descriptor instead. func (*MoonfantasyTriggerResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{3} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{1} } func (x *MoonfantasyTriggerResp) GetIssucc() bool { @@ -235,19 +148,20 @@ func (x *MoonfantasyTriggerResp) GetMonster() string { return "" } -///询问秘境 +///挑战秘境 type MoonfantasyAskReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"` //唯一id + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //发布者用户id + Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //唯一id } func (x *MoonfantasyAskReq) Reset() { *x = MoonfantasyAskReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -260,7 +174,7 @@ func (x *MoonfantasyAskReq) String() string { func (*MoonfantasyAskReq) ProtoMessage() {} func (x *MoonfantasyAskReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -273,7 +187,14 @@ func (x *MoonfantasyAskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyAskReq.ProtoReflect.Descriptor instead. func (*MoonfantasyAskReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{4} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *MoonfantasyAskReq) GetUid() string { + if x != nil { + return x.Uid + } + return "" } func (x *MoonfantasyAskReq) GetMid() string { @@ -288,14 +209,13 @@ type MoonfantasyAskResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 - Info *DBMoonFantasy `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` //秘境信息 可能为空 + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 } func (x *MoonfantasyAskResp) Reset() { *x = MoonfantasyAskResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -308,7 +228,7 @@ func (x *MoonfantasyAskResp) String() string { func (*MoonfantasyAskResp) ProtoMessage() {} func (x *MoonfantasyAskResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -321,7 +241,7 @@ func (x *MoonfantasyAskResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyAskResp.ProtoReflect.Descriptor instead. func (*MoonfantasyAskResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{5} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{3} } func (x *MoonfantasyAskResp) GetCode() ErrorCode { @@ -331,28 +251,22 @@ func (x *MoonfantasyAskResp) GetCode() ErrorCode { return ErrorCode_Success } -func (x *MoonfantasyAskResp) GetInfo() *DBMoonFantasy { - if x != nil { - return x.Info - } - return nil -} - ///挑战秘境 type MoonfantasyBattleReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"` //唯一id - Leadpos int32 `protobuf:"varint,2,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 - Teamids []string `protobuf:"bytes,3,rep,name=teamids,proto3" json:"teamids"` //阵容信息 + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //发布者用户id + Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //唯一id + Leadpos int32 `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 + Teamids []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"` //阵容信息 } func (x *MoonfantasyBattleReq) Reset() { *x = MoonfantasyBattleReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -365,7 +279,7 @@ func (x *MoonfantasyBattleReq) String() string { func (*MoonfantasyBattleReq) ProtoMessage() {} func (x *MoonfantasyBattleReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -378,7 +292,14 @@ func (x *MoonfantasyBattleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBattleReq.ProtoReflect.Descriptor instead. func (*MoonfantasyBattleReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{6} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *MoonfantasyBattleReq) GetUid() string { + if x != nil { + return x.Uid + } + return "" } func (x *MoonfantasyBattleReq) GetMid() string { @@ -407,15 +328,15 @@ type MoonfantasyBattleResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 - Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //怪物id - Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 + Monster string `protobuf:"bytes,2,opt,name=monster,proto3" json:"monster"` //怪物id + Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` } func (x *MoonfantasyBattleResp) Reset() { *x = MoonfantasyBattleResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -428,7 +349,7 @@ func (x *MoonfantasyBattleResp) String() string { func (*MoonfantasyBattleResp) ProtoMessage() {} func (x *MoonfantasyBattleResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -441,7 +362,7 @@ func (x *MoonfantasyBattleResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBattleResp.ProtoReflect.Descriptor instead. func (*MoonfantasyBattleResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{7} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{5} } func (x *MoonfantasyBattleResp) GetCode() ErrorCode { @@ -451,9 +372,9 @@ func (x *MoonfantasyBattleResp) GetCode() ErrorCode { return ErrorCode_Success } -func (x *MoonfantasyBattleResp) GetMid() string { +func (x *MoonfantasyBattleResp) GetMonster() string { if x != nil { - return x.Mid + return x.Monster } return "" } @@ -471,15 +392,15 @@ type MoonfantasyReceiveReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Bid string `protobuf:"bytes,2,opt,name=bid,proto3" json:"bid"` //战斗id 后续需要这个id来领取奖励 - Mid string `protobuf:"bytes,3,opt,name=mid,proto3" json:"mid"` //怪物id - Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报 + Bid string `protobuf:"bytes,2,opt,name=bid,proto3" json:"bid"` //战斗id 后续需要这个id来领取奖励 + Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //怪物id + Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报 } func (x *MoonfantasyReceiveReq) Reset() { *x = MoonfantasyReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -492,7 +413,7 @@ func (x *MoonfantasyReceiveReq) String() string { func (*MoonfantasyReceiveReq) ProtoMessage() {} func (x *MoonfantasyReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -505,7 +426,7 @@ func (x *MoonfantasyReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyReceiveReq.ProtoReflect.Descriptor instead. func (*MoonfantasyReceiveReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{8} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{6} } func (x *MoonfantasyReceiveReq) GetBid() string { @@ -515,9 +436,9 @@ func (x *MoonfantasyReceiveReq) GetBid() string { return "" } -func (x *MoonfantasyReceiveReq) GetMid() string { +func (x *MoonfantasyReceiveReq) GetMonster() string { if x != nil { - return x.Mid + return x.Monster } return "" } @@ -541,7 +462,7 @@ type MoonfantasyReceiveResp struct { func (x *MoonfantasyReceiveResp) Reset() { *x = MoonfantasyReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -554,7 +475,7 @@ func (x *MoonfantasyReceiveResp) String() string { func (*MoonfantasyReceiveResp) ProtoMessage() {} func (x *MoonfantasyReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -567,7 +488,7 @@ func (x *MoonfantasyReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyReceiveResp.ProtoReflect.Descriptor instead. func (*MoonfantasyReceiveResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{9} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{7} } func (x *MoonfantasyReceiveResp) GetIssucc() bool { @@ -583,59 +504,52 @@ var file_moonfantasy_moonfantasy_msg_proto_rawDesc = []byte{ 0x0a, 0x21, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2f, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, - 0x79, 0x2f, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x17, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x47, 0x65, - 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x46, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, - 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x09, 0x64, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, - 0x22, 0x57, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, - 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, - 0x72, 0x12, 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x22, 0x5c, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, - 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x6d, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x22, 0x25, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, - 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, - 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x58, - 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, - 0x73, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5c, 0x0a, 0x14, 0x4d, 0x6f, 0x6f, 0x6e, - 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, - 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, - 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, - 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, - 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x6a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, - 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 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, 0x22, 0x62, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, - 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x62, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x10, 0x0a, - 0x03, 0x6d, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, - 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, - 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x30, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x57, 0x0a, + 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, 0x67, + 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, + 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x22, 0x5c, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, + 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, + 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, + 0x73, 0x74, 0x65, 0x72, 0x22, 0x37, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, + 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x34, 0x0a, + 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, + 0x6f, 0x64, 0x65, 0x22, 0x6e, 0x0a, 0x14, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, + 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, + 0x69, 0x64, 0x73, 0x22, 0x72, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, + 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 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, 0x22, 0x6a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, + 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, + 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, + 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x22, 0x30, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, + 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, + 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -650,35 +564,30 @@ func file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP() []byte { return file_moonfantasy_moonfantasy_msg_proto_rawDescData } -var file_moonfantasy_moonfantasy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_moonfantasy_moonfantasy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_moonfantasy_moonfantasy_msg_proto_goTypes = []interface{}{ - (*MoonfantasyGetListReq)(nil), // 0: MoonfantasyGetListReq - (*MoonfantasyGetListResp)(nil), // 1: MoonfantasyGetListResp - (*MoonfantasyTriggerReq)(nil), // 2: MoonfantasyTriggerReq - (*MoonfantasyTriggerResp)(nil), // 3: MoonfantasyTriggerResp - (*MoonfantasyAskReq)(nil), // 4: MoonfantasyAskReq - (*MoonfantasyAskResp)(nil), // 5: MoonfantasyAskResp - (*MoonfantasyBattleReq)(nil), // 6: MoonfantasyBattleReq - (*MoonfantasyBattleResp)(nil), // 7: MoonfantasyBattleResp - (*MoonfantasyReceiveReq)(nil), // 8: MoonfantasyReceiveReq - (*MoonfantasyReceiveResp)(nil), // 9: MoonfantasyReceiveResp - (*DBMoonFantasy)(nil), // 10: DBMoonFantasy - (ErrorCode)(0), // 11: ErrorCode - (*BattleInfo)(nil), // 12: BattleInfo - (*BattleReport)(nil), // 13: BattleReport + (*MoonfantasyTriggerReq)(nil), // 0: MoonfantasyTriggerReq + (*MoonfantasyTriggerResp)(nil), // 1: MoonfantasyTriggerResp + (*MoonfantasyAskReq)(nil), // 2: MoonfantasyAskReq + (*MoonfantasyAskResp)(nil), // 3: MoonfantasyAskResp + (*MoonfantasyBattleReq)(nil), // 4: MoonfantasyBattleReq + (*MoonfantasyBattleResp)(nil), // 5: MoonfantasyBattleResp + (*MoonfantasyReceiveReq)(nil), // 6: MoonfantasyReceiveReq + (*MoonfantasyReceiveResp)(nil), // 7: MoonfantasyReceiveResp + (ErrorCode)(0), // 8: ErrorCode + (*BattleInfo)(nil), // 9: BattleInfo + (*BattleReport)(nil), // 10: BattleReport } var file_moonfantasy_moonfantasy_msg_proto_depIdxs = []int32{ - 10, // 0: MoonfantasyGetListResp.dfantasys:type_name -> DBMoonFantasy - 11, // 1: MoonfantasyAskResp.code:type_name -> ErrorCode - 10, // 2: MoonfantasyAskResp.info:type_name -> DBMoonFantasy - 11, // 3: MoonfantasyBattleResp.code:type_name -> ErrorCode - 12, // 4: MoonfantasyBattleResp.info:type_name -> BattleInfo - 13, // 5: MoonfantasyReceiveReq.report:type_name -> BattleReport - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 8, // 0: MoonfantasyAskResp.code:type_name -> ErrorCode + 8, // 1: MoonfantasyBattleResp.code:type_name -> ErrorCode + 9, // 2: MoonfantasyBattleResp.info:type_name -> BattleInfo + 10, // 3: MoonfantasyReceiveReq.report:type_name -> BattleReport + 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 } func init() { file_moonfantasy_moonfantasy_msg_proto_init() } @@ -687,34 +596,9 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return } file_errorcode_proto_init() - file_moonfantasy_moonfantasy_db_proto_init() file_battle_battle_msg_proto_init() if !protoimpl.UnsafeEnabled { file_moonfantasy_moonfantasy_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MoonfantasyGetListReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MoonfantasyGetListResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyTriggerReq); i { case 0: return &v.state @@ -726,7 +610,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyTriggerResp); i { case 0: return &v.state @@ -738,7 +622,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyAskReq); i { case 0: return &v.state @@ -750,7 +634,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyAskResp); i { case 0: return &v.state @@ -762,7 +646,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBattleReq); i { case 0: return &v.state @@ -774,7 +658,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBattleResp); i { case 0: return &v.state @@ -786,7 +670,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyReceiveReq); i { case 0: return &v.state @@ -798,7 +682,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyReceiveResp); i { case 0: return &v.state @@ -817,7 +701,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_moonfantasy_moonfantasy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 8, NumExtensions: 0, NumServices: 0, },