Merge branch 'develop' into dev_slots

dbproxy/svc/l_gamedetailed.go

@@ -30,6 +30,9 @@ func GameDetailedLogsCollection(plt string) *mongo.Collection {
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-ts", "gamefreeid"}, Background: true, Sparse: true})
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-ts", "cycleid"}, Background: true, Sparse: true})
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"cycleid"}, Background: true, Sparse: true})
+			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"ts", "cycleid"}, Background: true, Sparse: true})
+			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"time", "cycleid"}, Background: true, Sparse: true})
+			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-time", "cycleid"}, Background: true, Sparse: true})
 		}
 		return c_gamedetailed
 	}

dbproxy/svc/l_gameplayerlistlog.go

@@ -43,6 +43,7 @@ func GamePlayerListLogsCollection(plt string) *mongo.Collection {
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "snid", "gamefreeid"}, Background: true, Sparse: true})
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "cycleid"}, Background: true, Sparse: true})
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"cycleid"}, Background: true, Sparse: true})
+			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"ts", "cycleid"}, Background: true, Sparse: true})
 		}
 		return c_gameplayerlistlog
 	}

gamesrv/clawdoll/action_clawdoll.go

@@ -82,7 +82,7 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
 				sceneEx.playingSnid = p.SnId
 
 				//发送向前移动指令
-				sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
+				sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonBack)
 
 				s.ChangeSceneState(rule.ClawDollSceneStateStart)
 				sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))

worldsrv/action_login.go

@@ -212,7 +212,10 @@ func (this *CSLoginHandler) Process(s *netlib.Session, packetid int, data interf
 		// lss 其它连接
 		lss := LoginStateMgrSington.LoginFinish(csl.GetUsername(), csl.GetPlatform(), sid, ls.acc, tagkey)
 		player := PlayerMgrSington.GetPlayerBySnId(ls.acc.SnId)
-		waitMatch, _ := TournamentMgr.IsMatchWaiting(player.Platform, player.SnId)
+		waitMatch := false
+		if player != nil {
+			waitMatch, _ = TournamentMgr.IsMatchWaiting(player.Platform, player.SnId)
+		}
 		if len(lss) > 0 && (player != nil && (player.scene != nil || player.thrscene != 0 || waitMatch || TournamentMgr.IsMatching(player.SnId))) {
 			sendSCLogin(login_proto.OpResultCode_OPRC_LoginOtherPlace)
 			sendSCDisconnect(common.KickReason_Logining)