liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

招募相关

Browse Source
This commit is contained in:
meixiongfeng 2023-07-12 16:03:30 +08:00
parent c78a491c56
commit 371460b902
21 changed files with 1615 additions and 1032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_battleready.json
View File

@ -444,7 +444,7 @@
"battleScenes": [
"bossfight_chef_01"
],
"disableAiCamera": 1,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,

1756
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

32
bin/json/game_drawpool.json
View File

@ -329,37 +329,5 @@
"n": 100
}
]
},
{
"key": 7,
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool70003",
"p4pool": "pro_pool70004",
"p5pool": "pro_pool70005",
"n3pool": "base_pool70003",
"n4pool": "base_pool70004",
"n5pool": "base_pool70005",
"baodi4": 10,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000024",
"n": 1
}
],
"consumeB": [
{
"a": "item",
"t": "10000024",
"n": 10
}
]
}
]

50
bin/json/game_drawreplace.json Normal file
View File

@ -0,0 +1,50 @@
[
{
"id": 1,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "25001",
"replace_cd": 0,
"replace_num": 0
},
{
"id": 2,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "24002",
"replace_cd": 0,
"replace_num": 0
},
{
"id": 3,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "13003",
"replace_cd": 0,
"replace_num": 0
},
{
"id": 4,
"pool": 2,
"hero_initial": "35001",
"hero_replace": "35001",
"replace_cd": 5184000,
"replace_num": 60
},
{
"id": 5,
"pool": 2,
"hero_initial": "35001",
"hero_replace": "43006",
"replace_cd": 5184000,
"replace_num": 120
},
{
"id": 6,
"pool": 2,
"hero_initial": "35001",
"hero_replace": "43001",
"replace_cd": 5184000,
"replace_num": 200
}
]

98
bin/json/game_drawreward.json Normal file
View File

@ -0,0 +1,98 @@
[
{
"num": 20,
"text": {
"key": "drawcard_drawcard_reward_text20",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 1
}
},
{
"num": 40,
"text": {
"key": "drawcard_drawcard_reward_text40",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 1
}
},
{
"num": 60,
"text": {
"key": "drawcard_drawcard_reward_text60",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 1
}
},
{
"num": 80,
"text": {
"key": "drawcard_drawcard_reward_text80",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 1
}
},
{
"num": 100,
"text": {
"key": "drawcard_drawcard_reward_text100",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 10
}
},
{
"num": 120,
"text": {
"key": "drawcard_drawcard_reward_text120",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 5
}
},
{
"num": 150,
"text": {
"key": "drawcard_drawcard_reward_text150",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 5
}
},
{
"num": 200,
"text": {
"key": "drawcard_drawcard_reward_text200",
"text": "{0}抽"
},
"reward": {
"a": "item",
"t": "10000001",
"n": 10
}
}
]

2
comm/const.go
View File

@ -270,7 +270,7 @@ const (
TableHdData = "hddata"
// 活动列表
TableHdList = "huodong"
TableHdInfo = "hdinfo"
//世界任务
TableWtask = "wtask"

5
comm/imodule.go
View File

@ -548,4 +548,9 @@ type (
IWarorder interface {
Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets)
}
IActivity interface {
GetHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息
GetAllHdInfo() (result []*pb.DBHuodong, err error) // 获取所有活动信息
}
)

3
modules/activity/api_getlist.go
View File

@ -11,9 +11,10 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ActivityGet
return
}
// 获取所有活动信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) {
list, err := this.module.modelhdList.getHdList(session.GetUserId())
list, err := this.module.modelhdList.getHdInfo()
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

42
modules/activity/model_hdlist.go
View File

