diff --git a/comm/const.go b/comm/const.go index 37521c297..56bc17c35 100644 --- a/comm/const.go +++ b/comm/const.go @@ -748,6 +748,15 @@ const ( Reddot31101 ReddotType = 31101 //购物中心日周月礼包 //如梦战令 Reddot31104 ReddotType = 31104 //月梦战令待领取奖励 + //捕羊大赛 + Reddot38102 ReddotType = 38102 //捕羊大赛奖励可领取 + + //石阵秘境 + Reddot38104 ReddotType = 38104 //石阵秘境奖励可领取 + //扑克 + Reddot38106 ReddotType = 38106 //扑克对决奖励可领取 + //胜者为王 + Reddot38108 ReddotType = 38108 //胜者为王奖励可领取 // 主线 Reddot24101 ReddotType = 24101 // 主线章节有奖励没领取 diff --git a/comm/imodule.go b/comm/imodule.go index a3d1d6253..5e658f13e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -672,8 +672,9 @@ type ( HDPSTodayConsum(uid string, ps int32) // 今日消耗的体力 IActivityNotice } - + //石阵秘境 IStonehenge interface { + IGetReddot GmAddStoneEvent(uid string, eventid int32) } //战斗记录模块 diff --git a/modules/entertainment/module.go b/modules/entertainment/module.go index 715bbf301..90395324c 100644 --- a/modules/entertainment/module.go +++ b/modules/entertainment/module.go @@ -10,6 +10,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" ) @@ -380,3 +381,52 @@ func (this *Entertainment) Rpc_ModuleXXlSettlement(ctx context.Context, args *pb this.modelRank.raceSettlement() return } + +// 红点需求 +func (this *Entertainment) Reddot(session comm.IUserSession, rid map[comm.ReddotType]struct{}) (items map[comm.ReddotType]*pb.ReddotItem) { + var ( + selfrid []comm.ReddotType = []comm.ReddotType{comm.Reddot38108} + confs []*cfg.GameIntegralData + info *pb.DBXXLData + err error + ok bool + ) + items = make(map[comm.ReddotType]*pb.ReddotItem) + for _, v := range selfrid { + if _, ok = rid[v]; ok { + break + } + } + + if !ok { + return + } + + if info, err = this.model.getEntertainmList(session.GetUserId()); err != nil { + return + } + for _, v := range selfrid { + if _, ok = rid[v]; ok { + switch v { + case comm.Reddot38108: + if info.Reward >= info.Consumeexp { + break + } + if confs, err = this.configure.GetGameConsumeReward(); err != nil { + return + } + for _, v := range confs { + if v.Key > info.Reward && v.Key <= info.Consumeexp { + items[comm.Reddot38108] = &pb.ReddotItem{ + Rid: int32(comm.Reddot38108), + Activated: true, + } + break + } + } + break + } + } + } + return +} diff --git a/modules/jielong/module.go b/modules/jielong/module.go index 119cf0fa3..6cfd3d72d 100644 --- a/modules/jielong/module.go +++ b/modules/jielong/module.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" + "go_dreamfactory/pb" ) type Jielong struct { @@ -45,3 +46,67 @@ func (this *Jielong) OnInstallComp() { this.modelJielong = this.RegisterComp(new(ModelJielong)).(*ModelJielong) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } + +// 红点需求 +func (this *Jielong) Reddot(session comm.IUserSession, rid map[comm.ReddotType]struct{}) (items map[comm.ReddotType]*pb.ReddotItem) { + var ( + selfrid []comm.ReddotType = []comm.ReddotType{comm.Reddot38106} + info *pb.DBJielongData + err error + ok bool + ) + items = make(map[comm.ReddotType]*pb.ReddotItem) + for _, v := range selfrid { + if _, ok = rid[v]; ok { + break + } + } + + if !ok { + return + } + + if info, err = this.modelJielong.getUserJielongData(session.GetUserId()); err != nil { + return + } + + for _, v := range selfrid { + if _, ok = rid[v]; ok { + switch v { + case comm.Reddot38106: + if c, e := this.configure.getGameFastDataByType(1); e != nil { + break + } else { + for _, v := range c { + if info.Weekmax >= v.Condition { + if _, ok := info.Reward[v.Key]; !ok { + items[comm.Reddot38106] = &pb.ReddotItem{ + Rid: int32(comm.Reddot38106), + Activated: true, + } + break + } + } + } + } + if c, e := this.configure.getGameFastDataByType(2); e != nil { + break + } else { + for _, v := range c { + if info.Hisotry >= v.Condition { + if _, ok := info.Gotarr[v.Key]; !ok { + items[comm.Reddot38106] = &pb.ReddotItem{ + Rid: int32(comm.Reddot38106), + Activated: true, + } + break + } + } + } + } + break + } + } + } + return +} diff --git a/modules/stonehenge/module.go b/modules/stonehenge/module.go index 78f29a295..6845ea64f 100644 --- a/modules/stonehenge/module.go +++ b/modules/stonehenge/module.go @@ -7,6 +7,7 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/modules" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) const moduleName = "石阵秘境" @@ -90,3 +91,49 @@ func (this *Stonehenge) ReloadStageData() { this.modelStonehenge.reLoadStoneBoos() return } + +// 红点需求 +func (this *Stonehenge) Reddot(session comm.IUserSession, rid map[comm.ReddotType]struct{}) (items map[comm.ReddotType]*pb.ReddotItem) { + var ( + selfrid []comm.ReddotType = []comm.ReddotType{comm.Reddot38104} + confs []*cfg.GameStoneWeekData + info *pb.DBStonehenge + err error + ok bool + ) + items = make(map[comm.ReddotType]*pb.ReddotItem) + for _, v := range selfrid { + if _, ok = rid[v]; ok { + break + } + } + + if !ok { + return + } + if info, err = this.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil { + return + } + for _, v := range selfrid { + if _, ok = rid[v]; ok { + switch v { + case comm.Reddot38104: + if confs, err = this.configure.getGameStoneWeekDatas(); err != nil { + return + } + for _, v := range confs { + if _, ok = info.Weeklyreward[v.Id]; !ok { + if info.Integral >= v.Point { + items[comm.Reddot38104] = &pb.ReddotItem{ + Rid: int32(comm.Reddot38104), + Activated: true, + } + } + } + } + break + } + } + } + return +} diff --git a/pb/realarena_db.pb.go b/pb/realarena_db.pb.go index 5743f2a17..8b910920b 100644 --- a/pb/realarena_db.pb.go +++ b/pb/realarena_db.pb.go @@ -138,12 +138,14 @@ type DBRealArenaMember struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - User *BaseUserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"` //发起者信息 - Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 - Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` //积分 - Heros []string `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"` //队伍 - Disable int32 `protobuf:"varint,6,opt,name=disable,proto3" json:"disable"` //禁用 - Leader int32 `protobuf:"varint,7,opt,name=leader,proto3" json:"leader"` //队长 + User *BaseUserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"` //发起者信息 + Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` //积分 + Heros []string `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"` //队伍 + Disable int32 `protobuf:"varint,6,opt,name=disable,proto3" json:"disable"` //禁用 + Leader int32 `protobuf:"varint,7,opt,name=leader,proto3" json:"leader"` //队长 + Addintegral int32 `protobuf:"varint,8,opt,name=addintegral,proto3" json:"addintegral"` //当局获得积分 + Award []*UserAtno `protobuf:"bytes,9,rep,name=award,proto3" json:"award"` //奖励 } func (x *DBRealArenaMember) Reset() { @@ -220,6 +222,20 @@ func (x *DBRealArenaMember) GetLeader() int32 { return 0 } +func (x *DBRealArenaMember) GetAddintegral() int32 { + if x != nil { + return x.Addintegral + } + return 0 +} + +func (x *DBRealArenaMember) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + //竞技场比赛对象 type DBRealArenaRace struct { state protoimpl.MessageState @@ -317,7 +333,7 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{ 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 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, 0xac, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xef, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, @@ -328,18 +344,22 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{ 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x91, 0x01, - 0x0a, 0x0f, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63, - 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, - 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, - 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, - 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, - 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x20, 0x0a, + 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, + 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, + 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, + 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, + 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, + 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, + 0x62, 0x75, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -361,18 +381,20 @@ var file_realarena_realarena_db_proto_goTypes = []interface{}{ (*DBRealArenaRace)(nil), // 2: DBRealArenaRace nil, // 3: DBRealArena.DanawardEntry (*BaseUserInfo)(nil), // 4: BaseUserInfo + (*UserAtno)(nil), // 5: UserAtno } var file_realarena_realarena_db_proto_depIdxs = []int32{ 4, // 0: DBRealArena.uinfo:type_name -> BaseUserInfo 3, // 1: DBRealArena.danaward:type_name -> DBRealArena.DanawardEntry 4, // 2: DBRealArenaMember.user:type_name -> BaseUserInfo - 1, // 3: DBRealArenaRace.red:type_name -> DBRealArenaMember - 1, // 4: DBRealArenaRace.bule:type_name -> DBRealArenaMember - 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 + 5, // 3: DBRealArenaMember.award:type_name -> UserAtno + 1, // 4: DBRealArenaRace.red:type_name -> DBRealArenaMember + 1, // 5: DBRealArenaRace.bule:type_name -> DBRealArenaMember + 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 } func init() { file_realarena_realarena_db_proto_init() } diff --git a/pb/realarena_msg.pb.go b/pb/realarena_msg.pb.go index 3930c672e..f78640ea3 100644 --- a/pb/realarena_msg.pb.go +++ b/pb/realarena_msg.pb.go @@ -927,6 +927,70 @@ func (x *RealArenaSelectLeaderPush) GetIndex() int32 { return 0 } +//战斗结束推送 +type RealArenaBattleFinishPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Winside int32 `protobuf:"varint,1,opt,name=winside,proto3" json:"winside"` + Red *DBRealArenaMember `protobuf:"bytes,2,opt,name=red,proto3" json:"red"` + Bule *DBRealArenaMember `protobuf:"bytes,3,opt,name=bule,proto3" json:"bule"` +} + +func (x *RealArenaBattleFinishPush) Reset() { + *x = RealArenaBattleFinishPush{} + if protoimpl.UnsafeEnabled { + mi := &file_realarena_realarena_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RealArenaBattleFinishPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RealArenaBattleFinishPush) ProtoMessage() {} + +func (x *RealArenaBattleFinishPush) ProtoReflect() protoreflect.Message { + mi := &file_realarena_realarena_msg_proto_msgTypes[19] + 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 RealArenaBattleFinishPush.ProtoReflect.Descriptor instead. +func (*RealArenaBattleFinishPush) Descriptor() ([]byte, []int) { + return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *RealArenaBattleFinishPush) GetWinside() int32 { + if x != nil { + return x.Winside + } + return 0 +} + +func (x *RealArenaBattleFinishPush) GetRed() *DBRealArenaMember { + if x != nil { + return x.Red + } + return nil +} + +func (x *RealArenaBattleFinishPush) GetBule() *DBRealArenaMember { + if x != nil { + return x.Bule + } + return nil +} + //服务内部协议------------------------------------------------------------- //实时竞技场离线委托通知 type RPC_RealArenaTrusteeshipReq struct { @@ -941,7 +1005,7 @@ type RPC_RealArenaTrusteeshipReq struct { func (x *RPC_RealArenaTrusteeshipReq) Reset() { *x = RPC_RealArenaTrusteeshipReq{} if protoimpl.UnsafeEnabled { - mi := &file_realarena_realarena_msg_proto_msgTypes[19] + mi := &file_realarena_realarena_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -954,7 +1018,7 @@ func (x *RPC_RealArenaTrusteeshipReq) String() string { func (*RPC_RealArenaTrusteeshipReq) ProtoMessage() {} func (x *RPC_RealArenaTrusteeshipReq) ProtoReflect() protoreflect.Message { - mi := &file_realarena_realarena_msg_proto_msgTypes[19] + mi := &file_realarena_realarena_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -967,7 +1031,7 @@ func (x *RPC_RealArenaTrusteeshipReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RPC_RealArenaTrusteeshipReq.ProtoReflect.Descriptor instead. func (*RPC_RealArenaTrusteeshipReq) Descriptor() ([]byte, []int) { - return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{19} + return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{20} } func (x *RPC_RealArenaTrusteeshipReq) GetRoomId() string { @@ -993,7 +1057,7 @@ type RPC_RealArenaTrusteeshipResp struct { func (x *RPC_RealArenaTrusteeshipResp) Reset() { *x = RPC_RealArenaTrusteeshipResp{} if protoimpl.UnsafeEnabled { - mi := &file_realarena_realarena_msg_proto_msgTypes[20] + mi := &file_realarena_realarena_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1006,7 +1070,7 @@ func (x *RPC_RealArenaTrusteeshipResp) String() string { func (*RPC_RealArenaTrusteeshipResp) ProtoMessage() {} func (x *RPC_RealArenaTrusteeshipResp) ProtoReflect() protoreflect.Message { - mi := &file_realarena_realarena_msg_proto_msgTypes[20] + mi := &file_realarena_realarena_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1019,7 +1083,7 @@ func (x *RPC_RealArenaTrusteeshipResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RPC_RealArenaTrusteeshipResp.ProtoReflect.Descriptor instead. func (*RPC_RealArenaTrusteeshipResp) Descriptor() ([]byte, []int) { - return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{20} + return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{21} } var File_realarena_realarena_msg_proto protoreflect.FileDescriptor @@ -1094,15 +1158,23 @@ var file_realarena_realarena_msg_proto_rawDesc = []byte{ 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, - 0x71, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, - 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, - 0x64, 0x22, 0x1e, 0x0a, 0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, - 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, - 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x78, 0x22, 0x83, 0x01, 0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, + 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, + 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f, + 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, + 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x22, 0x1e, 0x0a, 0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52, + 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, + 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1117,7 +1189,7 @@ func file_realarena_realarena_msg_proto_rawDescGZIP() []byte { return file_realarena_realarena_msg_proto_rawDescData } -var file_realarena_realarena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_realarena_realarena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_realarena_realarena_msg_proto_goTypes = []interface{}{ (*RealArenaInfoReq)(nil), // 0: RealArenaInfoReq (*RealArenaInfoResp)(nil), // 1: RealArenaInfoResp @@ -1138,22 +1210,26 @@ var file_realarena_realarena_msg_proto_goTypes = []interface{}{ (*RealArenaSelectTeamLeaderReq)(nil), // 16: RealArenaSelectTeamLeaderReq (*RealArenaSelectTeamLeaderResp)(nil), // 17: RealArenaSelectTeamLeaderResp (*RealArenaSelectLeaderPush)(nil), // 18: RealArenaSelectLeaderPush - (*RPC_RealArenaTrusteeshipReq)(nil), // 19: RPC_RealArenaTrusteeshipReq - (*RPC_RealArenaTrusteeshipResp)(nil), // 20: RPC_RealArenaTrusteeshipResp - (*DBRealArena)(nil), // 21: DBRealArena - (*DBRealArenaRace)(nil), // 22: DBRealArenaRace - (*HeroBase)(nil), // 23: HeroBase + (*RealArenaBattleFinishPush)(nil), // 19: RealArenaBattleFinishPush + (*RPC_RealArenaTrusteeshipReq)(nil), // 20: RPC_RealArenaTrusteeshipReq + (*RPC_RealArenaTrusteeshipResp)(nil), // 21: RPC_RealArenaTrusteeshipResp + (*DBRealArena)(nil), // 22: DBRealArena + (*DBRealArenaRace)(nil), // 23: DBRealArenaRace + (*HeroBase)(nil), // 24: HeroBase + (*DBRealArenaMember)(nil), // 25: DBRealArenaMember } var file_realarena_realarena_msg_proto_depIdxs = []int32{ - 21, // 0: RealArenaInfoResp.info:type_name -> DBRealArena - 22, // 1: RealArenaMatchSuccPush.race:type_name -> DBRealArenaRace - 23, // 2: RealArenaSelectTeamHeroReq.heros:type_name -> HeroBase - 23, // 3: RealArenaSelectHeroPush.heros:type_name -> HeroBase - 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 + 22, // 0: RealArenaInfoResp.info:type_name -> DBRealArena + 23, // 1: RealArenaMatchSuccPush.race:type_name -> DBRealArenaRace + 24, // 2: RealArenaSelectTeamHeroReq.heros:type_name -> HeroBase + 24, // 3: RealArenaSelectHeroPush.heros:type_name -> HeroBase + 25, // 4: RealArenaBattleFinishPush.red:type_name -> DBRealArenaMember + 25, // 5: RealArenaBattleFinishPush.bule:type_name -> DBRealArenaMember + 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 } func init() { file_realarena_realarena_msg_proto_init() } @@ -1393,7 +1469,7 @@ func file_realarena_realarena_msg_proto_init() { } } file_realarena_realarena_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPC_RealArenaTrusteeshipReq); i { + switch v := v.(*RealArenaBattleFinishPush); i { case 0: return &v.state case 1: @@ -1405,6 +1481,18 @@ func file_realarena_realarena_msg_proto_init() { } } file_realarena_realarena_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RPC_RealArenaTrusteeshipReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_realarena_realarena_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RPC_RealArenaTrusteeshipResp); i { case 0: return &v.state @@ -1423,7 +1511,7 @@ func file_realarena_realarena_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_realarena_realarena_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 21, + NumMessages: 22, NumExtensions: 0, NumServices: 0, },