From 739627ca2a0b970d955fc12371407a5af929e99e Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 15 Nov 2023 18:38:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E9=82=80=E8=AF=B7=20=E5=89=8D=E5=90=8E=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caninerabbit/module.go | 4 ++-- modules/gameinvite/api_accept.go | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/caninerabbit/module.go b/modules/caninerabbit/module.go index bccd02680..552885756 100644 --- a/modules/caninerabbit/module.go +++ b/modules/caninerabbit/module.go @@ -94,8 +94,8 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()}) return } - if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil { - this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()}) + if blueinfo, err = this.model.getModel(sessions[1].GetUserId()); err != nil { + this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()}) return } diff --git a/modules/gameinvite/api_accept.go b/modules/gameinvite/api_accept.go index 0e03507b7..1d47a0aba 100644 --- a/modules/gameinvite/api_accept.go +++ b/modules/gameinvite/api_accept.go @@ -23,6 +23,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.GameInviteAc func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptReq) (errdata *pb.ErrorData) { var ( err error + user *pb.DBUser redRecord *pb.GameInviteQiecuoRecord blueRecord *pb.GameInviteQiecuoRecord sessions []comm.IUserSession @@ -36,7 +37,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR if errdata = this.AcceptCheck(session, req); errdata != nil { return } - sessions = append(sessions, session.Clone()) + //校验切磋请求是否超时 if redRecord, err = this.module.model.queryQiecuo(req.Uid); err != nil { errdata = &pb.ErrorData{ @@ -96,6 +97,18 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR } else { sessions = append(sessions, redsession) } + sessions = append(sessions, session.Clone()) + if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + this.module.SendMsgToUser(string(this.module.GetType()), "qiecuonotify", + &pb.GameInviteQiecuonotifyPush{User: comm.GetUserBaseInfo(user), NotifyType: 2, Gtype: req.Gtype}, req.Uid) + switch req.Gtype { case 2: if roomid, err = this.module.caninerabbit.CreateRoom(sessions, rules); err != nil { From a08417a98c84f8d09355762749b475c09f72c2fd Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 15 Nov 2023 18:51:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_booschallengeover.go | 1 + modules/mainline/api_challengeover.go | 4 + modules/mainline/api_levelpass.go | 4 + pb/mainline_msg.pb.go | 41 ++++++---- pb/user_db.pb.go | 98 ++++++++++++++--------- 5 files changed, 93 insertions(+), 55 deletions(-) diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go index 21e4c0ba1..46debc445 100644 --- a/modules/mainline/api_booschallengeover.go +++ b/modules/mainline/api_booschallengeover.go @@ -71,6 +71,7 @@ func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.Mainli info.Chapterboos[conf.MonsterChapter] = conf.MonsterStrength } info.Currbooschallengenum++ + if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ "chapterboos": info.Chapterboos, "currbooschallengenum": info.Currbooschallengenum, diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index f6b80168f..6c7880d3e 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -127,6 +127,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh Level: req.Level, Pos: req.Pos, } + } else { + info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + Pos: req.Pos, + } } this.module.modelMline.updateprogress(info) diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index a485a2e5e..eff554941 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -84,6 +84,10 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP Level: req.Level, Pos: req.Pos, } + } else { + info.Lastlevel[conf.Chapterid] = &pb.DBMainlineLastLevel{ + Pos: req.Pos, + } } this.module.modelMline.updateprogress(info) diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go index bda5d2da6..999d3c5bc 100644 --- a/pb/mainline_msg.pb.go +++ b/pb/mainline_msg.pb.go @@ -1312,6 +1312,7 @@ type MainlineBoosChallengeOverReq struct { Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"` Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 + Pos *DBVector3 `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos"` } func (x *MainlineBoosChallengeOverReq) Reset() { @@ -1360,6 +1361,13 @@ func (x *MainlineBoosChallengeOverReq) GetReport() *BattleReport { return nil } +func (x *MainlineBoosChallengeOverReq) GetPos() *DBVector3 { + if x != nil { + return x.Pos + } + return nil +} + type MainlineBoosChallengeOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1543,20 +1551,22 @@ var file_mainline_mainline_msg_proto_rawDesc = []byte{ 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x5d, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6e, + 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 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, 0x5a, 0x0a, 0x1d, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, - 0x4f, 0x76, 0x65, 0x72, 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, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, + 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x5a, 0x0a, 0x1d, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, + 0x65, 0x72, 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, 0x21, + 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -1630,12 +1640,13 @@ var file_mainline_mainline_msg_proto_depIdxs = []int32{ 27, // 18: MainlineBoosChallengeReq.battle:type_name -> BattleFormation 28, // 19: MainlineBoosChallengeResp.info:type_name -> BattleInfo 29, // 20: MainlineBoosChallengeOverReq.report:type_name -> BattleReport - 31, // 21: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno - 22, // [22:22] is the sub-list for method output_type - 22, // [22:22] is the sub-list for method input_type - 22, // [22:22] is the sub-list for extension type_name - 22, // [22:22] is the sub-list for extension extendee - 0, // [0:22] is the sub-list for field type_name + 30, // 21: MainlineBoosChallengeOverReq.pos:type_name -> DBVector3 + 31, // 22: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name } func init() { file_mainline_mainline_msg_proto_init() } diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index db37d766d..4ce1e689d 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -560,19 +560,20 @@ type DBUserSetting struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Huazhi uint32 `protobuf:"varint,3,opt,name=huazhi,proto3" json:"huazhi" bson:"huazhi"` //画质 0极致 1精致 2正常 3流畅 - Kangjuchi uint32 `protobuf:"varint,4,opt,name=kangjuchi,proto3" json:"kangjuchi" bson:"kangjuchi"` //抗锯齿 0 1 2 3 - Gaoguang bool `protobuf:"varint,5,opt,name=gaoguang,proto3" json:"gaoguang" bson:"gaoguang"` //高光 - Wuli bool `protobuf:"varint,6,opt,name=wuli,proto3" json:"wuli" bson:"wuli"` //物理模拟 - Music bool `protobuf:"varint,7,opt,name=music,proto3" json:"music" bson:"music"` //音乐 - Effect bool `protobuf:"varint,8,opt,name=effect,proto3" json:"effect" bson:"effect"` //音效 - Guaji bool `protobuf:"varint,9,opt,name=guaji,proto3" json:"guaji" bson:"guaji"` //挂机 - Fuben bool `protobuf:"varint,10,opt,name=fuben,proto3" json:"fuben" bson:"fuben"` //特殊副本重置 - Tansuo bool `protobuf:"varint,11,opt,name=tansuo,proto3" json:"tansuo" bson:"tansuo"` //蜂窝探索 - Huodong bool `protobuf:"varint,12,opt,name=huodong,proto3" json:"huodong" bson:"huodong"` //特殊活动开启 - Xuanshang bool `protobuf:"varint,13,opt,name=xuanshang,proto3" json:"xuanshang"` //@go_tags(`bson:"wanfa"`)悬赏玩法重置 - Saiji bool `protobuf:"varint,14,opt,name=saiji,proto3" json:"saiji"` //@go_tags(`bson:"wanfa"`)格斗场玩法赛季重置 + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Huazhi uint32 `protobuf:"varint,3,opt,name=huazhi,proto3" json:"huazhi" bson:"huazhi"` //画质 0极致 1精致 2正常 3流畅 + Kangjuchi uint32 `protobuf:"varint,4,opt,name=kangjuchi,proto3" json:"kangjuchi" bson:"kangjuchi"` //抗锯齿 0 1 2 3 + Gaoguang bool `protobuf:"varint,5,opt,name=gaoguang,proto3" json:"gaoguang" bson:"gaoguang"` //高光 + Wuli bool `protobuf:"varint,6,opt,name=wuli,proto3" json:"wuli" bson:"wuli"` //物理模拟 + Music bool `protobuf:"varint,7,opt,name=music,proto3" json:"music" bson:"music"` //音乐 + Effect bool `protobuf:"varint,8,opt,name=effect,proto3" json:"effect" bson:"effect"` //音效 + Guaji bool `protobuf:"varint,9,opt,name=guaji,proto3" json:"guaji" bson:"guaji"` //挂机 + Fuben bool `protobuf:"varint,10,opt,name=fuben,proto3" json:"fuben" bson:"fuben"` //特殊副本重置 + Tansuo bool `protobuf:"varint,11,opt,name=tansuo,proto3" json:"tansuo" bson:"tansuo"` //蜂窝探索 + Huodong bool `protobuf:"varint,12,opt,name=huodong,proto3" json:"huodong" bson:"huodong"` //特殊活动开启 + Xuanshang bool `protobuf:"varint,13,opt,name=xuanshang,proto3" json:"xuanshang"` //@go_tags(`bson:"wanfa"`)悬赏玩法重置 + Saiji bool `protobuf:"varint,14,opt,name=saiji,proto3" json:"saiji"` //@go_tags(`bson:"wanfa"`)格斗场玩法赛季重置 + BattleFormats map[int32]string `protobuf:"bytes,15,rep,name=battleFormats,proto3" json:"battleFormats" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //战斗阵容 } func (x *DBUserSetting) Reset() { @@ -698,6 +699,13 @@ func (x *DBUserSetting) GetSaiji() bool { return false } +func (x *DBUserSetting) GetBattleFormats() map[int32]string { + if x != nil { + return x.BattleFormats + } + return nil +} + // 签到功能 type DBSign struct { state protoimpl.MessageState @@ -962,7 +970,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x61, 0x6e, 0x18, 0x34, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x62, 0x61, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x68, 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x35, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x68, - 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, + 0x69, 0x62, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xd2, 0x03, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, @@ -983,25 +991,33 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, - 0x69, 0x22, 0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 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, 0x1a, - 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, - 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, - 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, - 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, - 0x44, 0x42, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, - 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, - 0x61, 0x6d, 0x65, 0x43, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x12, 0x47, 0x0a, 0x0d, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, + 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x62, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x1a, 0x40, 0x0a, 0x12, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 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, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb8, 0x01, 0x0a, + 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, + 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, + 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, + 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x6e, + 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65, 0x5f, + 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6e, + 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1016,20 +1032,22 @@ func file_user_user_db_proto_rawDescGZIP() []byte { return file_user_user_db_proto_rawDescData } -var file_user_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_user_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_user_user_db_proto_goTypes = []interface{}{ (*CacheUser)(nil), // 0: CacheUser (*DBUser)(nil), // 1: DBUser (*DBUserSetting)(nil), // 2: DBUserSetting (*DBSign)(nil), // 3: DBSign (*DBRandomName)(nil), // 4: DBRandomName + nil, // 5: DBUserSetting.BattleFormatsEntry } var file_user_user_db_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 5, // 0: DBUserSetting.battleFormats:type_name -> DBUserSetting.BattleFormatsEntry + 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_user_user_db_proto_init() } @@ -1105,7 +1123,7 @@ func file_user_user_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_user_user_db_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, },