diff --git a/server/roserver/config/csv/LiveRoomTalkCfg.csv b/server/roserver/config/csv/LiveRoomTalkCfg.csv index c83ad28..23a4ac2 100644 --- a/server/roserver/config/csv/LiveRoomTalkCfg.csv +++ b/server/roserver/config/csv/LiveRoomTalkCfg.csv @@ -45,4 +45,4 @@ int,int,int,int,int,list,list,list 42,5,3,10,1,1,最后十秒,各位老板的报价考虑好了吗?, 43,5,4,5,1,1,好了,经过激烈的竞拍,恭喜这些老板最终拿下了这款好物,老板大气,老板身体健康!, 44,5,4,5,1,1,没有拍到的老板不要气馁,说不定下一个,老板会更喜欢呢?, -37,100,0,5,1,1,感谢【{0}】哥哥,送的{1}!谢谢哥哥!, +45,1000,0,5,1,1,感谢【%s】哥哥,送的{%s}!谢谢哥哥!, diff --git a/server/roserver/fruit/model/live_room.go b/server/roserver/fruit/model/live_room.go index d1cfa76..72d5f06 100644 --- a/server/roserver/fruit/model/live_room.go +++ b/server/roserver/fruit/model/live_room.go @@ -220,6 +220,16 @@ func (self *LiveRoom) BaseInit() { self.ChangeStage(LIVEROOM_STAGE_IDLE) } +func (self *LiveRoom) GetLiveRoomTalkCfg(talkType int32) *serverproto.LiveRoomTalkCfg { + liveRoomTalkCfgMap := serverproto.LiveRoomTalkCfgLoader + for _, v := range liveRoomTalkCfgMap { + if v.Type == talkType { + return v + } + } + return nil +} + func (self *LiveRoom) CreateTimeline(stage int32) map[int32]*TimelineFrame { timeline := make(map[int32]*TimelineFrame, 0) var currentSN int32 = 0 @@ -271,7 +281,7 @@ func (self *LiveRoom) Update(deltaMS uint32) { self.giftRankResetTime = util.GetCurrentTime() util.InfoF("ResetGiftRank: RoomType=%d, time=%d", self.roomType, self.giftRankResetTime) } - if self.updateCount%300 == 0 { + if self.updateCount%600 == 0 { ret, err := service.GetRedis().HSet(model.LiveRoomHeartPrefix, fmt.Sprintf("%d", self.roomType), fmt.Sprintf("%d", self.heart)).Result() if err != nil { util.InfoF("[LiveRoom] Update HSet: %v %v", err, ret) @@ -808,7 +818,7 @@ func (self *LiveRoom) SendGift(uid uint64, giftId uint32) int32 { self.giftRank = self.giftRank[1:] } - sendGiftTalkCfg := serverproto.LiveRoomTalkCfgLoader[LIVEROOM_TYPE_SEND_GIFT] + sendGiftTalkCfg := self.GetLiveRoomTalkCfg(LIVEROOM_SEND_GIFT_TALK_TYPE) self.SendAllPlayers(func(uid uint64) interface{} { return &serverproto.SCLiveRoomCMDTalkNtf{ Uid: uid, diff --git a/server/roserver/fruit/model/room_def.go b/server/roserver/fruit/model/room_def.go index e58af5b..8677dbc 100644 --- a/server/roserver/fruit/model/room_def.go +++ b/server/roserver/fruit/model/room_def.go @@ -55,6 +55,10 @@ const ( LIVEROOM_CMD_PLAY_PARAM_Bid = "Bid" ) +const ( + LIVEROOM_SEND_GIFT_TALK_TYPE = 1000 +) + // 泛型按值删除 func SliceRemoveByValue[T comparable](slice []T, value T) []T { result := slice[:0]