好友打招呼奖励bug修复
This commit is contained in:
parent
a42e534245
commit
99ade15810
@ -8,6 +8,7 @@ import (
|
|||||||
"server/db"
|
"server/db"
|
||||||
"server/game/mod/activity"
|
"server/game/mod/activity"
|
||||||
"server/game/mod/friend"
|
"server/game/mod/friend"
|
||||||
|
"server/game/mod/item"
|
||||||
MsqMod "server/game/mod/msg"
|
MsqMod "server/game/mod/msg"
|
||||||
GoUtil "server/game_util"
|
GoUtil "server/game_util"
|
||||||
"server/msg"
|
"server/msg"
|
||||||
@ -417,6 +418,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
|
|||||||
}
|
}
|
||||||
ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE
|
ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE
|
||||||
now := GoUtil.Now()
|
now := GoUtil.Now()
|
||||||
|
items := make([]*item.Item, 0)
|
||||||
if req.Type == 1 && ReplyInfo.Uid > 10000 {
|
if req.Type == 1 && ReplyInfo.Uid > 10000 {
|
||||||
switch ReplyInfo.Type {
|
switch ReplyInfo.Type {
|
||||||
case friend.REPLY_TYPE_GREETING:
|
case friend.REPLY_TYPE_GREETING:
|
||||||
@ -434,6 +436,8 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
|
|||||||
Extra: ReplyData,
|
Extra: ReplyData,
|
||||||
})
|
})
|
||||||
FriendMod.GreetingFriend(int(ReplyInfo.Uid))
|
FriendMod.GreetingFriend(int(ReplyInfo.Uid))
|
||||||
|
reply_items := baseCfg.GetFriendReplyReward()
|
||||||
|
items = append(items, reply_items...)
|
||||||
case friend.REPLY_TYPE_CATNIP: // 猫草大作战同意邀请
|
case friend.REPLY_TYPE_CATNIP: // 猫草大作战同意邀请
|
||||||
GameId := GoUtil.Int(ReplyInfo.Param)
|
GameId := GoUtil.Int(ReplyInfo.Param)
|
||||||
activityInfo := player.GetActivityInfo(player.GetActivityId(activity.ACT_TYPE_CATNIP))
|
activityInfo := player.GetActivityInfo(player.GetActivityId(activity.ACT_TYPE_CATNIP))
|
||||||
@ -480,14 +484,15 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Items := baseCfg.GetFriendReplyReward()
|
if len(items) > 0 {
|
||||||
err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
|
err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
player.SendErrClienRes(&msg.ResFriendReplyHandle{
|
player.SendErrClienRes(&msg.ResFriendReplyHandle{
|
||||||
Code: msg.RES_CODE_FAIL,
|
Code: msg.RES_CODE_FAIL,
|
||||||
Msg: err.Error(),
|
Msg: err.Error(),
|
||||||
})
|
})
|
||||||
return err
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
player.FriendLogBackData()
|
player.FriendLogBackData()
|
||||||
player.PushClientRes(&msg.ResFriendReplyHandle{
|
player.PushClientRes(&msg.ResFriendReplyHandle{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user