@ -1,11 +1,13 @@
package activity
import (
"context"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
@ -16,32 +18,50 @@ type modelHdList struct {
}
func (this *modelHdList) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.TableName = string(comm.TableHdList)
this.TableName = string(comm.TableHdInfo)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Activity)
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "hdid", Value: bsonx.Int32(1)}},
})
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
return
}
func (this *modelHdList) getHdList(uid string) (result []*pb.DBHuodong, err error) {
result = make([]*pb.DBHuodong, 0)
if err = this.GetList(uid, &result); err != nil {
this.module.Errorf("getActivityList db error: %v", err)
err = nil
func (this *modelHdList) getHdInfo() (result []*pb.DBHuodong, err error) {
if _data, err := this.DBModel.DB.Find(comm.TableHdInfo, bson.M{}); err == nil {
for _data.Next(context.TODO()) {
temp := &pb.DBHuodong{}
if err = _data.Decode(temp); err != nil {
this.module.Errorln(err)
} else {
result = append(result, temp)
}
}
}
return
}
// 通过活动ID查找
func (this *modelHdList) getHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) {
_data := this.DBModel.DB.FindOne(comm.TableHdInfo, bson.M{"hdid": hid})
result = &pb.DBHuodong{}
if err = _data.Decode(result); err != nil {
this.module.Errorln(err)
}
return
}
// 不需要修改 此接口不调用
func (this *modelHdList) modifyHdList(uid string, data map[string]interface{}) error {
func (this *modelHdList) modifyHdInfo(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}
func (this *modelHdList) addHdList(hd *pb.DBHuodong) error {
func (this *modelHdList) addHdInfo(hd *pb.DBHuodong) error {
if _, err := this.DB.InsertOne(core.SqlTable("hdinfo"), hd); err != nil {
return err
}

20
modules/activity/module.go
View File

@ -44,7 +44,11 @@ func (this *Activity) Init(service core.IService, module core.IModule, options c
// }()
return
}
func (this *Activity) Start() (err error) {
err = this.ModuleBase.Start()
//this.modelhdList.getHdInfoByHdId(10002)
return
}
func (this *Activity) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
@ -92,7 +96,19 @@ func (this *Activity) CreateHdData() (err error) {
}
this.modelhdList.addHdList(db)
this.modelhdList.addHdInfo(db)
fmt.Printf("%v", db)
return
}
func (this *Activity) GetAllHdInfo() (result []*pb.DBHuodong, err error) {
result, err = this.modelhdList.getHdInfo()
return
}
// 通过活动ID查找
func (this *Activity) GetHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) {
result, err = this.modelhdList.getHdInfoByHdId(hid)
return
}

2
modules/hero/api_drawCard.go
View File

@ -52,7 +52,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
// 准备数据
/////////////////////////////////////
drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType + comm.DrawCardType0) // 获取新的抽卡配置
drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType) // 获取新的抽卡配置
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,

52
modules/hero/configure_comp.go
View File

