Видосы и параметризованный выбор кол-ва рас
This commit is contained in:
@@ -23,11 +23,14 @@ class UserActor(out: ActorRef,
|
||||
def writes(deciderMap: DeciderMap): JsValue = {
|
||||
Json.obj(
|
||||
"map" -> deciderMap.map,
|
||||
"description" -> deciderMap.description,
|
||||
"isBanned" -> deciderMap.isBanned
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
implicit val selectedRacesWrites: OWrites[SelectedRaces] = Json.writes[SelectedRaces]
|
||||
|
||||
implicit val userInfoWrites: OWrites[UserInfo] = Json.writes[UserInfo]
|
||||
|
||||
implicit val lobbyWrites: Writes[LobbyInfo] = new Writes[LobbyInfo]{
|
||||
@@ -172,6 +175,12 @@ class UserActor(out: ActorRef,
|
||||
val map = (json \ "map").as[String]
|
||||
lobbieActor.foreach(lobby => lobby ! BanMap(map))
|
||||
|
||||
case Some("selectRace") =>
|
||||
val firstRace = (json \ "raceFirst").as[Int]
|
||||
val secondRace = (json \ "raceSecond").as[Int]
|
||||
val thirdRace = (json \ "raceThird").as[Int]
|
||||
lobbieActor.foreach(lobby => lobby ! SelectedRaces(firstRace, secondRace, thirdRace))
|
||||
|
||||
case Some("getLobbies") =>
|
||||
logger.debug("Get all lobby request")
|
||||
(LobbiesActor.actor ? GetAllLobbies).mapTo[List[RefreshLobbyInfo]] onComplete {
|
||||
|
||||
Reference in New Issue
Block a user