From bf34ec773aaf4f705a22561c28b1ac3b7cc8adc3 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 15 Aug 2025 10:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerFunc.go | 6 ++++-- src/server/game/RegisterNetworkFunc.go | 23 ++++++++++++++--------- src/server/game/mod/playroom/playroom.go | 12 ++++++++++-- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index be997a21..69a1342f 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -68,7 +68,8 @@ func handle(p *Player, m *msg.Msg) error { } FriendMod.AddFriend(m.From) PlayroomMod := p.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointAdd() + BaseMod := p.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(p) p.TeLog("friend_add", map[string]interface{}{ "player_id": m.From, @@ -394,7 +395,8 @@ func HandleFriendMsg(p *Player, m *msg.Msg) error { Time: int32(GoUtil.Now()), }) PlayroomMod := p.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointAdd() + BaseMod := p.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(p) p.TeLog("friend_add", map[string]interface{}{ "player_id": m.From, diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 6b3737ca..7af54986 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -1587,7 +1587,8 @@ func ReqApplyFriend(player *Player, buf []byte) error { Uid: req.Uid, }) PlayroomMod := player.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointInvite() + BaseMod := player.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointInvite(BaseMod.GetLevel()) PlayroomBackData(player) player.TeLog("friend_add", map[string]interface{}{ "player_id": Uid, @@ -1617,7 +1618,6 @@ func ReqAgreeFriend(player *Player, buf []byte) error { } FriendMgrSend(m) FriendMod.AddFriend(Uid) - player.PlayMod.save() player.PushClientRes(&msg.ResAgreeFriend{ Code: msg.RES_CODE_SUCCESS, Uid: req.Uid, @@ -1630,8 +1630,10 @@ func ReqAgreeFriend(player *Player, buf []byte) error { player.AddLog(Uid, friend.LOG_TYPE_FRIEND_BECOME, "", GoUtil.Now()) FriendApplyBackData(player) PlayroomMod := player.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointAdd() + BaseMod := player.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(player) + player.PlayMod.save() return nil } @@ -2907,7 +2909,8 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error { SendT: GoUtil.Now(), }) PlayroomMod := player.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointAdd() + BaseMod := player.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(player) player.TeLog("friend_add", map[string]interface{}{ "player_id": req.Id, @@ -2947,7 +2950,8 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { SendT: GoUtil.Now(), }) PlayroomMod := player.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointAdd() + BaseMod := player.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(player) player.TeLog("friend_add", map[string]interface{}{ "player_id": req.Id, @@ -3269,9 +3273,9 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { } RandList = GoUtil.UniqueInts(RandList) if len(RandList) == 0 { - PlayroomMod.SetGameReward(0, 0, Star) + PlayroomMod.SetGameReward(Star, Star, Star) } else if len(RandList) == 1 { - PlayroomMod.SetGameReward(0, RandList[0], Star) + PlayroomMod.SetGameReward(RandList[0], Star, Star) } else { ChessList := GoUtil.RandSliceNum(RandList, 2) PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star) @@ -4430,8 +4434,9 @@ func ReqAddNpc(player *Player, buf []byte) error { player.PlayMod.save() FriendListBackData(player) PlayroomMod := player.PlayMod.getPlayroomMod() - PlayroomMod.AddRoomPointInvite() - PlayroomMod.AddRoomPointAdd() + BaseMod := player.PlayMod.getBaseMod() + PlayroomMod.AddRoomPointInvite(BaseMod.GetLevel()) + PlayroomMod.AddRoomPointAdd(BaseMod.GetLevel()) PlayroomBackData(player) player.TeLog("add_npc", map[string]interface{}{ "NpcId": int(req.NpcId), diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go index 341e4e57..f41ea0d2 100644 --- a/src/server/game/mod/playroom/playroom.go +++ b/src/server/game/mod/playroom/playroom.go @@ -101,6 +101,8 @@ const ( DAILY_TASK_TYPE_ONE = 1 // 一阶段任务 DAILY_TASK_TYPE_TWO = 2 // 二阶段任务 + + ROOM_POINT_UNLOCK_LV = 6 // 房间点数解锁等级 ) type ChipInfo struct { @@ -910,7 +912,10 @@ func (p *PlayroomMod) GetRoomPoint() int { func (p *PlayroomMod) SetRoomPoint(Point int) { p.RoomPoint = Point } -func (p *PlayroomMod) AddRoomPointInvite() { +func (p *PlayroomMod) AddRoomPointInvite(lv int) { + if lv < ROOM_POINT_UNLOCK_LV { + return + } Point := playroomCfg.GetRoomPointInvite() p.RoomPoint += Point if p.RoomPoint < 0 { @@ -918,7 +923,10 @@ func (p *PlayroomMod) AddRoomPointInvite() { } } -func (p *PlayroomMod) AddRoomPointAdd() { +func (p *PlayroomMod) AddRoomPointAdd(lv int) { + if lv < ROOM_POINT_UNLOCK_LV { + return + } Point := playroomCfg.GetRoomPointAdd() p.RoomPoint += Point if p.RoomPoint < 0 {