tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-09-29 11:22:12 +08:00
parent e07963720d a48a9fede4
commit 622d622194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbproxy/svc/l_itemlog.go
View File

@ -116,11 +116,12 @@ func (svc *ItemLogSvc) UpdateState(req *model.UpdateParam, res *model.UpdateRes)
} }
func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *model.GetClawdollItemLogRet) (err error) { func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *model.GetClawdollItemLogRet) (err error) {
var sql []bson.M
limitDataNum := 200
var Logs []model.RetClawdollItemLog var Logs []model.RetClawdollItemLog
for _, typeId := range args.TypeIds { for _, typeId := range args.TypeIds {
var SubLogs []model.RetClawdollItemLog var SubLogs []model.RetClawdollItemLog
var sql []bson.M
sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId}) sql = append(sql, bson.M{"snid": args.Snid, "typeid": typeId})
switch typeId { switch typeId {
@ -137,7 +138,7 @@ func (svc *ItemLogSvc) GetClawdollItemLog(args *model.ClawdollItemLogReq, ret *m
return return
} }
err = c.Find(bson.M{"$and": sql}).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&SubLogs) err = c.Find(bson.M{"$and": sql}).Sort("-createts").Limit(limitDataNum).Select(bson.M{"itemid": 1, "createts": 1, "typeid": 1, "count": 1, "logtype": 1}).All(&SubLogs)
Logs = append(Logs, SubLogs...) Logs = append(Logs, SubLogs...)
} }
@ -155,8 +156,9 @@ func (svc *ItemLogSvc) GetClawdollSuccessItemLog(args *model.ClawdollSuccessItem
return return
} }
limitDataNum := 300
var datas []model.ItemLog var datas []model.ItemLog
err = c.Find(cond).All(&datas) err = c.Find(cond).Sort("-createts").Limit(limitDataNum).All(&datas)
if err != nil { if err != nil {
logger.Logger.Error("GetClawdollSuccessItemLog error: ", err) logger.Logger.Error("GetClawdollSuccessItemLog error: ", err)
return err return err

3
gamesrv/clawdoll/action_clawdoll.go
View File

@ -109,6 +109,7 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
case 2: case 2:
if msg.Result == 1 { if msg.Result == 1 {
// 获得娃娃卡 // 获得娃娃卡
playerEx.CatchCardClawdoll()
playerEx.IsWin = true playerEx.IsWin = true
logger.Logger.Tracef("下抓成功！！！！！！！！！！！！snid = %v", msg.Snid) logger.Logger.Tracef("下抓成功！！！！！！！！！！！！snid = %v", msg.Snid)
@ -118,8 +119,6 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
playerEx.IsWin = false playerEx.IsWin = false
} }
playerEx.CatchCardClawdoll()
logger.Logger.Tracef("ClawDoll StatePlayGame OnPlayerOp Grab response, SnId= %v", msg.Snid) logger.Logger.Tracef("ClawDoll StatePlayGame OnPlayerOp Grab response, SnId= %v", msg.Snid)
s.ChangeSceneState(rule.ClawDollSceneStateBilled) s.ChangeSceneState(rule.ClawDollSceneStateBilled)

7
worldsrv/action_bag.go
View File

@ -626,14 +626,13 @@ func CSDollChange(s *netlib.Session, packetid int, data interface{}, sid int64)
}) })
logger.Logger.Trace("背包内使用兑换娃娃卡 bagInfo = ", bagInfo) logger.Logger.Trace("背包内使用兑换娃娃卡 bagInfo = ", bagInfo)
pack.RetCode = rest pack.RetCode = rest
if isF { if isF {
itemId := item.ItemId
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
dollLog := model.NewDbBagChangeDoll(p.Platform, p.SnId, item.ItemId, 1, 0, "", msg.Addr, msg.UserName, msg.UserTel) dollLog := model.NewDbBagChangeDoll(p.Platform, p.SnId, itemId, 1, 0, "", msg.Addr, msg.UserName, msg.UserTel)
return model.InsertDbBagChangeDollLog(dollLog) return model.InsertDbBagChangeDollLog(dollLog)
}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) { }), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
if data != nil {
logger.Logger.Errorf("CSDollChange err: %v", data)
}
}), "CSDollChange").Start() }), "CSDollChange").Start()
} }