解决冲突

worldsrv/action_player.go

@@ -2948,7 +2948,11 @@ func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) er
 		infoData := &player_proto.AnnouncerLogInfo{}
 		//infoData.Snid = logInfo.Snid
 		infoData.Name = logInfo.Name
-		infoData.Phone = logInfo.Phone[len(logInfo.Phone)-4:]
+		str := ""
+		if len(logInfo.Phone) > 4 {
+			str = logInfo.Phone[:4]
+		}
+		infoData.Phone = str
 		infoData.ItemId = logInfo.ItemId
 		infoData.TypeId = logInfo.TypeId
 		ret.AnnouncerLog = append(ret.AnnouncerLog, infoData)
@@ -2962,7 +2966,11 @@ func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) er
 					infoData := &player_proto.AnnouncerLogInfo{}
 					//infoData.Snid = info.Snid
 					infoData.Name = info.Name
-					infoData.Phone = info.Phone[len(info.Phone)-4:]
+					str := ""
+					if len(info.Phone) > 4 {
+						str = info.Phone[:4]
+					}
+					infoData.Phone = str
 					infoData.ItemId = info.ItemId
 					infoData.TypeId = info.TypeId
 					ret.AnnouncerLog = append(ret.AnnouncerLog, infoData)

worldsrv/awardlogmgr.go

@@ -67,6 +67,7 @@ func (this *AwardLogManager) UpdateAwardLog(plt string, itemId int32, num int64)
 
 // 实时播报数据
 func (this *AwardLogManager) UpdateAnnouncerLog(data model.AnnouncerLog) {
+	data.Ts = time.Now()
 	if this.AnnouncerLog == nil {
 		this.AnnouncerLog = make(map[string]map[int32][]model.AnnouncerLog)
 	}