From dcc921ff9144645de1406de4f8422d8f0448e9a1 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 1 Dec 2023 17:33:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/hero_test.go | 23 +++++++++++++++++++++++ modules/modeluserlog.go | 1 + modules/uigame/api_minergrid.go | 5 ++++- modules/uigame/api_puzzlegrid.go | 5 ++++- modules/user/api_changetips.go | 11 ++++++++--- modules/user/api_modifyname.go | 4 +++- modules/viking/api_challenge.go | 11 +++++++++++ modules/warorder/api_buylv.go | 7 ++++++- modules/wtask/api_exchange.go | 1 + modules/wtask/api_finish.go | 1 + 10 files changed, 62 insertions(+), 7 deletions(-) diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 96a0a334b..899f3433a 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -150,8 +150,31 @@ func GetLotterConfById(id int32) (data *cfg.GameLotteryData) { return } +type t20190107 struct { + v int +} + +func (t t20190107) F() int { + return t.v +} + +func (t t20190107) A(a int) int { + return t.v + a +} func Test_Main(t *testing.T) { + i := t20190107{678} + t1 := reflect.TypeOf(i) + for it := 0; it < t1.NumMethod(); it++ { + fmt.Println(t1.Method(it).Name) + } + + f1, _ := t1.MethodByName("F") + fmt.Println(f1.Name) + + r := f1.Func.Call([]reflect.Value{reflect.ValueOf(i), reflect.ValueOf(1)})[0].Int() + fmt.Println(r) + sz := make(map[string]*pb.DBHero) fmt.Printf("%v", sz["1"]) hero := &pb.DBHero{} diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go index 37b1cfebe..20a366cc4 100644 --- a/modules/modeluserlog.go +++ b/modules/modeluserlog.go @@ -46,6 +46,7 @@ func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data i jsonStr []byte logType string ) + if jsonStr, err = json.Marshal(data); err != nil { log.Errorln(err) return diff --git a/modules/uigame/api_minergrid.go b/modules/uigame/api_minergrid.go index ed270a7df..9f4f5f1ce 100644 --- a/modules/uigame/api_minergrid.go +++ b/modules/uigame/api_minergrid.go @@ -26,6 +26,8 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR var ( atno []*pb.UserAtno res []*cfg.Gameatn + conf *cfg.GameUiGameConsumData + err error ) list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) if _, ok := list.Gotarr[req.Cid]; ok { // 重复拼图 @@ -33,7 +35,7 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR } // 校验消耗 - if conf, err := this.module.configure.GetMinerConsumConf(); err == nil { + if conf, err = this.module.configure.GetMinerConsumConf(); err == nil { if conf.Cost.N > 0 { if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.Cost}, true); errdata != nil { return @@ -62,6 +64,7 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameMinerKeyReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UiGameMinerKeyReq", conf.Cost) }) return } diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 9e0c424ed..09eca9014 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -24,8 +24,10 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG return // 参数校验失败直接返回 } var ( + conf *cfg.GameUiGameConsumData atno []*pb.UserAtno res []*cfg.Gameatn + err error ) list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) if _, ok := list.Puzzle[req.Grid]; ok { // 重复拼图 @@ -33,7 +35,7 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG } // 校验消耗 - if conf, err := this.module.configure.GetPuzzleConsumConf(); err == nil { + if conf, err = this.module.configure.GetPuzzleConsumConf(); err == nil { if conf.Cost.N > 0 { if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.Cost}, true); errdata != nil { return @@ -68,6 +70,7 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGamePuzzleGridReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UiGamePuzzleGridReq", conf.Cost) }) return } diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 6b2c05632..5eddf282a 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -14,12 +14,14 @@ func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChan // 修改提示次数 func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) { - + var ( + consume *cfg.Gameatn + ) update := make(map[string]interface{}, 0) if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { - if conf := this.module.ModuleTools.GetGlobalConf().DailyTips; conf.N > 0 { - if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil { + if consume = this.module.ModuleTools.GetGlobalConf().DailyTips; consume.N > 0 { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consume}, true); errdata != nil { return } } @@ -31,6 +33,9 @@ func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTip session.SendMsg(string(this.module.GetType()), "changetips", &pb.UserChangeTipsResp{ Data: sign, }) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UserChangeTipsReq", consume) + }) } return diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index de80aff03..d7b144ad5 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -98,6 +98,8 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam //resp.Count = uint32(left) this.sendMsg(session, UserSubTypeModifyName, resp) - + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UserModifynameReq", this.module.globalConf.ChangeName) + }) return } diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index efe42e4d9..0f42b3433 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -129,5 +129,16 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng BossId: req.BossId, Difficulty: req.Difficulty, }) + if ps > 0 { + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + psAnt := &cfg.Gameatn{ // 构建一个atn 对象 + A: "attr", + T: "ps", + N: ps, + } + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "VikingChallengeReq", psAnt) + }) + } + return } diff --git a/modules/warorder/api_buylv.go b/modules/warorder/api_buylv.go index 740f03d1b..817a65c9f 100644 --- a/modules/warorder/api_buylv.go +++ b/modules/warorder/api_buylv.go @@ -22,6 +22,7 @@ func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.WarorderBuyLvReq) exp int32 err error ok bool + consum *cfg.Gameatn ) if errdata = this.BuyLvCheck(session, req); errdata != nil { return @@ -73,7 +74,8 @@ func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.WarorderBuyLvReq) need := this.module.ModuleTools.GetGlobalConf().Passcheck4GetLvCos lv := req.Lv - dwarorder.Lv - if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: need.A, T: need.T, N: need.N * lv}}, true); errdata != nil { + consum = &cfg.Gameatn{A: need.A, T: need.T, N: need.N * lv} + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consum}, true); errdata != nil { return } @@ -106,5 +108,8 @@ func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.WarorderBuyLvReq) return } session.SendMsg(string(this.module.GetType()), "buylv", &pb.WarorderBuyLvResp{Rtype: req.Rtype, Lv: req.Lv, Info: dwarorder}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WarorderBuyLvReq", consum) + }) return } diff --git a/modules/wtask/api_exchange.go b/modules/wtask/api_exchange.go index 5bcbac6d2..d92eec884 100644 --- a/modules/wtask/api_exchange.go +++ b/modules/wtask/api_exchange.go @@ -88,6 +88,7 @@ func (this *apiComp) Exchange(session comm.IUserSession, req *pb.WTaskExchangeRe go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskExchangeReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WTaskExchangeReq", money) }) return } diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 20b9243a3..571352732 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -153,6 +153,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, req.Tid) this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WTaskFinishReq", conf.TaskendRemoveitem) }) return }