@ -37,6 +37,11 @@ const (
hero_draw = "game_drawpool.json" // 新版抽卡
hero_cardweight = "game_drawweight.json" // 新版抽卡权重
hero_cardpool = "game_cardpool.json" // 新版卡池
// 限定招募和许愿招募
draw_replace = "game_drawreplace.json" // 设置5星英雄
draw_reward = "game_drawreward.json" //新手招募奖励
)
// /配置管理组件
@ -49,6 +54,8 @@ type configureComp struct {
module *Hero
starW map[int64]int32
cardPool map[string][]*cfg.GameCardPoolData
_selectPool map[int32][]*cfg.GamedrawReplaceData // 可选英雄卡池
}
// 组件初始化接口
@ -71,6 +78,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
game_shopitem: cfg.NewGameShopitem,
hero_skill: cfg.NewGameHeroSkill,
hero_draw: cfg.NewGameDrawPool,
draw_reward: cfg.NewGamedrawReward,
//hero_cardweight: cfg.NewGameDrawWeight,
})
//this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
@ -144,6 +152,22 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = fmt.Errorf("%T no is *cfg.NewGameCardPool", v)
}
})
//可选卡池初始化
configure.RegisterConfigure(draw_reward, cfg.NewGamedrawReplace, func() {
if v, err := this.GetConfigure(hero_cardpool); err == nil {
if _configure, ok := v.(*cfg.GamedrawReplace); ok {
this.hlock.Lock()
defer this.hlock.Unlock()
this._selectPool = make(map[int32][]*cfg.GamedrawReplaceData)
for _, v := range _configure.GetDataList() {
this._selectPool[v.Pool] = append(this._selectPool[v.Pool], v)
}
return
}
} else {
err = fmt.Errorf("%T no is *cfg.NewGamedrawReplace", v)
}
})
return
}
@ -497,3 +521,31 @@ func (this *configureComp) GMGetTalentByHeroId(hid string) (data []*cfg.GameHero
return
}
// 获取指定抽的奖励
func (this *configureComp) GetHeroDrawRewardConfigById(id int32) (data *cfg.GamedrawRewardData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(draw_reward); err == nil {
if conf, ok := v.(*cfg.GamedrawReward); ok {
if data = conf.Get(id); data != nil {
return
}
}
}
err = comm.NewNotFoundConfErr(moduleName, draw_reward, id)
return
}
// 获取所有的奖励数据
func (this *configureComp) GetAllDrawRewardConfigById() (data map[int32]*cfg.GamedrawRewardData) {
if v, err := this.GetConfigure(draw_reward); err == nil {
if conf, ok := v.(*cfg.GamedrawReward); ok {
data = conf.GetDataMap()
}
}
return
}

6
modules/hero/model_hero.go
View File

@ -299,8 +299,8 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
}
}
for k, v := range addProperty {
addProperty[k] += v
//for k, v := range addProperty {
//addProperty[k] += v
// switch k {
// case comm.AtkPro:
// addProperty[comm.Atk] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Atk])))
@ -311,7 +311,7 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
// case comm.SpeedPro:
// addProperty[comm.Speed] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Speed])))
// }
}
//}
this.mergeAddProperty(hero.Uid, hero, addProperty, equipSkill)
}

163
pb/hero_db.pb.go
View File

