InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[proto] add rooms and slots

Browse Source
This commit is contained in:
shmyga
2019-06-04 12:13:27 +03:00
parent 4c8ae66624
commit 78bbf5264e
25 changed files with 405 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/haxe/ru/m/tankz/game/NetworkGame.hx
View File

@@ -7,13 +7,14 @@ import ru.m.tankz.game.GameEvent;
import ru.m.tankz.game.GameState;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.pack.GameEventResponse;
import ru.m.tankz.proto.room.RoomSlotProto;
class NetworkGame extends Game {
private var network:NetworkManager;
public function new(network:NetworkManager) {
super(new GameState(network.game.type, 0, network.game.level));
super(new GameState(network.room.game.type, 0, network.room.game.level));
this.network = network;
this.controlFactory = new NetworkControlFactory();
network.gameEventSignal.connect(onGameEventProto);
@@ -30,17 +31,17 @@ class NetworkGame extends Game {
private function onConnectionState(state:ConnectionState):Void {
switch state {
case ONLINE(user):
if (network.game != null) {
network.joinGame(network.game.id);
if (network.room != null) {
network.joinGame(network.room.game.id);
}
case _:
}
}
override public function start():Void {
var player = Lambda.find(network.game.players, function(player) return player.user.uuid == network.user.uuid);
if (player != null) {
state.controls.push({playerId: [player.team, player.index], control: "human-0"});
var slot:RoomSlotProto = Lambda.find(network.room.slots, function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
if (slot != null) {
state.controls.push({playerId: [slot.slot.team, slot.slot.index], control: "human-0"});
}
super.start();
}

68
src/client/haxe/ru/m/tankz/network/NetworkManager.hx
View File

@@ -1,24 +1,26 @@
package ru.m.tankz.network;
import ru.m.tankz.proto.room.SlotProto;
import ru.m.tankz.proto.room.SlotRequest;
import haxe.Serializer;
import haxework.signal.Signal;
import ru.m.connect.IConnection;
import ru.m.tankz.control.Control;
import ru.m.tankz.game.GameEvent;
import ru.m.tankz.proto.core.GameProto;
import ru.m.tankz.proto.core.UserProto;
import ru.m.tankz.proto.game.GameChangeProto;
import ru.m.tankz.proto.pack.CreateGameRequest;
import ru.m.tankz.proto.pack.GameEventRequest;
import ru.m.tankz.proto.pack.GameEventResponse;
import ru.m.tankz.proto.pack.JoinGameRequest;
import ru.m.tankz.proto.pack.LeaveGameRequest;
import ru.m.tankz.proto.pack.ListGameRequest;
import ru.m.tankz.proto.pack.LoginRequest;
import ru.m.tankz.proto.pack.LogoutRequest;
import ru.m.tankz.proto.pack.Request;
import ru.m.tankz.proto.pack.Response;
import ru.m.tankz.proto.pack.StartGameRequest;
import ru.m.tankz.proto.room.CreateRequest;
import ru.m.tankz.proto.room.JoinRequest;
import ru.m.tankz.proto.room.LeaveRequest;
import ru.m.tankz.proto.room.RoomListRequest;
import ru.m.tankz.proto.room.RoomProto;
import ru.m.tankz.proto.room.RoomRequest;
import ru.m.tankz.proto.room.StartRequest;
import ru.m.tankz.storage.MultiplayerStorage;
typedef ClientConnection = IConnection<Request, Response>;
@@ -35,13 +37,12 @@ enum ConnectionState {
class NetworkManager {
public var state(default, null):ConnectionState;
public var game(default, null):GameProto;
public var room(default, null):RoomProto;
public var user(default, null):UserProto;
public var stateSignal:Signal<ConnectionState>;
public var listGameSignal:Signal<Array<GameProto>>;
public var gameSignal:Signal<GameProto>;
public var gameUpdateSignal:Signal<Array<GameChangeProto>>;
public var listRoomSignal:Signal<Array<RoomProto>>;
public var roomSignal:Signal<RoomProto>;
public var gameEventSignal:Signal<GameEventResponse>;
@:provide private var connection:ClientConnection;
@@ -53,9 +54,8 @@ class NetworkManager {
public function new() {
reconnectDelay = 500;
stateSignal = new Signal();
listGameSignal = new Signal();
gameSignal = new Signal();
gameUpdateSignal = new Signal();
listRoomSignal = new Signal();
roomSignal = new Signal();
gameEventSignal = new Signal();
updateState(OFFLINE);
connection.handler.connect(onConnectionEvent);
@@ -81,24 +81,28 @@ class NetworkManager {
connection.send(new Request().setLogout(new LogoutRequest()));
}
public function listGame():Void {
connection.send(new Request().setListGame(new ListGameRequest()));
public function listGame(subscribe:Bool):Void {
connection.send(new Request().setRoomList(new RoomListRequest().setSubscribe(subscribe)));
}
public function createGame(type:String, level:Int):Void {
connection.send(new Request().setCreateGame(new CreateGameRequest().setType(type).setLevel(level)));
connection.send(new Request().setRoom(new RoomRequest().setCreate(new CreateRequest().setType(type).setLevel(level))));
}
public function joinGame(gameId:Int, restore:Bool = false):Void {
connection.send(new Request().setJoinGame(new JoinGameRequest().setGameId(gameId).setRestore(restore)));
connection.send(new Request().setRoom(new RoomRequest().setJoin(new JoinRequest().setGameId(gameId))));
}
public function selectSlot(slot:SlotProto):Void {
connection.send(new Request().setRoom(new RoomRequest().setSlot(new SlotRequest().setSlot(slot))));
}
public function leaveGame():Void {
connection.send(new Request().setLeaveGame(new LeaveGameRequest()));
connection.send(new Request().setRoom(new RoomRequest().setLeave(new LeaveRequest())));
}
public function startGame():Void {
connection.send(new Request().setStartGame(new StartGameRequest()));
connection.send(new Request().setRoom(new RoomRequest().setStart(new StartRequest())));
}
public function action(tankId:Int, action:TankAction):Void {
@@ -154,25 +158,11 @@ class NetworkManager {
} else if (packet.hasLogout()) {
storage.user = null;
updateState(CONNECTED);
} else if (packet.hasListGame()) {
listGameSignal.emit(packet.listGame.games);
} else if (packet.hasCreateGame()) {
game = packet.createGame.game;
gameSignal.emit(game);
} else if (packet.hasJoinGame()) {
game = packet.joinGame.game;
gameSignal.emit(game);
} else if (packet.hasLeaveGame()) {
if (packet.leaveGame.user.uuid == user.uuid) {
game = null;
gameSignal.emit(null);
} else {
game = packet.leaveGame.game;
gameSignal.emit(game);
}
} else if (packet.hasStartGame()) {
game = packet.startGame.game;
gameSignal.emit(game);
} else if (packet.hasRoomList()) {
listRoomSignal.emit(packet.roomList.rooms);
} else if (packet.hasRoom()) {
room = packet.room.room;
roomSignal.emit(room);
} else if (packet.hasGameEvent()) {
gameEventSignal.emit(packet.gameEvent);
}

8
src/client/haxe/ru/m/tankz/view/ClientView.yaml
View File

@@ -17,10 +17,10 @@ views:
$type: ru.m.tankz.view.SettingsFrame
- id: record
$type: ru.m.tankz.view.RecordFrame
- id: game_list
$type: ru.m.tankz.view.network.GameListFrame
- id: game_room
$type: ru.m.tankz.view.network.GameRoomFrame
- id: room_list
$type: ru.m.tankz.view.network.RoomListFrame
- id: room
$type: ru.m.tankz.view.network.RoomFrame
- $type: haxework.view.HGroupView
skinId: panel
layout.margin: 10

14
src/client/haxe/ru/m/tankz/view/StartFrame.hx
View File

@@ -5,8 +5,8 @@ import haxework.view.VGroupView;
import ru.m.tankz.game.GameState;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.Type.GameType;
import ru.m.tankz.view.network.GameListFrame;
import ru.m.tankz.view.network.GameRoomFrame;
import ru.m.tankz.view.network.RoomListFrame;
import ru.m.tankz.view.network.RoomFrame;
import ru.m.tankz.view.popup.FontPopup;
import ru.m.tankz.view.popup.LoginPopup;
@@ -28,16 +28,16 @@ import ru.m.tankz.view.popup.LoginPopup;
private function startNetwork():Void {
switch network.state {
case ONLINE(user):
if (network.game != null) {
switcher.change(GameRoomFrame.ID);
network.joinGame(network.game.id, true);
if (network.room != null) {
switcher.change(RoomFrame.ID);
network.joinGame(network.room.game.id, true);
} else {
switcher.change(GameListFrame.ID);
switcher.change(RoomListFrame.ID);
}
case CONNECTED:
LoginPopup.instance.show().then(function(user):Void {
if (user != null) {
switcher.change(GameListFrame.ID);
switcher.change(RoomListFrame.ID);
}
});
case _:

24
src/client/haxe/ru/m/tankz/view/network/GameItemView.hx
View File

@@ -1,24 +0,0 @@
package ru.m.tankz.view.network;
import haxework.view.LabelView;
import haxework.view.HGroupView;
import haxework.view.list.ListView;
import ru.m.tankz.proto.core.GameProto;
@:template class GameItemView extends HGroupView implements IListItemView<GameProto> {
public var item_index(default, default):Int;
public var data(default, set):GameProto;
@:view var label:LabelView;
private function set_data(value:GameProto):GameProto {
data = value;
label.text = '[${value.creator.name}] ${value.type} ${value.level} (${value.players.length})';
return data;
}
public static function factory():GameItemView {
return new GameItemView();
}
}

45
src/client/haxe/ru/m/tankz/view/network/GameListFrame.hx
View File

@@ -1,45 +0,0 @@
package ru.m.tankz.view.network;
import haxework.view.frame.FrameSwitcher;
import haxework.view.list.VListView;
import haxework.view.VGroupView;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.core.GameProto;
@:template class GameListFrame extends VGroupView {
public static inline var ID = "game_list";
@:view var games:VListView<GameProto>;
@:provide var switcher:FrameSwitcher;
@:provide var network:NetworkManager;
public function onShow():Void {
network.listGameSignal.connect(onGameList);
network.gameSignal.connect(onGame);
network.listGame();
}
public function onHide():Void {
network.listGameSignal.disconnect(onGameList);
network.gameSignal.disconnect(onGame);
}
private function create():Void {
network.createGame("classic", 0);
}
private function onGameList(data:Array<GameProto>):Void {
games.data = data;
}
private function onGame(game:GameProto):Void {
if (game != null) {
switcher.change(GameRoomFrame.ID);
}
}
private function selectGame(game:GameProto):Void {
network.joinGame(game.id, true);
}
}

55
src/client/haxe/ru/m/tankz/view/network/GameRoomFrame.hx
View File

@@ -1,55 +0,0 @@
package ru.m.tankz.view.network;
import haxework.view.ButtonView;
import haxework.view.frame.FrameSwitcher;
import haxework.view.list.VListView;
import haxework.view.TextView;
import haxework.view.VGroupView;
import ru.m.tankz.game.IGame;
import ru.m.tankz.game.NetworkGame;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.core.GameProto;
import ru.m.tankz.proto.core.GameStateProto;
import ru.m.tankz.proto.core.PlayerProto;
@:template class GameRoomFrame extends VGroupView {
public static inline var ID = "game_room";
@:view var start:ButtonView;
@:view var info:TextView;
@:view var players:VListView<PlayerProto>;
@:provide var switcher:FrameSwitcher;
@:provide var network:NetworkManager;
@:provide var game:IGame;
private function refresh(game:GameProto):Void {
if (game != null) {
start.visible = game.creator.uuid == network.user.uuid;
info.text = '[${game.creator.name}] ${game.type} ${game.level} (${game.players.length})';
players.data = game.players;
if (game.state == GameStateProto.STARTED) {
if (this.game == null) {
this.game = new NetworkGame(network);
}
switcher.change(GameFrame.ID);
}
} else {
Timer.delay(function() switcher.change(GameListFrame.ID), 1);
}
}
public function onShow():Void {
refresh(network.game);
network.gameSignal.connect(onGame);
}
public function onHide():Void {
network.gameSignal.disconnect(onGame);
}
private function onGame(game:GameProto):Void {
refresh(game);
}
}

24
src/client/haxe/ru/m/tankz/view/network/PlayerItemView.hx
View File

@@ -1,24 +0,0 @@
package ru.m.tankz.view.network;
import haxework.view.HGroupView;
import haxework.view.LabelView;
import haxework.view.list.ListView;
import ru.m.tankz.proto.core.PlayerProto;
@:template class PlayerItemView extends HGroupView implements IListItemView<PlayerProto> {
public var item_index(default, default):Int;
public var data(default, set):PlayerProto;
@:view var label:LabelView;
private function set_data(value:PlayerProto):PlayerProto {
data = value;
label.text = '${value.user.name}';
return data;
}
public static function factory():PlayerItemView {
return new PlayerItemView();
}
}

54
src/client/haxe/ru/m/tankz/view/network/RoomFrame.hx Normal file
View File

@@ -0,0 +1,54 @@
package ru.m.tankz.view.network;
import haxework.view.ButtonView;
import haxework.view.frame.FrameSwitcher;
import haxework.view.list.VListView;
import haxework.view.TextView;
import haxework.view.VGroupView;
import ru.m.tankz.game.IGame;
import ru.m.tankz.game.NetworkGame;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.room.RoomProto;
import ru.m.tankz.proto.room.RoomSlotProto;
@:template class RoomFrame extends VGroupView {
public static inline var ID = "room";
@:view var start:ButtonView;
@:view var info:TextView;
@:view var slots:VListView<RoomSlotProto>;
@:provide var switcher:FrameSwitcher;
@:provide var network:NetworkManager;
@:provide var game:IGame;
private function refresh(room:RoomProto):Void {
if (room != null) {
start.visible = room.creator.uuid == network.user.uuid;
info.text = '[${room.creator.name}] ${room.game.type} ${room.game.level} (${room.users.length})';
slots.data = room.slots;
if (room.game.started) {
if (this.game == null) {
this.game = new NetworkGame(network);
}
switcher.change(GameFrame.ID);
}
} else {
Timer.delay(function() switcher.change(RoomListFrame.ID), 1);
}
}
private function selectSlot(slot:RoomSlotProto):Void {
network.selectSlot(slot.slot);
}
public function onShow():Void {
refresh(network.room);
network.roomSignal.connect(refresh);
}
public function onHide():Void {
network.roomSignal.disconnect(refresh);
}
}

5
src/client/haxe/ru/m/tankz/view/network/GameRoomFrame.yaml → src/client/haxe/ru/m/tankz/view/network/RoomFrame.yaml
View File

@@ -19,7 +19,8 @@ views:
$type: haxework.view.LabelView
geometry.size.width: 100%
skinId: text.box
- id: players
- id: slots
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: $code:ru.m.tankz.view.network.PlayerItemView.factory
factory: $code:ru.m.tankz.view.network.SlotItemView.factory
+onItemSelect: $code:function(item) selectSlot(item.data)

24
src/client/haxe/ru/m/tankz/view/network/RoomItemView.hx Normal file
View File

@@ -0,0 +1,24 @@
package ru.m.tankz.view.network;
import haxework.view.HGroupView;
import haxework.view.LabelView;
import haxework.view.list.ListView;
import ru.m.tankz.proto.room.RoomProto;
@:template class RoomItemView extends HGroupView implements IListItemView<RoomProto> {
public var item_index(default, default):Int;
public var data(default, set):RoomProto;
@:view var label:LabelView;
private function set_data(value:RoomProto):RoomProto {
data = value;
label.text = '[${value.creator.name}] ${value.game.type} ${value.game.level} (${value.users.length})';
return data;
}
public static function factory():RoomItemView {
return new RoomItemView();
}
}

0
src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml → src/client/haxe/ru/m/tankz/view/network/RoomItemView.yaml
View File

47
src/client/haxe/ru/m/tankz/view/network/RoomListFrame.hx Normal file
View File

@@ -0,0 +1,47 @@
package ru.m.tankz.view.network;
import haxework.view.frame.FrameSwitcher;
import haxework.view.list.VListView;
import haxework.view.VGroupView;
import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.room.RoomProto;
@:template class RoomListFrame extends VGroupView {
public static inline var ID = "room_list";
@:view var games:VListView<RoomProto>;
@:provide var switcher:FrameSwitcher;
@:provide var network:NetworkManager;
public function onShow():Void {
network.listRoomSignal.connect(onRoomList);
network.roomSignal.connect(onRoom);
network.listGame(true);
}
public function onHide():Void {
network.listRoomSignal.disconnect(onRoomList);
network.roomSignal.disconnect(onRoom);
network.listGame(false);
}
private function create():Void {
network.createGame("classic", 0);
}
private function onRoomList(data:Array<RoomProto>):Void {
games.data = data;
}
private function onRoom(room:RoomProto):Void {
if (room != null) {
switcher.change(RoomFrame.ID);
}
}
private function selectRoom(room:RoomProto):Void {
network.joinGame(room.game.id, true);
}
}

4
src/client/haxe/ru/m/tankz/view/network/GameListFrame.yaml → src/client/haxe/ru/m/tankz/view/network/RoomListFrame.yaml
View File

@@ -16,6 +16,6 @@ views:
- id: games
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: $code:ru.m.tankz.view.network.GameItemView.factory
factory: $code:ru.m.tankz.view.network.RoomItemView.factory
geometry.margin: 10
+onItemSelect: $code:function(item) selectGame(item.data)
+onItemSelect: $code:function(item) selectRoom(item.data)

24
src/client/haxe/ru/m/tankz/view/network/SlotItemView.hx Normal file
View File

@@ -0,0 +1,24 @@
package ru.m.tankz.view.network;
import haxework.view.HGroupView;
import haxework.view.LabelView;
import haxework.view.list.ListView;
import ru.m.tankz.proto.room.RoomSlotProto;
@:template class SlotItemView extends HGroupView implements IListItemView<RoomSlotProto> {
public var item_index(default, default):Int;
public var data(default, set):RoomSlotProto;
@:view var label:LabelView;
private function set_data(value:RoomSlotProto):RoomSlotProto {
data = value;
label.text = '${value.slot.team}-${value.slot.index} ${value.hasUser() ? value.user.name : '(NONE)'}';
return data;
}
public static function factory():SlotItemView {
return new SlotItemView();
}
}

0
src/client/haxe/ru/m/tankz/view/network/PlayerItemView.yaml → src/client/haxe/ru/m/tankz/view/network/SlotItemView.yaml
View File