diff --git a/model/player.go b/model/player.go index e9466eb..8b6d39c 100644 --- a/model/player.go +++ b/model/player.go @@ -104,6 +104,11 @@ const ( SystemFreeGive_GiveType_MailSystemGive //邮件系统赠送 SystemFreeGive_GiveType_RankMatch //段位奖励 SystemFreeGive_GiveType_BindTel // 绑定手机号奖励 + SystemFreeGive_GiveType_TaskInvite // 邀请任务 + SystemFreeGive_GiveType_TaskNewPlayer // 新手任务 + SystemFreeGive_GiveType_TaskAchievement // 成就任务 + SystemFreeGive_GiveType_TaskEveryDay // 每日任务 + SystemFreeGive_GiveType_TaskWeekActive // 周活跃奖励 ) const ( SystemFreeGive_CoinType_Coin int32 = iota //金币 diff --git a/worldsrv/action_task.go b/worldsrv/action_task.go index 15dcb7e..761c519 100644 --- a/worldsrv/action_task.go +++ b/worldsrv/action_task.go @@ -7,6 +7,7 @@ import ( "mongo.games.com/goserver/core/netlib" "mongo.games.com/game/common" + "mongo.games.com/game/model" taskproto "mongo.games.com/game/protocol/task" "mongo.games.com/game/srvdata" ) @@ -80,19 +81,37 @@ func SendReward(p *Player, m map[int64]int64, tp int32) { }) } gain := int32(0) + giveType := int32(-1) switch tp { case 1: gain = common.GainWayItemTaskEveryDay + giveType = model.SystemFreeGive_GiveType_TaskEveryDay case 2: gain = common.GainWayItemWeekActive + giveType = model.SystemFreeGive_GiveType_TaskWeekActive case 3: gain = common.GainWayItemTaskNewPlayer + giveType = model.SystemFreeGive_GiveType_TaskNewPlayer case 4: gain = common.GainWayItemTaskInvite + giveType = model.SystemFreeGive_GiveType_TaskInvite case 5: gain = common.GainWayItemTaskAchievement + giveType = model.SystemFreeGive_GiveType_TaskAchievement } BagMgrSingleton.AddItems(p, items, 0, gain, "system", "任务奖励", 0, 0, false) + for _, v := range items { + tp := int32(-1) + if v.ItemId == common.ItemIDCoin { + tp = model.SystemFreeGive_CoinType_Coin + } else if v.ItemId == common.ItemIDDiamond { + tp = model.SystemFreeGive_CoinType_Diamond + } + if !p.IsRob && tp >= 0 && giveType >= 0 { + LogChannelSingleton.WriteMQData( + model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, giveType, tp, v.ItemNum)) + } + } } func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) error {