diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index 289ecb08..dd1f6ab5 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -225,7 +225,9 @@ func handle(p *Player, m *msg.Msg) error { p.HandleItem(Items, proto.ITEM_POP_LABEL_Friendtreasure.String()) case msg.HANDLE_TYPE_HANDBOOK_COLLECTION: // 图鉴收集奖励 data := m.Extra.(msg.HandbookMsg) - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, data.Type) + p.AddLog(m.From, friend.LOG_TYPE_HANDBOOK, data.Type) + case msg.HANDLE_TYPE_HANDBOOK_UPVOTE: // 图鉴点赞 + p.AddLog(m.From, friend.LOG_TYPE_HANDBOOK_UPVOTE, "") } // #region 以下是处理系统请求 return nil diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 815aa176..404435b3 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -2467,7 +2467,7 @@ func ReqFriendTLUpvote(player *Player, buf []byte) error { req := &msg.ReqFriendTLUpvote{} proto.Unmarshal(buf, req) FriendMod := player.PlayMod.getFriendMod() - Items, err := FriendMod.Upvote(int(req.Id)) + Items, FUid, err := FriendMod.Upvote(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResFriendTLUpvote{ Code: msg.RES_CODE_FAIL, @@ -2483,6 +2483,13 @@ func ReqFriendTLUpvote(player *Player, buf []byte) error { }) return err } + m := &MsqMod.Msg{ + Type: MsqMod.HANDLE_TYPE_HANDBOOK_UPVOTE, + From: int(player.M_DwUin), + To: int(FUid), + SendT: GoUtil.Now(), + } + FriendMgrSend(m) player.PlayMod.save() player.PushClientRes(&msg.ResFriendTLUpvote{ Code: msg.RES_CODE_SUCCESS, diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go index 1fe1987e..b71bd132 100644 --- a/src/server/game/mod/friend/Friend.go +++ b/src/server/game/mod/friend/Friend.go @@ -33,6 +33,7 @@ const ( LOG_TYPE_FRIEND_DELETE = 14 // 删除好友 LOG_TYPE_PLAYROOM_VISIT = 15 // 拜访玩家 LOG_TYPE_HANDBOOK = 16 // 图鉴收集 + LOG_TYPE_HANDBOOK_UPVOTE = 17 // 图鉴点赞 ) const ( @@ -168,14 +169,14 @@ func (f *FriendMod) ResetGoldCardEx() { } } -func (f *FriendMod) Upvote(Id int) ([]*item.Item, error) { +func (f *FriendMod) Upvote(Id int) ([]*item.Item, int, error) { info := f.Log[Id] if info == nil { - return nil, fmt.Errorf("log not exist") + return nil, 0, fmt.Errorf("log not exist") } if info.Upvote { - return nil, fmt.Errorf("already upvote") + return nil, 0, fmt.Errorf("already upvote") } info.Upvote = true - return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, 1)}, nil + return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, 1)}, info.Uid, nil } diff --git a/src/server/game/mod/msg/Msg.go b/src/server/game/mod/msg/Msg.go index b845f5b1..ecd4647c 100644 --- a/src/server/game/mod/msg/Msg.go +++ b/src/server/game/mod/msg/Msg.go @@ -73,6 +73,7 @@ const ( HANDLE_TYPE_MAIL_RELOAD //重新加载邮件 HANDLE_TYPE_HANDBOOK_COLLECTION //图鉴收集 + HANDLE_TYPE_HANDBOOK_UPVOTE //图鉴收集时间线点赞 ) const (