From d52b94d095e72868b1a68a76a2f2de0f9b49fee1 Mon Sep 17 00:00:00 2001 From: shmyga Date: Sun, 17 Mar 2019 14:12:13 +0300 Subject: [PATCH] [client] ResultFrame update --- package.json | 2 +- src/client/haxe/ru/m/tankz/frame/ResultFrame.hx | 6 ++++++ src/client/haxe/ru/m/tankz/frame/ResultFrame.yaml | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c751d84..591bfc8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tankz", - "version": "0.8.3", + "version": "0.8.4", "private": true, "devDependencies": { "dateformat": "^3.0.3", diff --git a/src/client/haxe/ru/m/tankz/frame/ResultFrame.hx b/src/client/haxe/ru/m/tankz/frame/ResultFrame.hx index 52bb5a6..2c2bd83 100644 --- a/src/client/haxe/ru/m/tankz/frame/ResultFrame.hx +++ b/src/client/haxe/ru/m/tankz/frame/ResultFrame.hx @@ -1,5 +1,7 @@ package ru.m.tankz.frame; +import haxework.gui.LabelView; +import haxework.gui.ButtonView; import haxework.gui.DataView; import haxework.gui.frame.FrameSwitcher; import haxework.gui.VGroupView; @@ -15,6 +17,8 @@ import ru.m.tankz.preset.DotaGame; public static var ID(default, never):String = "result"; @:view("result") var resultView:DataView; + @:view("next") var nextButton:ButtonView; + @:view("level") var levelLabel:LabelView; @:provide var frames:FrameSwitcher; @:provide var state:GameState; @@ -34,6 +38,8 @@ import ru.m.tankz.preset.DotaGame; public function onShow() { resultView.data = resultState.players.filter(function(player) return player.control == Control.HUMAN); + levelLabel.text = 'Level: ${resultState.level}'; + nextButton.visible = state != null; } private function next() { diff --git a/src/client/haxe/ru/m/tankz/frame/ResultFrame.yaml b/src/client/haxe/ru/m/tankz/frame/ResultFrame.yaml index 627db74..1196f44 100644 --- a/src/client/haxe/ru/m/tankz/frame/ResultFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/ResultFrame.yaml @@ -3,9 +3,9 @@ geometry.size.stretch: true layout.hAlign: center layout.vAlign: middle views: - - $type: haxework.gui.LabelView + - id: level + $type: haxework.gui.LabelView skinId: text.header - text: Result - id: result $type: haxework.gui.DataView