上传红点和英雄禁用

This commit is contained in:
liwei1dao 2024-03-07 14:37:44 +08:00
parent f76a63fa3e
commit 1b198d0ab5
14 changed files with 654 additions and 631 deletions

View File

@ -483,8 +483,7 @@ type (
}
//支付模块
IPay interface {
//模拟发货
// ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData)
IGetReddot
IActivityNotice
}
@ -533,6 +532,7 @@ type (
//捕羊大赛
IParkour interface {
IGetReddot
}
ITools interface {
@ -612,6 +612,7 @@ type (
}
//战令
IWarorder interface {
IGetReddot
IPayDelivery
IActivityNotice
}

View File

@ -184,6 +184,14 @@ func (this *ServiceBase) GetModule(ModuleName core.M_Modules) (module core.IModu
}
}
//获取当前服务下指定模块对象
func (this *ServiceBase) GetAllModules() (modules []core.IModule, err error) {
for _, v := range this.modules {
modules = append(modules, v.mi)
}
return
}
//获取当前服务下指定组件对象
func (this *ServiceBase) GetComp(CompName core.S_Comps) (comp core.IServiceComp, err error) {
if v, ok := this.comps[CompName]; ok {

View File

@ -61,6 +61,7 @@ type IService interface {
Destroy() (err error) //销毁服务
GetComp(CompName S_Comps) (comp IServiceComp, err error) //获取组件
GetModule(ModuleName M_Modules) (module IModule, err error) //获取模块
GetAllModules() (modules []IModule, err error) //获取所有模块
}
//基础服务组件的接口设计

View File

@ -55,11 +55,6 @@ func (this *apiComp) DanReceive(session comm.IUserSession, req *pb.ArenaDanRecei
return
}
if errdata, atno = this.module.DispenseAtno(session, conf.ExReward, true); errdata != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if err = this.module.model.change(session.GetUserId(), map[string]interface{}{

View File

@ -26,7 +26,7 @@ func (this *apiComp) SelectTeamHero(session comm.IUserSession, req *pb.RealArena
room, ok = this.module.rooms[req.Roomid]
this.module.lock.RUnlock()
if ok {
if err = room.selectheros(session.GetUserId(), req.Herosids, req.Heroscids); err != nil {
if err = room.selectheros(session.GetUserId(), req.Heros); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: err.Error(),

View File

@ -6,7 +6,9 @@ import (
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
@ -81,6 +83,43 @@ func (this *modelComp) change(uid string, update map[string]interface{}) (err er
return
}
// 积分计算
func (this *modelComp) integralCompute(red, bule *pb.ArenaPlayer, iswin bool) {
var (
redactive *cfg.GameArenaActiveRewardData
buleactive *cfg.GameArenaActiveRewardData
err error
)
if redactive, err = this.module.configure.getGameArenarealtimeConfig(red.Dan); err != nil {
this.module.Errorln(err)
return
}
if buleactive, err = this.module.configure.getGameArenarealtimeConfig(bule.Dan); err != nil {
this.module.Errorln(err)
return
}
if iswin {
red.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float32(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400)))))
bule.Changeintegral = int32(float64(buleactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral))/400))))
} else {
red.Changeintegral = int32(float64(redactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400)))))
bule.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral)/400)))))
}
if red.Integral+red.Changeintegral < 0 {
red.Changeintegral = -red.Integral
red.Integral = 0
} else {
red.Integral = red.Integral + red.Changeintegral
}
if bule.Integral+bule.Changeintegral < 0 {
bule.Changeintegral = -bule.Integral
bule.Integral = 0
} else {
bule.Integral = bule.Integral + bule.Changeintegral
}
}
// 埋点专属模型 会封装特殊的数据转换接口
type realArenaModel struct {
module *RealArena

View File

@ -0,0 +1,93 @@
package realarena
import (
"context"
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/sys/db"
"github.com/go-redis/redis/v8"
)
// /竞技场 数据组件
type modelRank struct {
modules.MCompModel
module *RealArena
}
// 组件初始化接口
func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
this.TableName = comm.TableArenaRank
this.MCompModel.Init(service, module, comp, opt)
this.module = module.(*RealArena)
return
}
func (this *modelRank) rankey() string {
return fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName)
}
// 更新排名
func (this *modelRank) updateArenaRank(uid string, integral int32) (rank int64, err error) {
var (
pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO())
cmd *redis.IntCmd
menbersCmd *redis.IntCmd
)
if cmd = pipe.ZAdd(this.rankey(), &redis.Z{Score: float64(integral), Member: uid}); err != nil {
this.module.Errorln(err)
}
menbersCmd = pipe.ZRevRank(this.rankey(), uid)
if _, err = pipe.Exec(); err != nil {
this.module.Errorln(err)
return
}
if _, err = cmd.Result(); err != nil {
this.module.Errorln(err)
return
}
if rank, err = menbersCmd.Result(); err != nil {
this.module.Errorln(err)
return
}
rank = rank + 1
return
}
//获取指定区间的玩家人数
func (this *modelRank) queryRankByScoreArea(min, max int32) (count int64, err error) {
if count, err = this.DBModel.Redis.ZCount(this.rankey(), fmt.Sprintln(min), fmt.Sprintln(max)); err != nil {
this.module.Errorln(err)
return
}
return
}
// 获取排行榜前50的用户名单
func (this *modelRank) queryRankUser() (ranks []string, err error) {
var (
result []string
)
if result, err = this.DBModel.Redis.ZRevRange(this.rankey(), 0, 50).Result(); err != nil {
this.module.Errorln(err)
return
}
ranks = make([]string, 0)
for i := 0; i < len(result); i += 1 {
ranks = append(ranks, result[i])
}
return
}
// 比赛结算
func (this *modelRank) raceSettlement() {
// if isopen := this.module.modelArena.isInMaintenance(); isopen {
this.DBModel.Del(this.rankey(), db.SetDBMgoLog(false))
// }
}