@ -340,6 +340,10 @@ type DBHeroRecord struct {
Baodi5 map[int32]int32 `protobuf:"bytes,13,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count
Count map[int32]int32 `protobuf:"bytes,14,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count
Peach map[int32]bool `protobuf:"bytes,15,rep,name=peach,proto3" json:"peach" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 记录圣桃结实已领取的奖励
Limit map[string]int64 `protobuf:"bytes,16,rep,name=limit,proto3" json:"limit" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 限定抽卡 key:英雄id value 冷却结束时间
LimitHero string `protobuf:"bytes,17,opt,name=limitHero,proto3" json:"limitHero"`
Wish map[string]int64 `protobuf:"bytes,18,rep,name=wish,proto3" json:"wish" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 许愿招募 key:英雄id value 冷却结束时间
WishHero string `protobuf:"bytes,19,opt,name=wishHero,proto3" json:"wishHero"` // 当前许愿英雄
}
func (x *DBHeroRecord) Reset() {
@ -465,6 +469,34 @@ func (x *DBHeroRecord) GetPeach() map[int32]bool {
return nil
}
func (x *DBHeroRecord) GetLimit() map[string]int64 {
if x != nil {
return x.Limit
}
return nil
}
func (x *DBHeroRecord) GetLimitHero() string {
if x != nil {
return x.LimitHero
}
return ""
}
func (x *DBHeroRecord) GetWish() map[string]int64 {
if x != nil {
return x.Wish
}
return nil
}
func (x *DBHeroRecord) GetWishHero() string {
if x != nil {
return x.WishHero
}
return ""
}
// 英雄天赋系统
type DBHeroTalent struct {
state protoimpl.MessageState
@ -628,7 +660,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xaa, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb4, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65,
0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x14, 0x0a, 0x05, 0x6d, 0x74,
@ -661,48 +693,65 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x70, 0x65, 0x61, 0x63, 0x68, 0x18, 0x0f,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x2e, 0x50, 0x65, 0x61, 0x63, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x70, 0x65, 0x61, 0x63, 0x68, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f,
0x70, 0x65, 0x61, 0x63, 0x68, 0x12, 0x2e, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x10,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x2e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x48, 0x65,
0x72, 0x6f, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x48,
0x65, 0x72, 0x6f, 0x12, 0x2b, 0x0a, 0x04, 0x77, 0x69, 0x73, 0x68, 0x18, 0x12, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
0x2e, 0x57, 0x69, 0x73, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x77, 0x69, 0x73, 0x68,
0x12, 0x1a, 0x0a, 0x08, 0x77, 0x69, 0x73, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x13, 0x20, 0x01,
0x28, 0x09, 0x52, 0x08, 0x77, 0x69, 0x73, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x1a, 0x3c, 0x0a, 0x0e,
0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74,
0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
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, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61,
0x6f, 0x64, 0x69, 0x34, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 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,
0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x65,
0x61, 0x63, 0x68, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54,
0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12,
0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54,
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65,
0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x2a, 0x2f, 0x0a,
0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72,
0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65,
0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 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, 0x1a, 0x39, 0x0a, 0x0b,
0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74,
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, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x65, 0x61, 0x63, 0x68, 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, 0x08,
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c,
0x69, 0x6d, 0x69, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x57, 0x69, 0x73, 0x68, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6,
0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c,
0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65,
0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b,
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54,
0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e,
0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65,
0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -718,7 +767,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
}
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_hero_hero_db_proto_goTypes = []interface{}{
(HeroType)(0), // 0: HeroType
(*DBHero)(nil), // 1: DBHero
@ -737,19 +786,21 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
nil, // 14: DBHeroRecord.Baodi5Entry
nil, // 15: DBHeroRecord.CountEntry
nil, // 16: DBHeroRecord.PeachEntry
nil, // 17: DBHeroTalent.TalentEntry
(*SkillData)(nil), // 18: SkillData
(*DB_EquipmentSuit)(nil), // 19: DB_EquipmentSuit
nil, // 17: DBHeroRecord.LimitEntry
nil, // 18: DBHeroRecord.WishEntry
nil, // 19: DBHeroTalent.TalentEntry
(*SkillData)(nil), // 20: SkillData
(*DB_EquipmentSuit)(nil), // 21: DB_EquipmentSuit
}
var file_hero_hero_db_proto_depIdxs = []int32{
18, // 0: DBHero.normalSkill:type_name -> SkillData
20, // 0: DBHero.normalSkill:type_name -> SkillData
4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
0, // 4: DBHero.status:type_name -> HeroType
19, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
21, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
18, // 7: DBHero.equipSkill:type_name -> SkillData
20, // 7: DBHero.equipSkill:type_name -> SkillData
8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry
10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
@ -759,12 +810,14 @@ var file_hero_hero_db_proto_depIdxs = []int32{
14, // 14: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry
15, // 15: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry
16, // 16: DBHeroRecord.peach:type_name -> DBHeroRecord.PeachEntry
17, // 17: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
18, // [18:18] is the sub-list for method output_type
18, // [18:18] is the sub-list for method input_type
18, // [18:18] is the sub-list for extension type_name
18, // [18:18] is the sub-list for extension extendee
0, // [0:18] is the sub-list for field type_name
17, // 17: DBHeroRecord.limit:type_name -> DBHeroRecord.LimitEntry
18, // 18: DBHeroRecord.wish:type_name -> DBHeroRecord.WishEntry
19, // 19: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
20, // [20:20] is the sub-list for method output_type
20, // [20:20] is the sub-list for method input_type
20, // [20:20] is the sub-list for extension type_name
20, // [20:20] is the sub-list for extension extendee
0, // [0:20] is the sub-list for field type_name
}
func init() { file_hero_hero_db_proto_init() }
@ -818,7 +871,7 @@ func file_hero_hero_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_db_proto_rawDesc,
NumEnums: 1,
NumMessages: 17,
NumMessages: 19,
NumExtensions: 0,
NumServices: 0,
},

211
pb/hero_msg.pb.go
View File

@ -1935,6 +1935,109 @@ func (x *HeroPeachRewardResp) GetAtno() []*UserAtno {
return nil
}
// 招募指定英雄
type HeroAppointHeroReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
DrawType int32 `protobuf:"varint,1,opt,name=drawType,proto3" json:"drawType"` // 招募类型 0 限定招募 1 许愿招募
Heroid string `protobuf:"bytes,2,opt,name=heroid,proto3" json:"heroid"` // 更换招募获得的英雄
}
func (x *HeroAppointHeroReq) Reset() {
*x = HeroAppointHeroReq{}
if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[37]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *HeroAppointHeroReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*HeroAppointHeroReq) ProtoMessage() {}
func (x *HeroAppointHeroReq) ProtoReflect() protoreflect.Message {
mi := &file_hero_hero_msg_proto_msgTypes[37]
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 HeroAppointHeroReq.ProtoReflect.Descriptor instead.
func (*HeroAppointHeroReq) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{37}
}
func (x *HeroAppointHeroReq) GetDrawType() int32 {
if x != nil {
return x.DrawType
}
return 0
}
func (x *HeroAppointHeroReq) GetHeroid() string {
if x != nil {
return x.Heroid
}
return ""
}
type HeroAppointHeroResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 更换招募获得的英雄
}
func (x *HeroAppointHeroResp) Reset() {
*x = HeroAppointHeroResp{}
if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[38]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *HeroAppointHeroResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*HeroAppointHeroResp) ProtoMessage() {}
func (x *HeroAppointHeroResp) ProtoReflect() protoreflect.Message {
mi := &file_hero_hero_msg_proto_msgTypes[38]
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 HeroAppointHeroResp.ProtoReflect.Descriptor instead.
func (*HeroAppointHeroResp) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{38}
}
func (x *HeroAppointHeroResp) 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{
@ -2128,8 +2231,16 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
0x74, 0x6e, 0x6f, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x65, 0x61, 0x63, 0x68, 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, 0x08, 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,
0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x48, 0x0a,
0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x70, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x65, 0x72, 0x6f,
0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12,
0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x41,
0x70, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -2144,7 +2255,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, 45)
var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 47)
var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroInfoReq)(nil), // 0: HeroInfoReq
(*HeroInfoResp)(nil), // 1: HeroInfoResp
@ -2183,42 +2294,44 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroFirstGetPush)(nil), // 34: HeroFirstGetPush
(*HeroPeachRewardReq)(nil), // 35: HeroPeachRewardReq
(*HeroPeachRewardResp)(nil), // 36: HeroPeachRewardResp
nil, // 37: HeroStrengthenUplvReq.ItemEntry
nil, // 38: HeroStrengthenUpSkillReq.ItemEntry
nil, // 39: HeroPropertyPush.PropertyEntry
nil, // 40: HeroPropertyPush.AddPropertyEntry
nil, // 41: HeroDrawCardFloorResp.Baodi4Entry
nil, // 42: HeroDrawCardFloorResp.Baodi5Entry
nil, // 43: HeroFusionReq.HerosEntry
nil, // 44: HeroPeachRewardResp.PeachEntry
(*DBHero)(nil), // 45: DBHero
(*UserAtno)(nil), // 46: UserAtno
(*DBHeroTalent)(nil), // 47: DBHeroTalent
(*HeroAppointHeroReq)(nil), // 37: HeroAppointHeroReq
(*HeroAppointHeroResp)(nil), // 38: HeroAppointHeroResp
nil, // 39: HeroStrengthenUplvReq.ItemEntry
nil, // 40: HeroStrengthenUpSkillReq.ItemEntry
nil, // 41: HeroPropertyPush.PropertyEntry
nil, // 42: HeroPropertyPush.AddPropertyEntry
nil, // 43: HeroDrawCardFloorResp.Baodi4Entry
nil, // 44: HeroDrawCardFloorResp.Baodi5Entry
nil, // 45: HeroFusionReq.HerosEntry
nil, // 46: HeroPeachRewardResp.PeachEntry
(*DBHero)(nil), // 47: DBHero
(*UserAtno)(nil), // 48: UserAtno
(*DBHeroTalent)(nil), // 49: DBHeroTalent
}
var file_hero_hero_msg_proto_depIdxs = []int32{
45, // 0: HeroInfoResp.base:type_name -> DBHero
45, // 1: HeroListResp.list:type_name -> DBHero
37, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry
45, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
45, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero
38, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry
45, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
45, // 7: HeroAwakenResp.hero:type_name -> DBHero
39, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
40, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
45, // 10: HeroLockResp.hero:type_name -> DBHero
45, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero
46, // 12: AtnoData.atno:type_name -> UserAtno
47, // 0: HeroInfoResp.base:type_name -> DBHero
47, // 1: HeroListResp.list:type_name -> DBHero
39, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry
47, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
47, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero
40, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry
47, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
47, // 7: HeroAwakenResp.hero:type_name -> DBHero
41, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
42, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
47, // 10: HeroLockResp.hero:type_name -> DBHero
47, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero
48, // 12: AtnoData.atno:type_name -> UserAtno
19, // 13: HeroDrawCardResp.data:type_name -> AtnoData
45, // 14: HeroChangePush.list:type_name -> DBHero
41, // 15: HeroDrawCardFloorResp.baodi4:type_name -> HeroDrawCardFloorResp.Baodi4Entry
42, // 16: HeroDrawCardFloorResp.baodi5:type_name -> HeroDrawCardFloorResp.Baodi5Entry
43, // 17: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
47, // 18: HeroTalentListResp.telnet:type_name -> DBHeroTalent
47, // 19: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
47, // 20: HeroTalentResetResp.telnet:type_name -> DBHeroTalent
44, // 21: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry
46, // 22: HeroPeachRewardResp.atno:type_name -> UserAtno
47, // 14: HeroChangePush.list:type_name -> DBHero
43, // 15: HeroDrawCardFloorResp.baodi4:type_name -> HeroDrawCardFloorResp.Baodi4Entry
44, // 16: HeroDrawCardFloorResp.baodi5:type_name -> HeroDrawCardFloorResp.Baodi5Entry
45, // 17: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
49, // 18: HeroTalentListResp.telnet:type_name -> DBHeroTalent
49, // 19: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
49, // 20: HeroTalentResetResp.telnet:type_name -> DBHeroTalent
46, // 21: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry
48, // 22: HeroPeachRewardResp.atno: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
@ -2678,6 +2791,30 @@ func file_hero_hero_msg_proto_init() {
return nil
}
}
file_hero_hero_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*HeroAppointHeroReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_hero_hero_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*HeroAppointHeroResp); 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{
@ -2685,7 +2822,7 @@ func file_hero_hero_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 45,
NumMessages: 47,
NumExtensions: 0,
NumServices: 0,
},

1
services/worker/main.go
View File

@ -132,6 +132,7 @@ func main() {
wtask.NewModule(),
passon.NewModule(),
warorder.NewModule(),
activity.NewModule(),
)
}

42
sys/configure/structs/Game.drawReplace.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamedrawReplace struct {
_dataMap map[int32]*GamedrawReplaceData
_dataList []*GamedrawReplaceData
}
func NewGamedrawReplace(_buf []map[string]interface{}) (*GamedrawReplace, error) {
_dataList := make([]*GamedrawReplaceData, 0, len(_buf))
dataMap := make(map[int32]*GamedrawReplaceData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamedrawReplaceData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GamedrawReplace{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamedrawReplace) GetDataMap() map[int32]*GamedrawReplaceData {
return table._dataMap
}
func (table *GamedrawReplace) GetDataList() []*GamedrawReplaceData {
return table._dataList
}
func (table *GamedrawReplace) Get(key int32) *GamedrawReplaceData {
return table._dataMap[key]
}

45
sys/configure/structs/Game.drawReplaceData.go Normal file
View File

@ -0,0 +1,45 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamedrawReplaceData struct {
Id int32
Pool int32
HeroInitial string
HeroReplace string
ReplaceCd int32
ReplaceNum int32
}
const TypeId_GamedrawReplaceData = 1468145342
func (*GamedrawReplaceData) GetTypeId() int32 {
return 1468145342
}
func (_v *GamedrawReplaceData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pool"].(float64); !_ok_ { err = errors.New("pool error"); return }; _v.Pool = int32(_tempNum_) }
{ var _ok_ bool; if _v.HeroInitial, _ok_ = _buf["hero_initial"].(string); !_ok_ { err = errors.New("hero_initial error"); return } }
{ var _ok_ bool; if _v.HeroReplace, _ok_ = _buf["hero_replace"].(string); !_ok_ { err = errors.New("hero_replace error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["replace_cd"].(float64); !_ok_ { err = errors.New("replace_cd error"); return }; _v.ReplaceCd = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["replace_num"].(float64); !_ok_ { err = errors.New("replace_num error"); return }; _v.ReplaceNum = int32(_tempNum_) }
return
}
func DeserializeGamedrawReplaceData(_buf map[string]interface{}) (*GamedrawReplaceData, error) {
v := &GamedrawReplaceData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.drawReward.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamedrawReward struct {
_dataMap map[int32]*GamedrawRewardData
_dataList []*GamedrawRewardData
}
func NewGamedrawReward(_buf []map[string]interface{}) (*GamedrawReward, error) {
_dataList := make([]*GamedrawRewardData, 0, len(_buf))
dataMap := make(map[int32]*GamedrawRewardData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamedrawRewardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Num] = _v
}
}
return &GamedrawReward{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamedrawReward) GetDataMap() map[int32]*GamedrawRewardData {
return table._dataMap
}
func (table *GamedrawReward) GetDataList() []*GamedrawRewardData {
return table._dataList
}
func (table *GamedrawReward) Get(key int32) *GamedrawRewardData {
return table._dataMap[key]
}

39
sys/configure/structs/Game.drawRewardData.go Normal file
View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamedrawRewardData struct {
Num int32
Text string
Reward *Gameatn
}
const TypeId_GamedrawRewardData = 1862777145
func (*GamedrawRewardData) GetTypeId() int32 {
return 1862777145
}
func (_v *GamedrawRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["reward"].(map[string]interface{}); !_ok_ { err = errors.New("reward error"); return }; if _v.Reward, err = DeserializeGameatn(_x_); err != nil { return } }
return
}
func DeserializeGamedrawRewardData(_buf map[string]interface{}) (*GamedrawRewardData, error) {
v := &GamedrawRewardData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

14
sys/configure/structs/Tables.go
View File

@ -186,6 +186,8 @@ type Tables struct {
Robot *GameRobot
Passon *GamePasson
Circulate *GameCirculate
drawReward *GamedrawReward
drawReplace *GamedrawReplace
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -1243,5 +1245,17 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Circulate, err = NewGameCirculate(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_drawreward") ; err != nil {
return nil, err
}
if tables.drawReward, err = NewGamedrawReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_drawreplace") ; err != nil {
return nil, err
}
if tables.drawReplace, err = NewGamedrawReplace(buf) ; err != nil {
return nil, err
}
return tables, nil
}