From 35714bc422e1f010ef0f71cf9a6ec1be4e7f2b9a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 14 Dec 2023 10:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/academy/api_receive.go | 9 ++++++--- modules/academy/api_teachingreceive.go | 7 +++++-- modules/caravan/api_buyorsell.go | 13 +++++-------- modules/caravan/module.go | 24 +++++++++++++++--------- modules/combat/api_challengereceive.go | 7 +++++-- modules/combat/api_drop.go | 5 +++-- modules/dispatch/api_autoreceive.go | 19 +++++++++---------- modules/dispatch/api_notice.go | 12 +++++++----- modules/dispatch/api_week.go | 9 +++++---- modules/enchant/api_challengeover.go | 5 +++-- modules/equipment/api_sellI.go | 8 ++++---- modules/friend/api_cross_getreward.go | 7 +++++-- modules/friend/api_cross_zan.go | 7 +++++-- modules/gourmet/api_activateatlas.go | 10 +++++++--- modules/gourmet/api_createfood.go | 7 +++++-- modules/hero/hero_test.go | 6 ++++++ modules/modeluserlog.go | 4 ++++ 17 files changed, 99 insertions(+), 60 deletions(-) diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index 321f17fb0..69ed37eba 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -19,7 +19,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe level *cfg.GameTeachingData info *pb.DBAcademy // group []*cfg.GameTeachingData - err error + err error + atno []*pb.UserAtno ) if errdata = this.ReceiveCheck(session, req); errdata != nil { return @@ -65,11 +66,13 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe return } - this.module.DispenseRes(session, level.Award, true) + if errdata, atno = this.module.DispenseAtno(session, level.Award, true); err != nil { + return + } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype151, 1)) - this.module.WriteUserLog(session.GetUserId(),req, comm.GMResAddType, "AcademyReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AcademyReceiveReq", atno) }) } diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index 1066fa478..830a22fec 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -20,6 +20,7 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT level *cfg.GameHeroStrategyData info *pb.DBAcademy err error + atno []*pb.UserAtno ) if errdata = this.TeachingReceiveCheck(session, req); errdata != nil { return @@ -64,10 +65,12 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT } return } - this.module.DispenseRes(session, level.Award, true) + if errdata, atno = this.module.DispenseAtno(session, level.Award, true); err != nil { + return + } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AcademyTeachingReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AcademyTeachingReceiveReq", atno) }) } session.SendMsg(string(this.module.GetType()), "teachingreceive", &pb.AcademyTeachingReceiveResp{Issucc: true}) diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 2d84e7e2d..5b1036300 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -28,6 +28,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe buyValue int32 // 任务统计 贩卖货物价值 sellSpValue int32 // 任务统计 向指定X城市贩卖货物贩卖货物价值 profitValue int32 // 盈利 + atno []*pb.UserAtno ) update = make(map[string]interface{}) if errdata = this.BuyOrSellCheck(session, req); errdata != nil { @@ -112,11 +113,11 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe T: "profit", N: profitValue, }) - if errdata = this.module.DispenseRes(session, addRes, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, addRes, true); errdata != nil { this.module.Errorf("获得虚拟币失败:%v", errdata) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll sell", addRes) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll sell", atno) }) this.module.ArrayBag(caravan) @@ -220,7 +221,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } return } - if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{ + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{{ A: "attr", T: "merchantmoney", N: addScore, @@ -228,11 +229,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe this.module.Errorf("获得虚拟币失败:%v", errdata) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll buy", []*cfg.Gameatn{{ - A: "attr", - T: "merchantmoney", - N: addScore, - }}) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll buy", atno) }) } diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 5972c5fa5..3221e6056 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -216,13 +216,17 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) { // 初始化门票和虚拟币 func (this *Caravan) InitCaravanTicket(session comm.IUserSession, conf *cfg.GameCaravanLvData) (errdata *pb.ErrorData) { - var res []*cfg.Gameatn + var ( + res []*cfg.Gameatn + atno []*pb.UserAtno + ) res = append(res, conf.Tickettop) res = append(res, conf.Moneynumtop) - errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源 - + if errdata, atno = this.DispenseAtno(session, res, true); errdata != nil { // 推送门票和虚拟币资源 + return + } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "", 0, "InitCaravanTicket", res) + this.WriteUserLog(session.GetUserId(), "", 0, "InitCaravanTicket", atno) }) return } @@ -337,7 +341,6 @@ func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCara A: "attr", T: "merchantmoney", N: -list.Unreword[1], // 扣除虚拟币 - O: "", }) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.WriteUserLog(session.GetUserId(), "", comm.GMResDelType, "CheckCaravanTask", resp.Reward) // 消耗资源 @@ -379,15 +382,18 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid ...int32) { resp = &pb.CaravanTaskCompletePush{} resp.Data = list resp.BSuccess = true - - if errdata, reward := this.ModuleBase.DispenseAtno(session, conf.Reword, true); errdata != nil { + var ( + atno []*pb.UserAtno + errdata *pb.ErrorData + ) + if errdata, atno = this.ModuleBase.DispenseAtno(session, conf.Reword, true); errdata != nil { this.Errorf("Caravan DispenseRes err:%v", conf.Reword) } else { - resp.Reward = reward + resp.Reward = atno } session.SendMsg(string(this.GetType()), "taskcomplete", resp) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), taskid, 0, "TaskComplete", conf.Reword) + this.WriteUserLog(session.GetUserId(), taskid, comm.GMResAddType, "TaskComplete", atno) }) } } diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index d98516e3c..83e41962c 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -23,6 +23,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC atns []*pb.UserAssets ok bool err error + atno []*pb.UserAtno ) if errdata = this.ChallengeReceiveCheck(session, req); errdata != nil { @@ -82,7 +83,9 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC return } - this.module.DispenseRes(session, manster.Award, true) + if errdata, atno = this.module.DispenseAtno(session, manster.Award, true); errdata != nil { + return + } atns = make([]*pb.UserAssets, len(manster.Award)) for i, v := range manster.Award { atns[i] = &pb.UserAssets{ @@ -101,7 +104,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatChallengeReceiveReq", atns) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatChallengeReceiveReq", atno) }) } session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Level: req.Level, Manster: req.Manster, Atns: atns}) diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index 1034d4186..af34a0183 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -23,6 +23,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err user *pb.DBUser ok bool err error + atno []*pb.UserAtno ) if errdata = this.DropCheck(session, req); errdata != nil { return @@ -92,7 +93,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err } return } - if errdata = this.module.DispenseRes(session, reward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil { return } atns = make([]*pb.UserAssets, len(reward)) @@ -114,7 +115,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Level: req.Level, Atns: atns}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatDropReq", atns) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatDropReq", atno) }) return } diff --git a/modules/dispatch/api_autoreceive.go b/modules/dispatch/api_autoreceive.go index c3aba5f83..feb7c8eae 100644 --- a/modules/dispatch/api_autoreceive.go +++ b/modules/dispatch/api_autoreceive.go @@ -12,7 +12,11 @@ func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAu } func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) { - var res []*cfg.Gameatn + var ( + res []*cfg.Gameatn + rss []*pb.DispatchTaskRsp + atno []*pb.UserAtno + ) rsp := &pb.DispatchAutoReceiveResp{} d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { @@ -32,11 +36,6 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec } } - // if !flag { - // code = pb.ErrorCode_DispatchNoFinished - // return - // } - tasks, oldTasks := a.module.modelDispatch.replaceFinishedTask(session.GetUserId(), d) //更新公告任务 @@ -45,8 +44,6 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec return } - var rss []*pb.DispatchTaskRsp - //奖励 for _, t := range oldTasks { gd, err := a.module.configure.getDispatchTaskConf(t.TaskId) @@ -65,13 +62,15 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec } rss = append(rss, rs) } - a.module.DispenseRes(session, res, true) + if errdata, atno = a.module.DispenseAtno(session, res, true); errdata != nil { + return + } rsp.Task = rss session.SendMsg(string(a.module.GetType()), "autoreceive", rsp) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchAutoReceiveReq", res) + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchAutoReceiveReq", atno) }) return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 31fc07c66..626a9406a 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -66,11 +66,13 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( if int32(left) < limit { add := limit - int32(left) atn := &cfg.Gameatn{A: "item", T: itemId, N: add} - a.module.DispenseRes(session, []*cfg.Gameatn{atn}, true) - - go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "恢复门票", atn) - }) + if e, atno := a.module.DispenseAtno(session, []*cfg.Gameatn{atn}, true); e != nil { + return e + } else { + go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "恢复门票", atno) + }) + } } } //周任务重置 diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index d41588638..1af8814bf 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -57,10 +57,11 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci } } if len(res) > 0 { - a.module.DispenseRes(session, res, true) - go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchWeekReciveReq", res) - }) + if errdata, atno := a.module.DispenseAtno(session, res, true); errdata != nil { + go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchWeekReciveReq", atno) + }) + } } session.SendMsg(string(a.module.GetType()), "weekrecive", rsp) return diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index ff229fc27..890486ad8 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -25,6 +25,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha bWin bool // 战斗是否胜利 score int32 // 通关获得分数 res []*cfg.Gameatn + atno []*pb.UserAtno ) mapData = make(map[string]interface{}, 0) // reward = make([]*cfg.Gameatn, 0) @@ -102,11 +103,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha } } if len(res) > 0 { - if errdata = this.module.DispenseRes(session, res, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EnchantChallengeOverReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EnchantChallengeOverReq", atno) }) } diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 753f4509a..4b6c2d201 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -26,7 +26,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( confs []*cfg.GameEquipData confUpsells []*cfg.GameEquipUpsellData sale [][]*cfg.Gameatn - reward []*pb.UserAtno + atno []*pb.UserAtno ) if errdata = this.SellCheck(session, req); errdata != nil { return @@ -102,15 +102,15 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( for _, v := range sale { sales = append(sales, v...) } - if errdata, reward = this.module.DispenseAtno(session, sales, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, sales, true); errdata != nil { return } if errdata = this.module.DelEquipments(session, req.EquipIds, true); errdata != nil { return } - session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true, Reward: reward}) + session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true, Reward: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EquipmentSellReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EquipmentSellReq", atno) }) return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index be630be3d..a7932b482 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -12,6 +12,9 @@ func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGet } func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (errdata *pb.ErrorData) { + var ( + atno []*pb.UserAtno + ) uid := session.GetUserId() //获取玩家自己好友数据 self, err := this.module.modelFriend.GetFriend(uid) @@ -48,7 +51,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar } globalConf := this.module.ModuleTools.GetGlobalConf() - if errdata = this.module.DispenseRes(session, globalConf.FriendPeize, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, globalConf.FriendPeize, true); errdata != nil { this.module.Error("好友领奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "reward", Value: globalConf.FriendPeize}, @@ -61,7 +64,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar session.SendMsg(string(this.module.GetType()), "getreward", rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", globalConf.FriendPeize) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", atno) }) return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index 0839ff69c..46f4c6009 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -29,6 +29,7 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda target *pb.DBFriend err error selfId string + atno []*pb.UserAtno ) uid := session.GetUserId() @@ -126,14 +127,16 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda T: "friendPoint", N: 1, } - this.module.DispenseRes(s, []*cfg.Gameatn{res}, true) + if errdata, atno = this.module.DispenseAtno(s, []*cfg.Gameatn{res}, true); errdata != nil { + return + } session.SendMsg(string(this.module.GetType()), FriendSubTypeZan, rsp) // 赠送X次友情点 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype11, 1)) - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", atno) }) return } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index df0cd7cab..4cfd41492 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -18,7 +18,9 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm } func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) { - + var ( + atno []*pb.UserAtno + ) errdata = this.ActivateAtlasCheck(session, req) if errdata != nil { return // 参数校验失败直接返回 @@ -56,13 +58,15 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct } // 发送首次获得奖励 - this.module.DispenseRes(session, []*cfg.Gameatn{conf.Unlockreward}, true) + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.Unlockreward}, true); errdata != nil { + return + } session.SendMsg(string(this.module.GetType()), "activateatlas", &pb.GourmetActivateAtlasResp{ Atlas: _gourmet.Atlas, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetActivateAtlasReq", conf.Unlockreward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetActivateAtlasReq", atno) }) return } diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index ccb08547a..c5fe578d6 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -24,6 +24,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate res []*cfg.Gameatn curFood string // 做出来的食物ID bFirst bool // 是否首次获得 + atno []*pb.UserAtno ) errdata = this.CreateFoodCheck(session, req) if errdata != nil { @@ -78,7 +79,9 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate T: curFood, N: 1, } - this.module.DispenseRes(session, []*cfg.Gameatn{atn}, true) + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{atn}, true); errdata != nil { + return + } rst, _ := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId()) // 校验是否首次获得 if _, ok := rst.Atlas[curFood]; !ok { @@ -100,7 +103,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype150, 1)) - this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetCreateFoodReq", atn) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetCreateFoodReq", atno) this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "GourmetCreateFoodReq", res) }) return diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index b5467ebe3..2ec0ef297 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -164,7 +164,13 @@ func (t t20190107) A(a int) int { return t.v + a } func Test_Main(t *testing.T) { + var ( + szByte []byte + ) + szByte = make([]byte, 0) + //szByte = append(szByte, 8) + fmt.Printf("%v,%s", szByte, string(szByte)) i := t20190107{678} t1 := reflect.TypeOf(i) for it := 0; it < t1.NumMethod(); it++ { diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go index dedc4085b..fcc283d69 100644 --- a/modules/modeluserlog.go +++ b/modules/modeluserlog.go @@ -58,10 +58,14 @@ func (this *modelUserLog) AddUserLog(uid string, req interface{}, itype int32, t if len(jsonStr) == 0 { return } + if jsonReq, err = json.Marshal(req); err != nil { log.Errorln(err) return } + if len(jsonReq) > 128 { + jsonReq = make([]byte, 0) + } if itype == 0 { logType = "add" // 新增资源类型 } else if itype == 1 {