Compare commits

..

No commits in common. "ba1b4ae7c7aa244f60331c28b8dd91fc556f743f" and "63f3d02349f91afa51793c3f7ed78eaa191cfc83" have entirely different histories.

7 changed files with 8 additions and 14 deletions

View File

@ -301,13 +301,11 @@ func (this *CSInviteFriendHandler) Process(s *netlib.Session, packetid int, data
SrcHead: proto.Int32(p.Head),
SrcHeadUrl: proto.String(p.HeadUrl),
OpRetCode: opRetCode,
GameId: proto.Int(p.scene.gameId),
RoomId: proto.Int(p.scene.sceneId),
Pos: proto.Int32(msg.GetPos()),
RoleId: int32(roleId),
}
if p.scene != nil {
pack.GameId = int32(p.scene.gameId)
pack.RoomId = int32(p.scene.sceneId)
}
proto.SetDefaults(pack)
player.SendToClient(int(friend.FriendPacketID_PACKET_SCInviteFriend), pack)
logger.Logger.Trace("SCInviteFriendHandler: ", pack)

View File

@ -330,7 +330,7 @@ func (m *CoinSceneMgr) TouchCreateRoom(platform string, gameFreeId int32) {
return
}
gf := PlatformMgrSingleton.GetGameFree(platform, gameFreeId)
if gf != nil && gf.GetDbGameFree().GetCreateRoomNum() > 0 {
if gf.Status && gf.DbGameFree.GetCreateRoomNum() > 0 {
logger.Logger.Tracef("TouchCreateRoom platform:%v gameFreeId:%v", platform, gameFreeId)
m.delayCache = append(m.delayCache, &CreateRoomCache{
platformName: platform,

View File

@ -270,7 +270,7 @@ func (csp *CoinScenePool) playerEnter(p *Player, roomId int32, exclude []int32,
logger.Logger.Infof("(csp *CoinScenePool) PlayerEnter create new scene:%v snid:%v gamefreeid:%v", scene.sceneId, p.SnId, csp.ID())
csp.AddScene(scene)
} else {
logger.Logger.Warnf("Create %v scene failed.", csp.ID())
logger.Logger.Errorf("Create %v scene failed.", csp.ID())
}
}

View File

@ -212,14 +212,14 @@ func (l *CoinScenePoolLocal) NewScene(pool *CoinScenePool, p *Player) *Scene {
}
}
if dbCreateRoom == nil {
logger.Logger.Errorf("CoinScenePool CreateLocalGameNewScene failed! playerTakeCoin:%v ", playerTakeCoin)
logger.Logger.Tracef("CoinScenePool CreateLocalGameNewScene failed! playerTakeCoin:%v ", playerTakeCoin)
return nil
}
if len(dbCreateRoom.GetBetRange()) != 0 && dbCreateRoom.GetBetRange()[0] != 0 {
baseScore = common.RandInt32Slice(dbCreateRoom.GetBetRange())
}
if baseScore == 0 {
logger.Logger.Errorf("CoinScenePool CreateLocalGameNewScene failed! BaseScore==0")
logger.Logger.Tracef("CoinScenePool CreateLocalGameNewScene failed! BaseScore==0")
return nil
}
scene := SceneMgrSingleton.CreateScene(&CreateSceneParam{

View File

@ -779,7 +779,7 @@ func (this *FriendMgr) FriendRefuse(p *Player, destP *model.BindFriend) {
}), task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
//拒绝了不提醒
if data != nil {
logger.Logger.Warn("FriendRefuse data:", data)
logger.Logger.Error("FriendRefuse data:", data)
SendToClick(friend.OpResultCode_OPRC_Error)
return
}

View File

@ -507,25 +507,21 @@ type CreateSceneParam struct {
func (m *SceneMgr) CreateScene(args *CreateSceneParam) *Scene {
logger.Logger.Tracef("SceneMgr NewScene %v", args)
if args.GF == nil {
logger.Logger.Errorf("SceneMgr NewScene GameFree is nil")
return nil
}
if args.Platform == nil {
logger.Logger.Errorf("SceneMgr NewScene Platform is nil")
return nil
}
if args.GS == nil {
args.GS = GameSessMgrSington.GetMinLoadSess(int(args.GF.GetGameId()))
}
if args.GS == nil {
logger.Logger.Errorf("SceneMgr NewScene GameServer is nil")
return nil
}
// 创建房间
s := NewScene(args)
if s == nil {
logger.Logger.Errorf("SceneMgr NewScene Scene is nil")
return nil
}
m.scenes[args.RoomId] = s

View File

@ -2258,7 +2258,7 @@ func init() {
state = msg.GetState()
player := PlayerMgrSington.GetPlayerBySnId(info.SnId)
if player == nil {
if msg.State == 1 {
if info.State == 1 {
state = 3
}
}