View File

@ -31,6 +31,7 @@ type RealArena struct {
apicomp *apiComp
configure *configureComp
model *modelComp
modelRank *modelRank
match *matchComp
lock sync.RWMutex
rooms map[string]*Room
@ -69,6 +70,7 @@ func (this *RealArena) OnInstallComp() {
this.apicomp = this.RegisterComp(new(apiComp)).(*apiComp)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
this.model = this.RegisterComp(new(modelComp)).(*modelComp)
this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank)
this.match = this.RegisterComp(new(matchComp)).(*matchComp)
}
@ -174,3 +176,36 @@ func (this *RealArena) endgame(ctx context.Context, req *pb.RPC_RealArenaTrustee
}
return
}
//战斗结束
func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32) {
var (
// room *Room
ok bool
err error
)
this.lock.Lock()
_, ok = this.rooms[roomid]
delete(this.rooms, roomid)
this.lock.Unlock()
if ok {
if err = this.model.change(red, map[string]interface{}{
"state": 0,
"roomid": "",
"roompath": "",
"integral": 0,
}); err != nil {
this.Errorln(err)
return
}
if err = this.model.change(bule, map[string]interface{}{
"state": 0,
"roomid": "",
"roompath": "",
"integral": 0,
}); err != nil {
this.Errorln(err)
return
}
}
}

View File

