From 0d56de59aa71de88e7f28bb57759a334db65f296 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 1 Sep 2023 17:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E7=BD=B2gm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 1 + modules/dragon/api_train.go | 1 + modules/gm/module.go | 16 ++++++++++++++++ modules/gourmet/comp_configure.go | 17 +++++++++++++++++ modules/gourmet/module.go | 20 ++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/comm/imodule.go b/comm/imodule.go index 175067152..a838e4e6e 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -447,6 +447,7 @@ type ( IGourmet interface { ///红点 IGetReddot + GMCreateAltas(uid string) } ILibrary interface { diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go index 3f8bb43ef..cae0d2a7e 100644 --- a/modules/dragon/api_train.go +++ b/modules/dragon/api_train.go @@ -143,6 +143,7 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e } rsp.Reward = atno } + rsp.Dragons = dragon this.module.modelDragon.UpdateDragonData(session.GetUserId(), dragon.Id, update) session.SendMsg(string(this.module.GetType()), "train", rsp) return diff --git a/modules/gm/module.go b/modules/gm/module.go index acc2bb25b..9f9f1b1f2 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -687,6 +687,22 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er module1.(comm.IBuried).CompleteCondition(session.GetUserId(), int32(condiId)) + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + ) + } else if len(datas) == 1 && (datas[0] == "groumet") { + var ( + err error + ) + + module1, err := this.service.GetModule(comm.ModuleGourmet) + if err != nil { + return + } + + module1.(comm.IGourmet).GMCreateAltas(session.GetUserId()) + this.Debug("使用bingo命令:uid = %s ", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "0", Value: datas[0]}, diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go index b0b2ab66f..af12bf412 100644 --- a/modules/gourmet/comp_configure.go +++ b/modules/gourmet/comp_configure.go @@ -88,3 +88,20 @@ func (this *configureComp) GetNormalGourmetFood() string { return this.normal } + +// gm 获取所有 +func (this *configureComp) GMGetAllCookBookConf() (sz []string, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_food); err == nil { + if conf, ok := v.(*cfg.GameBreakingbad); ok { + for _, v := range conf.GetDataList() { + sz = append(sz, v.Delicacies) + } + return + } + } + err = comm.NewNotFoundConfErr("gourmet", game_food, "") + return +} diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go index c8fca7e6a..85f1965ed 100644 --- a/modules/gourmet/module.go +++ b/modules/gourmet/module.go @@ -79,3 +79,23 @@ func (this *Gourmet) GetSuccessRate(m map[string]int32, conf *cfg.GameBreakingba } return } + +func (this *Gourmet) GMCreateAltas(uid string) { + _gourmet, err := this.modelAtlas.getGourmetAtlasList(uid) + if err != nil { + return + } + sz, err := this.configure.GMGetAllCookBookConf() + if err != nil { // 配置校验 + return + } + _gourmet.Atlas = make(map[string]int32) + for _, v := range sz { + _gourmet.Atlas[v] = 1 + } + if err := this.modelAtlas.Change(uid, map[string]interface{}{ + "atlas": _gourmet.Atlas, + }); err != nil { + this.Errorf("change modelAtlas failed: %v", err) + } +}