From 3d87c00b77c378056e3e433eaa45e9c06b39d4c1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 28 Dec 2022 10:16:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E7=A7=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 ++ modules/equipment/module.go | 18 ++++++++++++++++++ modules/mainline/api_challengeover.go | 2 +- modules/worldtask/api_finish.go | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index 5648fd7b3..5a4a60bc7 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -130,6 +130,8 @@ type ( QueryEquipmentAmount(uid string, equipmentId string) (amount uint32) //添加新武器 AddNewEquipments(session IUserSession, cIds map[string]uint32, bPush bool) (change []*pb.DB_Equipment, code pb.ErrorCode) + //添加所有装备 + AddAllEquipments(session IUserSession) (code pb.ErrorCode) //创建装备 NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment) //添加装备 diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 440af04ea..646265dec 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -110,6 +110,24 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri return } +func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.ErrorCode) { + var ( + configure *cfg.GameEquip + cIds map[string]uint32 + err error + ) + if configure, err = this.configure.GetEquipmentConfigure(); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + cIds = make(map[string]uint32) + for _, v := range configure.GetDataList() { + cIds[v.Id] = 1 + } + _, code = this.AddNewEquipments(session, cIds, true) + return +} + //删除武器 func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (code pb.ErrorCode) { var ( diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 65d6b06fa..e467304e5 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -75,7 +75,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh if len(hero) > 0 { ishave := this.module.ModuleUser.CheckTujianHero(session, hero) for i, v := range ishave { - if v { + if !v { newhero = append(newhero, hero[i]) } } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index d07ea6e7d..c1d8a0978 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -116,7 +116,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if len(hero) > 0 { ishave := this.module.ModuleUser.CheckTujianHero(session, hero) for i, v := range ishave { - if v { + if !v { newhero = append(newhero, hero[i]) } } From 07774d0c598b33bd0a40428a6137bf3b3d0fd340 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Dec 2022 10:38:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E8=8B=B1=E9=9B=84=20=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/hero_test.go | 11 ++++ modules/hero/module.go | 4 ++ modules/hunting/model_rank.go | 2 +- modules/hunting/module.go | 3 +- modules/viking/model_rank.go | 2 +- modules/viking/module.go | 3 +- pb/hero_msg.pb.go | 120 ++++++++++++++++++++++++++-------- 7 files changed, 113 insertions(+), 32 deletions(-) diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 2ace8e4d8..ccd28ac06 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -18,6 +18,7 @@ import ( "go_dreamfactory/sys/configure" "go_dreamfactory/sys/db" "go_dreamfactory/utils" + "math" "reflect" "strings" "testing" @@ -70,6 +71,16 @@ func GetMonthStartEnd() (int64, int64) { return _d1, _d2 } func Test_Main(t *testing.T) { + + var l int64 + var l1 int64 + var i int32 + var f float64 + i = math.MaxInt32 + l = int64(i) << 31 + l1 = 1 << 31 + f = float64(l) + fmt.Printf("%d,%d,%f", l, l1, f) var list []int32 var list2 []int32 list = []int32{1, 2, 3, 4, 5, 6, 7, 8, 9} diff --git a/modules/hero/module.go b/modules/hero/module.go index a46bc6d6c..2ef8fa60c 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -95,6 +95,10 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string, initUpdate["tujian"] = sz this.ModuleUser.ChangeUserExpand(session.GetUserId(), initUpdate) + // 首次获得英雄 则推送 + session.SendMsg("hero", "firstget", &pb.HeroFirstGetPush{ + HeroId: heroCfgId, + }) } } //}(session.GetUserId(), heroCfgId) diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go index 8e0ff8816..f2d307f7f 100644 --- a/modules/hunting/model_rank.go +++ b/modules/hunting/model_rank.go @@ -56,7 +56,7 @@ func (this *ModelRank) getHuntingRankListByBossType(uid string, bossType int32) } // 排行数据写跨服 -func (this *ModelRank) SetRankListData(tableName string, score int32, uid string) { +func (this *ModelRank) SetRankListData(tableName string, score int64, uid string) { if !db.IsCross() { if conn, err := db.Cross(); err == nil { var ( diff --git a/modules/hunting/module.go b/modules/hunting/module.go index 69a9f7f8b..b9b2b2f12 100644 --- a/modules/hunting/module.go +++ b/modules/hunting/module.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/db" + "math" "strconv" "time" @@ -136,7 +137,7 @@ func (this *Hunting) CheckRank(uid string, boosID int32, difficulty int32, hunti dbModel := db.NewDBModel(comm.TableHuntingRank, time.Hour, conn_) dbModel.AddList(uid, new.Id, new) } - this.modulerank.SetRankListData("huntingRank"+strconv.Itoa(int(boosID)), difficulty<<16+costTime, objID) + this.modulerank.SetRankListData("huntingRank"+strconv.Itoa(int(boosID)), int64(difficulty)<<31+int64(math.MaxInt32-costTime), objID) } } diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go index f8b5af96b..9540a3020 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -55,7 +55,7 @@ func (this *ModelRank) getVikingRankListByBossType(uid string, bossType int32) * } // 排行数据写跨服 -func (this *ModelRank) SetRankListData(tableName string, score int32, uid string) { +func (this *ModelRank) SetRankListData(tableName string, score int64, uid string) { if !db.IsCross() { if conn, err := db.Cross(); err == nil { var ( diff --git a/modules/viking/module.go b/modules/viking/module.go index d2ffc2ada..3f4cdc61e 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -13,6 +13,7 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" + "math" "strconv" "time" @@ -143,7 +144,7 @@ func (this *Viking) CheckRank(uid string, boosID int32, difficulty int32, viking dbModel := db.NewDBModel(comm.TableVikingRank, time.Hour, conn_) dbModel.AddList(uid, new.Id, new) } - this.modulerank.SetRankListData("vikingRank"+strconv.Itoa(int(boosID)), difficulty<<16+costTime, objID) + this.modulerank.SetRankListData("vikingRank"+strconv.Itoa(int(boosID)), int64(difficulty<<31)+int64(math.MaxInt32-costTime), objID) } } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 212cd1ac4..76dba0441 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2184,6 +2184,54 @@ func (x *HeroBuyResp) GetTenbuy() int32 { return 0 } +// 首次获得英雄 +type HeroFirstGetPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + HeroId string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId"` //英雄id +} + +func (x *HeroFirstGetPush) Reset() { + *x = HeroFirstGetPush{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroFirstGetPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroFirstGetPush) ProtoMessage() {} + +func (x *HeroFirstGetPush) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[41] + 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 HeroFirstGetPush.ProtoReflect.Descriptor instead. +func (*HeroFirstGetPush) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{41} +} + +func (x *HeroFirstGetPush) GetHeroId() string { + if x != nil { + return x.HeroId + } + return "" +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -2379,8 +2427,11 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, + 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2395,7 +2446,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 44) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 45) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2438,36 +2489,37 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroTalentResetResp)(nil), // 38: HeroTalentResetResp (*HeroBuyReq)(nil), // 39: HeroBuyReq (*HeroBuyResp)(nil), // 40: HeroBuyResp - nil, // 41: HeroPropertyPush.PropertyEntry - nil, // 42: HeroPropertyPush.AddPropertyEntry - nil, // 43: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 44: DBHero - (*DBHeroTalent)(nil), // 45: DBHeroTalent + (*HeroFirstGetPush)(nil), // 41: HeroFirstGetPush + nil, // 42: HeroPropertyPush.PropertyEntry + nil, // 43: HeroPropertyPush.AddPropertyEntry + nil, // 44: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 45: DBHero + (*DBHeroTalent)(nil), // 46: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 44, // 0: HeroInfoResp.base:type_name -> DBHero - 44, // 1: HeroListResp.list:type_name -> DBHero + 45, // 0: HeroInfoResp.base:type_name -> DBHero + 45, // 1: HeroListResp.list:type_name -> DBHero 4, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32 - 44, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 45, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero 7, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData 7, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 44, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 44, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 44, // 8: HeroResonanceResp.hero:type_name -> DBHero - 44, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero - 44, // 10: HeroResonanceResetResp.hero:type_name -> DBHero + 45, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 45, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 45, // 8: HeroResonanceResp.hero:type_name -> DBHero + 45, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero + 45, // 10: HeroResonanceResetResp.hero:type_name -> DBHero 16, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData - 44, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 44, // 13: HeroAwakenResp.hero:type_name -> DBHero - 41, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 42, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 44, // 16: HeroLockResp.hero:type_name -> DBHero - 44, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero - 44, // 18: HeroChangePush.list:type_name -> DBHero - 43, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 45, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 45, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 45, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 45, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 45, // 13: HeroAwakenResp.hero:type_name -> DBHero + 42, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 43, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 45, // 16: HeroLockResp.hero:type_name -> DBHero + 45, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero + 45, // 18: HeroChangePush.list:type_name -> DBHero + 44, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 46, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 46, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 46, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent 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 @@ -2974,6 +3026,18 @@ func file_hero_hero_msg_proto_init() { return nil } } + file_hero_hero_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroFirstGetPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -2981,7 +3045,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 44, + NumMessages: 45, NumExtensions: 0, NumServices: 0, }, From 9131789b3daffd842400a1ff6d40f90f3375902e Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 28 Dec 2022 10:43:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=AB=9E=E6=8A=80?= =?UTF-8?q?=E5=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/arena/api_rank.go | 13 ++++- pb/arena_msg.pb.go | 114 +++++++++++++++++++++----------------- 2 files changed, 75 insertions(+), 52 deletions(-) diff --git a/modules/arena/api_rank.go b/modules/arena/api_rank.go index b4f27c3fe..8f112e126 100644 --- a/modules/arena/api_rank.go +++ b/modules/arena/api_rank.go @@ -16,6 +16,7 @@ func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) ///排行榜获取 func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data proto.Message) { var ( + info *pb.DBArenaUser uids []string ranks []*pb.DBArenaUser players []*pb.ArenaPlayer @@ -25,6 +26,10 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code if code = this.RankCheck(session, req); code != pb.ErrorCode_Success { return } + if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError + return + } if uids, err = this.module.modelRank.queryRankUser(); err != nil { code = pb.ErrorCode_DBError return @@ -46,7 +51,13 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code Defend: v.Defend, Isai: false, } + if session.GetUserId() == v.Uid && info.Rank != v.Rank { + info.Rank = v.Rank + if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { + code = pb.ErrorCode_DBError + } + } } - session.SendMsg(string(this.module.GetType()), "rank", &pb.ArenaRankResp{Players: players}) + session.SendMsg(string(this.module.GetType()), "rank", &pb.ArenaRankResp{Players: players, Info: info}) return } diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go index b19f806ce..1d8ebd269 100644 --- a/pb/arena_msg.pb.go +++ b/pb/arena_msg.pb.go @@ -807,6 +807,7 @@ type ArenaRankResp struct { unknownFields protoimpl.UnknownFields Players []*ArenaPlayer `protobuf:"bytes,1,rep,name=players,proto3" json:"players"` + Info *DBArenaUser `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` } func (x *ArenaRankResp) Reset() { @@ -848,6 +849,13 @@ func (x *ArenaRankResp) GetPlayers() []*ArenaPlayer { return nil } +func (x *ArenaRankResp) GetInfo() *DBArenaUser { + if x != nil { + return x.Info + } + return nil +} + //购买票据 type ArenaBuyReq struct { state protoimpl.MessageState @@ -1353,50 +1361,53 @@ var file_arena_arena_msg_proto_rawDesc = []byte{ 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, - 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, + 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x59, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x73, 0x22, 0x25, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, - 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, - 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, + 0x73, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0c, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x22, 0x25, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, + 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e, 0x0a, 0x0c, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 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, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x25, 0x0a, 0x11, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, + 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, + 0x64, 0x22, 0x3e, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 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, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, + 0x64, 0x22, 0x4a, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x70, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x62, 0x0a, + 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 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, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 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, 0x4d, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 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, 0x9e, 0x01, 0x0a, 0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 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, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x25, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, - 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, - 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, - 0x3e, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 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, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, - 0x4a, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, - 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, - 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x62, 0x0a, 0x0d, 0x41, - 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 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, - 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 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, - 0x4d, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x70, 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, 0x9e, - 0x01, 0x0a, 0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 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, 0x2f, - 0x0a, 0x03, 0x6e, 0x70, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, - 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, - 0x42, 0x4e, 0x70, 0x63, 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, + 0x12, 0x2f, 0x0a, 0x03, 0x6e, 0x70, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, + 0x63, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, + 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 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 ( @@ -1455,17 +1466,18 @@ var file_arena_arena_msg_proto_depIdxs = []int32{ 29, // 5: ArenaChallengeResp.info:type_name -> BattleInfo 30, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport 26, // 7: ArenaRankResp.players:type_name -> ArenaPlayer - 27, // 8: ArenaPlotReq.battle:type_name -> BattleFormation - 28, // 9: ArenaPlotResp.code:type_name -> ErrorCode - 29, // 10: ArenaPlotResp.info:type_name -> BattleInfo - 30, // 11: ArenaPlotRewardReq.report:type_name -> BattleReport - 24, // 12: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry - 31, // 13: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc - 14, // [14:14] is the sub-list for method output_type - 14, // [14:14] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 25, // 8: ArenaRankResp.info:type_name -> DBArenaUser + 27, // 9: ArenaPlotReq.battle:type_name -> BattleFormation + 28, // 10: ArenaPlotResp.code:type_name -> ErrorCode + 29, // 11: ArenaPlotResp.info:type_name -> BattleInfo + 30, // 12: ArenaPlotRewardReq.report:type_name -> BattleReport + 24, // 13: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry + 31, // 14: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_arena_arena_msg_proto_init() }