@ -40,7 +40,7 @@ func (this *Room) init() (err error) {
}
//选择英雄
func (this *Room) selectheros(uid string, heros []string, herocid []string) (err error) {
func (this *Room) selectheros(uid string, heros []*pb.HeroBase) (err error) {
var (
num int32
)
@ -51,8 +51,12 @@ func (this *Room) selectheros(uid string, heros []string, herocid []string) (err
for _, v := range this.members {
if v.User.Uid == uid {
v.Heros = heros
v.Heroscid = herocid
v.Heros = make([]string, len(heros))
for i, hero := range heros {
if hero != nil {
v.Heros[i] = hero.Old
}
}
} else {
this.handle = v.User.Uid
}
@ -69,14 +73,14 @@ func (this *Room) selectheros(uid string, heros []string, herocid []string) (err
break
}
this.PushMessage("startselecthero", &pb.RealArenaSelectHeroPush{
Uid: this.members[0].User.Uid,
Heroscids: herocid,
Uid: this.members[0].User.Uid,
Heros: heros,
})
this.step++
if this.step == 7 { //选完了
this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
Uid: this.members[0].User.Uid,
Uid: this.members[1].User.Uid,
Countdown: 10,
})
} else {
@ -94,19 +98,23 @@ func (this *Room) disableheros(uid string, index int32) (err error) {
var finish bool
finish = true
for _, v := range this.members {
if v.User.Uid == uid {
if v.User.Uid != uid {
v.Disable = index
}
if v.Disable == -1 {
finish = false
}
}
this.PushMessage("selecthero", &pb.RealArenaDisableHeroPush{
this.PushMessage("disablehero", &pb.RealArenaDisableHeroPush{
Uid: uid,
Index: index,
})
if finish {
this.PushMessage("startselectleader", &pb.RealArenaStartSelectLeaderPush{
Countdown: 10,
})
} else {
this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
Uid: this.members[0].User.Uid,
Countdown: 10,
})

View File

@ -2,6 +2,7 @@ package reddot
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/pb"
)
@ -27,144 +28,21 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
var (
modules []core.IModule
reddotItem []*pb.ReddotItem = make([]*pb.ReddotItem, 0)
)
for _, v := range this.module.mainline.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
modules, _ = this.module.service.GetAllModules()
for _, module := range modules {
if redot, ok := module.(comm.IGetReddot); ok {
for _, v := range redot.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
}
}
for _, v := range this.module.smithy.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.ModuleSociaty.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.arena.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.friend.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.library.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.guildgve.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.horoscope.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.gourmet.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.mail.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.viking.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.hunting.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.gourmet.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.ModuleUser.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.atlas.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.color.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
for _, v := range this.module.catchbugs.Reddot(session, reds) {
reddotItem = append(reddotItem, v)
}
if len(reddotItem) > 0 {
session.SendMsg(string(this.module.GetType()), "change", &pb.ReddotChangePush{Rids: reddotItem})
}
})
// for _, rid := range req.Rids {
// _rid := comm.ReddotType(rid)
// switch _rid {
// //任务
// // case comm.Reddot10101, comm.Reddot10102, comm.Reddot10103, comm.Reddot10201, comm.Reddot10301:
// // for k, v := range this.module.ModuleTask.Reddot(session, _rid) {
// // reddot[int32(k)] = v
// // }
// //主线
// case comm.Reddot24101:
// for k, v := range this.module.mainline.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //铁匠铺
// case comm.Reddot17102, comm.Reddot17106, comm.Reddot17107:
// for k, v := range this.module.smithy.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //工会
// case comm.Reddot15102, comm.Reddot15201, comm.Reddot15401:
// for k, v := range this.module.ModuleSociaty.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //竞技场
// case comm.Reddot22102:
// for k, v := range this.module.arena.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //好友
// case comm.Reddot21101:
// for k, v := range this.module.friend.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //羁绊
// case comm.Reddot19103, comm.Reddot19105, comm.Reddot19109, comm.Reddot19110:
// for k, v := range this.module.library.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //每日任务
// case comm.Reddot25101:
// for k, v := range this.module.library.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// //工会boos战
// case comm.Reddot15301:
// for k, v := range this.module.guildgve.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot17:
// for k, v := range this.module.horoscope.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot20, comm.Reddot21, comm.Reddot22:
// for k, v := range this.module.gourmet.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot12101, comm.Reddot12102:
// for k, v := range this.module.mail.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot13102:
// for k, v := range this.module.viking.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot14102:
// for k, v := range this.module.hunting.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot23101:
// for k, v := range this.module.gourmet.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// case comm.Reddot27101, comm.Reddot30100:
// for k, v := range this.module.ModuleUser.Reddot(session, _rid) {
// reddot[int32(k)] = v
// }
// }
// }
return
}

View File

@ -21,27 +21,7 @@ func NewModule() core.IModule {
type Reddot struct {
modules.ModuleBase
service base.IRPCXService
smithy comm.ISmithy //铁匠铺
library comm.ILibrary //羁绊
mail comm.Imail //邮件
sociaty comm.ISociaty //工会
pagoda comm.IPagoda
horoscope comm.IHoroscope
arena comm.IArena //竞技场
practice comm.IPractice //武馆
dailytask comm.IDailytask //每日任务
friend comm.IFriend
gourmet comm.IGourmet
viking comm.IViking
hunting comm.IHunting
guildgve comm.IGuildgve //工会boos战
expedition comm.IExpedition //工会远征
api_comp *apiComp
mainline comm.IMainline
atlas comm.IPandaAtlas
color comm.IDColor
catchbugs comm.ICatchBugs
apicomp *apiComp
}
// 模块名
@ -61,96 +41,13 @@ func (this *Reddot) Start() (err error) {
if err = this.ModuleBase.Start(); err != nil {
return
}
var module core.IModule
if module, err = this.service.GetModule(comm.ModuleMainline); err != nil {
return
}
this.mainline = module.(comm.IMainline)
if module, err = this.service.GetModule(comm.ModuleSmithy); err != nil {
return
}
this.smithy = module.(comm.ISmithy)
if module, err = this.service.GetModule(comm.ModuleFriend); err != nil {
return
}
this.friend = module.(comm.IFriend)
if module, err = this.service.GetModule(comm.ModulePagoda); err != nil {
return
}
this.pagoda = module.(comm.IPagoda)
if module, err = this.service.GetModule(comm.ModuleHoroscope); err != nil {
return
}
this.horoscope = module.(comm.IHoroscope)
if module, err = this.service.GetModule(comm.ModuleArena); err != nil {
return
}
this.arena = module.(comm.IArena)
if module, err = this.service.GetModule(comm.ModulePractice); err != nil {
return
}
this.practice = module.(comm.IPractice)
if module, err = this.service.GetModule(comm.ModuleGourmet); err != nil {
return
}
this.gourmet = module.(comm.IGourmet)
if module, err = this.service.GetModule(comm.ModuleSociaty); err != nil {
return
}
this.sociaty = module.(comm.ISociaty)
if module, err = this.service.GetModule(comm.ModuleMail); err != nil {
return
}
this.mail = module.(comm.Imail)
if module, err = this.service.GetModule(comm.ModuleViking); err != nil {
return
}
this.viking = module.(comm.IViking)
if module, err = this.service.GetModule(comm.ModuleHunting); err != nil {
return
}
this.hunting = module.(comm.IHunting)
if module, err = this.service.GetModule(comm.ModuleLibrary); err != nil {
return
}
this.library = module.(comm.ILibrary)
if module, err = this.service.GetModule(comm.ModuleDailytask); err != nil {
return
}
this.dailytask = module.(comm.IDailytask)
if module, err = this.service.GetModule(comm.ModuleGuildGve); err != nil {
return
}
this.guildgve = module.(comm.IGuildgve)
if module, err = this.service.GetModule(comm.ModulePandaAtlas); err != nil {
return
}
this.atlas = module.(comm.IPandaAtlas)
if module, err = this.service.GetModule(comm.ModuleDcolor); err != nil {
return
}
this.color = module.(comm.IDColor)
if module, err = this.service.GetModule(comm.ModuleCatchbugs); err != nil {
return
}
this.catchbugs = module.(comm.ICatchBugs)
return
}
// 装备组件
func (this *Reddot) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
this.apicomp = this.RegisterComp(new(apiComp)).(*apiComp)
}
// 推送红点

File diff suppressed because it is too large Load Diff

View File

@ -142,7 +142,6 @@ type DBRealArenaMember struct {
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"` //队伍
Heroscid []string `protobuf:"bytes,5,rep,name=heroscid,proto3" json:"heroscid"` //队伍cid
Disable int32 `protobuf:"varint,6,opt,name=disable,proto3" json:"disable"` //禁用
Leader int32 `protobuf:"varint,7,opt,name=leader,proto3" json:"leader"` //队长
}
@ -207,13 +206,6 @@ func (x *DBRealArenaMember) GetHeros() []string {
return nil
}
func (x *DBRealArenaMember) GetHeroscid() []string {
if x != nil {
return x.Heroscid
}
return nil
}
func (x *DBRealArenaMember) GetDisable() int32 {
if x != nil {
return x.Disable
@ -325,7 +317,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, 0xc8,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xac,
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,
@ -333,22 +325,21 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x04,
0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x68,
0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x68,
0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 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,
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,
}
var (

View File

@ -379,9 +379,8 @@ type RealArenaSelectTeamHeroReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
Herosids []string `protobuf:"bytes,2,rep,name=herosids,proto3" json:"herosids"`
Heroscids []string `protobuf:"bytes,3,rep,name=heroscids,proto3" json:"heroscids"`
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
Heros []*HeroBase `protobuf:"bytes,2,rep,name=heros,proto3" json:"heros"`
}
func (x *RealArenaSelectTeamHeroReq) Reset() {
@ -423,16 +422,9 @@ func (x *RealArenaSelectTeamHeroReq) GetRoomid() string {
return ""
}
func (x *RealArenaSelectTeamHeroReq) GetHerosids() []string {
func (x *RealArenaSelectTeamHeroReq) GetHeros() []*HeroBase {
if x != nil {
return x.Herosids
}
return nil
}
func (x *RealArenaSelectTeamHeroReq) GetHeroscids() []string {
if x != nil {
return x.Heroscids
return x.Heros
}
return nil
}
@ -481,8 +473,8 @@ type RealArenaSelectHeroPush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
Heroscids []string `protobuf:"bytes,2,rep,name=heroscids,proto3" json:"heroscids"`
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
Heros []*HeroBase `protobuf:"bytes,2,rep,name=heros,proto3" json:"heros"`
}
func (x *RealArenaSelectHeroPush) Reset() {
@ -524,9 +516,9 @@ func (x *RealArenaSelectHeroPush) GetUid() string {
return ""
}
func (x *RealArenaSelectHeroPush) GetHeroscids() []string {
func (x *RealArenaSelectHeroPush) GetHeros() []*HeroBase {
if x != nil {
return x.Heroscids
return x.Heros
}
return nil
}
@ -743,8 +735,7 @@ type RealArenaStartSelectLeaderPush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
Countdown int32 `protobuf:"varint,2,opt,name=countdown,proto3" json:"countdown"` //倒计时
Countdown int32 `protobuf:"varint,2,opt,name=countdown,proto3" json:"countdown"` //倒计时
}
func (x *RealArenaStartSelectLeaderPush) Reset() {
@ -779,13 +770,6 @@ func (*RealArenaStartSelectLeaderPush) Descriptor() ([]byte, []int) {
return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{15}
}
func (x *RealArenaStartSelectLeaderPush) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
func (x *RealArenaStartSelectLeaderPush) GetCountdown() int32 {
if x != nil {
return x.Countdown
@ -1043,83 +1027,82 @@ var File_realarena_realarena_msg_proto protoreflect.FileDescriptor
var file_realarena_realarena_msg_proto_rawDesc = []byte{
0x0a, 0x1d, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c,
0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x1c, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x61,
0x72, 0x65, 0x6e, 0x61, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a,
0x10, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
0x71, 0x22, 0x35, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e,
0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65,
0x6e, 0x61, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c,
0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a,
0x12, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52,
0x65, 0x73, 0x70, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61,
0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1a,
0x0a, 0x18, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68,
0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e, 0x0a, 0x16, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63,
0x50, 0x75, 0x73, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61,
0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x60, 0x0a, 0x1c, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65,
0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x1c,
0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x6e, 0x0a, 0x1a,
0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54,
0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x69, 0x64, 0x73, 0x18, 0x02,
0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x69, 0x64, 0x73, 0x12, 0x1c,
0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x73, 0x22, 0x1d, 0x0a, 0x1b,
0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54,
0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x17, 0x52,
0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65,
0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x72, 0x65, 0x61,
0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61,
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65, 0x61,
0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a,
0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0c, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x04,
0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x52, 0x65, 0x61,
0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22,
0x19, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63,
0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1a, 0x0a, 0x18, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63,
0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72,
0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73, 0x68,
0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63, 0x65,
0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x60, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72,
0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65,
0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
0x73, 0x63, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72,
0x6f, 0x73, 0x63, 0x69, 0x64, 0x73, 0x22, 0x4f, 0x0a, 0x1d, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72,
0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48,
0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75,
0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f,
0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4b, 0x0a, 0x1b, 0x52, 0x65, 0x61, 0x6c, 0x41,
0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x48,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f,
0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63,
0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x55, 0x0a, 0x1a, 0x52, 0x65, 0x61, 0x6c,
0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x48,
0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 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, 0x1e, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f,
0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x18, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 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, 0x50, 0x0a, 0x1e, 0x52, 0x65, 0x61, 0x6c,
0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
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, 0x1c, 0x0a, 0x09,
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4c, 0x0a, 0x1c, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61,
0x6d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
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, 0x1f, 0x0a, 0x1d, 0x52, 0x65, 0x61, 0x6c,
0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x4c,
0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x43, 0x0a, 0x19, 0x52, 0x65, 0x61,
0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64,
0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1f,
0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22,
0x1d, 0x0a, 0x1b, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65,
0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4c,
0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63,
0x74, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x68,
0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x48, 0x65, 0x72,
0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22, 0x4f, 0x0a, 0x1d,
0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44, 0x69,
0x73, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a,
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4b, 0x0a,
0x1b, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c,
0x65, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 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, 0x1e, 0x0a, 0x1c, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65,
0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x18, 0x52, 0x65,
0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65,
0x72, 0x6f, 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,
0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3e,
0x0a, 0x1e, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74,
0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68,
0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4c,
0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63,
0x74, 0x54, 0x65, 0x61, 0x6d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16,
0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x72, 0x6f, 0x6f, 0x6d, 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, 0x1f, 0x0a, 0x1d,
0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54,
0x65, 0x61, 0x6d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x43, 0x0a,
0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
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,
}
var (
@ -1159,15 +1142,18 @@ var file_realarena_realarena_msg_proto_goTypes = []interface{}{
(*RPC_RealArenaTrusteeshipResp)(nil), // 20: RPC_RealArenaTrusteeshipResp
(*DBRealArena)(nil), // 21: DBRealArena
(*DBRealArenaRace)(nil), // 22: DBRealArenaRace
(*HeroBase)(nil), // 23: HeroBase
}
var file_realarena_realarena_msg_proto_depIdxs = []int32{
21, // 0: RealArenaInfoResp.info:type_name -> DBRealArena
22, // 1: RealArenaMatchSuccPush.race:type_name -> DBRealArenaRace
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
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
}
func init() { file_realarena_realarena_msg_proto_init() }
@ -1175,6 +1161,7 @@ func file_realarena_realarena_msg_proto_init() {
if File_realarena_realarena_msg_proto != nil {
return
}
file_comm_proto_init()
file_realarena_realarena_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_realarena_realarena_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {