diff --git a/comm/const.go b/comm/const.go index 1a2f13251..030c100a4 100644 --- a/comm/const.go +++ b/comm/const.go @@ -1133,3 +1133,8 @@ const ( OpencondTypePagoda OpencondType = 5 //爬塔 OpencondTypeSociaty OpencondType = 6 //工会等级 ) + +const ( + GMResAddType int32 = 0 + GMResDelType int32 = 1 +) diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index 588f59ff8..e95575b9f 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe 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(), "AcademyReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AcademyReceiveReq", level.Award) }) } diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index c9962fb6a..c106790e6 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -67,7 +67,7 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT this.module.DispenseRes(session, level.Award, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "AcademyTeachingReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AcademyTeachingReceiveReq", level.Award) }) } session.SendMsg(string(this.module.GetType()), "teachingreceive", &pb.AcademyTeachingReceiveResp{Issucc: true}) diff --git a/modules/achieve/api_award.go b/modules/achieve/api_award.go index 81f0eaa7c..9dfd39e8d 100644 --- a/modules/achieve/api_award.go +++ b/modules/achieve/api_award.go @@ -81,7 +81,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AchieveAwardReq) ( session.SendMsg(string(this.module.GetType()), "award", &pb.AchieveAwardResp{Id: req.Id, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "AchieveAwardReq", conf.TaskReward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AchieveAwardReq", conf.TaskReward) }) return } diff --git a/modules/activity/api_getreward.go b/modules/activity/api_getreward.go index 3580181cf..1d3e62a86 100644 --- a/modules/activity/api_getreward.go +++ b/modules/activity/api_getreward.go @@ -98,7 +98,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ActivityGetRew }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ActivityGetRewardReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ActivityGetRewardReq", reward) }) return } diff --git a/modules/addrecharge/api_receive.go b/modules/addrecharge/api_receive.go index 5ff97e3e5..f04929340 100644 --- a/modules/addrecharge/api_receive.go +++ b/modules/addrecharge/api_receive.go @@ -77,7 +77,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AddRechargeRecei session.SendMsg(string(this.module.GetType()), "receive", &pb.AddRechargeReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "AddRechargeReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AddRechargeReceiveReq", award) }) return } diff --git a/modules/addrecharge/api_receiveall.go b/modules/addrecharge/api_receiveall.go index dbe1b318a..bed907c78 100644 --- a/modules/addrecharge/api_receiveall.go +++ b/modules/addrecharge/api_receiveall.go @@ -79,7 +79,7 @@ func (this *apiComp) ReceiveAll(session comm.IUserSession, req *pb.AddRechargeRe }) session.SendMsg(string(this.module.GetType()), "receiveall", &pb.AddRechargeReceiveAllResp{Record: info.Record, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "AddRechargeReceiveAllReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AddRechargeReceiveAllReq", award) }) return } diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index a0fca42a6..80ede904e 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -99,7 +99,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat session.SendMsg(string(this.module.GetType()), "buy", &pb.MoonfantasyBuyResp{Issucc: true, BattleNum: info.Buynum}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MoonfantasyBuyReq", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyBuyReq", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}) }) return } diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 8f48fdb45..2bd0ca57b 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -289,7 +289,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) if bReward { - this.module.WriteUserLog(session.GetUserId(), "ArenaChallengeRewardReq", reward.WinReward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ArenaChallengeRewardReq", reward.WinReward) } }) diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index 320a7c123..5d3a834cf 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -98,7 +98,7 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ArenaPlotRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ArenaPlotRewardReq", atno) }) return } diff --git a/modules/atlas/api_atlasaward.go b/modules/atlas/api_atlasaward.go index e3f6bd444..ba8c4949f 100644 --- a/modules/atlas/api_atlasaward.go +++ b/modules/atlas/api_atlasaward.go @@ -73,7 +73,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (er Res: respRes, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "AtlasAwardReq", respRes) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AtlasAwardReq", respRes) }) return } diff --git a/modules/caninerabbit/api_award.go b/modules/caninerabbit/api_award.go index 01dd7781c..43ae6a3ac 100644 --- a/modules/caninerabbit/api_award.go +++ b/modules/caninerabbit/api_award.go @@ -63,7 +63,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardR session.SendMsg(string(this.module.GetType()), "award", &pb.CanineRabbitAwardResp{Type: req.Type, Awardmap: info.Award, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CanineRabbitAwardReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CanineRabbitAwardReq", res) }) return } diff --git a/modules/capturesheep/api_allweekreward.go b/modules/capturesheep/api_allweekreward.go index 00922c0fa..18219d428 100644 --- a/modules/capturesheep/api_allweekreward.go +++ b/modules/capturesheep/api_allweekreward.go @@ -71,7 +71,7 @@ func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.Captureshe } session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CapturesheepAllWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) }) return } diff --git a/modules/capturesheep/api_over.go b/modules/capturesheep/api_over.go index b9c73a72b..10584f5db 100644 --- a/modules/capturesheep/api_over.go +++ b/modules/capturesheep/api_over.go @@ -134,7 +134,7 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CapturesheepOverReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepOverReq", award) }) return } diff --git a/modules/capturesheep/api_weekreward.go b/modules/capturesheep/api_weekreward.go index b6b13a4ff..799287728 100644 --- a/modules/capturesheep/api_weekreward.go +++ b/modules/capturesheep/api_weekreward.go @@ -74,7 +74,7 @@ func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.CapturesheepW session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CapturesheepWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepWeekRewardReq", award) }) return } diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 5d5bc8efb..198f5f052 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -116,7 +116,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(), "troll sell", addRes) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "troll sell", addRes) }) this.module.ArrayBag(caravan) @@ -232,7 +232,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(), "troll buy", []*cfg.Gameatn{{ + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "troll buy", []*cfg.Gameatn{{ A: "attr", T: "merchantmoney", N: addScore, diff --git a/modules/caravan/api_getreward.go b/modules/caravan/api_getreward.go index 2403abad2..74a8092ba 100644 --- a/modules/caravan/api_getreward.go +++ b/modules/caravan/api_getreward.go @@ -99,7 +99,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CaravanGetRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CaravanGetRewardReq", atno) }) return } diff --git a/modules/caravan/module.go b/modules/caravan/module.go index c0424556d..9990df18f 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -222,7 +222,7 @@ func (this *Caravan) InitCaravanTicket(session comm.IUserSession, conf *cfg.Game errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源 go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "InitCaravanTicket", res) + this.WriteUserLog(session.GetUserId(), 0, "InitCaravanTicket", res) }) return } @@ -387,7 +387,7 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid ...int32) { } session.SendMsg(string(this.GetType()), "taskcomplete", resp) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "TaskComplete", conf.Reword) + this.WriteUserLog(session.GetUserId(), 0, "TaskComplete", conf.Reword) }) } } diff --git a/modules/catchbugs/api_award.go b/modules/catchbugs/api_award.go index 493550e23..e4a130a92 100644 --- a/modules/catchbugs/api_award.go +++ b/modules/catchbugs/api_award.go @@ -54,7 +54,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CatchbugsAwardReq) session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsAwardResp{Awardmap: info.Awards, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CatchbugsAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CatchbugsAwardReq", atno) }) return } diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index f58f3ce29..63a3eb01b 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -153,7 +153,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CombatAskReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatAskReq", reward) }) return } diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index a249ad4dc..da5505f5d 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -101,7 +101,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(), "CombatChallengeReceiveReq", atns) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatChallengeReceiveReq", atns) }) } 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 c8e584e96..335e7a92f 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -112,7 +112,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(), "CombatDropReq", atns) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatDropReq", atns) }) return } diff --git a/modules/dailytask/api_receive.go b/modules/dailytask/api_receive.go index 5abff5d9a..863bf9bac 100644 --- a/modules/dailytask/api_receive.go +++ b/modules/dailytask/api_receive.go @@ -58,7 +58,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.DailytaskReceive session.SendMsg(string(this.module.GetType()), "receive", &pb.DailytaskReceiveResp{Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "DailytaskReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DailytaskReceiveReq", atno) }) return } diff --git a/modules/dcolor/api_award.go b/modules/dcolor/api_award.go index 05cf45609..6cca636cb 100644 --- a/modules/dcolor/api_award.go +++ b/modules/dcolor/api_award.go @@ -81,7 +81,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (e session.SendMsg(string(this.module.GetType()), "award", &pb.DColorAwardResp{Atype: req.Atype, Award: atno, Awardmap: awards}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "DColorAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DColorAwardReq", atno) }) return } diff --git a/modules/dispatch/api_autoreceive.go b/modules/dispatch/api_autoreceive.go index 395ef5c9e..9576fad4f 100644 --- a/modules/dispatch/api_autoreceive.go +++ b/modules/dispatch/api_autoreceive.go @@ -71,7 +71,7 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec session.SendMsg(string(a.module.GetType()), "autoreceive", rsp) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), "DispatchAutoReceiveReq", res) + a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchAutoReceiveReq", res) }) return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 3855321d5..aed4b2e3c 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -69,7 +69,7 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( a.module.DispenseRes(session, []*cfg.Gameatn{atn}, true) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), "恢复门票", atn) + a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "恢复门票", atn) }) } } diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index f3a6a30ae..a4356b4c7 100644 --- a/modules/dispatch/api_receive.go +++ b/modules/dispatch/api_receive.go @@ -94,7 +94,7 @@ func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) session.SendMsg(string(a.module.GetType()), "receive", rsp) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), "DispatchReceiveReq", res) + a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchReceiveReq", res) }) return } diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index 6db4b17c2..fb8e0deb3 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -59,7 +59,7 @@ 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(), "DispatchWeekReciveReq", res) + a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchWeekReciveReq", res) }) } session.SendMsg(string(a.module.GetType()), "weekrecive", rsp) diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go index 94e259bec..de68f9958 100644 --- a/modules/dragon/api_train.go +++ b/modules/dragon/api_train.go @@ -170,7 +170,7 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e if curLv > preLv { // 升级后统计任务 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype235, dragon.Lv, utils.ToInt32(dragon.Dragonid))) - this.module.WriteUserLog(session.GetUserId(), "DragonTrainReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DragonTrainReq", atno) }) } return diff --git a/modules/egghunt/api_award.go b/modules/egghunt/api_award.go index 512332e5e..c3419a267 100644 --- a/modules/egghunt/api_award.go +++ b/modules/egghunt/api_award.go @@ -58,7 +58,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.EgghuntAwardReq) ( session.SendMsg(string(this.module.GetType()), "award", &pb.EgghuntAwardResp{Id: req.Id, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "EgghuntAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EgghuntAwardReq", atno) }) return } diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 727d54ebc..17b8a2057 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -100,7 +100,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "EnchantChallengeOverReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EnchantChallengeOverReq", res) }) } diff --git a/modules/entertainment/api_boxreward.go b/modules/entertainment/api_boxreward.go index 173b1a11e..8e27d2bc2 100644 --- a/modules/entertainment/api_boxreward.go +++ b/modules/entertainment/api_boxreward.go @@ -88,7 +88,7 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "EntertainBoxRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EntertainBoxRewardReq", atno) }) return } diff --git a/modules/entertainment/api_getreward.go b/modules/entertainment/api_getreward.go index f6ac5ddf8..1b7e8fa20 100644 --- a/modules/entertainment/api_getreward.go +++ b/modules/entertainment/api_getreward.go @@ -66,7 +66,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.EntertainRewardRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "EntertainRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(),0, "EntertainRewardReq", atno) }) return } diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 463a26f16..b16f13023 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -582,7 +582,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) { return } go this.module.AsynHandleSession(this.szSession[winindex], func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "xxlGame", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "xxlGame", atno) }) this.szSession[winindex].Push() } diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 25328c012..0ea322664 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -110,7 +110,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( } session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true, Reward: reward}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "EquipmentSellReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EquipmentSellReq", reward) }) return } diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 5dd3d3d8e..4e87e9332 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -418,7 +418,7 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) } go func() { - this.WriteUserLog(session.GetUserId(), "SellEquipments", atno) + this.WriteUserLog(session.GetUserId(), 0, "SellEquipments", atno) }() return } @@ -515,7 +515,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin return } go func() { - this.WriteUserLog(session.GetUserId(), "RecycleEquipments", atno) + this.WriteUserLog(session.GetUserId(), 0, "RecycleEquipments", atno) }() return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index 460fa3a31..9cbebd80c 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -61,7 +61,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(), "FriendGetrewardReq", globalConf.FriendPeize) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "FriendGetrewardReq", globalConf.FriendPeize) }) return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index 69eb240c0..b9e1e45b4 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -133,7 +133,7 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda // 赠送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(), "FriendGetrewardReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "FriendGetrewardReq", res) }) return } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 2d695cc89..2861feb2b 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -62,7 +62,7 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GourmetActivateAtlasReq", conf.Unlockreward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GourmetActivateAtlasReq", conf.Unlockreward) }) return } diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index a1f8948e6..8f5ec7efd 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -100,7 +100,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(), "GourmetCreateFoodReq", atn) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GourmetCreateFoodReq", atn) }) return } diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index 06b47697f..243b2d9ef 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -116,7 +116,7 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GrowtaskAdvReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GrowtaskAdvReceiveReq", atno) }) return } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index 47e2a572c..1d81c8313 100644 --- a/modules/growtask/api_receive.go +++ b/modules/growtask/api_receive.go @@ -77,7 +77,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GrowtaskReceiveReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GrowtaskReceiveReq", reward) }) return } diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go index ce77c8387..4cdf48e8c 100644 --- a/modules/guildgve/api_challengefinish.go +++ b/modules/guildgve/api_challengefinish.go @@ -206,7 +206,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve Boosticket: member.Boosticket, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GuildGveChallengeFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GuildGveChallengeFinishReq", award) }) return } diff --git a/modules/guildgve/api_roulette.go b/modules/guildgve/api_roulette.go index d98613851..a49b87db5 100644 --- a/modules/guildgve/api_roulette.go +++ b/modules/guildgve/api_roulette.go @@ -73,7 +73,7 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GuildGveRouletteReq", confs[index].Reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GuildGveRouletteReq", confs[index].Reward) }) return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 452c839ad..bc136502c 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -372,7 +372,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq this.module.SendTaskMsg(session, szStar, req.DrawCount, req.DrawType) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "HeroDrawCardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroDrawCardReq", atno) }) return } diff --git a/modules/hero/api_peachreward.go b/modules/hero/api_peachreward.go index 3292a1c0c..c67e875fa 100644 --- a/modules/hero/api_peachreward.go +++ b/modules/hero/api_peachreward.go @@ -100,7 +100,7 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew session.SendMsg(string(this.module.GetType()), HeroPeachRewardReq, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "HeroPeachRewardReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroPeachRewardReq", reward) }) return } diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index a98d9d70f..1d953c085 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -117,7 +117,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) if len(starConf.Starup) > 0 { - this.module.WriteUserLog(session.GetUserId(), "HeroStrengthenUpStarReq", starConf.Starup) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroStrengthenUpStarReq", starConf.Starup) } }) return diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index 2fa921804..4e774dc74 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -73,7 +73,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe this.module.Errorf("DispenseRes err,uid:%s,item:%v", session.GetUserId(), res) } // 返还升级的天赋点数 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "HeroTalentResetReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroTalentResetReq", res) }) } diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index a1244a08c..d6b72f534 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -868,7 +868,7 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c if len(res) > 0 { // 资源统一发放 this.module.DispenseRes(session, res, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "create hero", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "create hero", res) }) } return @@ -973,7 +973,7 @@ func (this *ModelHero) GetDrawCardReward(session comm.IUserSession, szCards []st rsp = append(rsp, &pb.AtnoData{Atno: atno}) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "GetDrawCardReward", rsp) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GetDrawCardReward", rsp) }) return } diff --git a/modules/herotask/api_receive.go b/modules/herotask/api_receive.go index 84344f220..3fb432623 100644 --- a/modules/herotask/api_receive.go +++ b/modules/herotask/api_receive.go @@ -108,7 +108,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.HeroTaskReceiveR } session.SendMsg(string(this.module.GetType()), "receive", &pb.HeroTaskReceiveResp{Hero: req.Hero, Stage: req.Stage, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "HeroTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroTaskReceiveReq", award) }) return diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index fbb9f4215..6ab8f74e9 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -71,7 +71,7 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) } session.SendMsg(string(this.module.GetType()), "reset", &pb.HoroscopeResetResp{Issucc: true, Info: info, Award: consume}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "HoroscopeResetReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HoroscopeResetReq", res) }) return diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 879deb9f7..41ac48e01 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -204,7 +204,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1)) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "HuntingChallengeOverReq", szAtno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HuntingChallengeOverReq", szAtno) }) return } diff --git a/modules/island/api_complete.go b/modules/island/api_complete.go index 8842c8fa4..b52da4c3d 100644 --- a/modules/island/api_complete.go +++ b/modules/island/api_complete.go @@ -93,7 +93,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR session.SendMsg(string(this.module.GetType()), "complete", &pb.IsLandCompleteResp{Level: req.Level, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "IsLandCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "IsLandCompleteReq", award) }) return } diff --git a/modules/island/api_receive.go b/modules/island/api_receive.go index 1f57c1ae8..64d751c53 100644 --- a/modules/island/api_receive.go +++ b/modules/island/api_receive.go @@ -70,7 +70,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq session.SendMsg(string(this.module.GetType()), "receive", &pb.IsLandReceiveResp{Info: info, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "IsLandReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "IsLandReceiveReq", award) }) return } diff --git a/modules/items/api_buyphysical.go b/modules/items/api_buyphysical.go index 9b47daebf..94c2d0562 100644 --- a/modules/items/api_buyphysical.go +++ b/modules/items/api_buyphysical.go @@ -109,7 +109,7 @@ func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhys }) session.SendMsg(string(this.module.GetType()), "buyphysical", &pb.ItemsBuyPhysicalResp{Issucc: true, PhysicalBuyNum: user.Physicalbuynum, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ItemsBuyPhysicalReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsBuyPhysicalReq", atno) }) return } diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index 52cee4667..b9572686f 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -92,7 +92,7 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose session.SendMsg(string(this.module.GetType()), "decompose", &pb.ItemsDecomposeResp{GridId: req.GridId, Amount: req.Amount, Issucc: true, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ItemsDecomposeReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsDecomposeReq", atno) }) return } diff --git a/modules/items/api_potionsynthesis.go b/modules/items/api_potionsynthesis.go index 7679fc342..e55975bc5 100644 --- a/modules/items/api_potionsynthesis.go +++ b/modules/items/api_potionsynthesis.go @@ -71,7 +71,7 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot session.SendMsg(string(this.module.GetType()), "potionsynthesis", &pb.ItemsPotionSynthesisResp{Succ: true, Id: req.Id, Num: req.Num}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ItemsPotionSynthesisReq", give) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsPotionSynthesisReq", give) }) return diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index aa1d75553..bd75096bb 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -73,7 +73,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe } session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ItemsSellItemReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsSellItemReq", atno) }) return } diff --git a/modules/items/api_sellinbulk.go b/modules/items/api_sellinbulk.go index 5189521ce..906e394f4 100644 --- a/modules/items/api_sellinbulk.go +++ b/modules/items/api_sellinbulk.go @@ -88,7 +88,7 @@ func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbu session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellinbulkResp{Grids: req.Grids, Amount: req.Amount, Issucc: issucc}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ItemsSellinbulkReq", sale) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsSellinbulkReq", sale) }) return } diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 07fb7e943..fd1c20e75 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -546,7 +546,7 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "buyTicket", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "buyTicket", res) }) return } @@ -604,7 +604,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}, true) info.Recovertimeunifiedticket = time.Unix(info.Recovertimeunifiedticket, 0).Add(time.Duration(ticketNum) * time.Minute).Unix() go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "recoverTicket", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "recoverTicket", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}) }) } } @@ -829,7 +829,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "useitem", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "useitem", atno) }) return } diff --git a/modules/items/module.go b/modules/items/module.go index 057451d6e..621989efd 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -365,7 +365,7 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b this.itemsChangePush(session, change) //推送道具背包变化 } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "SellItem", atno) + this.WriteUserLog(session.GetUserId(), 0, "SellItem", atno) }) return } diff --git a/modules/jielong/api_reward.go b/modules/jielong/api_reward.go index c456987cb..2d239a0aa 100644 --- a/modules/jielong/api_reward.go +++ b/modules/jielong/api_reward.go @@ -92,7 +92,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq) }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "JielongRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "JielongRewardReq", atno) }) return } diff --git a/modules/kftask/api_receive.go b/modules/kftask/api_receive.go index e92038001..cff4c9d70 100644 --- a/modules/kftask/api_receive.go +++ b/modules/kftask/api_receive.go @@ -104,7 +104,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq }) session.SendMsg(string(this.module.GetType()), "receive", &pb.KFTaskReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "KFTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "KFTaskReceiveReq", award) }) return diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 2dc620d2d..106db0222 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -108,7 +108,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "LibraryGetStoryRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LibraryGetStoryRewardReq", atno) }) return } diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 9da7a3a1b..9cc7435d8 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -73,7 +73,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward Reward: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "LibraryLvRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LibraryLvRewardReq", atno) }) return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index 539df42da..ff5f8cb69 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive } session.SendMsg(string(this.module.GetType()), LinestorySubTypeReceive, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "LinestoryReceiveReq", conf.Reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LinestoryReceiveReq", conf.Reward) }) return } diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index 01bfcc1f5..b3cc34a42 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -61,7 +61,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma session.SendMsg(string(this.module.GetType()), "getusermailattachment", &pb.MailGetUserMailAttachmentResp{Mail: mail}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MailGetUserMailAttachmentReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MailGetUserMailAttachmentReq", res) }) return } @@ -124,7 +124,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai Ids: mailIds, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MailGetAllMailAttachmentReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MailGetAllMailAttachmentReq", atno) }) return } diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go index 4514cc182..21e4c0ba1 100644 --- a/modules/mainline/api_booschallengeover.go +++ b/modules/mainline/api_booschallengeover.go @@ -87,7 +87,7 @@ func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.Mainli Reward: aeward, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MainlineBoosChallengeOverReq", aeward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineBoosChallengeOverReq", aeward) }) return } diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index c204fcce4..4c04fb9da 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -82,7 +82,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh }) // 数据推送 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MainlineChallengeOverReq false", conf.PsConsume) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineChallengeOverReq false", conf.PsConsume) }) return } @@ -197,7 +197,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level) - this.module.WriteUserLog(session.GetUserId(), "MainlineChallengeOverReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineChallengeOverReq", reward) }) return } diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index 1e5061b43..bfec97dab 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -137,7 +137,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "MainlineLevelPassReq", aeward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineLevelPassReq", aeward) }) return } diff --git a/modules/mainline/api_receiveaward.go b/modules/mainline/api_receiveaward.go index 29d3bc0aa..d66c113bd 100644 --- a/modules/mainline/api_receiveaward.go +++ b/modules/mainline/api_receiveaward.go @@ -156,7 +156,7 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MainlineReceiveAwardReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineReceiveAwardReq", reward) }) return } diff --git a/modules/mainline/api_shopbuy.go b/modules/mainline/api_shopbuy.go index 32e1b7937..fe0cb5b4a 100644 --- a/modules/mainline/api_shopbuy.go +++ b/modules/mainline/api_shopbuy.go @@ -92,7 +92,7 @@ func (this *apiComp) ShopBuy(session comm.IUserSession, req *pb.MainlineShopBuyR go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "MainlineShopBuyReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineShopBuyReq", atno) }) return } diff --git a/modules/mainline/api_taskchaptereward.go b/modules/mainline/api_taskchaptereward.go index 7ea542d47..bd275e03d 100644 --- a/modules/mainline/api_taskchaptereward.go +++ b/modules/mainline/api_taskchaptereward.go @@ -96,7 +96,7 @@ func (this *apiComp) TaskChapteReward(session comm.IUserSession, req *pb.Mainlin }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MainlineTaskChapteRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineTaskChapteRewardReq", award) }) return } diff --git a/modules/mainline/api_taskreceive.go b/modules/mainline/api_taskreceive.go index 4a16d08a8..d41d79608 100644 --- a/modules/mainline/api_taskreceive.go +++ b/modules/mainline/api_taskreceive.go @@ -78,7 +78,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.MainlineTask session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.MainlineTaskReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MainlineTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineTaskReceiveReq", award) }) return } diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go index 853069ce3..37b1cfebe 100644 --- a/modules/modeluserlog.go +++ b/modules/modeluserlog.go @@ -39,16 +39,22 @@ func (this *modelUserLog) Init(service core.IService, module core.IModule, comp } // 用户操作明细数据记录 -func (this *modelUserLog) AddUserLog(uid string, tag string, data interface{}) { +func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data interface{}) { var ( dbModel *db.DBModel err error jsonStr []byte + logType string ) if jsonStr, err = json.Marshal(data); err != nil { log.Errorln(err) return } + if itype == 0 { + logType = "add" // 新增资源类型 + } else if itype == 1 { + logType = "sub" // 消耗资源类型 + } if db.IsCross() { //如果是跨服 直接找到对应的本服 if tag, _, b := utils.UIdSplit(uid); b { if conn, err := db.ServerDBConn(tag); err == nil { @@ -57,6 +63,7 @@ func (this *modelUserLog) AddUserLog(uid string, tag string, data interface{}) { Id: primitive.NewObjectID().Hex(), Uid: uid, ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(), + Logtype: logType, Tag: tag, Data: string(jsonStr), }); err != nil { @@ -71,6 +78,7 @@ func (this *modelUserLog) AddUserLog(uid string, tag string, data interface{}) { Uid: uid, ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(), Tag: tag, + Logtype: logType, Data: string(jsonStr), }); err != nil { log.Errorln(err) diff --git a/modules/modulebase.go b/modules/modulebase.go index 902f427d1..cb596c7b2 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -955,6 +955,6 @@ func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func } //写用户日志 -func (this *ModuleBase) WriteUserLog(uid string, tag string, data interface{}) { - this.userlog.AddUserLog(uid, tag, data) +func (this *ModuleBase) WriteUserLog(uid string, itype int32, tag string, data interface{}) { + this.userlog.AddUserLog(uid, itype, tag, data) } diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go index ad4f5fc29..20ec7f159 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -44,7 +44,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MoonfantasyReceiveReq", boss.PsMg) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyReceiveReq", boss.PsMg) }) return } else { @@ -54,7 +54,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei this.module.DispenseRes(session, boss.Prize, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "MoonfantasyReceiveReq", boss.Prize) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyReceiveReq", boss.Prize) }) } diff --git a/modules/oldtimes/api_receive.go b/modules/oldtimes/api_receive.go index 275291714..6fd8a2957 100644 --- a/modules/oldtimes/api_receive.go +++ b/modules/oldtimes/api_receive.go @@ -63,7 +63,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveR if len(res) > 0 { this.module.DispenseRes(session, res, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "OldtimesReceiveReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "OldtimesReceiveReq", res) }) } session.SendMsg(string(this.module.GetType()), "receive", rsp) diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 97a295c41..ab600d7f3 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -192,7 +192,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key) this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab)) - this.module.WriteUserLog(session.GetUserId(), "PagodaChallengeOverReq", conf.Reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaChallengeOverReq", conf.Reward) }) return } diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index 767cae9a1..4d60fc025 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -68,7 +68,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "PagodaGetRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaGetRewardReq", atno) }) } return diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go index 8fb03bf05..660be00cd 100644 --- a/modules/pagoda/api_racechallengeover.go +++ b/modules/pagoda/api_racechallengeover.go @@ -188,7 +188,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "PagodaChallengeRaceOverReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaChallengeRaceOverReq", atno) }) return } diff --git a/modules/parkour/api_allweekreward.go b/modules/parkour/api_allweekreward.go index af7aff417..6857a3594 100644 --- a/modules/parkour/api_allweekreward.go +++ b/modules/parkour/api_allweekreward.go @@ -71,7 +71,7 @@ func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.ParkourAll } session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CapturesheepAllWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) }) return } diff --git a/modules/parkour/api_weekreward.go b/modules/parkour/api_weekreward.go index 6a5c8f8a6..0a06440d2 100644 --- a/modules/parkour/api_weekreward.go +++ b/modules/parkour/api_weekreward.go @@ -74,7 +74,7 @@ func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.ParkourWeekRe } session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "CapturesheepWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepWeekRewardReq", award) }) return } diff --git a/modules/parkour/module.go b/modules/parkour/module.go index 3e17243ea..47f32a8e9 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -584,7 +584,7 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) { Award: award[v.GetUserId()], }) go this.AsynHandleSession(v, func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "ParkourRaceOverPush", award[v.GetUserId()]) + this.WriteUserLog(session.GetUserId(), 0, "ParkourRaceOverPush", award[v.GetUserId()]) }) sessions = append(sessions, v) } diff --git a/modules/pay/modelActivity.go b/modules/pay/modelActivity.go index 1917a8e56..30de953d6 100644 --- a/modules/pay/modelActivity.go +++ b/modules/pay/modelActivity.go @@ -143,7 +143,7 @@ func (this *modelActivityComp) deliverybyid(session comm.IUserSession, id int32) return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "deliverybyid", conf.Item) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", conf.Item) }) return } @@ -210,7 +210,7 @@ func (this *modelActivityComp) delivery(session comm.IUserSession, pid string) ( return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "delivery", conf.Item) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "delivery", conf.Item) }) return } diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index ca3c21eb9..ac6fd756a 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -103,7 +103,7 @@ func (this *modelDailyComp) deliverybyid(session comm.IUserSession, id int32) (e return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "deliverybyid", conf.Item) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", conf.Item) }) return } @@ -154,7 +154,7 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (err return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "delivery", conf.Item) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "delivery", conf.Item) }) return } diff --git a/modules/pay/module.go b/modules/pay/module.go index 5d54d3f60..109fdd1af 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -208,7 +208,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.ModuleHero.RechargeMoney(args.Uid, args.Price) this.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype229, 1, conf.Pid)) - this.WriteUserLog(session.GetUserId(), "Rpc_ModulePayDelivery", res) + this.WriteUserLog(session.GetUserId(), 0, "Rpc_ModulePayDelivery", res) }) return } @@ -316,7 +316,7 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, } } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "ModulePayDelivery", res) + this.WriteUserLog(session.GetUserId(), 0, "ModulePayDelivery", res) this.ModuleHero.RechargeMoney(session.GetUserId(), conf.Amount) }) return diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index 666c45483..1a4392d0a 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -64,7 +64,7 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "PracticeGetGymBuffReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeGetGymBuffReq", award) }) return } diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index 1ba699499..830ede40c 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -91,7 +91,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "PracticeNPCBattkleFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeNPCBattkleFinishReq", award) }) return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 944748b15..dd9814f36 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -305,7 +305,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "PracticeReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeReceiveReq", award) }) return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 7372a738a..33121ae16 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -81,7 +81,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "PracticeUnLockReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeUnLockReq", res) }) return diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index da54a4bbc..cf9240505 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -88,7 +88,7 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "PrivilegeBuyGiftReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PrivilegeBuyGiftReq", atno) }) return } diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 06614b6e9..e2d6dae76 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -193,7 +193,7 @@ func (this *Privilege) Delivery(session comm.IUserSession, cId string) (errdata // 推送 session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeBuyYuekaResp{Data: list}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "PrivilegeBuyYuekaReq", items) + this.WriteUserLog(session.GetUserId(), 0, "PrivilegeBuyYuekaReq", items) }) return } @@ -227,7 +227,7 @@ func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string) } session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeGetListResp{Data: list}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "PrivilegeGetListReq", conf.DisposableReward) + this.WriteUserLog(session.GetUserId(), 0, "PrivilegeGetListReq", conf.DisposableReward) }) } else { errdata = &pb.ErrorData{ diff --git a/modules/pushgiftbag/module.go b/modules/pushgiftbag/module.go index 0b66e9502..fc4d259db 100644 --- a/modules/pushgiftbag/module.go +++ b/modules/pushgiftbag/module.go @@ -97,7 +97,7 @@ func (this *PushGiftbag) Delivery(session comm.IUserSession, pid string) (errdat }) session.SendMsg(string(this.GetType()), "chanage", &pb.PushGiftbagChanagePush{Item: info.Item}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "PushGiftbagChanagePush", conf.Lbid) + this.WriteUserLog(session.GetUserId(), 0, "PushGiftbagChanagePush", conf.Lbid) }) return } diff --git a/modules/questionnaire/api_answer.go b/modules/questionnaire/api_answer.go index c8f77f70c..86d5eed18 100644 --- a/modules/questionnaire/api_answer.go +++ b/modules/questionnaire/api_answer.go @@ -93,7 +93,7 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw } this.module.DispenseRes(session, groupconfig.Reward, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "QuestionnaireAnswerReq", groupconfig.Reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "QuestionnaireAnswerReq", groupconfig.Reward) }) } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype203, 1, req.Group)) diff --git a/modules/reputation/module.go b/modules/reputation/module.go index 6f08bad15..8490fd1e7 100644 --- a/modules/reputation/module.go +++ b/modules/reputation/module.go @@ -125,7 +125,7 @@ func (this *Reputation) Upgrade(session comm.IUserSession, raceType int32, fv in this.DispenseRes(session, []*cfg.Gameatn{reward}, false) } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "ReputationUpgrade", reward) + this.WriteUserLog(session.GetUserId(), 0, "ReputationUpgrade", reward) }) } diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index f6f8be261..bf6439477 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -238,7 +238,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "ShopBuyResq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ShopBuyResq", award) }) } return diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index 59266e779..1f4a30d90 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -169,7 +169,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } session.SendMsg(string(this.module.GetType()), "receive", &pb.ShopCenterReceiveResp{Fid: req.Fid, Pid: req.Pid, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "ShopCenterReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ShopCenterReceiveReq", award) }) return } diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index f550d97c2..2b10f76d8 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -60,7 +60,7 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw Reward: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SmithyAtlasAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyAtlasAwardReq", atno) }) return } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 7d01cf800..8108f5c3b 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -374,7 +374,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "SmithyForgeEquipReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyForgeEquipReq", atno) }) return diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index 4c65a1f77..dcd19eecd 100644 --- a/modules/smithy/api_receive.go +++ b/modules/smithy/api_receive.go @@ -62,7 +62,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwar }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SmithyTaskAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyTaskAwardReq", atno) }) return } diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 1b2015600..b82fcf907 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -72,7 +72,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err session.SendMsg(string(this.module.GetType()), "sell", rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SmithySellReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithySellReq", atno) }) return } diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 82a2749a5..a4d720b57 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -316,7 +316,7 @@ func (this *Smithy) GmSmithyAtlas(session comm.IUserSession) { this.modelAtlas.CheckActivateEquipAtlas(session.GetUserId(), equip, 1) } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), "GmSmithyAtlas", atno) + this.WriteUserLog(session.GetUserId(), 0, "GmSmithyAtlas", atno) }) } diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 6c954b385..77946af32 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -93,7 +93,7 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SociatyActivityReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyActivityReceiveReq", atno) }) return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index 81edcc3fb..34aa6c772 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -99,7 +99,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd session.SendMsg(string(this.module.GetType()), SociatySubTypeBuy, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SociatyBuyReq", atn) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyBuyReq", atn) }) return } diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index df013fc40..dc995b535 100644 --- a/modules/sociaty/api_cross_receive.go +++ b/modules/sociaty/api_cross_receive.go @@ -123,7 +123,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveRe session.SendMsg(string(this.module.GetType()), SociatySubTypeReceive, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SociatyReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyReceiveReq", atno) }) return } diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index 94e6110cc..02d211cbf 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -109,7 +109,7 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er session.SendMsg(string(this.module.GetType()), SociatySubTypeSign, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "SociatySignReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatySignReq", atno) }) return } diff --git a/modules/stonehenge/api_bookaward.go b/modules/stonehenge/api_bookaward.go index 353425dd4..792ded3d0 100644 --- a/modules/stonehenge/api_bookaward.go +++ b/modules/stonehenge/api_bookaward.go @@ -94,7 +94,7 @@ func (this *apiComp) BookAward(session comm.IUserSession, req *pb.StonehengeBook session.SendMsg(string(this.module.GetType()), "bookaward", &pb.StonehengeBookAwardResp{Btype: req.Btype, Stage: req.Stage, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "StonehengeBookAwardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeBookAwardReq", award) }) return } diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go index 23064b80b..ffd8dd0da 100644 --- a/modules/stonehenge/api_enterlevel.go +++ b/modules/stonehenge/api_enterlevel.go @@ -184,7 +184,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt this.module.ModuleBuried.TriggerBuried(session, tasks...) } if len(reward) > 0 { - this.module.WriteUserLog(session.GetUserId(), "StonehengeEnterLevelReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeEnterLevelReq", reward) } }) return diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index 7206fa37f..7ee181661 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -634,7 +634,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq this.module.ModuleBuried.TriggerBuried(session, tasks...) } if len(reward) > 0 { - this.module.WriteUserLog(session.GetUserId(), "StonehengeEventReq", reward) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeEventReq", reward) } }) diff --git a/modules/stonehenge/api_finish.go b/modules/stonehenge/api_finish.go index 2f04c7c97..b77cb7122 100644 --- a/modules/stonehenge/api_finish.go +++ b/modules/stonehenge/api_finish.go @@ -111,7 +111,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "StonehengeFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeFinishReq", atno) }) return } diff --git a/modules/stonehenge/api_taskreceive.go b/modules/stonehenge/api_taskreceive.go index 721052acb..ae68780c4 100644 --- a/modules/stonehenge/api_taskreceive.go +++ b/modules/stonehenge/api_taskreceive.go @@ -95,7 +95,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTa session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.StonehengeTaskReceiveResp{Task: info.Task, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "StonehengeTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeTaskReceiveReq", award) }) } diff --git a/modules/stonehenge/api_weekAward.go b/modules/stonehenge/api_weekAward.go index ed6afc00d..34ef75827 100644 --- a/modules/stonehenge/api_weekAward.go +++ b/modules/stonehenge/api_weekAward.go @@ -94,7 +94,7 @@ func (this *apiComp) WeekAward(session comm.IUserSession, req *pb.StonehengeWeek session.SendMsg(string(this.module.GetType()), "weekaward", &pb.StonehengeWeekAwardResp{Id: req.Id, Weeklyreward: info.Weeklyreward, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "StonehengeWeekAwardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeWeekAwardReq", award) }) } diff --git a/modules/storyline/api_complete.go b/modules/storyline/api_complete.go index 6763762f5..c206b9dd9 100644 --- a/modules/storyline/api_complete.go +++ b/modules/storyline/api_complete.go @@ -190,7 +190,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple session.SendMsg(string(this.module.GetType()), "complete", &pb.StorylineCompleteResp{Level: req.Level, Story: req.Story, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "StorylineCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StorylineCompleteReq", award) }) } return diff --git a/modules/turntable/api_draw.go b/modules/turntable/api_draw.go index 08213643f..cb81ad0a8 100644 --- a/modules/turntable/api_draw.go +++ b/modules/turntable/api_draw.go @@ -83,7 +83,7 @@ func (this *apiComp) Draw(session comm.IUserSession, req *pb.TurntableDrawReq) ( }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "TurntableDrawReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "TurntableDrawReq", atno) }) return } diff --git a/modules/uigame/api_latticefinish.go b/modules/uigame/api_latticefinish.go index 002ba9acb..2937a3893 100644 --- a/modules/uigame/api_latticefinish.go +++ b/modules/uigame/api_latticefinish.go @@ -57,7 +57,7 @@ func (this *apiComp) LatticeFinish(session comm.IUserSession, req *pb.UiGameLatt Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGameLatticeFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeFinishReq", atno) }) return } diff --git a/modules/uigame/api_latticegrid.go b/modules/uigame/api_latticegrid.go index fc912d4d7..9322bdc39 100644 --- a/modules/uigame/api_latticegrid.go +++ b/modules/uigame/api_latticegrid.go @@ -139,7 +139,7 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGameLatticeGridReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeGridReq", atno) }) return } diff --git a/modules/uigame/api_latticereward.go b/modules/uigame/api_latticereward.go index 0e5395ce4..ae918ede6 100644 --- a/modules/uigame/api_latticereward.go +++ b/modules/uigame/api_latticereward.go @@ -65,7 +65,7 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGameLatticeRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeRewardReq", atno) }) return } diff --git a/modules/uigame/api_minerfinish.go b/modules/uigame/api_minerfinish.go index bbab7bb82..f38e95aa7 100644 --- a/modules/uigame/api_minerfinish.go +++ b/modules/uigame/api_minerfinish.go @@ -57,7 +57,7 @@ func (this *apiComp) MinerFinish(session comm.IUserSession, req *pb.UiGameMinerF Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGameMinerFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameMinerFinishReq", atno) }) return } diff --git a/modules/uigame/api_minergrid.go b/modules/uigame/api_minergrid.go index 6b46fe02a..ed270a7df 100644 --- a/modules/uigame/api_minergrid.go +++ b/modules/uigame/api_minergrid.go @@ -61,7 +61,7 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGameMinerKeyReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameMinerKeyReq", atno) }) return } diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 2bce6ba82..9e0c424ed 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -67,7 +67,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(), "UiGamePuzzleGridReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGamePuzzleGridReq", atno) }) return } diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go index 0915d5394..a7e14b6ba 100644 --- a/modules/uigame/api_puzzlereward.go +++ b/modules/uigame/api_puzzlereward.go @@ -50,7 +50,7 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UiGamePuzzleRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGamePuzzleRewardReq", atno) }) return } diff --git a/modules/uigame/module.go b/modules/uigame/module.go index 1d1767018..2ce3baa57 100644 --- a/modules/uigame/module.go +++ b/modules/uigame/module.go @@ -89,7 +89,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) }) } @@ -140,7 +140,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { } this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) }) } @@ -191,7 +191,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { } this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) }) } diff --git a/modules/user/api_create.go b/modules/user/api_create.go index fadbaf122..17b2dec85 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -121,7 +121,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e if len(tasks) > 0 { this.module.ModuleBuried.TriggerBuried(session, tasks...) } - this.module.WriteUserLog(session.GetUserId(), "UserCreateReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserCreateReq", res) }) return } diff --git a/modules/user/api_deposit.go b/modules/user/api_deposit.go index f7da1c103..22896bc33 100644 --- a/modules/user/api_deposit.go +++ b/modules/user/api_deposit.go @@ -75,7 +75,7 @@ func (this *apiComp) Deposit(session comm.IUserSession, req *pb.UserDepositReq) }, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UserDepositReq", atn) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserDepositReq", atn) }) return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index 9efe0580f..ed688dba0 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -71,7 +71,7 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw Index: req.Index, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "UserPuzzleAwardReq", res) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserPuzzleAwardReq", res) }) return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 909bc87fd..d2cb85a49 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -307,7 +307,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv) - this.module.WriteUserLog(session.GetUserId(), "changelv", rewards) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "changelv", rewards) }) session.Push() diff --git a/modules/venture/api_lvreward.go b/modules/venture/api_lvreward.go index a1096abe5..f7dc183b1 100644 --- a/modules/venture/api_lvreward.go +++ b/modules/venture/api_lvreward.go @@ -81,7 +81,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.VentureLvReward Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "VentureLvRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VentureLvRewardReq", atno) }) return } diff --git a/modules/venture/api_signreward.go b/modules/venture/api_signreward.go index cf09c8014..c9a8252ca 100644 --- a/modules/venture/api_signreward.go +++ b/modules/venture/api_signreward.go @@ -71,7 +71,7 @@ func (this *apiComp) SignReward(session comm.IUserSession, req *pb.VentureSignRe Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "VentureSignRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VentureSignRewardReq", atno) }) return } diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 52f2bf015..6ec5efab0 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -94,7 +94,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal Data: viking, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "VikingChallengeOverReq", vikingCfg.PsConsume) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VikingChallengeOverReq", vikingCfg.PsConsume) }) return } @@ -254,7 +254,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "VikingChallengeOverReq", szAtno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VikingChallengeOverReq", szAtno) }) } return diff --git a/modules/warorder/api_receive.go b/modules/warorder/api_receive.go index d0a058992..226c115ba 100644 --- a/modules/warorder/api_receive.go +++ b/modules/warorder/api_receive.go @@ -146,7 +146,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: ads}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WarorderReceiveReq", awards) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WarorderReceiveReq", awards) }) return } diff --git a/modules/weektask/api_activityreceive.go b/modules/weektask/api_activityreceive.go index c4863d05c..ae8dd8013 100644 --- a/modules/weektask/api_activityreceive.go +++ b/modules/weektask/api_activityreceive.go @@ -78,7 +78,7 @@ func (this *apiComp) ActivityReceive(session comm.IUserSession, req *pb.WeekTask }) session.SendMsg(string(this.module.GetType()), "activityreceive", &pb.WeekTaskActivityReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WeekTaskActivityReceiveReq", conf.Reword) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WeekTaskActivityReceiveReq", conf.Reword) }) return } diff --git a/modules/weektask/api_receive.go b/modules/weektask/api_receive.go index c5914ed3a..368b5d5e0 100644 --- a/modules/weektask/api_receive.go +++ b/modules/weektask/api_receive.go @@ -106,7 +106,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR }) session.SendMsg(string(this.module.GetType()), "receive", &pb.WeekTaskReceiveResp{Tid: req.Tid, Activity: info.Activity, Tasks: info.Tasks, Progress: progress, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WeekTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WeekTaskReceiveReq", award) }) return } diff --git a/modules/whackamole/api_award.go b/modules/whackamole/api_award.go index 16203e843..63c2b61a3 100644 --- a/modules/whackamole/api_award.go +++ b/modules/whackamole/api_award.go @@ -36,7 +36,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.WhackamoleAwardReq session.SendMsg(string(this.module.GetType()), "award", &pb.WhackamoleAwardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WhackamoleAwardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WhackamoleAwardReq", award) }) return } diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index e132f12a0..c9c90fd09 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -111,7 +111,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WTaskAcceptReq", conf.GetItem) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskAcceptReq", conf.GetItem) }) return } diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go index a5fcb8111..6bbe99b42 100644 --- a/modules/wtask/api_battlefinish.go +++ b/modules/wtask/api_battlefinish.go @@ -102,7 +102,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "WTaskBattleFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskBattleFinishReq", atno) }) } return diff --git a/modules/wtask/api_boxreceive.go b/modules/wtask/api_boxreceive.go index 5bcc3137c..9aed73260 100644 --- a/modules/wtask/api_boxreceive.go +++ b/modules/wtask/api_boxreceive.go @@ -117,7 +117,7 @@ func (this *apiComp) BoxReceive(session comm.IUserSession, req *pb.WTaskBoxRecei if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "WTaskBoxReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskBoxReceiveReq", award) }) } return diff --git a/modules/wtask/api_chapterreward.go b/modules/wtask/api_chapterreward.go index 21b6d92ab..0584f18ee 100644 --- a/modules/wtask/api_chapterreward.go +++ b/modules/wtask/api_chapterreward.go @@ -72,7 +72,7 @@ func (this *apiComp) ChapterReward(session comm.IUserSession, req *pb.WTaskChapt // } session.SendMsg(string(this.module.GetType()), "chapterreward", &pb.WTaskChapterRewardResp{Group: req.Group, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WTaskChapterRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskChapterRewardReq", award) }) return } diff --git a/modules/wtask/api_eventcomplete.go b/modules/wtask/api_eventcomplete.go index b5c310be5..619bd0111 100644 --- a/modules/wtask/api_eventcomplete.go +++ b/modules/wtask/api_eventcomplete.go @@ -94,7 +94,7 @@ func (this *apiComp) EventComplete(session comm.IUserSession, req *pb.WTaskEvent go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), "WTaskEventCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskEventCompleteReq", award) }) return } diff --git a/modules/wtask/api_exchange.go b/modules/wtask/api_exchange.go index 420e1b8f6..5bcbac6d2 100644 --- a/modules/wtask/api_exchange.go +++ b/modules/wtask/api_exchange.go @@ -87,7 +87,7 @@ func (this *apiComp) Exchange(session comm.IUserSession, req *pb.WTaskExchangeRe session.SendMsg(string(this.module.GetType()), "exchange", &pb.WTaskExchangeResp{Eid: req.Eid, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), "WTaskExchangeReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskExchangeReq", award) }) return } diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 49c64243f..20b9243a3 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -152,7 +152,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(), "WTaskFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskFinishReq", award) }) return }