From c76d8e77e51de1e0bcb7e6913f91c7f101bd4303 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 22 Nov 2023 18:41:21 +0800 Subject: [PATCH] update --- comm/imodule.go | 1 - modules/gm/module.go | 7 +++---- modules/moonfantasy/api_buy.go | 4 ++++ modules/moonlv/api_lvaward.go | 4 +++- modules/passon/api_clearcd.go | 3 +++ modules/pay/api_activitybuy.go | 3 +++ modules/pay/api_dailybuy.go | 3 +++ modules/practice/api_gymrefresh.go | 3 +++ modules/practice/api_upgrade.go | 3 +++ modules/privilege/api_buygift.go | 3 +++ modules/privilege/model_vip.go | 4 ++-- modules/privilege/module.go | 4 ++-- modules/smithy/module.go | 1 - 13 files changed, 32 insertions(+), 11 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index e61e532e1..bc1c727a1 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -400,7 +400,6 @@ type ( // 查询所有特权 key 对应comm.PrivilegeType1类型 CheckAllPrivilege(session IUserSession) map[int32]*pb.PrivilegeList // 通过特权类型获取特权对应的增加数量 - GetCountByPrivilegeId(uid string, pType int32) (count int32) } //武馆 diff --git a/modules/gm/module.go b/modules/gm/module.go index a40affb90..e7edcb63c 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -801,7 +801,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er log.Field{Key: "0", Value: datas[0]}, ) - } else if len(datas) == 2 && (datas[0] == "create") { + } else if len(datas) == 1 && (datas[0] == "create") { var ( err error ) @@ -811,9 +811,8 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } req := &pb.UserCreateReq{ - NickName: datas[1], - Figure: 16010101, - Gender: 1, + Figure: 16010101, + Gender: 1, } if errdata = module1.(comm.IUser).GMCreatePlayer(session, req); errdata != nil { return diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index 0a5d7ccca..acae227c9 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -95,5 +95,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( // "ticket": info.Ticket, }) session.SendMsg(string(this.module.GetType()), "buy", &pb.MoonfantasyBuyResp{Issucc: true, BattleNum: req.BuyNum}) + + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "MoonfantasyBuyReq", need) + }) return } diff --git a/modules/moonlv/api_lvaward.go b/modules/moonlv/api_lvaward.go index e7f2efaa3..46e5f705d 100644 --- a/modules/moonlv/api_lvaward.go +++ b/modules/moonlv/api_lvaward.go @@ -60,7 +60,9 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e list.Lv += 1 update["lv"] = list.Lv - this.module.ModuleUser.ChangeUserMoonLv(session, list.Lv) + if errdata = this.module.ModuleUser.ChangeUserMoonLv(session, list.Lv); errdata != nil { + return + } // 升级了清空当前任务 list.Tasks = nil // 重置任务 diff --git a/modules/passon/api_clearcd.go b/modules/passon/api_clearcd.go index 5e490f4fd..4bcc24bcc 100644 --- a/modules/passon/api_clearcd.go +++ b/modules/passon/api_clearcd.go @@ -58,5 +58,8 @@ func (this *apiComp) ClearCD(session comm.IUserSession, req *pb.PassonClearCDReq return } session.SendMsg(string(this.module.GetType()), "clearcd", &pb.PassonClearCDResp{Index: req.Index}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PassonClearCDReq", conf.Remake) + }) return } diff --git a/modules/pay/api_activitybuy.go b/modules/pay/api_activitybuy.go index 0bf118472..1fc1a10df 100644 --- a/modules/pay/api_activitybuy.go +++ b/modules/pay/api_activitybuy.go @@ -92,5 +92,8 @@ func (this *apiComp) ActivityBuy(session comm.IUserSession, req *pb.PayActivityB return } session.SendMsg(string(this.module.GetType()), "activitybuy", &pb.PayDailyBuyResp{Isucc: true, Items: items}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) + }) return } diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index 770c8c739..3daa99998 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -67,5 +67,8 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) } session.SendMsg(string(this.module.GetType()), "dailybuy", &pb.PayDailyBuyResp{Isucc: true, Items: items}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) + }) return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index cd26101af..438460db5 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -85,5 +85,8 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe }) session.SendMsg(string(this.module.GetType()), "gymrefresh", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PracticeGymRefreshReq", atn) + }) return } diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index 273fae038..b146f5f3d 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -88,5 +88,8 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR "pillarf": room.Pillarf, }) session.SendMsg(string(this.module.GetType()), "upgrade", &pb.PracticeUpgradeResp{Index: req.Index, Lv: pillar.Lv}) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PracticeUpgradeReq", pillarconfigure.UpLvConsume) + }) return } diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index cf9240505..1ba8df24a 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -89,6 +89,9 @@ 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(), comm.GMResAddType, "PrivilegeBuyGiftReq", atno) + if conf.PriceDiscount.N > 0 { + this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PrivilegeBuyGiftReq", conf.PriceDiscount) + } }) return } diff --git a/modules/privilege/model_vip.go b/modules/privilege/model_vip.go index 7d237c5ca..9ab10fa0a 100644 --- a/modules/privilege/model_vip.go +++ b/modules/privilege/model_vip.go @@ -41,8 +41,8 @@ func (this *ModelVip) modifyVipData(uid string, data map[string]interface{}) err return this.Change(uid, data) } -// 增加vip信息 -func (this *ModelVip) addVipData(uId string, vip *pb.DBVip) (err error) { +//创建一条VIP信息 +func (this *ModelVip) createVipData(uId string, vip *pb.DBVip) (err error) { if err = this.Add(uId, vip); err != nil { this.module.Errorf("err:%v", err) diff --git a/modules/privilege/module.go b/modules/privilege/module.go index edd18f6fd..a81e88799 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -143,7 +143,7 @@ func (this *Privilege) Delivery(session comm.IUserSession, pId int32) (errdata * CTime: configure.Now().Unix(), RewardTime: 0, } - if err = this.modelVip.addVipData(session.GetUserId(), vip); err != nil { + if err = this.modelVip.createVipData(session.GetUserId(), vip); err != nil { this.Errorf("err:%v", err) return } @@ -372,7 +372,7 @@ func (this *Privilege) AddVipData(session comm.IUserSession, oldVip, newVip int3 CTime: configure.Now().Unix(), RewardTime: configure.Now().Unix(), } - if err = this.modelVip.addVipData(session.GetUserId(), vip); err != nil { + if err = this.modelVip.createVipData(session.GetUserId(), vip); err != nil { this.Errorf("err:%v", err) return } diff --git a/modules/smithy/module.go b/modules/smithy/module.go index a4d720b57..9516f17fa 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -73,7 +73,6 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) { if this.IsCross() { atlas := &pb.DBAtlas{} if model, err := this.GetDBModelByUid(uid, this.modelAtlas.TableName); err == nil { - if err := model.Get(uid, atlas); err != nil { // 防止数据没有初始化情况 if mongo.ErrNoDocuments == err { atlas.Id = primitive.NewObjectID().Hex()