Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game 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
+					}
 				}
 			}
 		}

protocol/clawdoll/clawdoll.pb.go

@@ -1123,7 +1123,7 @@ type SCCLAWDOLLConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Info []*MachineInfo `protobuf:"bytes,1,rep,name=info,proto3" json:"info,omitempty"`
+	Info []*MachineInfo `protobuf:"bytes,1,rep,name=Info,proto3" json:"Info,omitempty"`
 }
 
 func (x *SCCLAWDOLLConfig) Reset() {
@@ -1356,9 +1356,9 @@ var file_clawdoll_proto_rawDesc = []byte{
 	0x28, 0x05, 0x52, 0x04, 0x53, 0x74, 0x61, 0x74, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x53, 0x43, 0x4c,
 	0x41, 0x57, 0x44, 0x4f, 0x4c, 0x4c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x3d, 0x0a, 0x10,
 	0x53, 0x43, 0x43, 0x4c, 0x41, 0x57, 0x44, 0x4f, 0x4c, 0x4c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x29, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15,
+	0x12, 0x29, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15,
 	0x2e, 0x63, 0x6c, 0x61, 0x77, 0x64, 0x6f, 0x6c, 0x6c, 0x2e, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0b,
+	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0b,
 	0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x49,
 	0x63, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49,
 	0x63, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x73, 0x74, 0x49,
@@ -1447,7 +1447,7 @@ var file_clawdoll_proto_depIdxs = []int32{
 	1,  // 1: clawdoll.SCCLAWDOLLOp.OpRetCode:type_name -> clawdoll.OpResultCode
 	14, // 2: clawdoll.SCCLAWDOLLPlayerEnter.Data:type_name -> clawdoll.CLAWDOLLPlayerDigestInfo
 	14, // 3: clawdoll.CLAWDOLLWaitPlayers.WaitPlayersInfo:type_name -> clawdoll.CLAWDOLLPlayerDigestInfo
-	17, // 4: clawdoll.SCCLAWDOLLConfig.info:type_name -> clawdoll.MachineInfo
+	17, // 4: clawdoll.SCCLAWDOLLConfig.Info:type_name -> clawdoll.MachineInfo
 	5,  // [5:5] is the sub-list for method output_type
 	5,  // [5:5] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name

protocol/clawdoll/clawdoll.proto

@@ -137,7 +137,7 @@ message CLAWDOLLPlayerDigestInfo {
 message CSCLAWDOLLConfig{
 }
 message SCCLAWDOLLConfig{
-	repeated MachineInfo info =1;
+	repeated MachineInfo Info =1;
 }
 message MachineInfo{
 	string IconAddr =1;		//图片地址

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
 		}