diff --git a/src/server/game/game_type.go b/src/server/game/game_type.go index dbc05e48..6e36e59f 100644 --- a/src/server/game/game_type.go +++ b/src/server/game/game_type.go @@ -35,6 +35,7 @@ type PlayerSimpleData struct { CardInfo []int ActLog *friend.ActLogInfo Physiology map[int]int + Lang int } type VarGoldCard struct { diff --git a/src/server/game/limited_time_trigger.go b/src/server/game/limited_time_trigger.go index 985a951b..00027714 100644 --- a/src/server/game/limited_time_trigger.go +++ b/src/server/game/limited_time_trigger.go @@ -115,14 +115,15 @@ func (p *Player) LimitedTimeCardTrigger() { var EndTime int64 for k, v := range FriendMod.Card { if v.EndTime > 0 && v.EndTime <= Now { - if v.Status == card.STATUS_CARD_EX_1 { + switch v.Status { + case card.STATUS_CARD_EX_1: delete(FriendMod.Card, k) FriendMgrSend(&MsgMod.Msg{ From: v.BUid, To: v.AUid, Type: MsgMod.HANDLE_TYPE_EX_CARD_SELECT_TIMEOUT, }) - } else if v.Status == card.STATUS_CARD_EX_2 { + case card.STATUS_CARD_EX_2: delete(FriendMod.Card, k) FriendMgrSend(&MsgMod.Msg{ From: v.AUid, diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go index c70689ca..a155ca0c 100644 --- a/src/server/game/player_data.go +++ b/src/server/game/player_data.go @@ -1001,7 +1001,7 @@ func (p *Player) UpdateUserInfo() { simple.CardInfo = CardMod.GetCardList() simple.ActLog = p.PlayMod.getFriendMod().GetActLogLast() simple.Physiology = p.PlayMod.getPlayroomMod().GetPhysiologyList() - + simple.Lang = int(p.PlayMod.getBaseMod().Lang) //TODO 存储到redis 在新版本中将优化成gob进行压缩 value, _ := json.Marshal(simple) IdStr := GoUtil.String(p.M_DwUin)