From 4b37daa27a1bf0ebc3f1c354e0676da532e7f796 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:29:32 +0800 Subject: [PATCH] =?UTF-8?q?playroom=E7=82=B9=E8=B5=9E=E5=8A=A0=E9=81=93?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/RegisterNetworkFunc.go | 9 ++++++++- src/server/game/mod/playroom/playroom.go | 6 +++--- src/server/msg/Gameapi.pb.go | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index b1d3fe8c..594a0d97 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -3491,7 +3491,7 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { req := &msg.ReqPlayroomUpvote{} proto.Unmarshal(buf, req) PlayroomMod := player.PlayMod.getPlayroomMod() - err := PlayroomMod.GiveUpvote(int(req.Id)) + Items, err := PlayroomMod.GiveUpvote(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomUpvote{ Code: msg.RES_CODE_FAIL, @@ -3499,6 +3499,13 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { }) return err } + err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomUpvote.String()) + if err != nil { + player.SendErrClienRes(&msg.ResPlayroomUpvote{ + Code: msg.RES_CODE_FAIL, + Msg: err.Error(), + }) + } FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), To: int(req.Id), diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go index bc414300..9f07ceba 100644 --- a/src/server/game/mod/playroom/playroom.go +++ b/src/server/game/mod/playroom/playroom.go @@ -773,12 +773,12 @@ func (p *PlayroomMod) PlayroomDressSet(DressSet map[int]int) ([]int, error) { return Part, nil } -func (p *PlayroomMod) GiveUpvote(Uid int) error { +func (p *PlayroomMod) GiveUpvote(Uid int) ([]*item.Item, error) { if GoUtil.InArray(Uid, p.UpvoteList) { - return fmt.Errorf("upvote already") + return nil, fmt.Errorf("upvote already") } p.UpvoteList = append(p.UpvoteList, Uid) - return nil + return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, 10)}, nil } func (p *PlayroomMod) AddUpvote() { diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index d21c2683..3b31f9b0 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -89,6 +89,7 @@ const ( ITEM_POP_LABEL_GetWish ITEM_POP_LABEL = 62 // 心愿单奖励 ITEM_POP_LABEL_PlayroomTask ITEM_POP_LABEL = 63 // playroom任务 ITEM_POP_LABEL_PlayroomTaskReward ITEM_POP_LABEL = 64 // playroom任务奖励 大奖 + ITEM_POP_LABEL_PlayroomUpvote ITEM_POP_LABEL = 65 // 玩家点赞 ) // Enum value maps for ITEM_POP_LABEL. @@ -159,6 +160,7 @@ var ( 62: "GetWish", 63: "PlayroomTask", 64: "PlayroomTaskReward", + 65: "PlayroomUpvote", } ITEM_POP_LABEL_value = map[string]int32{ "Playroom": 0, @@ -226,6 +228,7 @@ var ( "GetWish": 62, "PlayroomTask": 63, "PlayroomTaskReward": 64, + "PlayroomUpvote": 65, } ) @@ -24162,7 +24165,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\n" + "ReqAdminGm\x12\x10\n" + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x18\n" + - "\aCommand\x18\x02 \x01(\tR\aCommand*\xd4\t\n" + + "\aCommand\x18\x02 \x01(\tR\aCommand*\xe8\t\n" + "\x0eITEM_POP_LABEL\x12\f\n" + "\bPlayroom\x10\x00\x12\r\n" + "\tPiggyBank\x10\x01\x12\n" + @@ -24235,7 +24238,8 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\aAddWish\x10=\x12\v\n" + "\aGetWish\x10>\x12\x10\n" + "\fPlayroomTask\x10?\x12\x16\n" + - "\x12PlayroomTaskReward\x10@*B\n" + + "\x12PlayroomTaskReward\x10@\x12\x12\n" + + "\x0ePlayroomUpvote\x10A*B\n" + "\vHANDLE_TYPE\x12\a\n" + "\x03ADD\x10\x00\x12\v\n" + "\aCOMPOSE\x10\x01\x12\a\n" +