获奖记录
This commit is contained in:
parent
805c82bdd5
commit
107ac98d81
|
|
@ -2914,27 +2914,31 @@ func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) er
|
||||||
awardData.AwardLog = append(awardData.AwardLog, infoData)
|
awardData.AwardLog = append(awardData.AwardLog, infoData)
|
||||||
}
|
}
|
||||||
//处理后台数据
|
//处理后台数据
|
||||||
for _, awardLog := range awardLogConfig.AwardLog {
|
if awardLogConfig != nil {
|
||||||
if awardLog.TypeId == msg.TypeId {
|
for _, awardLog := range awardLogConfig.AwardLog {
|
||||||
for _, log := range awardLog.AwardLog {
|
if awardLog.TypeId == msg.TypeId {
|
||||||
status := false
|
for _, log := range awardLog.AwardLog {
|
||||||
for _, info := range awardData.AwardLog {
|
status := false
|
||||||
if log.ItemId == info.ItemId {
|
for _, info := range awardData.AwardLog {
|
||||||
status = true
|
if log.ItemId == info.ItemId {
|
||||||
if log.Num > info.Num {
|
status = true
|
||||||
info.Num = log.Num
|
info.Order = log.Order
|
||||||
|
if log.Num > info.Num {
|
||||||
|
info.Num = log.Num
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
break
|
}
|
||||||
|
if !status {
|
||||||
|
infoData := &player_proto.AwardLogInfo{}
|
||||||
|
infoData.ItemId = log.ItemId
|
||||||
|
infoData.Num = log.Num
|
||||||
|
infoData.Order = log.Order
|
||||||
|
awardData.AwardLog = append(awardData.AwardLog, infoData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !status {
|
awardData.SortId = awardLog.SortId
|
||||||
infoData := &player_proto.AwardLogInfo{}
|
|
||||||
infoData.ItemId = log.ItemId
|
|
||||||
infoData.Num = log.Num
|
|
||||||
awardData.AwardLog = append(awardData.AwardLog, infoData)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
awardData.SortId = awardLog.SortId
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ret.AwardLog = awardData
|
ret.AwardLog = awardData
|
||||||
|
|
@ -2952,17 +2956,19 @@ func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) er
|
||||||
//处理实时播报数据
|
//处理实时播报数据
|
||||||
if len(ret.AnnouncerLog) < 100 {
|
if len(ret.AnnouncerLog) < 100 {
|
||||||
//后台数据
|
//后台数据
|
||||||
for _, info := range awardLogConfig.AnnouncerLog {
|
if awardLogConfig != nil {
|
||||||
if info.TypeId == msg.TypeId {
|
for _, info := range awardLogConfig.AnnouncerLog {
|
||||||
infoData := &player_proto.AnnouncerLogInfo{}
|
if info.TypeId == msg.TypeId {
|
||||||
//infoData.Snid = info.Snid
|
infoData := &player_proto.AnnouncerLogInfo{}
|
||||||
infoData.Name = info.Name
|
//infoData.Snid = info.Snid
|
||||||
infoData.Phone = info.Phone[len(info.Phone)-4:]
|
infoData.Name = info.Name
|
||||||
infoData.ItemId = info.ItemId
|
infoData.Phone = info.Phone[len(info.Phone)-4:]
|
||||||
infoData.TypeId = info.TypeId
|
infoData.ItemId = info.ItemId
|
||||||
ret.AnnouncerLog = append(ret.AnnouncerLog, infoData)
|
infoData.TypeId = info.TypeId
|
||||||
if len(ret.AnnouncerLog) >= 100 {
|
ret.AnnouncerLog = append(ret.AnnouncerLog, infoData)
|
||||||
break
|
if len(ret.AnnouncerLog) >= 100 {
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue