[client] fix app icon

This commit is contained in:
2019-03-14 21:26:57 +03:00
parent 426b2718bb
commit 0f5cf7fdc5
8 changed files with 5051 additions and 1497 deletions

View File

@@ -34,7 +34,7 @@ const config = new Project.Config({
meta: { meta: {
title: 'Tank\'z', title: 'Tank\'z',
filename: 'tankz', filename: 'tankz',
icon: 'src/client/resources/image/tank/pd-0.png', icon: 'src/client/resources/icon.png',
pack: 'ru.m.tankz', pack: 'ru.m.tankz',
author: 'shmyga <shmyga.z@gmail.com>', author: 'shmyga <shmyga.z@gmail.com>',
company: 'MegaLoMania', company: 'MegaLoMania',

6518
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,13 @@
{ {
"name": "tankz", "name": "tankz",
"version": "0.8.2", "version": "0.8.3",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"dateformat": "^3.0.3", "dateformat": "^3.0.3",
"gulp": "^4.0.0", "gulp": "^4.0.0",
"gulp-add": "0.0.2", "gulp-add": "0.0.2",
"gulp-clean": "^0.4.0", "gulp-clean": "^0.4.0",
"gulp-haxetool": "^0.0.15" "gulp-haxetool": "^0.0.16"
}, },
"haxeDependencies": { "haxeDependencies": {
"haxework": "git@bitbucket.org:shmyga/haxework.git", "haxework": "git@bitbucket.org:shmyga/haxework.git",

View File

@@ -1,5 +1,6 @@
package ru.m.tankz.frame.classic; package ru.m.tankz.frame.classic;
import haxework.gui.LabelView;
import haxework.gui.VGroupView; import haxework.gui.VGroupView;
import ru.m.tankz.frame.common.IGamePanel; import ru.m.tankz.frame.common.IGamePanel;
import ru.m.tankz.frame.common.LifeView; import ru.m.tankz.frame.common.LifeView;
@@ -11,10 +12,12 @@ import ru.m.tankz.preset.ClassicGame;
@:view var bot:LifeView; @:view var bot:LifeView;
@:view var player1:LifeView; @:view var player1:LifeView;
@:view var player2:LifeView; @:view var player2:LifeView;
@:view var level:LabelView;
public var game:Game; public var game:Game;
private function updateViews():Void { private function updateViews():Void {
level.text = 'Level: ${game.state.level}';
bot.live = game.teams[ClassicGame.BOT].life; bot.live = game.teams[ClassicGame.BOT].life;
player1.live = game.teams[ClassicGame.HUMAN].players[0].state.life; player1.live = game.teams[ClassicGame.HUMAN].players[0].state.life;
player1.score = game.teams[ClassicGame.HUMAN].players[0].state.score; player1.score = game.teams[ClassicGame.HUMAN].players[0].state.score;

View File

@@ -1,8 +1,17 @@
--- ---
geometry.padding: 5 geometry.padding: 5
geometry.size.height: 100%
layout.margin: 5 layout.margin: 5
layout.hAlign: right layout.hAlign: right
views: views:
- id: level
$type: haxework.gui.LabelView
skinId: text.box
geometry.size.height: 38
geometry.padding: [20, 0]
geometry.hAlign: center
- $type: haxework.gui.SpriteView
geometry.size.height: 50%
- id: bot - id: bot
$type: ru.m.tankz.frame.common.LifeView $type: ru.m.tankz.frame.common.LifeView
tank: ba tank: ba

View File

@@ -1,6 +1,7 @@
package ru.m.tankz.frame.dota; package ru.m.tankz.frame.dota;
import haxework.gui.HGroupView; import haxework.gui.HGroupView;
import haxework.gui.LabelView;
import ru.m.tankz.frame.common.IGamePanel; import ru.m.tankz.frame.common.IGamePanel;
import ru.m.tankz.frame.common.LifeView; import ru.m.tankz.frame.common.LifeView;
import ru.m.tankz.game.Game; import ru.m.tankz.game.Game;
@@ -10,10 +11,12 @@ import ru.m.tankz.preset.DotaGame;
@:view var radiant:LifeView; @:view var radiant:LifeView;
@:view var dire:LifeView; @:view var dire:LifeView;
@:view var level:LabelView;
public var game:Game; public var game:Game;
private function updateViews():Void { private function updateViews():Void {
level.text = 'Level: ${game.state.level}';
radiant.live = game.teams[DotaGame.RADIANT].life; radiant.live = game.teams[DotaGame.RADIANT].life;
radiant.score = game.teams[DotaGame.RADIANT].score; radiant.score = game.teams[DotaGame.RADIANT].score;
dire.live = game.teams[DotaGame.DIRE].life; dire.live = game.teams[DotaGame.DIRE].life;

View File

@@ -7,7 +7,14 @@ views:
tank: bc tank: bc
color: 0xff4422 color: 0xff4422
- $type: haxework.gui.SpriteView - $type: haxework.gui.SpriteView
geometry.size.width: 100% geometry.size.width: 50%
- id: level
$type: haxework.gui.LabelView
skinId: text.box
geometry.size.height: 38
geometry.padding: [20, 0]
- $type: haxework.gui.SpriteView
geometry.size.width: 50%
- id: dire - id: dire
$type: ru.m.tankz.frame.common.LifeView $type: ru.m.tankz.frame.common.LifeView
tank: bc tank: bc

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB