diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index 84d2f441..41b93513 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -326,7 +326,7 @@ func (p *Player) handle(m *msg.Msg) error { if len(m.Item) == 0 { return nil } - var broken bool + var bankruptcy bool if gameId == playroom.GAME_TYPE_HOOK || gameId == playroom.GAME_TYPE_HIDE { PlayroomMod.AddChip(m.From, m.SendT, emoji) p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CAT_WIN, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) @@ -342,14 +342,14 @@ func (p *Player) handle(m *msg.Msg) error { starNum := BaseMod.GetStar() m.Item[0].Num = min(m.Item[0].Num, starNum) if m.Item[0].Num >= starNum { - broken = true - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BROKEN, fmt.Sprintf("%d", m.Item[0].Id), m.SendT) + bankruptcy = true + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BANKRUPTCY, fmt.Sprintf("%d", m.Item[0].Id), m.SendT) } p.HandleLoseItem(m.Item, "HANDLE_TYPE_PLAYROOM_LOSE") } else { PlayroomMod.Lose(m.Item) } - if broken { + if bankruptcy { playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.NotifyPlayroomBroken{ Player: playerSimpleData, diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go index 283b27cb..23955cf1 100644 --- a/src/server/game/mod/friend/Friend.go +++ b/src/server/game/mod/friend/Friend.go @@ -97,37 +97,37 @@ const ( ) const ( - LOG_TYPE_FRIEND_APPLY = 1 // 收到申请好友 - LOG_TYPE_FRIEND_BECOME = 2 // 成为好友 - LOG_TYPE_CARD_EX_SEND = 3 // 发起卡牌交换申请 - LOG_TYPE_CARD_SEND = 4 // 赠送卡牌 - LOG_TYPE_CARD_GIVE = 5 // 请求卡牌 - LOG_TYPE_CARD_SELECT_GET = 6 // 选择卡牌交换 - LOG_TYPE_CARD_ACCEPT_GIVE = 7 // 接受卡牌 - LOG_TYPE_CARD_EX_GET = 8 // 收到卡牌交换申请 - LOG_TYPE_CARD_SELECT_SEND = 9 // 选择卡牌交换 - LOG_TYPE_CARD_EX_SUCCESS_1 = 10 // 卡牌交换成功 - LOG_TYPE_CARD_EX_SUCCESS_2 = 11 // 卡牌交换成功 - LOG_TYPE_FRIEND_DELETE = 14 // 删除好友 - LOG_TYPE_PLAYROOM_VISIT = 15 // 非小猫游戏,他人偷走了玩家的猫币 - LOG_TYPE_HANDBOOK = 16 // 图鉴收集 - LOG_TYPE_HANDBOOK_UPVOTE = 17 // 图鉴点赞 - LOG_TYPE_CHARGE_SEND = 18 // 赠送充值礼物 - LOG_TYPE_CHARGE_RECEIVE = 19 // 收到充值礼物 - LOG_TYPE_WISH = 20 // 心愿单请求 - LOG_TYPE_FRIEND_BECOME_NPC = 21 // npc成为好友 - LOG_TYPE_PLAYROOM_UPVOTE = 22 // playroom点赞 - LOG_TYPE_PLAYROOM_CHAMPSHIP = 23 // 竞标赛排名 - LOG_TYPE_TREASURE = 24 // 好友宝藏 - LOG_TYPE_CARD_SEND_ACCEPT = 25 // 收到赠送卡牌 - LOG_TYPE_PLAYROOM_CAT_WIN = 26 // 小猫游戏,给小猫成功装箱 - LOG_TYPE_PLAYROOM_CAT_LOSE = 27 // 小猫游戏,装箱小猫未成功 - LOG_TYPE_CARD_GIVE_ACCEPT = 28 // 接受卡牌请求 - LOG_TYPE_FRIEND_INVITE = 29 // 邀请注册 - LOG_TYPE_TREASURE_HELP = 30 // 好友宝藏帮助 - LOG_TYPE_FRIEND_SPONSOR = 31 // 好友赞助体力 - LOG_TYPE_FRIEND_SPONSOR_GET = 32 // 获得好友赞助体力 - LOG_TYPE_PLAYROOM_BROKEN = 33 // 小猫游戏,玩家的Playroom被拜访的玩家破产 + LOG_TYPE_FRIEND_APPLY = 1 // 收到申请好友 + LOG_TYPE_FRIEND_BECOME = 2 // 成为好友 + LOG_TYPE_CARD_EX_SEND = 3 // 发起卡牌交换申请 + LOG_TYPE_CARD_SEND = 4 // 赠送卡牌 + LOG_TYPE_CARD_GIVE = 5 // 请求卡牌 + LOG_TYPE_CARD_SELECT_GET = 6 // 选择卡牌交换 + LOG_TYPE_CARD_ACCEPT_GIVE = 7 // 接受卡牌 + LOG_TYPE_CARD_EX_GET = 8 // 收到卡牌交换申请 + LOG_TYPE_CARD_SELECT_SEND = 9 // 选择卡牌交换 + LOG_TYPE_CARD_EX_SUCCESS_1 = 10 // 卡牌交换成功 + LOG_TYPE_CARD_EX_SUCCESS_2 = 11 // 卡牌交换成功 + LOG_TYPE_FRIEND_DELETE = 14 // 删除好友 + LOG_TYPE_PLAYROOM_VISIT = 15 // 非小猫游戏,他人偷走了玩家的猫币 + LOG_TYPE_HANDBOOK = 16 // 图鉴收集 + LOG_TYPE_HANDBOOK_UPVOTE = 17 // 图鉴点赞 + LOG_TYPE_CHARGE_SEND = 18 // 赠送充值礼物 + LOG_TYPE_CHARGE_RECEIVE = 19 // 收到充值礼物 + LOG_TYPE_WISH = 20 // 心愿单请求 + LOG_TYPE_FRIEND_BECOME_NPC = 21 // npc成为好友 + LOG_TYPE_PLAYROOM_UPVOTE = 22 // playroom点赞 + LOG_TYPE_PLAYROOM_CHAMPSHIP = 23 // 竞标赛排名 + LOG_TYPE_TREASURE = 24 // 好友宝藏 + LOG_TYPE_CARD_SEND_ACCEPT = 25 // 收到赠送卡牌 + LOG_TYPE_PLAYROOM_CAT_WIN = 26 // 小猫游戏,给小猫成功装箱 + LOG_TYPE_PLAYROOM_CAT_LOSE = 27 // 小猫游戏,装箱小猫未成功 + LOG_TYPE_CARD_GIVE_ACCEPT = 28 // 接受卡牌请求 + LOG_TYPE_FRIEND_INVITE = 29 // 邀请注册 + LOG_TYPE_TREASURE_HELP = 30 // 好友宝藏帮助 + LOG_TYPE_FRIEND_SPONSOR = 31 // 好友赞助体力 + LOG_TYPE_FRIEND_SPONSOR_GET = 32 // 获得好友赞助体力 + LOG_TYPE_PLAYROOM_BANKRUPTCY = 33 // 小猫游戏,玩家的Playroom被拜访的玩家破产 ) const (