Merge branch 'release' into develop

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -970,6 +970,10 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
 						playerEx.robotGameTimes--
 						sceneEx.robotGamingNum++
 					}
+					if _, ok := sceneEx.BilledList[playerEx.SnId]; !ok {
+						arr := make([]*BilledInfo, 0)
+						sceneEx.BilledList[playerEx.SnId] = &arr
+					}
 				}
 			}
 		}

worldsrv/action_player.go

@@ -2663,8 +2663,8 @@ func CSBindTel(s *netlib.Session, packetId int, data interface{}, sid int64) err
 				SaveInviteScore(&model.InviteScore{
 					Platform:   p.Platform,
 					SnId:       p.SnId,
-					InviteSnId: p.InviterId,
-					Tp:         common.InviteScoreTypeBind,
+					InviteSnId: p.PSnId,
+					Tp:         common.InviteScoreTypeBindTel,
 					Score:      cfg.GetBindTelScore(),
 					Ts:         time.Now().Unix(),
 					Money:      0,

worldsrv/action_server.go

@@ -192,7 +192,7 @@ func init() {
 	netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_AUDIENCELEAVE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
 		logger.Logger.Trace("receive PACKET_GW_AUDIENCELEAVE GWPlayerLeave:", pack)
 		if msg, ok := pack.(*serverproto.GWPlayerLeave); ok {
-			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()))
+			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
 			if scene != nil {
 				p := PlayerMgrSington.GetPlayerBySnId(msg.GetPlayerId())
 				if p != nil {

worldsrv/action_welfare.go

@@ -459,6 +459,17 @@ func CSBindInvite(s *netlib.Session, packetid int, data interface{}, sid int64)
 					Ts:         now.Unix(),
 					Money:      0,
 				})
+				if len(p.Tel) > 0 {
+					SaveInviteScore(&model.InviteScore{
+						Platform:   p.Platform,
+						SnId:       p.SnId,
+						InviteSnId: inviteSnId,
+						Tp:         common.InviteScoreTypeBindTel,
+						Score:      cfg.GetBindTelScore(),
+						Ts:         time.Now().Unix(),
+						Money:      0,
+					})
+				}
 			}
 			return nil
 		}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {

worldsrv/playernotify.go

@@ -84,7 +84,7 @@ func (p *PlayerNotify) SendToClient(tp common.NotifyType, packetId int, pack int
 		if len(d.GetDatas()) == 0 {
 			return
 		}
-		scene := SceneMgrSingleton.GetScene(int(d.GetDatas()[0].GetRoomId()))
+		scene := SceneMgrSingleton.GetScene(int(d.GetDatas()[0].GetRoomId()), true)
 		if scene == nil {
 			return
 		}