Merge branch 'develop' into release

worldsrv/action_friend.go

@@ -15,7 +15,6 @@ import (
 	"mongo.games.com/game/model"
 	"mongo.games.com/game/proto"
 	"mongo.games.com/game/protocol/friend"
-	"mongo.games.com/game/protocol/welfare"
 	"mongo.games.com/game/srvdata"
 )
 
@@ -603,29 +602,6 @@ func (this *CSFuzzyQueryPlayerHandler) Process(s *netlib.Session, packetid int,
 			return nil
 		}
 
-		pack2 := &welfare.NotifyLotteryAward{
-			Info: &welfare.LotteryInfo{
-				Id:      45,
-				StartTs: time.Now().Unix(),
-				Index:   int32(5),
-				Award: []*welfare.PropInfo{
-					{
-						ItemId:  100001,
-						ItemNum: 100,
-					},
-				},
-				SnId:    p.SnId,
-				Name:    p.Name,
-				RoleId:  p.Roles.ModId,
-				Price:   1000,
-				WinCode: "123456",
-			},
-		}
-
-		// 广播中奖结果
-		PlayerMgrSington.BroadcastMessageToPlatform(p.Platform, int(welfare.SPacketID_PACKET_NotifyLotteryAward), pack2)
-		logger.Logger.Tracef("广播中奖信息: %v", pack2)
-
 		queryContent := msg.GetQueryContent()
 		if utf8.RuneCountInString(queryContent) < 3 {
 			return nil

worldsrv/action_player.go

@@ -3181,7 +3181,9 @@ func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid in
 			}
 		} else {
 			pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
-			p.GuideData[msg.GuideId] = int32(msg.Param[0])
+			if len(msg.Param) > 0 {
+				p.GuideData[msg.GuideId] = int32(msg.Param[0])
+			}
 			send()
 			return nil
 		}

worldsrv/lotterymgr.go

@@ -47,6 +47,22 @@ func init() {
 				}
 			}
 		},
+		OnMiniTimerFunc: func() {
+			for i := range LotteryMgrInst.Data {
+				for k := range LotteryMgrInst.Data[i] {
+					d := LotteryMgrInst.Data[i][k]
+					if d == nil {
+						continue
+					}
+					lc := PlatformMgrSingleton.GetLotteryConfig(d.Platform, d.CId)
+					if lc == nil || lc.GetOn() != common.On {
+						continue
+					}
+					// 随机给机器人发放抽奖码
+					d.sendRobotCode(1, 5)
+				}
+			}
+		},
 	})
 }
 
@@ -477,8 +493,6 @@ func (l *LotteryMgr) Update() {
 			if lc == nil || lc.GetOn() != common.On {
 				continue
 			}
-			// 随机给机器人发放抽奖码
-			d.sendRobotCode(1, 5)
 			// 活动结束，开始抽奖
 			d.Done()
 			// 开始发奖

worldsrv/player.go

@@ -1124,7 +1124,6 @@ func (this *Player) IsOnLine() bool {
 
 func (this *Player) SetOnline() {
 	this.state = PlayerStateOnline
-	this.UpdateLastLogoutTime()
 }
 
 func (this *Player) IsOffline() bool {