diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go index 2a3a4e04..7a7e7ece 100644 --- a/src/server/game/req_func_friend.go +++ b/src/server/game/req_func_friend.go @@ -8,6 +8,7 @@ import ( "server/db" "server/game/mod/activity" "server/game/mod/friend" + "server/game/mod/item" MsqMod "server/game/mod/msg" GoUtil "server/game_util" "server/msg" @@ -417,6 +418,7 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { } ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE now := GoUtil.Now() + items := make([]*item.Item, 0) if req.Type == 1 && ReplyInfo.Uid > 10000 { switch ReplyInfo.Type { case friend.REPLY_TYPE_GREETING: @@ -434,6 +436,8 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { Extra: ReplyData, }) FriendMod.GreetingFriend(int(ReplyInfo.Uid)) + reply_items := baseCfg.GetFriendReplyReward() + items = append(items, reply_items...) case friend.REPLY_TYPE_CATNIP: // 猫草大作战同意邀请 GameId := GoUtil.Int(ReplyInfo.Param) activityInfo := player.GetActivityInfo(player.GetActivityId(activity.ACT_TYPE_CATNIP)) @@ -480,14 +484,15 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { } } - Items := baseCfg.GetFriendReplyReward() - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) - if err != nil { - player.SendErrClienRes(&msg.ResFriendReplyHandle{ - Code: msg.RES_CODE_FAIL, - Msg: err.Error(), - }) - return err + if len(items) > 0 { + err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String()) + if err != nil { + player.SendErrClienRes(&msg.ResFriendReplyHandle{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + return err + } } player.FriendLogBackData() player.PushClientRes(&msg.ResFriendReplyHandle{