From c934218f472251ccddd53b028ae43ad1763793a6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 13:34:06 +0800 Subject: [PATCH 1/7] bugs --- modules/comp_configure.go | 9 +++++---- modules/gourmet/model_gourmet.go | 2 +- modules/hunting/comp_configure.go | 4 +--- modules/mail/configure_comp.go | 6 +++--- modules/mainline/comp_configure.go | 2 +- modules/smithy/model_smithy.go | 4 +++- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/comp_configure.go b/modules/comp_configure.go index e8cfd20fb..bc3e9061c 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -167,8 +167,9 @@ func (this *MCompConfigure) GetDropData(dropId int32) (data []*cfg.GameDropData) } // todo 调用drop 表 获取掉落信息 -func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, Items []*pb.UserAssets) { +func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, items []*pb.UserAssets) (resData []*pb.UserAssets) { res := make([]*cfg.Gameatn, 0) + for i := 0; i < int(count); i++ { data := this.GetDropData(dropId) szW := make([]int32, 0) @@ -182,21 +183,21 @@ func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, Items []* } for _, v := range res { bFind := false - for _, v1 := range Items { + for _, v1 := range items { if v.A == v1.A && v.T == v1.T { v1.N += v.N bFind = true } } if !bFind { - Items = append(Items, &pb.UserAssets{ + items = append(items, &pb.UserAssets{ A: v.A, T: v.T, N: v.N, }) } } - + resData = append(resData, items...) return } func (this *MCompConfigure) GetDropReward(dropId int32, Items []*cfg.Gameatn) { diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go index 78f327b27..760a1ef6e 100644 --- a/modules/gourmet/model_gourmet.go +++ b/modules/gourmet/model_gourmet.go @@ -105,7 +105,7 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet) gourmet.OrderCostTime = 0 // 清空当天的订单时长 } order.FoodCount-- - this.module.configure.GetMultipleDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup, gourmet.Items) // 获取掉落奖励 + gourmet.Items = this.module.configure.GetMultipleDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup, gourmet.Items) // 获取掉落奖励 if curTime > costTime { gourmet.OrderCostTime += int32(curTime - costTime) diff --git a/modules/hunting/comp_configure.go b/modules/hunting/comp_configure.go index 530b4d122..2d9813e2a 100644 --- a/modules/hunting/comp_configure.go +++ b/modules/hunting/comp_configure.go @@ -2,7 +2,6 @@ package hunting import ( "go_dreamfactory/lego/core" - "go_dreamfactory/lego/core/cbase" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" @@ -17,7 +16,6 @@ const ( ///配置管理基础组件 type configureComp struct { - cbase.ModuleCompBase hlock sync.RWMutex modules.MCompConfigure _vikingMap map[int64]*cfg.GameHuntingBossData @@ -25,7 +23,7 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - err = this.ModuleCompBase.Init(service, module, comp, options) + err = this.MCompConfigure.Init(service, module, comp, options) this._vikingMap = make(map[int64]*cfg.GameHuntingBossData, 0) configure.RegisterConfigure(game_vikingboss, cfg.NewGameHuntingBoss, func() { diff --git a/modules/mail/configure_comp.go b/modules/mail/configure_comp.go index 34790e964..7645e5912 100644 --- a/modules/mail/configure_comp.go +++ b/modules/mail/configure_comp.go @@ -2,15 +2,15 @@ package mail import ( "go_dreamfactory/lego/core" - "go_dreamfactory/lego/core/cbase" + "go_dreamfactory/modules" ) // 邮件配置管理组件 type Configure_Comp struct { - cbase.ModuleCompBase + modules.MCompConfigure } func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.ModuleCompBase.Init(service, module, comp, options) + this.MCompConfigure.Init(service, module, comp, options) return } diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go index 45c5b92ae..45d2f2cba 100644 --- a/modules/mainline/comp_configure.go +++ b/modules/mainline/comp_configure.go @@ -22,7 +22,7 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - err = this.ModuleCompBase.Init(service, module, comp, options) + err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Mainline) err = this.LoadMultiConfigure(map[string]interface{}{ game_mainlinechapter: cfg.NewGameMainlineChapter, diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go index 5f330a073..c7508110c 100644 --- a/modules/smithy/model_smithy.go +++ b/modules/smithy/model_smithy.go @@ -103,7 +103,9 @@ func (this *modelSmithy) CalculationSmithy(uid string, Smithy *pb.DBSmithy) { Smithy.OrderCostTime = 0 // 清空当天的订单时长 } order.Count-- - this.module.configure.GetMultipleDropReward(1, _Smithycfg.Drop, Smithy.Items) // 获取掉落奖励 + + Smithy.Items = this.module.configure.GetMultipleDropReward(1, _Smithycfg.Drop, Smithy.Items) // 获取掉落奖励 + mapData["items"] = Smithy.Items if curTime > costTime { Smithy.OrderCostTime += int32(curTime - costTime) From 91026c85c356663df84dc5c2847f4fce435971a8 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 17:14:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonance.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 7bd9af3c1..b73d4ab3a 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -126,5 +126,9 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR ChangeList = append(ChangeList, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero}) + + // 任务相关 + this.module.ModuleRtask.SendToRtask(session, comm.Rtype39, 1) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype39, 1, 1) return } From 431c95ebb0dc9d803d15ecb66fb0cf0aacaf8500 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 17:14:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_smithystove.json | 20 ++++++++++---------- comm/const.go | 2 +- modules/hero/api_awaken.go | 8 ++++++++ modules/hero/api_drawCard.go | 21 +++++++++++++++++++++ modules/hero/api_strengthenUpStar.go | 12 ++++++++++++ modules/hero/api_strengthenUplv.go | 10 ++++++++++ modules/hero/module.go | 24 ++++++++++++++++++++++++ modules/rtask/module.go | 2 +- pb/hunting_db.pb.go | 2 +- 9 files changed, 88 insertions(+), 13 deletions(-) diff --git a/bin/json/game_smithystove.json b/bin/json/game_smithystove.json index dfb91fd95..5cd340b02 100644 --- a/bin/json/game_smithystove.json +++ b/bin/json/game_smithystove.json @@ -21,7 +21,7 @@ ], "probability": 100, "floors": 1, - "time": 300, + "time": 15, "desk": "" }, { @@ -46,7 +46,7 @@ ], "probability": 100, "floors": 1, - "time": 300, + "time": 15, "desk": "" }, { @@ -71,7 +71,7 @@ ], "probability": 100, "floors": 1, - "time": 300, + "time": 15, "desk": "" }, { @@ -96,7 +96,7 @@ ], "probability": 100, "floors": 2, - "time": 300, + "time": 15, "desk": "" }, { @@ -121,7 +121,7 @@ ], "probability": 100, "floors": 3, - "time": 300, + "time": 15, "desk": "" }, { @@ -146,7 +146,7 @@ ], "probability": 100, "floors": 4, - "time": 300, + "time": 15, "desk": "" }, { @@ -171,7 +171,7 @@ ], "probability": 100, "floors": 5, - "time": 300, + "time": 15, "desk": "" }, { @@ -196,7 +196,7 @@ ], "probability": 100, "floors": 5, - "time": 300, + "time": 15, "desk": "" }, { @@ -221,7 +221,7 @@ ], "probability": 100, "floors": 5, - "time": 300, + "time": 15, "desk": "" }, { @@ -235,7 +235,7 @@ "starupneed": [], "probability": 100, "floors": -1, - "time": 300, + "time": 15, "desk": "" }, { diff --git a/comm/const.go b/comm/const.go index 6c01a0204..156fe6a06 100644 --- a/comm/const.go +++ b/comm/const.go @@ -210,7 +210,7 @@ const ( Rtype1 TaskType = 1 //英雄指定 Rtype2 TaskType = 2 //主线之内触发了剧情Id Rtype3 TaskType = 3 //每日任务 - Rtask4 TaskType = 4 //指定英雄的等级限制 + Rtype4 TaskType = 4 //指定英雄的等级限制 Rtype5 TaskType = 5 //指定英雄的装备数量 Rtype6 TaskType = 6 //指定英雄的星级 Rtype7 TaskType = 7 //日常登录一次 diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 9e1a782e8..cda8199cf 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "go_dreamfactory/utils" "strconv" "google.golang.org/protobuf/proto" @@ -119,5 +120,12 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c chanegCard = append(chanegCard, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard}) session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenResp{Hero: _hero}) + //任务相关 + this.module.ModuleRtask.SendToRtask(session, comm.Rtype34, 1, _hero.JuexingLv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID)) + cfg := this.module.configure.GetHero(_hero.HeroID) + if cfg != nil { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv) + } return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 26a4f615f..ded38923d 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -190,5 +190,26 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq rsp.Heroes = szCards session.SendMsg(string(this.module.GetType()), DrawCard, rsp) + + // 任务统计 + if req.DrawType == 0 { //普通招募 + if drawCount == 10 { + sz := make(map[int32]int32, 0) + for _, star := range szStar { + sz[star]++ + } + for k, v := range sz { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype17, k, v) + } + } + this.module.ModuleRtask.SendToRtask(session, comm.Rtype14, drawCount) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype18, drawCount) + } else { // 阵营招募 + this.module.ModuleRtask.SendToRtask(session, comm.Rtype15, drawCount) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype19, drawCount) + } + for _, star := range szStar { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype16, star, 1) + } return } diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index f17fc0059..ba8d24e82 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -168,5 +169,16 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr chanegCard = append(chanegCard, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard}) session.SendMsg(string(this.module.GetType()), StrengthenUpStar, &pb.HeroStrengthenUpStarResp{Hero: _hero}) + + this.module.ModuleRtask.SendToRtask(session, comm.Rtype6, utils.ToInt32(_hero.HeroID), _hero.Star) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype25, 1, utils.ToInt32(_hero.HeroID), _hero.Star) + if _hero.Star == 4 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype26, 1) + } else if _hero.Star == 5 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype27, 1) + } else if _hero.Star == 6 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype28, 1) + } + return } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 91fadbe6b..8141d5e0a 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -3,6 +3,7 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -189,6 +190,15 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero}) if iLvUp > 0 { // 升级了 统计任务 this.module.ModuleTask.SendToTask(session, comm.TaskTypeUpHeroLevel, &pb.TaskParam{Second: iLvUp}) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype4, utils.ToInt32(_hero.HeroID), _hero.Lv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype23, 1, _hero.Star, _hero.Lv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype24, iLvUp) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype29, 1, _hero.Lv, utils.ToInt32(_hero.HeroID)) + cfg := this.module.configure.GetHero(_hero.HeroID) + if cfg != nil { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype32, 1, cfg.Color, _hero.Lv) + } + this.module.ModuleRtask.SendToRtask(session, comm.Rtype33, 1, 1, _hero.Lv) } return diff --git a/modules/hero/module.go b/modules/hero/module.go index 17bda7e63..4a5c07453 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -7,6 +7,7 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/utils" ) func NewModule() core.IModule { @@ -71,10 +72,21 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string, } if len(initUpdate) != 0 { + this.ModuleUser.ChangeUserExpand(uid, initUpdate) } } }(session.GetUserId(), heroCfgId) + // 统计任务 + this.ModuleRtask.SendToRtask(session, comm.Rtype1, utils.ToInt32(heroCfgId)) + // 查品质 + cfg := this.configure.GetHero(heroCfgId) + if cfg != nil { + + this.ModuleRtask.SendToRtask(session, comm.Rtype30, 1, cfg.Color) + this.ModuleRtask.SendToRtask(session, comm.Rtype31, 1, cfg.Color) + } + if bPush { //推送 session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}}) } @@ -197,6 +209,13 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] continue } changeHero = append(changeHero, hero) + // 查品质 + cfg := this.configure.GetHero(heroCfgId) + if cfg != nil { + + this.ModuleRtask.SendToRtask(session, comm.Rtype30, 1, cfg.Color) + this.ModuleRtask.SendToRtask(session, comm.Rtype31, 1, cfg.Color) + } } // 添加图鉴 @@ -218,6 +237,11 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] } } }(session.GetUserId(), heros) + for k := range heros { // 任务统计 + this.ModuleRtask.SendToRtask(session, comm.Rtype1, utils.ToInt32(k)) + + } + if bPush && len(changeHero) > 0 { //推送 session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeHero}) } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index bff56a9e9..80b5f84b9 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -78,7 +78,7 @@ func (this *ModuleRtask) initRtaskHandle() { cfg: typeCfg, fn: this.modelRtask.HeroTarget, }) - case comm.Rtask4: + case comm.Rtype4: this.register(v.Id, &rtaskCondi{ cfg: typeCfg, fn: this.modelRtask.HeroLvTarget, diff --git a/pb/hunting_db.pb.go b/pb/hunting_db.pb.go index d26605ccf..e8cbbe590 100644 --- a/pb/hunting_db.pb.go +++ b/pb/hunting_db.pb.go @@ -115,7 +115,7 @@ func (x *DBHunting) GetChallengeTime() map[int32]int32 { return nil } -// 维京远征排行榜 +// 狩猎排行榜 type DBHuntingRank struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache From 057dd305aa3e8fda71b4bab36b456157e85adc45 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 17:26:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E5=AE=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_gourmet.json | 740 +++++++++++++++--- modules/gourmet/api_createorder.go | 6 +- modules/gourmet/api_foodskilllv.go | 6 +- modules/gourmet/comp_configure.go | 67 +- modules/gourmet/model_gourmet.go | 8 +- sys/configure/structs/game.GourmetData.go | 62 +- sys/configure/structs/game.GourmetSkill.go | 42 - .../structs/game.GourmetSkillData.go | 91 --- 8 files changed, 725 insertions(+), 297 deletions(-) delete mode 100644 sys/configure/structs/game.GourmetSkill.go delete mode 100644 sys/configure/structs/game.GourmetSkillData.go diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json index 822bc5720..0aaa868ef 100644 --- a/bin/json/game_gourmet.json +++ b/bin/json/game_gourmet.json @@ -1,19 +1,44 @@ [ { - "id": 1, + "id": 10011, "type": 1001, + "skill_type": 1, + "initial": 1, "level": 1, "levelname": { "key": "gourmet_ln1", "text": "马马虎虎" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1001", - "text": "魔法料理" + "key": "gourmet_ln1", + "text": "魔法厨艺" }, - "picture": "ty_wz_k1", - "consume": [ + "needtime": 3600, + "display": 1000, + "probability": 1000, + "delicious_icon": "ty_wz_k1", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln1", + "text": "无" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -24,20 +49,45 @@ "propsgroup": 10001 }, { - "id": 2, + "id": 10012, "type": 1001, + "skill_type": 1, + "initial": 0, "level": 2, "levelname": { "key": "gourmet_ln2", "text": "匠心独运" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1001", - "text": "魔法料理" + "key": "gourmet_ln2", + "text": "魔法厨艺" }, - "picture": "ty_wz_k1", - "consume": [ + "needtime": 7200, + "display": 1000, + "probability": 500, + "delicious_icon": "ty_wz_k1", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln2", + "text": "极低" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -48,20 +98,45 @@ "propsgroup": 10001 }, { - "id": 3, + "id": 10013, "type": 1001, + "skill_type": 1, + "initial": 0, "level": 3, "levelname": { "key": "gourmet_ln3", "text": "孰能生巧" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1001", - "text": "魔法料理" + "key": "gourmet_ln3", + "text": "魔法厨艺" }, - "picture": "ty_wz_k1", - "consume": [ + "needtime": 14400, + "display": 1000, + "probability": 20, + "delicious_icon": "ty_wz_k1", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln3", + "text": "中等" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -72,20 +147,45 @@ "propsgroup": 10001 }, { - "id": 4, + "id": 10014, "type": 1001, + "skill_type": 1, + "initial": 0, "level": 4, "levelname": { "key": "gourmet_ln4", "text": "可圈可点" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1001", - "text": "魔法料理" + "key": "gourmet_ln4", + "text": "魔法厨艺" }, - "picture": "ty_wz_k1", - "consume": [ + "needtime": 28800, + "display": 1000, + "probability": 10, + "delicious_icon": "ty_wz_k1", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln4", + "text": "较高" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -96,20 +196,45 @@ "propsgroup": 10001 }, { - "id": 5, + "id": 10021, "type": 1002, + "skill_type": 1, + "initial": 1, "level": 1, "levelname": { "key": "gourmet_ln1", "text": "马马虎虎" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1002", - "text": "功夫料理" + "key": "gourmet_ln1", + "text": "功夫厨艺" }, - "picture": "ty_wz_k2", - "consume": [ + "needtime": 3600, + "display": 1000, + "probability": 1000, + "delicious_icon": "ty_wz_k2", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln1", + "text": "无" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -120,20 +245,45 @@ "propsgroup": 10001 }, { - "id": 6, + "id": 10022, "type": 1002, + "skill_type": 1, + "initial": 0, "level": 2, "levelname": { "key": "gourmet_ln2", "text": "匠心独运" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1002", - "text": "功夫料理" + "key": "gourmet_ln2", + "text": "功夫厨艺" }, - "picture": "ty_wz_k2", - "consume": [ + "needtime": 7200, + "display": 1000, + "probability": 500, + "delicious_icon": "ty_wz_k2", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln2", + "text": "极低" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -144,20 +294,45 @@ "propsgroup": 10001 }, { - "id": 7, + "id": 10023, "type": 1002, + "skill_type": 1, + "initial": 0, "level": 3, "levelname": { "key": "gourmet_ln3", "text": "孰能生巧" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1002", - "text": "功夫料理" + "key": "gourmet_ln3", + "text": "功夫厨艺" }, - "picture": "ty_wz_k2", - "consume": [ + "needtime": 14400, + "display": 1000, + "probability": 20, + "delicious_icon": "ty_wz_k2", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln3", + "text": "中等" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -168,20 +343,45 @@ "propsgroup": 10001 }, { - "id": 8, + "id": 10024, "type": 1002, + "skill_type": 1, + "initial": 0, "level": 4, "levelname": { "key": "gourmet_ln4", "text": "可圈可点" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1002", - "text": "功夫料理" + "key": "gourmet_ln4", + "text": "功夫厨艺" }, - "picture": "ty_wz_k2", - "consume": [ + "needtime": 28800, + "display": 1000, + "probability": 10, + "delicious_icon": "ty_wz_k2", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln4", + "text": "较高" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -192,20 +392,45 @@ "propsgroup": 10001 }, { - "id": 9, + "id": 10031, "type": 1003, + "skill_type": 1, + "initial": 1, "level": 1, "levelname": { "key": "gourmet_ln1", "text": "马马虎虎" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1003", - "text": "科技料理" + "key": "gourmet_ln1", + "text": "科技厨艺" }, - "picture": "ty_wz_k3", - "consume": [ + "needtime": 3600, + "display": 1000, + "probability": 1000, + "delicious_icon": "ty_wz_k3", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln1", + "text": "无" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -216,20 +441,45 @@ "propsgroup": 10001 }, { - "id": 10, + "id": 10032, "type": 1003, + "skill_type": 1, + "initial": 0, "level": 2, "levelname": { "key": "gourmet_ln2", "text": "匠心独运" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1003", - "text": "科技料理" + "key": "gourmet_ln2", + "text": "科技厨艺" }, - "picture": "ty_wz_k3", - "consume": [ + "needtime": 7200, + "display": 1000, + "probability": 500, + "delicious_icon": "ty_wz_k3", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln2", + "text": "极低" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -240,20 +490,45 @@ "propsgroup": 10001 }, { - "id": 11, + "id": 10033, "type": 1003, + "skill_type": 1, + "initial": 0, "level": 3, "levelname": { "key": "gourmet_ln3", "text": "孰能生巧" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1003", - "text": "科技料理" + "key": "gourmet_ln3", + "text": "科技厨艺" }, - "picture": "ty_wz_k3", - "consume": [ + "needtime": 14400, + "display": 1000, + "probability": 20, + "delicious_icon": "ty_wz_k3", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln3", + "text": "中等" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -264,20 +539,45 @@ "propsgroup": 10001 }, { - "id": 12, + "id": 10034, "type": 1003, + "skill_type": 1, + "initial": 0, "level": 4, "levelname": { "key": "gourmet_ln4", "text": "可圈可点" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1003", - "text": "科技料理" + "key": "gourmet_ln4", + "text": "科技厨艺" }, - "picture": "ty_wz_k3", - "consume": [ + "needtime": 28800, + "display": 1000, + "probability": 10, + "delicious_icon": "ty_wz_k3", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln4", + "text": "较高" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -288,20 +588,45 @@ "propsgroup": 10001 }, { - "id": 13, + "id": 10041, "type": 1004, + "skill_type": 1, + "initial": 1, "level": 1, "levelname": { "key": "gourmet_ln1", "text": "马马虎虎" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1004", - "text": "月能料理" + "key": "gourmet_ln1", + "text": "月能厨艺" }, - "picture": "ty_wz_k4", - "consume": [ + "needtime": 3600, + "display": 1000, + "probability": 1000, + "delicious_icon": "ty_wz_k4", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln1", + "text": "无" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -312,20 +637,45 @@ "propsgroup": 10001 }, { - "id": 14, + "id": 10042, "type": 1004, + "skill_type": 1, + "initial": 0, "level": 2, "levelname": { "key": "gourmet_ln2", "text": "匠心独运" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1004", - "text": "月能料理" + "key": "gourmet_ln2", + "text": "月能厨艺" }, - "picture": "ty_wz_k4", - "consume": [ + "needtime": 7200, + "display": 1000, + "probability": 500, + "delicious_icon": "ty_wz_k4", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln2", + "text": "极低" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -336,20 +686,45 @@ "propsgroup": 10001 }, { - "id": 15, + "id": 10043, "type": 1004, + "skill_type": 1, + "initial": 0, "level": 3, "levelname": { "key": "gourmet_ln3", "text": "孰能生巧" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1004", - "text": "月能料理" + "key": "gourmet_ln3", + "text": "月能厨艺" }, - "picture": "ty_wz_k4", - "consume": [ + "needtime": 14400, + "display": 1000, + "probability": 20, + "delicious_icon": "ty_wz_k4", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln3", + "text": "中等" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -360,20 +735,45 @@ "propsgroup": 10001 }, { - "id": 16, + "id": 10044, "type": 1004, + "skill_type": 1, + "initial": 0, "level": 4, "levelname": { "key": "gourmet_ln4", "text": "可圈可点" }, - "colour": 0, + "lv_colour": "", "name": { - "key": "gourmet_1004", - "text": "月能料理" + "key": "gourmet_ln4", + "text": "月能厨艺" }, - "picture": "ty_wz_k4", - "consume": [ + "needtime": 28800, + "display": 1000, + "probability": 10, + "delicious_icon": "ty_wz_k4", + "skill_icon": "ty_wz_k1", + "item": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "affix": { + "key": "gourmet_ln4", + "text": "较高" + }, + "affix_colour": "", + "delicious_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "skill_consume": [ { "a": "item", "t": "10002", @@ -382,5 +782,153 @@ ], "using": 1, "propsgroup": 10001 + }, + { + "id": 10051, + "type": 1005, + "skill_type": 2, + "initial": 1, + "level": 1, + "levelname": { + "key": "gourmet_ln1", + "text": "马马虎虎" + }, + "lv_colour": "", + "name": { + "key": "gourmet_ln1", + "text": "高效制作" + }, + "needtime": -300, + "display": 1000, + "probability": 1000, + "delicious_icon": "", + "skill_icon": "ty_wz_k1", + "item": [], + "affix": { + "key": "gourmet_ln1", + "text": "出餐时间-5分钟" + }, + "affix_colour": "", + "delicious_consume": [], + "skill_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "using": 0, + "propsgroup": 0 + }, + { + "id": 10052, + "type": 1005, + "skill_type": 2, + "initial": 0, + "level": 2, + "levelname": { + "key": "gourmet_ln2", + "text": "匠心独运" + }, + "lv_colour": "", + "name": { + "key": "gourmet_ln2", + "text": "高效制作" + }, + "needtime": -600, + "display": 1000, + "probability": 500, + "delicious_icon": "", + "skill_icon": "ty_wz_k1", + "item": [], + "affix": { + "key": "gourmet_ln2", + "text": "出餐时间-10分钟" + }, + "affix_colour": "", + "delicious_consume": [], + "skill_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "using": 0, + "propsgroup": 0 + }, + { + "id": 10053, + "type": 1005, + "skill_type": 2, + "initial": 0, + "level": 3, + "levelname": { + "key": "gourmet_ln3", + "text": "孰能生巧" + }, + "lv_colour": "", + "name": { + "key": "gourmet_ln3", + "text": "高效制作" + }, + "needtime": -900, + "display": 1000, + "probability": 20, + "delicious_icon": "", + "skill_icon": "ty_wz_k1", + "item": [], + "affix": { + "key": "gourmet_ln3", + "text": "出餐时间-15分钟" + }, + "affix_colour": "", + "delicious_consume": [], + "skill_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "using": 0, + "propsgroup": 0 + }, + { + "id": 10054, + "type": 1005, + "skill_type": 2, + "initial": 0, + "level": 4, + "levelname": { + "key": "gourmet_ln4", + "text": "可圈可点" + }, + "lv_colour": "", + "name": { + "key": "gourmet_ln4", + "text": "高效制作" + }, + "needtime": -1200, + "display": 1000, + "probability": 10, + "delicious_icon": "", + "skill_icon": "ty_wz_k1", + "item": [], + "affix": { + "key": "gourmet_ln4", + "text": "出餐时间-20分钟" + }, + "affix_colour": "", + "delicious_consume": [], + "skill_consume": [ + { + "a": "item", + "t": "10002", + "n": 1 + } + ], + "using": 0, + "propsgroup": 0 } ] \ No newline at end of file diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go index fe5d32775..a72d4e5dd 100644 --- a/modules/gourmet/api_createorder.go +++ b/modules/gourmet/api_createorder.go @@ -44,7 +44,7 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat // 获取技能等级 skillLv := _gourmet.Skill[foodtype] // 计算出需要的时间 - _skillCfg := this.module.configure.GetGourmetSkillConfigData(foodtype, skillLv) + _skillCfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) costTime += _skillCfg.Needtime * order.FoodCount } if _gourmet.Foods == nil { // 队列数据为nil 直接将订单数据给ta @@ -77,7 +77,7 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat if v.FoodCount > 0 { v.FoodCount-- // 获取生产时间 - _skillCfg := this.module.configure.GetGourmetSkillConfigData(v.FoodType, _gourmet.Skill[v.FoodType]) + _skillCfg := this.module.configure.GetGourmetConfigData(v.FoodType, _gourmet.Skill[v.FoodType]) _gourmet.CookingFood = &pb.Cooking{ FoodType: v.FoodType, ETime: time.Now().Unix() + int64(_skillCfg.Needtime), @@ -90,7 +90,7 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat // 計算耗時 for _, v := range _gourmet.Foods { if v.FoodCount > 0 { - _skillCfg := this.module.configure.GetGourmetSkillConfigData(v.FoodType, _gourmet.Skill[v.FoodType]) + _skillCfg := this.module.configure.GetGourmetConfigData(v.FoodType, _gourmet.Skill[v.FoodType]) v.CookTime = _skillCfg.Needtime * v.FoodCount } } diff --git a/modules/gourmet/api_foodskilllv.go b/modules/gourmet/api_foodskilllv.go index 2d5da755e..57405422e 100644 --- a/modules/gourmet/api_foodskilllv.go +++ b/modules/gourmet/api_foodskilllv.go @@ -42,17 +42,17 @@ func (this *apiComp) SkillLV(session comm.IUserSession, req *pb.GourmetSkillLvRe bSpecial = true } - if this.module.configure.GetGourmetSkillConfigData(req.SkillType, skilllv+1) == nil { // 下一级是否存在 + if this.module.configure.GetGourmetConfigData(req.SkillType, skilllv+1) == nil { // 下一级是否存在 code = pb.ErrorCode_GourmetSkillMaxLv return } - _skillCfg := this.module.configure.GetGourmetSkillConfigData(req.SkillType, skilllv) // 获取技能配置 + _skillCfg := this.module.configure.GetGourmetConfigData(req.SkillType, skilllv) // 获取技能配置 // code = this.module.CheckRes(session, _skillCfg.Consume) // 消耗检测 // if code != pb.ErrorCode_Success { // return // } - code = this.module.ConsumeRes(session, _skillCfg.Consume, true) // 消耗检测 + code = this.module.ConsumeRes(session, _skillCfg.SkillConsume, true) // 消耗检测 if code != pb.ErrorCode_Success { return } diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go index ad5794fba..a7b965fe8 100644 --- a/modules/gourmet/comp_configure.go +++ b/modules/gourmet/comp_configure.go @@ -18,8 +18,7 @@ const ( type configureComp struct { hlock sync.RWMutex modules.MCompConfigure - _gourmetMap map[int64]*cfg.GameGourmetData - _gourmetSkillMap map[int64]*cfg.GameGourmetSkillData + _gourmetMap map[int64]*cfg.GameGourmetData } //组件初始化接口 @@ -41,21 +40,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp log.Errorf("get game_pagoda conf err:%v", err) return }) - this._gourmetSkillMap = make(map[int64]*cfg.GameGourmetSkillData, 0) - configure.RegisterConfigure(game_gourmetskill, cfg.NewGameGourmetSkill, func() { - if v, err := this.GetConfigure(game_gourmetskill); err == nil { - if configure, ok := v.(*cfg.GameGourmetSkill); ok { - this.hlock.Lock() - defer this.hlock.Unlock() - for _, value := range configure.GetDataList() { - this._gourmetSkillMap[int64(value.Type<<16)+int64(value.Level)] = value - } - return - } - } - log.Errorf("get game_pagoda conf err:%v", err) - return - }) return } @@ -66,39 +50,6 @@ func (this *configureComp) GetGourmetConfigData(gourmetType int32, level int32) return this._gourmetMap[int64(gourmetType<<16)+int64(level)] } -// 获取美食馆配置数据 -func (this *configureComp) GetGourmetSkillConfigData(gourmetType int32, level int32) (data *cfg.GameGourmetSkillData) { - - return this._gourmetSkillMap[int64(gourmetType<<16)+int64(level)] -} - -// 通过技能id 查询技能配置表 -func (this *configureComp) GetGourmetSkillConfigBySkillID(skillId int) (data *cfg.GameGourmetSkillData) { - - if v, err := this.GetConfigure(game_gourmetskill); err == nil { - if configure, ok := v.(*cfg.GameGourmetSkill); ok { - data = configure.Get(int32(skillId)) - return - } - } - return -} - -func (this *configureComp) GetGourmetSkillConfigBySkillType(skillType int) (szSkill []int32) { - szSkill = make([]int32, 0) - if v, err := this.GetConfigure(game_gourmetskill); err == nil { - if configure, ok := v.(*cfg.GameGourmetSkill); ok { - for _, data := range configure.GetDataList() { - if skillType == int(data.SkillType) && data.Initial == 1 { - szSkill = append(szSkill, data.Type) - } - } - return - } - } - return -} - //加载多个配置文件 func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) { for k, v := range confs { @@ -115,3 +66,19 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } +func (this *configureComp) GetGourmetSkillConfigBySkillType(skillType int32) (data []int32) { + data = make([]int32, 0) + if v, err := this.GetConfigure(game_gourmet); err == nil { + if configure, ok := v.(*cfg.GameGourmet); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + for _, value := range configure.GetDataList() { + if value.SkillType == skillType && value.Initial == 1 { + data = append(data, value.Type) + } + } + return + } + } + return +} diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go index 760a1ef6e..e483d273d 100644 --- a/modules/gourmet/model_gourmet.go +++ b/modules/gourmet/model_gourmet.go @@ -90,8 +90,8 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet) skillLv := gourmet.Skill[foodtype] // 计算出需要的时间 - _skillCfg := this.module.configure.GetGourmetSkillConfigData(foodtype, skillLv) // 技能配置表 - _gourmetcfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) // 美食家配置表 + _skillCfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) // 技能配置表 + _gourmetcfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv) // 美食家配置表 for i := 0; i < int(order.FoodCount); i++ { curTime += _skillCfg.Needtime // 判断是不是第二天 @@ -142,7 +142,7 @@ func (this *modelGourmet) CalculationGourmetbySkiiLv(uid string, gourmet *pb.DBG mapData := make(map[string]interface{}, 0) for _, v := range gourmet.Foods { if v.FoodCount > 0 && v.FoodType == skillType { - _skillCfg := this.module.configure.GetGourmetSkillConfigData(skillType, skilllv) + _skillCfg := this.module.configure.GetGourmetConfigData(skillType, skilllv) if _skillCfg != nil { v.CookTime = _skillCfg.Needtime * v.FoodCount mapData["foods"] = gourmet.Foods @@ -159,7 +159,7 @@ func (this *modelGourmet) CalculationSpecialSkillLv(uid string, gourmet *pb.DBGo mapData := make(map[string]interface{}, 0) for _, v := range gourmet.Foods { if v.FoodCount > 0 { - _skillCfg := this.module.configure.GetGourmetSkillConfigData(skillType, skilllv) + _skillCfg := this.module.configure.GetGourmetConfigData(skillType, skilllv) if _skillCfg != nil { v.CookTime += _skillCfg.Needtime * v.FoodCount if v.CookTime < 0 { // 担心配置错误 为负数情况 所以这里做下判断 diff --git a/sys/configure/structs/game.GourmetData.go b/sys/configure/structs/game.GourmetData.go index 4fc757e3a..770a567af 100644 --- a/sys/configure/structs/game.GourmetData.go +++ b/sys/configure/structs/game.GourmetData.go @@ -13,12 +13,22 @@ import "errors" type GameGourmetData struct { Id int32 Type int32 + SkillType int32 + Initial int32 Level int32 Levelname string - Colour int32 + LvColour string Name string - Picture string - Consume []*Gameatn + Needtime int32 + Display int32 + Probability int32 + DeliciousIcon string + SkillIcon string + Item []*Gameatn + Affix string + AffixColour string + DeliciousConsume []*Gameatn + SkillConsume []*Gameatn Using int32 Propsgroup int32 } @@ -32,22 +42,58 @@ func (*GameGourmetData) GetTypeId() int32 { func (_v *GameGourmetData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["levelname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Levelname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Levelname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour"].(float64); !_ok_ { err = errors.New("colour error"); return }; _v.Colour = int32(_tempNum_) } + { var _ok_ bool; if _v.LvColour, _ok_ = _buf["lv_colour"].(string); !_ok_ { err = errors.New("lv_colour error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; if _v.Picture, _ok_ = _buf["picture"].(string); !_ok_ { err = errors.New("picture error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } + { var _ok_ bool; if _v.DeliciousIcon, _ok_ = _buf["delicious_icon"].(string); !_ok_ { err = errors.New("delicious_icon error"); return } } + { var _ok_ bool; if _v.SkillIcon, _ok_ = _buf["skill_icon"].(string); !_ok_ { err = errors.New("skill_icon error"); return } } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return } + if _arr_, _ok_ = _buf["item"].([]interface{}); !_ok_ { err = errors.New("item error"); return } - _v.Consume = make([]*Gameatn, 0, len(_arr_)) + _v.Item = make([]*Gameatn, 0, len(_arr_)) for _, _e_ := range _arr_ { var _list_v_ *Gameatn { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Consume = append(_v.Consume, _list_v_) + _v.Item = append(_v.Item, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Affix error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Affix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.AffixColour, _ok_ = _buf["affix_colour"].(string); !_ok_ { err = errors.New("affix_colour error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["delicious_consume"].([]interface{}); !_ok_ { err = errors.New("delicious_consume error"); return } + + _v.DeliciousConsume = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.DeliciousConsume = append(_v.DeliciousConsume, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["skill_consume"].([]interface{}); !_ok_ { err = errors.New("skill_consume error"); return } + + _v.SkillConsume = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.SkillConsume = append(_v.SkillConsume, _list_v_) } } diff --git a/sys/configure/structs/game.GourmetSkill.go b/sys/configure/structs/game.GourmetSkill.go deleted file mode 100644 index 36104b464..000000000 --- a/sys/configure/structs/game.GourmetSkill.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameGourmetSkill struct { - _dataMap map[int32]*GameGourmetSkillData - _dataList []*GameGourmetSkillData -} - -func NewGameGourmetSkill(_buf []map[string]interface{}) (*GameGourmetSkill, error) { - _dataList := make([]*GameGourmetSkillData, 0, len(_buf)) - dataMap := make(map[int32]*GameGourmetSkillData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameGourmetSkillData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &GameGourmetSkill{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameGourmetSkill) GetDataMap() map[int32]*GameGourmetSkillData { - return table._dataMap -} - -func (table *GameGourmetSkill) GetDataList() []*GameGourmetSkillData { - return table._dataList -} - -func (table *GameGourmetSkill) Get(key int32) *GameGourmetSkillData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/game.GourmetSkillData.go b/sys/configure/structs/game.GourmetSkillData.go deleted file mode 100644 index 2e6048363..000000000 --- a/sys/configure/structs/game.GourmetSkillData.go +++ /dev/null @@ -1,91 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -import "errors" - -type GameGourmetSkillData struct { - Id int32 - Type int32 - SkillType int32 - Initial int32 - Level int32 - Levelname string - Colour int32 - Name string - Needtime int32 - Display int32 - Probability int32 - Icon string - Item []*Gameatn - Affix string - AffixColour int32 - Consume []*Gameatn -} - -const TypeId_GameGourmetSkillData = 2062196640 - -func (*GameGourmetSkillData) GetTypeId() int32 { - return 2062196640 -} - -func (_v *GameGourmetSkillData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["levelname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Levelname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Levelname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour"].(float64); !_ok_ { err = errors.New("colour error"); return }; _v.Colour = int32(_tempNum_) } - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } - { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["item"].([]interface{}); !_ok_ { err = errors.New("item error"); return } - - _v.Item = make([]*Gameatn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Gameatn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Item = append(_v.Item, _list_v_) - } - } - - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Affix error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Affix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["affix_colour"].(float64); !_ok_ { err = errors.New("affix_colour error"); return }; _v.AffixColour = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return } - - _v.Consume = make([]*Gameatn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Gameatn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Consume = append(_v.Consume, _list_v_) - } - } - - return -} - -func DeserializeGameGourmetSkillData(_buf map[string]interface{}) (*GameGourmetSkillData, error) { - v := &GameGourmetSkillData{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } -} From a5a4c3ae373da7149c76c2d7d850109e3a6ddfc4 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 17:31:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?tables=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys/configure/structs/Tables.go | 956 ++++++++++++++++---------------- 1 file changed, 476 insertions(+), 480 deletions(-) diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index c2c0d18fb..3c0fd02a4 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -11,488 +11,484 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - Global *GameGlobal - Plot *GamePlot - Extservers *GameExtservers - SkillAtk *GameSkillAtk - SkillAfteratk *GameSkillAfteratk - SkillBuff *GameSkillBuff - SkillPassive *GameSkillPassive - Hero *GameHero - HeroStargrow *GameHeroStargrow - HeroLevelgrow *GameHeroLevelgrow - HeroStarup *GameHeroStarup - HeroExp *GameHeroExp - HeroLevelup *GameHeroLevelup - Equip *GameEquip - EquipAttrlibrary *GameEquipAttrlibrary - EquipSuit *GameEquipSuit - EquipColor *GameEquipColor - EquipIntensify *GameEquipIntensify - Item *GameItem - HeroSkillLevel *GameHeroSkillLevel - HeroResonance *GameHeroResonance - ComAtn *GameComAtn - HeroAwaken *GameHeroAwaken - HeroMethod *GameHeroMethod - Shop *GameShop - Shopitem *GameShopitem - ActiveReward *GameActiveReward - Skill *GameSkill - Model *GameModel - MainlineChapter *GameMainlineChapter - MainlineEasy *GameMainlineEasy - MainlineHard *GameMainlineHard - MainlinePurgatory *GameMainlinePurgatory - DrawCard *GameDrawCard - ChatChannel *GameChatChannel - ChatSystem *GameChatSystem - ChatServerGroup *GameChatServerGroup - ChatChannelCom *GameChatChannelCom - ChatExpression *GameChatExpression - TaskRound *GameTaskRound - TaskActiveReward *GameTaskActiveReward - Coin *GameCoin - Initial *GameInitial - Monster *GameMonster - EquipPos *GameEquipPos - Playerlv *GamePlayerlv - Propsgroup *GamePropsgroup - Facemod *GameFacemod - Msgdistrib *GameMsgdistrib - Opencond *GameOpencond - Stroy *GameStroy - Pagoda *GamePagoda - PagodaTaskReward *GamePagodaTaskReward - PagodaSeasonReward *GamePagodaSeasonReward - PagodaseasonLoop *GamePagodaseasonLoop - Rdtask *GameRdtask - RdtaskCondi *GameRdtaskCondi - RdtaskChoose *GameRdtaskChoose - RdtaskSide *GameRdtaskSide - KungfuUnlock *GameKungfuUnlock - KungfuMasterworker *GameKungfuMasterworker - Gourmet *GameGourmet - GourmetSkill *GameGourmetSkill - Drop *GameDrop - Smithy *GameSmithy - SmithyStove *GameSmithyStove - VikingBoss *GameVikingBoss - VikingChallenge *GameVikingChallenge + Global *GameGlobal + Plot *GamePlot + Extservers *GameExtservers + SkillAtk *GameSkillAtk + SkillAfteratk *GameSkillAfteratk + SkillBuff *GameSkillBuff + SkillPassive *GameSkillPassive + Hero *GameHero + HeroStargrow *GameHeroStargrow + HeroLevelgrow *GameHeroLevelgrow + HeroStarup *GameHeroStarup + HeroExp *GameHeroExp + HeroLevelup *GameHeroLevelup + Equip *GameEquip + EquipAttrlibrary *GameEquipAttrlibrary + EquipSuit *GameEquipSuit + EquipColor *GameEquipColor + EquipIntensify *GameEquipIntensify + Item *GameItem + HeroSkillLevel *GameHeroSkillLevel + HeroResonance *GameHeroResonance + ComAtn *GameComAtn + HeroAwaken *GameHeroAwaken + HeroMethod *GameHeroMethod + Shop *GameShop + Shopitem *GameShopitem + ActiveReward *GameActiveReward + Skill *GameSkill + Model *GameModel + MainlineChapter *GameMainlineChapter + MainlineEasy *GameMainlineEasy + MainlineHard *GameMainlineHard + MainlinePurgatory *GameMainlinePurgatory + DrawCard *GameDrawCard + ChatChannel *GameChatChannel + ChatSystem *GameChatSystem + ChatServerGroup *GameChatServerGroup + ChatChannelCom *GameChatChannelCom + ChatExpression *GameChatExpression + TaskRound *GameTaskRound + TaskActiveReward *GameTaskActiveReward + Coin *GameCoin + Initial *GameInitial + Monster *GameMonster + EquipPos *GameEquipPos + Playerlv *GamePlayerlv + Propsgroup *GamePropsgroup + Facemod *GameFacemod + Msgdistrib *GameMsgdistrib + Opencond *GameOpencond + Stroy *GameStroy + Pagoda *GamePagoda + PagodaTaskReward *GamePagodaTaskReward + PagodaSeasonReward *GamePagodaSeasonReward + PagodaseasonLoop *GamePagodaseasonLoop + Rdtask *GameRdtask + RdtaskCondi *GameRdtaskCondi + RdtaskChoose *GameRdtaskChoose + RdtaskSide *GameRdtaskSide + KungfuUnlock *GameKungfuUnlock + KungfuMasterworker *GameKungfuMasterworker + Gourmet *GameGourmet + Drop *GameDrop + Smithy *GameSmithy + SmithyStove *GameSmithyStove + VikingBoss *GameVikingBoss + VikingChallenge *GameVikingChallenge } func NewTables(loader JsonLoader) (*Tables, error) { - var err error - var buf []map[string]interface{} + var err error + var buf []map[string]interface{} - tables := &Tables{} - if buf, err = loader("game_global") ; err != nil { - return nil, err - } - if tables.Global, err = NewGameGlobal(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_plot") ; err != nil { - return nil, err - } - if tables.Plot, err = NewGamePlot(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_extservers") ; err != nil { - return nil, err - } - if tables.Extservers, err = NewGameExtservers(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillatk") ; err != nil { - return nil, err - } - if tables.SkillAtk, err = NewGameSkillAtk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillafteratk") ; err != nil { - return nil, err - } - if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillbuff") ; err != nil { - return nil, err - } - if tables.SkillBuff, err = NewGameSkillBuff(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillpassive") ; err != nil { - return nil, err - } - if tables.SkillPassive, err = NewGameSkillPassive(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_hero") ; err != nil { - return nil, err - } - if tables.Hero, err = NewGameHero(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostargrow") ; err != nil { - return nil, err - } - if tables.HeroStargrow, err = NewGameHeroStargrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelgrow") ; err != nil { - return nil, err - } - if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostarup") ; err != nil { - return nil, err - } - if tables.HeroStarup, err = NewGameHeroStarup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroexp") ; err != nil { - return nil, err - } - if tables.HeroExp, err = NewGameHeroExp(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelup") ; err != nil { - return nil, err - } - if tables.HeroLevelup, err = NewGameHeroLevelup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equip") ; err != nil { - return nil, err - } - if tables.Equip, err = NewGameEquip(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipattrlibrary") ; err != nil { - return nil, err - } - if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipsuit") ; err != nil { - return nil, err - } - if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipcolor") ; err != nil { - return nil, err - } - if tables.EquipColor, err = NewGameEquipColor(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipintensify") ; err != nil { - return nil, err - } - if tables.EquipIntensify, err = NewGameEquipIntensify(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_item") ; err != nil { - return nil, err - } - if tables.Item, err = NewGameItem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroskilllevel") ; err != nil { - return nil, err - } - if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroresonance") ; err != nil { - return nil, err - } - if tables.HeroResonance, err = NewGameHeroResonance(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_comatn") ; err != nil { - return nil, err - } - if tables.ComAtn, err = NewGameComAtn(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroawaken") ; err != nil { - return nil, err - } - if tables.HeroAwaken, err = NewGameHeroAwaken(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heromethod") ; err != nil { - return nil, err - } - if tables.HeroMethod, err = NewGameHeroMethod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shop") ; err != nil { - return nil, err - } - if tables.Shop, err = NewGameShop(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shopitem") ; err != nil { - return nil, err - } - if tables.Shopitem, err = NewGameShopitem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_activereward") ; err != nil { - return nil, err - } - if tables.ActiveReward, err = NewGameActiveReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skill") ; err != nil { - return nil, err - } - if tables.Skill, err = NewGameSkill(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_model") ; err != nil { - return nil, err - } - if tables.Model, err = NewGameModel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinechapter") ; err != nil { - return nil, err - } - if tables.MainlineChapter, err = NewGameMainlineChapter(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlineeasy") ; err != nil { - return nil, err - } - if tables.MainlineEasy, err = NewGameMainlineEasy(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinehard") ; err != nil { - return nil, err - } - if tables.MainlineHard, err = NewGameMainlineHard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinepurgatory") ; err != nil { - return nil, err - } - if tables.MainlinePurgatory, err = NewGameMainlinePurgatory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcard") ; err != nil { - return nil, err - } - if tables.DrawCard, err = NewGameDrawCard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannel") ; err != nil { - return nil, err - } - if tables.ChatChannel, err = NewGameChatChannel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatsystem") ; err != nil { - return nil, err - } - if tables.ChatSystem, err = NewGameChatSystem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatservergroup") ; err != nil { - return nil, err - } - if tables.ChatServerGroup, err = NewGameChatServerGroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannelcom") ; err != nil { - return nil, err - } - if tables.ChatChannelCom, err = NewGameChatChannelCom(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatexpression") ; err != nil { - return nil, err - } - if tables.ChatExpression, err = NewGameChatExpression(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskround") ; err != nil { - return nil, err - } - if tables.TaskRound, err = NewGameTaskRound(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskactivereward") ; err != nil { - return nil, err - } - if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_coin") ; err != nil { - return nil, err - } - if tables.Coin, err = NewGameCoin(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_initial") ; err != nil { - return nil, err - } - if tables.Initial, err = NewGameInitial(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_monster") ; err != nil { - return nil, err - } - if tables.Monster, err = NewGameMonster(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equippos") ; err != nil { - return nil, err - } - if tables.EquipPos, err = NewGameEquipPos(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_playerlv") ; err != nil { - return nil, err - } - if tables.Playerlv, err = NewGamePlayerlv(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_propsgroup") ; err != nil { - return nil, err - } - if tables.Propsgroup, err = NewGamePropsgroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_facemod") ; err != nil { - return nil, err - } - if tables.Facemod, err = NewGameFacemod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_msgdistrib") ; err != nil { - return nil, err - } - if tables.Msgdistrib, err = NewGameMsgdistrib(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_opencond") ; err != nil { - return nil, err - } - if tables.Opencond, err = NewGameOpencond(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_stroy") ; err != nil { - return nil, err - } - if tables.Stroy, err = NewGameStroy(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_pagoda") ; err != nil { - return nil, err - } - if tables.Pagoda, err = NewGamePagoda(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_pagodataskreward") ; err != nil { - return nil, err - } - if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_pagodaseasonreward") ; err != nil { - return nil, err - } - if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_pagodaseasonloop") ; err != nil { - return nil, err - } - if tables.PagodaseasonLoop, err = NewGamePagodaseasonLoop(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_rdtask") ; err != nil { - return nil, err - } - if tables.Rdtask, err = NewGameRdtask(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_rdtaskcondi") ; err != nil { - return nil, err - } - if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_rdtaskchoose") ; err != nil { - return nil, err - } - if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_rdtaskside") ; err != nil { - return nil, err - } - if tables.RdtaskSide, err = NewGameRdtaskSide(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_kungfuunlock") ; err != nil { - return nil, err - } - if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_kungfumasterworker") ; err != nil { - return nil, err - } - if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_gourmet") ; err != nil { - return nil, err - } - if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_gourmetskill") ; err != nil { - return nil, err - } - if tables.GourmetSkill, err = NewGameGourmetSkill(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drop") ; err != nil { - return nil, err - } - if tables.Drop, err = NewGameDrop(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_smithy") ; err != nil { - return nil, err - } - if tables.Smithy, err = NewGameSmithy(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_smithystove") ; err != nil { - return nil, err - } - if tables.SmithyStove, err = NewGameSmithyStove(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_vikingboss") ; err != nil { - return nil, err - } - if tables.VikingBoss, err = NewGameVikingBoss(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_vikingchallenge") ; err != nil { - return nil, err - } - if tables.VikingChallenge, err = NewGameVikingChallenge(buf) ; err != nil { - return nil, err - } - return tables, nil + tables := &Tables{} + if buf, err = loader("game_global"); err != nil { + return nil, err + } + if tables.Global, err = NewGameGlobal(buf); err != nil { + return nil, err + } + if buf, err = loader("game_plot"); err != nil { + return nil, err + } + if tables.Plot, err = NewGamePlot(buf); err != nil { + return nil, err + } + if buf, err = loader("game_extservers"); err != nil { + return nil, err + } + if tables.Extservers, err = NewGameExtservers(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillatk"); err != nil { + return nil, err + } + if tables.SkillAtk, err = NewGameSkillAtk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillafteratk"); err != nil { + return nil, err + } + if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillbuff"); err != nil { + return nil, err + } + if tables.SkillBuff, err = NewGameSkillBuff(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillpassive"); err != nil { + return nil, err + } + if tables.SkillPassive, err = NewGameSkillPassive(buf); err != nil { + return nil, err + } + if buf, err = loader("game_hero"); err != nil { + return nil, err + } + if tables.Hero, err = NewGameHero(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostargrow"); err != nil { + return nil, err + } + if tables.HeroStargrow, err = NewGameHeroStargrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelgrow"); err != nil { + return nil, err + } + if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostarup"); err != nil { + return nil, err + } + if tables.HeroStarup, err = NewGameHeroStarup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroexp"); err != nil { + return nil, err + } + if tables.HeroExp, err = NewGameHeroExp(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelup"); err != nil { + return nil, err + } + if tables.HeroLevelup, err = NewGameHeroLevelup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equip"); err != nil { + return nil, err + } + if tables.Equip, err = NewGameEquip(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipattrlibrary"); err != nil { + return nil, err + } + if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipsuit"); err != nil { + return nil, err + } + if tables.EquipSuit, err = NewGameEquipSuit(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipcolor"); err != nil { + return nil, err + } + if tables.EquipColor, err = NewGameEquipColor(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipintensify"); err != nil { + return nil, err + } + if tables.EquipIntensify, err = NewGameEquipIntensify(buf); err != nil { + return nil, err + } + if buf, err = loader("game_item"); err != nil { + return nil, err + } + if tables.Item, err = NewGameItem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroskilllevel"); err != nil { + return nil, err + } + if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroresonance"); err != nil { + return nil, err + } + if tables.HeroResonance, err = NewGameHeroResonance(buf); err != nil { + return nil, err + } + if buf, err = loader("game_comatn"); err != nil { + return nil, err + } + if tables.ComAtn, err = NewGameComAtn(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroawaken"); err != nil { + return nil, err + } + if tables.HeroAwaken, err = NewGameHeroAwaken(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heromethod"); err != nil { + return nil, err + } + if tables.HeroMethod, err = NewGameHeroMethod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shop"); err != nil { + return nil, err + } + if tables.Shop, err = NewGameShop(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shopitem"); err != nil { + return nil, err + } + if tables.Shopitem, err = NewGameShopitem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_activereward"); err != nil { + return nil, err + } + if tables.ActiveReward, err = NewGameActiveReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skill"); err != nil { + return nil, err + } + if tables.Skill, err = NewGameSkill(buf); err != nil { + return nil, err + } + if buf, err = loader("game_model"); err != nil { + return nil, err + } + if tables.Model, err = NewGameModel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinechapter"); err != nil { + return nil, err + } + if tables.MainlineChapter, err = NewGameMainlineChapter(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlineeasy"); err != nil { + return nil, err + } + if tables.MainlineEasy, err = NewGameMainlineEasy(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinehard"); err != nil { + return nil, err + } + if tables.MainlineHard, err = NewGameMainlineHard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinepurgatory"); err != nil { + return nil, err + } + if tables.MainlinePurgatory, err = NewGameMainlinePurgatory(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcard"); err != nil { + return nil, err + } + if tables.DrawCard, err = NewGameDrawCard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannel"); err != nil { + return nil, err + } + if tables.ChatChannel, err = NewGameChatChannel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatsystem"); err != nil { + return nil, err + } + if tables.ChatSystem, err = NewGameChatSystem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatservergroup"); err != nil { + return nil, err + } + if tables.ChatServerGroup, err = NewGameChatServerGroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannelcom"); err != nil { + return nil, err + } + if tables.ChatChannelCom, err = NewGameChatChannelCom(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatexpression"); err != nil { + return nil, err + } + if tables.ChatExpression, err = NewGameChatExpression(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskround"); err != nil { + return nil, err + } + if tables.TaskRound, err = NewGameTaskRound(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskactivereward"); err != nil { + return nil, err + } + if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_coin"); err != nil { + return nil, err + } + if tables.Coin, err = NewGameCoin(buf); err != nil { + return nil, err + } + if buf, err = loader("game_initial"); err != nil { + return nil, err + } + if tables.Initial, err = NewGameInitial(buf); err != nil { + return nil, err + } + if buf, err = loader("game_monster"); err != nil { + return nil, err + } + if tables.Monster, err = NewGameMonster(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equippos"); err != nil { + return nil, err + } + if tables.EquipPos, err = NewGameEquipPos(buf); err != nil { + return nil, err + } + if buf, err = loader("game_playerlv"); err != nil { + return nil, err + } + if tables.Playerlv, err = NewGamePlayerlv(buf); err != nil { + return nil, err + } + if buf, err = loader("game_propsgroup"); err != nil { + return nil, err + } + if tables.Propsgroup, err = NewGamePropsgroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_facemod"); err != nil { + return nil, err + } + if tables.Facemod, err = NewGameFacemod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_msgdistrib"); err != nil { + return nil, err + } + if tables.Msgdistrib, err = NewGameMsgdistrib(buf); err != nil { + return nil, err + } + if buf, err = loader("game_opencond"); err != nil { + return nil, err + } + if tables.Opencond, err = NewGameOpencond(buf); err != nil { + return nil, err + } + if buf, err = loader("game_stroy"); err != nil { + return nil, err + } + if tables.Stroy, err = NewGameStroy(buf); err != nil { + return nil, err + } + if buf, err = loader("game_pagoda"); err != nil { + return nil, err + } + if tables.Pagoda, err = NewGamePagoda(buf); err != nil { + return nil, err + } + if buf, err = loader("game_pagodataskreward"); err != nil { + return nil, err + } + if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_pagodaseasonreward"); err != nil { + return nil, err + } + if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_pagodaseasonloop"); err != nil { + return nil, err + } + if tables.PagodaseasonLoop, err = NewGamePagodaseasonLoop(buf); err != nil { + return nil, err + } + if buf, err = loader("game_rdtask"); err != nil { + return nil, err + } + if tables.Rdtask, err = NewGameRdtask(buf); err != nil { + return nil, err + } + if buf, err = loader("game_rdtaskcondi"); err != nil { + return nil, err + } + if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf); err != nil { + return nil, err + } + if buf, err = loader("game_rdtaskchoose"); err != nil { + return nil, err + } + if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf); err != nil { + return nil, err + } + if buf, err = loader("game_rdtaskside"); err != nil { + return nil, err + } + if tables.RdtaskSide, err = NewGameRdtaskSide(buf); err != nil { + return nil, err + } + if buf, err = loader("game_kungfuunlock"); err != nil { + return nil, err + } + if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf); err != nil { + return nil, err + } + if buf, err = loader("game_kungfumasterworker"); err != nil { + return nil, err + } + if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf); err != nil { + return nil, err + } + if buf, err = loader("game_gourmet"); err != nil { + return nil, err + } + if tables.Gourmet, err = NewGameGourmet(buf); err != nil { + return nil, err + } + if buf, err = loader("game_gourmetskill"); err != nil { + return nil, err + } + if buf, err = loader("game_drop"); err != nil { + return nil, err + } + if tables.Drop, err = NewGameDrop(buf); err != nil { + return nil, err + } + if buf, err = loader("game_smithy"); err != nil { + return nil, err + } + if tables.Smithy, err = NewGameSmithy(buf); err != nil { + return nil, err + } + if buf, err = loader("game_smithystove"); err != nil { + return nil, err + } + if tables.SmithyStove, err = NewGameSmithyStove(buf); err != nil { + return nil, err + } + if buf, err = loader("game_vikingboss"); err != nil { + return nil, err + } + if tables.VikingBoss, err = NewGameVikingBoss(buf); err != nil { + return nil, err + } + if buf, err = loader("game_vikingchallenge"); err != nil { + return nil, err + } + if tables.VikingChallenge, err = NewGameVikingChallenge(buf); err != nil { + return nil, err + } + return tables, nil } From a47f734c16d9f1579d9593867cb6d1628aef99cf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 19:25:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=8B=A9=E7=8C=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_smithystove.json | 20 +-- modules/game/configure_comp.go | 6 +- modules/hunting/comp_configure.go | 3 - .../{model_viking.go => model_hunting.go} | 9 +- modules/hunting/model_rank.go | 3 +- pb/hero_db.pb.go | 115 ++++++++++++------ services/worker/main.go | 2 + 7 files changed, 97 insertions(+), 61 deletions(-) rename modules/hunting/{model_viking.go => model_hunting.go} (98%) diff --git a/bin/json/game_smithystove.json b/bin/json/game_smithystove.json index 5cd340b02..dfb91fd95 100644 --- a/bin/json/game_smithystove.json +++ b/bin/json/game_smithystove.json @@ -21,7 +21,7 @@ ], "probability": 100, "floors": 1, - "time": 15, + "time": 300, "desk": "" }, { @@ -46,7 +46,7 @@ ], "probability": 100, "floors": 1, - "time": 15, + "time": 300, "desk": "" }, { @@ -71,7 +71,7 @@ ], "probability": 100, "floors": 1, - "time": 15, + "time": 300, "desk": "" }, { @@ -96,7 +96,7 @@ ], "probability": 100, "floors": 2, - "time": 15, + "time": 300, "desk": "" }, { @@ -121,7 +121,7 @@ ], "probability": 100, "floors": 3, - "time": 15, + "time": 300, "desk": "" }, { @@ -146,7 +146,7 @@ ], "probability": 100, "floors": 4, - "time": 15, + "time": 300, "desk": "" }, { @@ -171,7 +171,7 @@ ], "probability": 100, "floors": 5, - "time": 15, + "time": 300, "desk": "" }, { @@ -196,7 +196,7 @@ ], "probability": 100, "floors": 5, - "time": 15, + "time": 300, "desk": "" }, { @@ -221,7 +221,7 @@ ], "probability": 100, "floors": 5, - "time": 15, + "time": 300, "desk": "" }, { @@ -235,7 +235,7 @@ "starupneed": [], "probability": 100, "floors": -1, - "time": 15, + "time": 300, "desk": "" }, { diff --git a/modules/game/configure_comp.go b/modules/game/configure_comp.go index f64addeab..0dd90c62b 100644 --- a/modules/game/configure_comp.go +++ b/modules/game/configure_comp.go @@ -6,10 +6,6 @@ import ( "go_dreamfactory/lego/core" ) -const ( - game_equipment = "game_equipment.json" -) - ///配置管理组件 type configureComp struct { modules.MCompConfigure @@ -17,7 +13,7 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.ModuleCompBase.Init(service, module, comp, options) + this.MCompConfigure.Init(service, module, comp, options) return } diff --git a/modules/hunting/comp_configure.go b/modules/hunting/comp_configure.go index 2d9813e2a..90ca858f5 100644 --- a/modules/hunting/comp_configure.go +++ b/modules/hunting/comp_configure.go @@ -41,9 +41,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp return }) err = this.LoadConfigure(game_challenge, cfg.NewGameHuntingChallenge) - - // _data := this.GetBuyChallengeCount(1) - // log.Debugf("%v", _data) return } diff --git a/modules/hunting/model_viking.go b/modules/hunting/model_hunting.go similarity index 98% rename from modules/hunting/model_viking.go rename to modules/hunting/model_hunting.go index 9f0405fe3..3b005ca74 100644 --- a/modules/hunting/model_viking.go +++ b/modules/hunting/model_hunting.go @@ -27,6 +27,11 @@ func (this *modelHunting) Init(service core.IService, module core.IModule, comp return } +func (this *modelHunting) modifyHuntingDataByObjId(uid string, data map[string]interface{}) error { + return this.Change(uid, data) +} + +// 获取列表信息 func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err error) { result = &pb.DBHunting{} if err = this.Get(uid, result); err != nil && redis.RedisNil != err { @@ -35,7 +40,3 @@ func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err err = nil return result, err } - -func (this *modelHunting) modifyHuntingDataByObjId(uid string, data map[string]interface{}) error { - return this.Change(uid, data) -} diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go index b5301b65c..9a27f5946 100644 --- a/modules/hunting/model_rank.go +++ b/modules/hunting/model_rank.go @@ -54,9 +54,10 @@ func (this *ModelRank) ChangeUserRank(uid string, value map[string]interface{}) return this.Change(uid, value) } +// 获取排行榜数据 func (this *ModelRank) GetRankData() (data []*pb.DBHuntingRank, err error) { data = make([]*pb.DBHuntingRank, 0) - err = this.Redis.LRange(comm.TableHuntingRank, 0, -1, &data) + err = this.Redis.LRange(comm.TableHuntingRank, 0, -1, &data) // 0 表示列表的第一个元素 -1 表示列表的最后一个元素 return } diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 1dd0f7d25..c005dade1 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -152,6 +152,10 @@ type DBHero struct { EnergyProperty map[string]int32 `protobuf:"bytes,24,rep,name=energyProperty,proto3" json:"energyProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"energyProperty"` // JuexProperty map[string]int32 `protobuf:"bytes,25,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp Status HeroType `protobuf:"varint,26,opt,name=status,proto3,enum=HeroType" json:"status" bson:"heroType"` //状态 (1 练功) + Suite1Star int32 `protobuf:"varint,27,opt,name=suite1Star,proto3" json:"suite1Star"` + Suite2Star int32 `protobuf:"varint,28,opt,name=suite2Star,proto3" json:"suite2Star"` + Suite1Lv int32 `protobuf:"varint,29,opt,name=suite1Lv,proto3" json:"suite1Lv"` + Suite2Lv int32 `protobuf:"varint,30,opt,name=suite2Lv,proto3" json:"suite2Lv"` } func (x *DBHero) Reset() { @@ -368,6 +372,34 @@ func (x *DBHero) GetStatus() HeroType { return HeroType_HeroTypeNil } +func (x *DBHero) GetSuite1Star() int32 { + if x != nil { + return x.Suite1Star + } + return 0 +} + +func (x *DBHero) GetSuite2Star() int32 { + if x != nil { + return x.Suite2Star + } + return 0 +} + +func (x *DBHero) GetSuite1Lv() int32 { + if x != nil { + return x.Suite1Lv + } + return 0 +} + +func (x *DBHero) GetSuite2Lv() int32 { + if x != nil { + return x.Suite2Lv + } + return 0 +} + type Floor struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -519,7 +551,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xb3, 0x09, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, + 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xab, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x44, 0x18, 0x03, 0x20, 0x01, @@ -574,43 +606,50 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x21, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, - 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x3e, 0x0a, 0x10, - 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x39, 0x0a, 0x0b, - 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67, - 0x79, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x3f, 0x0a, 0x11, 0x4a, 0x75, - 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x27, 0x0a, 0x05, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x68, 0x35, 0x22, 0x90, 0x01, 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, 0x73, 0x74, 0x61, 0x72, 0x34, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, - 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, - 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, - 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, + 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, + 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x12, + 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1c, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x12, + 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x73, + 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, + 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 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, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 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, 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 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, + 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 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, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 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, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, + 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, + 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x90, 0x01, 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, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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 ( diff --git a/services/worker/main.go b/services/worker/main.go index 36d4c6593..f4e5eb867 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -10,6 +10,7 @@ import ( "go_dreamfactory/modules/gm" "go_dreamfactory/modules/gourmet" "go_dreamfactory/modules/hero" + "go_dreamfactory/modules/hunting" "go_dreamfactory/modules/items" "go_dreamfactory/modules/mail" "go_dreamfactory/modules/mainline" @@ -69,6 +70,7 @@ func main() { rtask.NewModule(), viking.NewModule(), smithy.NewModule(), + hunting.NewModule(), ) } From 645514ed3d7c666b17d1451b2d4f327dace2501b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 31 Aug 2022 19:49:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E5=AE=B6=20=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A2=E5=8D=95=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 2 +- bin/json/game_gourmet.json | 40 +++++++------- modules/gourmet/api_createorder.go | 1 + modules/gourmet/model_gourmet.go | 4 +- pb/errorcode.pb.go | 11 ++-- pb/gourmet_db.pb.go | 84 +++++++++++++++++------------- 6 files changed, 79 insertions(+), 63 deletions(-) diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 6441768e1..672ed5282 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -129,7 +129,7 @@ "camp_pool_star3": 9000, "camp_pool_star4": 900, "camp_pool_star5": 100, - "gourmet": 3600, + "gourmet": 36000, "smithy_maxplayer": 20, "smithy_maxtime": 36000, "chat_expression_small": [ diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json index 0aaa868ef..7c8036cfb 100644 --- a/bin/json/game_gourmet.json +++ b/bin/json/game_gourmet.json @@ -14,7 +14,7 @@ "key": "gourmet_ln1", "text": "魔法厨艺" }, - "needtime": 3600, + "needtime": 300, "display": 1000, "probability": 1000, "delicious_icon": "ty_wz_k1", @@ -63,7 +63,7 @@ "key": "gourmet_ln2", "text": "魔法厨艺" }, - "needtime": 7200, + "needtime": 260, "display": 1000, "probability": 500, "delicious_icon": "ty_wz_k1", @@ -112,7 +112,7 @@ "key": "gourmet_ln3", "text": "魔法厨艺" }, - "needtime": 14400, + "needtime": 150, "display": 1000, "probability": 20, "delicious_icon": "ty_wz_k1", @@ -161,7 +161,7 @@ "key": "gourmet_ln4", "text": "魔法厨艺" }, - "needtime": 28800, + "needtime": 100, "display": 1000, "probability": 10, "delicious_icon": "ty_wz_k1", @@ -210,7 +210,7 @@ "key": "gourmet_ln1", "text": "功夫厨艺" }, - "needtime": 3600, + "needtime": 300, "display": 1000, "probability": 1000, "delicious_icon": "ty_wz_k2", @@ -259,7 +259,7 @@ "key": "gourmet_ln2", "text": "功夫厨艺" }, - "needtime": 7200, + "needtime": 260, "display": 1000, "probability": 500, "delicious_icon": "ty_wz_k2", @@ -308,7 +308,7 @@ "key": "gourmet_ln3", "text": "功夫厨艺" }, - "needtime": 14400, + "needtime": 150, "display": 1000, "probability": 20, "delicious_icon": "ty_wz_k2", @@ -357,7 +357,7 @@ "key": "gourmet_ln4", "text": "功夫厨艺" }, - "needtime": 28800, + "needtime": 100, "display": 1000, "probability": 10, "delicious_icon": "ty_wz_k2", @@ -406,7 +406,7 @@ "key": "gourmet_ln1", "text": "科技厨艺" }, - "needtime": 3600, + "needtime": 300, "display": 1000, "probability": 1000, "delicious_icon": "ty_wz_k3", @@ -455,7 +455,7 @@ "key": "gourmet_ln2", "text": "科技厨艺" }, - "needtime": 7200, + "needtime": 260, "display": 1000, "probability": 500, "delicious_icon": "ty_wz_k3", @@ -504,7 +504,7 @@ "key": "gourmet_ln3", "text": "科技厨艺" }, - "needtime": 14400, + "needtime": 150, "display": 1000, "probability": 20, "delicious_icon": "ty_wz_k3", @@ -553,7 +553,7 @@ "key": "gourmet_ln4", "text": "科技厨艺" }, - "needtime": 28800, + "needtime": 100, "display": 1000, "probability": 10, "delicious_icon": "ty_wz_k3", @@ -602,7 +602,7 @@ "key": "gourmet_ln1", "text": "月能厨艺" }, - "needtime": 3600, + "needtime": 300, "display": 1000, "probability": 1000, "delicious_icon": "ty_wz_k4", @@ -651,7 +651,7 @@ "key": "gourmet_ln2", "text": "月能厨艺" }, - "needtime": 7200, + "needtime": 260, "display": 1000, "probability": 500, "delicious_icon": "ty_wz_k4", @@ -700,7 +700,7 @@ "key": "gourmet_ln3", "text": "月能厨艺" }, - "needtime": 14400, + "needtime": 150, "display": 1000, "probability": 20, "delicious_icon": "ty_wz_k4", @@ -749,7 +749,7 @@ "key": "gourmet_ln4", "text": "月能厨艺" }, - "needtime": 28800, + "needtime": 100, "display": 1000, "probability": 10, "delicious_icon": "ty_wz_k4", @@ -798,7 +798,7 @@ "key": "gourmet_ln1", "text": "高效制作" }, - "needtime": -300, + "needtime": -10, "display": 1000, "probability": 1000, "delicious_icon": "", @@ -835,7 +835,7 @@ "key": "gourmet_ln2", "text": "高效制作" }, - "needtime": -600, + "needtime": -20, "display": 1000, "probability": 500, "delicious_icon": "", @@ -872,7 +872,7 @@ "key": "gourmet_ln3", "text": "高效制作" }, - "needtime": -900, + "needtime": -30, "display": 1000, "probability": 20, "delicious_icon": "", @@ -909,7 +909,7 @@ "key": "gourmet_ln4", "text": "高效制作" }, - "needtime": -1200, + "needtime": -40, "display": 1000, "probability": 10, "delicious_icon": "", diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go index a72d4e5dd..f1cae9bc8 100644 --- a/modules/gourmet/api_createorder.go +++ b/modules/gourmet/api_createorder.go @@ -81,6 +81,7 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat _gourmet.CookingFood = &pb.Cooking{ FoodType: v.FoodType, ETime: time.Now().Unix() + int64(_skillCfg.Needtime), + STime: time.Now().Unix() - int64(_skillCfg.Needtime), } break } diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go index e483d273d..896dc1239 100644 --- a/modules/gourmet/model_gourmet.go +++ b/modules/gourmet/model_gourmet.go @@ -110,9 +110,9 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet) if curTime > costTime { gourmet.OrderCostTime += int32(curTime - costTime) // 转时间戳 - eTimd := time.Now().Unix() + int64(curTime-costTime) gourmet.CookingFood.FoodType = order.FoodType - gourmet.CookingFood.ETime = eTimd + gourmet.CookingFood.ETime = time.Now().Unix() + int64(curTime-costTime) + gourmet.CookingFood.STime = time.Now().Unix() - int64(curTime-costTime) bCooking = true // 记录下订单时间 diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 0fa1797c6..dccbbcd46 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -167,6 +167,7 @@ const ( // moonfantasy 月之秘境 ErrorCode_MoonfantasyHasExpired ErrorCode = 2401 // boos 连接已失效 ErrorCode_MoonfantasyJoinUp ErrorCode = 2402 // boos 参与人数已达上限 + ErrorCode_MoonfantasyDareUp ErrorCode = 2403 // boos 挑战次数已达上限 ) // Enum value maps for ErrorCode. @@ -301,6 +302,7 @@ var ( 2303: "VikingBuyMaxCount", 2401: "MoonfantasyHasExpired", 2402: "MoonfantasyJoinUp", + 2403: "MoonfantasyDareUp", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -432,6 +434,7 @@ var ( "VikingBuyMaxCount": 2303, "MoonfantasyHasExpired": 2401, "MoonfantasyJoinUp": 2402, + "MoonfantasyDareUp": 2403, } ) @@ -466,7 +469,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xe7, 0x15, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xff, 0x15, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -640,8 +643,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, - 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, + 0x10, 0xe3, 0x12, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pb/gourmet_db.pb.go b/pb/gourmet_db.pb.go index 8972beaeb..141de57d0 100644 --- a/pb/gourmet_db.pb.go +++ b/pb/gourmet_db.pb.go @@ -28,6 +28,7 @@ type Cooking struct { FoodType int32 `protobuf:"varint,1,opt,name=foodType,proto3" json:"foodType"` // 料理类型 ETime int64 `protobuf:"varint,2,opt,name=eTime,proto3" json:"eTime"` // 结束时间戳 + STime int64 `protobuf:"varint,3,opt,name=sTime,proto3" json:"sTime"` // 开始时间戳 } func (x *Cooking) Reset() { @@ -76,6 +77,13 @@ func (x *Cooking) GetETime() int64 { return 0 } +func (x *Cooking) GetSTime() int64 { + if x != nil { + return x.STime + } + return 0 +} + // 队列里的烹饪食品 type OrderCook struct { state protoimpl.MessageState @@ -256,46 +264,48 @@ var File_gourmet_gourmet_db_proto protoreflect.FileDescriptor var file_gourmet_gourmet_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2f, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x07, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x51, 0x0a, 0x07, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x22, 0x61, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, - 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, - 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, - 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, - 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xc4, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x47, 0x6f, 0x75, - 0x72, 0x6d, 0x65, 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, 0x2a, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x46, 0x6f, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, - 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x6f, - 0x6f, 0x64, 0x12, 0x20, 0x0a, 0x05, 0x66, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, 0x52, 0x05, 0x66, - 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, - 0x65, 0x74, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x40, 0x0a, 0x0c, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x47, - 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, - 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, - 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, - 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x3f, 0x0a, 0x11, - 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x61, 0x0a, 0x09, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xc4, 0x03, 0x0a, + 0x09, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 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, 0x2a, 0x0a, 0x0b, + 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x6f, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x0b, 0x63, 0x6f, 0x6f, + 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x6f, 0x6f, 0x64, 0x12, 0x20, 0x0a, 0x05, 0x66, 0x6f, 0x6f, 0x64, + 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, + 0x6f, 0x6f, 0x6b, 0x52, 0x05, 0x66, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, + 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, + 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, + 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x40, 0x0a, 0x0c, 0x73, 0x70, + 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2e, 0x53, 0x70, 0x65, + 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, + 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 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, 0x3f, 0x0a, 0x11, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var (