From 56c2cd9437b242f978c2988e9b5422be4d81af87 Mon Sep 17 00:00:00 2001 From: shmyga Date: Wed, 13 Mar 2019 21:10:46 +0300 Subject: [PATCH] [client] small fixes --- package.json | 2 +- src/client/haxe/ru/m/tankz/Style.hx | 18 ++++++++++++++---- .../haxe/ru/m/tankz/frame/SettingsFrame.yaml | 3 +-- .../haxe/ru/m/tankz/frame/StartFrame.yaml | 6 ++---- .../haxe/ru/m/tankz/frame/common/PlayerView.hx | 4 ++-- .../ru/m/tankz/frame/dota/DotaLevelFrame.hx | 6 +++--- src/common/haxe/ru/m/tankz/game/Game.hx | 4 ++-- src/common/haxe/ru/m/tankz/game/GameStart.hx | 6 +++--- 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 7946e2c..abe079d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tankz", - "version": "0.8.1", + "version": "0.8.2", "private": true, "devDependencies": { "dateformat": "^3.0.3", diff --git a/src/client/haxe/ru/m/tankz/Style.hx b/src/client/haxe/ru/m/tankz/Style.hx index 7f185ed..784d6a6 100644 --- a/src/client/haxe/ru/m/tankz/Style.hx +++ b/src/client/haxe/ru/m/tankz/Style.hx @@ -16,10 +16,20 @@ class Style { private static var fontFamily = "Courirer New"; public static function register() { - resources.skin.put("light", [Skin.color(lightColor)]); - resources.skin.put("dark", [Skin.color(darkColor)]); - resources.skin.put("text", [Skin.text(textColor, 16, fontFamily)]); - resources.skin.put("text.header", [Skin.text(textColor, 22, fontFamily)]); + resources.skin.put("light", [ + Skin.color(lightColor), + ]); + resources.skin.put("dark", [ + Skin.color(darkColor), + ]); + resources.skin.put("text", [ + Skin.text(textColor, 16, fontFamily), + ]); + resources.skin.put("text.header", [ + Skin.color(lightColor), + Skin.text(textColor, 22, fontFamily), + Skin.size(200, 38), + ]); resources.skin.put("button", [ Skin.buttonColor(lightColor), Skin.text(textColor, 18, fontFamily), diff --git a/src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml b/src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml index 7deda09..98706fd 100644 --- a/src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml @@ -18,7 +18,6 @@ views: skinId: button.close +onPress: $this:onPress geometry.position: absolute - geometry.margin.left: 10 - geometry.margin.bottom: 10 + geometry.margin: 10 geometry.vAlign: bottom geometry.hAlign: left diff --git a/src/client/haxe/ru/m/tankz/frame/StartFrame.yaml b/src/client/haxe/ru/m/tankz/frame/StartFrame.yaml index e10c847..1ac1f09 100644 --- a/src/client/haxe/ru/m/tankz/frame/StartFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/StartFrame.yaml @@ -29,16 +29,14 @@ views: - $type: haxework.gui.LabelView skinId: text geometry.position: absolute - geometry.margin.right: 10 - geometry.margin.bottom: 10 + geometry.margin: 10 geometry.vAlign: bottom geometry.hAlign: right text: $r:text:version - id: settings $type: haxework.gui.ButtonView geometry.position: absolute - geometry.margin.left: 10 - geometry.margin.bottom: 10 + geometry.margin: 10 geometry.vAlign: bottom geometry.hAlign: left skinId: button.settings diff --git a/src/client/haxe/ru/m/tankz/frame/common/PlayerView.hx b/src/client/haxe/ru/m/tankz/frame/common/PlayerView.hx index 2da2cd4..cf7d338 100644 --- a/src/client/haxe/ru/m/tankz/frame/common/PlayerView.hx +++ b/src/client/haxe/ru/m/tankz/frame/common/PlayerView.hx @@ -44,7 +44,7 @@ class TeamSkin implements ISkin { private static inline var NONE:TeamId = "none"; public var item_index(default, set):Int; - public var data(default, set):PlayerStart; + public var data(default, set):PlayerType; @:view var label(default, null):LabelView; @:view var teams(default, null):DataView; @@ -60,7 +60,7 @@ class TeamSkin implements ISkin { return view; } - private function set_data(value:PlayerStart):PlayerStart { + private function set_data(value:PlayerType):PlayerType { data = value; teams.data = [NONE].concat([for (team in start.preset.teams) team.id]); return data; diff --git a/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx b/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx index 25148fe..56fcf31 100644 --- a/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx +++ b/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx @@ -6,14 +6,14 @@ import haxework.gui.frame.FrameSwitcher; import ru.m.tankz.control.Control; import ru.m.tankz.frame.common.LevelFrame; import ru.m.tankz.frame.common.PlayerView; -import ru.m.tankz.game.GameStart.PlayerStart; +import ru.m.tankz.game.GameStart.PlayerType; import ru.m.tankz.preset.DotaGame; @:template class DotaLevelFrame extends LevelFrame { public static inline var ID = "dota.level"; @:view var levels(default, null):DataView; - @:view var players(default, null):DataView; + @:view var players(default, null):DataView; @:provide var frames:FrameSwitcher; @@ -31,7 +31,7 @@ import ru.m.tankz.preset.DotaGame; players.data = data; } - private function playerViewFactory(index:Int, player:PlayerStart):PlayerView { + private function playerViewFactory(index:Int, player:PlayerType):PlayerView { var view = new PlayerView(); view.item_index = index; view.data = player; diff --git a/src/common/haxe/ru/m/tankz/game/Game.hx b/src/common/haxe/ru/m/tankz/game/Game.hx index fa96a9f..611ad39 100644 --- a/src/common/haxe/ru/m/tankz/game/Game.hx +++ b/src/common/haxe/ru/m/tankz/game/Game.hx @@ -27,7 +27,7 @@ class Game { public var type(default, null):GameType; public var level(default, null):Int; - public var players(default, null):Array; + public var players(default, null):Array; public var preset(default, null):GamePreset; public var teams(default, null):Map; public var config(default, null):Config; @@ -133,7 +133,7 @@ class Game { } private function spawn(task:SpawnTask):Void { - L.d(TAG, 'spawn(${task}'); + L.d(TAG, 'spawn(${task})'); var team = getTeam(task.playerId.team); var player = getPlayer(task.playerId); player.tankId = 0; diff --git a/src/common/haxe/ru/m/tankz/game/GameStart.hx b/src/common/haxe/ru/m/tankz/game/GameStart.hx index cdb4d26..0a7f625 100644 --- a/src/common/haxe/ru/m/tankz/game/GameStart.hx +++ b/src/common/haxe/ru/m/tankz/game/GameStart.hx @@ -4,7 +4,7 @@ import ru.m.tankz.config.Config; import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.Type; -typedef PlayerStart = { +typedef PlayerType = { var playerId: PlayerId; var control:ControlType; } @@ -15,11 +15,11 @@ class GameStart { public var type(default, default):GameType; public var presetId(default, default):PresetId; public var level(default, default):Int; - public var players(default, default):Array; + public var players(default, default):Array; public var preset(get, null):GamePreset; - public function new(type:GameType, presetId:PresetId, level:Int = 0, players:Array = null) { + public function new(type:GameType, presetId:PresetId, level:Int = 0, players:Array = null) { this.type = type; this.presetId = presetId; this.level = level;