diff --git a/gulpfile.js b/gulpfile.js index ef382f4..f9146ff 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -68,6 +68,7 @@ const client = new Project( sources: ['src/client/haxe'], main: 'ru.m.tankz.Client', assets: ['src/client/resources'], + flags: ['bitmap_text'], }), module.exports.generate ).bind(module, gulp); diff --git a/src/client/haxe/ru/m/skin/SimpleButtonSkin.hx b/src/client/haxe/ru/m/skin/SimpleButtonSkin.hx index 1cf8307..c96604d 100644 --- a/src/client/haxe/ru/m/skin/SimpleButtonSkin.hx +++ b/src/client/haxe/ru/m/skin/SimpleButtonSkin.hx @@ -8,7 +8,7 @@ class SimpleButtonSkin extends ButtonColorSkin { public var borderColor(default, default):Int; - public function new(color:Int = 0xffffff, borderColor:Int = 0x95937D) { + public function new(color:Int = 0xffffff, borderColor:Int = 0xffffff) { super(color, 0.6); this.borderColor = borderColor; } @@ -19,7 +19,8 @@ class SimpleButtonSkin extends ButtonColorSkin { graphics.clear(); graphics.beginFill(color, alpha); graphics.lineStyle(2, borderColor); - graphics.drawRoundRect(0, 0, view.width, view.height, 10, 10); + //graphics.drawRoundRect(0, 0, view.width, view.height, 10, 10); + graphics.drawRect(0, 0, view.width, view.height); graphics.endFill(); } } diff --git a/src/client/haxe/ru/m/tankz/ClientView.yaml b/src/client/haxe/ru/m/tankz/ClientView.yaml index a6a5849..e5d62e9 100755 --- a/src/client/haxe/ru/m/tankz/ClientView.yaml +++ b/src/client/haxe/ru/m/tankz/ClientView.yaml @@ -4,16 +4,15 @@ pWidth: 100 pHeight: 100 skin: $type: haxework.gui.skin.ColorSkin - color: "0x95937D" + color: 0x95937D views: - id: switcher $type: haxework.gui.frame.FrameSwitcher width: 960 height: 720 skin: - $type: haxework.gui.skin.BitmapSkin - image: "@asset:image:resources/image/ui/background.png" - fillType: REPEAT + $type: haxework.gui.skin.ColorSkin + color: 0x777564 views: - id: start $type: ru.m.tankz.frame.StartFrame diff --git a/src/client/haxe/ru/m/tankz/Style.yaml b/src/client/haxe/ru/m/tankz/Style.yaml index 43760db..cf3b6f7 100644 --- a/src/client/haxe/ru/m/tankz/Style.yaml +++ b/src/client/haxe/ru/m/tankz/Style.yaml @@ -8,24 +8,22 @@ button: downImage: "@asset:image:resources/image/ui/button/down.png" overImage: "@asset:image:resources/image/ui/button/over.png" fillType: NINEPATH - fontFamily: "@res:text:font" - fontEmbed: true - fontColor: "#E7E0BB" - fontSize: 20 + fontFamily: Courirer New + fontColor: 0xE7E0BB + fontSize: 18 button_simple: width: 100 height: 36 skin: $type: ru.m.skin.SimpleButtonSkin - fontFamily: "@res:text:font" - fontEmbed: true - fontColor: "#95937D" - fontSize: 20 + fontFamily: Courirer New + fontColor: 0xffffff + fontSize: 18 + shadowColor: 0x000000 label: - fontColor: "#ffffff" - fontEmbed: false + fontColor: 0xffffff fontFamily: Courirer New fontSize: 16 shadowColor: 0x000000 diff --git a/src/client/haxe/ru/m/tankz/frame/StartGameFrame.hx b/src/client/haxe/ru/m/tankz/frame/StartGameFrame.hx index 6338d90..8e8b457 100644 --- a/src/client/haxe/ru/m/tankz/frame/StartGameFrame.hx +++ b/src/client/haxe/ru/m/tankz/frame/StartGameFrame.hx @@ -7,7 +7,7 @@ import haxework.provider.Provider; import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.config.Config; import ru.m.tankz.control.Control; -import ru.m.tankz.frame.level.PresetsView; +import ru.m.tankz.frame.start.PresetsView; import ru.m.tankz.game.GameState; import ru.m.tankz.storage.SaveStorage; import ru.m.tankz.Type; @@ -57,9 +57,8 @@ import ru.m.tankz.Type; if (presetId != null) { preset = config.getPreset(presetId); var players:Array = []; + var human = true; for (team in preset.teams) { - var human = true; - players.push(new PlayerId(team.id, -1)); for (player in team.players) { var playerId = new PlayerId(team.id, player.index); state.control.set(playerId, human ? Control.HUMAN : Control.BOT); diff --git a/src/client/haxe/ru/m/tankz/frame/StartGameFrame.yaml b/src/client/haxe/ru/m/tankz/frame/StartGameFrame.yaml index 69ec914..11953ae 100644 --- a/src/client/haxe/ru/m/tankz/frame/StartGameFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/StartGameFrame.yaml @@ -3,7 +3,7 @@ pWidth: 100 pHeight: 100 views: - id: presets - $type: ru.m.tankz.frame.level.PresetsView + $type: ru.m.tankz.frame.start.PresetsView contentSize: true topMargin: 10 - $type: haxework.gui.HGroupView @@ -12,7 +12,7 @@ views: views: - id: players $type: haxework.gui.list.VListView - factory: "@class:ru.m.tankz.frame.level.PlayerView" + factory: "@class:ru.m.tankz.frame.start.PlayerView" pWidth: 50 pHeight: 100 paddings: 10 @@ -28,7 +28,7 @@ views: alpha: 0 - id: levels $type: haxework.gui.list.VListView - factory: "@class:ru.m.tankz.frame.level.LevelView" + factory: "@class:ru.m.tankz.frame.start.LevelView" pWidth: 50 pHeight: 100 paddings: 10 diff --git a/src/client/haxe/ru/m/tankz/frame/level/PlayerView.hx b/src/client/haxe/ru/m/tankz/frame/level/PlayerView.hx deleted file mode 100644 index ffbbc4b..0000000 --- a/src/client/haxe/ru/m/tankz/frame/level/PlayerView.hx +++ /dev/null @@ -1,55 +0,0 @@ -package ru.m.tankz.frame.level; - -import haxework.gui.ButtonView; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; -import haxework.gui.list.ListView.IListItemView; -import ru.m.tankz.control.Control; -import ru.m.tankz.game.GameState; -import ru.m.tankz.Type; - - -@:template class PlayerView extends HGroupView implements IListItemView { - - public var item_index(default, default):Int; - public var data(default, set):PlayerId; - - @:view("index") var indexLabel(default, null):LabelView; - @:view var control(default, null):ButtonView; - - @:provide var state:GameState; - - private function init():Void { - control.onPress = this; - } - - private function set_data(value:PlayerId):PlayerId { - data = value; - if (data.index == -1) { - indexLabel.text = ""; - control.text = data.team; - control.fontColor = 0x00ff00; - } else { - indexLabel.text = Std.string(data.index); - var controlType = state.control.get(value); - control.text = controlType; - control.fontColor = switch controlType { - case Control.HUMAN: 0xffff00; - case _: 0xffffff; - }; - } - return data; - } - - public function onPress(view:ButtonView):Void { - if (data != null && data.index > -1) { - var controlType = switch state.control.get(data) { - case Control.BOT: Control.HUMAN; - case Control.HUMAN: Control.BOT; - case _: Control.BOT; - } - state.control.set(data, controlType); - this.data = data; - } - } -} \ No newline at end of file diff --git a/src/client/haxe/ru/m/tankz/frame/level/LevelView.hx b/src/client/haxe/ru/m/tankz/frame/start/LevelView.hx similarity index 93% rename from src/client/haxe/ru/m/tankz/frame/level/LevelView.hx rename to src/client/haxe/ru/m/tankz/frame/start/LevelView.hx index 3c23e21..d6e3c42 100755 --- a/src/client/haxe/ru/m/tankz/frame/level/LevelView.hx +++ b/src/client/haxe/ru/m/tankz/frame/start/LevelView.hx @@ -1,4 +1,4 @@ -package ru.m.tankz.frame.level; +package ru.m.tankz.frame.start; import haxework.gui.HGroupView; import haxework.gui.LabelView; diff --git a/src/client/haxe/ru/m/tankz/frame/level/LevelView.yaml b/src/client/haxe/ru/m/tankz/frame/start/LevelView.yaml similarity index 91% rename from src/client/haxe/ru/m/tankz/frame/level/LevelView.yaml rename to src/client/haxe/ru/m/tankz/frame/start/LevelView.yaml index 5e7e02a..cb96219 100644 --- a/src/client/haxe/ru/m/tankz/frame/level/LevelView.yaml +++ b/src/client/haxe/ru/m/tankz/frame/start/LevelView.yaml @@ -11,5 +11,5 @@ views: text: "" skin: $type: haxework.gui.skin.ColorSkin - color: "#000000" + color: 0x000000 alpha: 0.2 diff --git a/src/client/haxe/ru/m/tankz/frame/start/PlayerView.hx b/src/client/haxe/ru/m/tankz/frame/start/PlayerView.hx new file mode 100644 index 0000000..c544bec --- /dev/null +++ b/src/client/haxe/ru/m/tankz/frame/start/PlayerView.hx @@ -0,0 +1,69 @@ +package ru.m.tankz.frame.start; + +import ru.m.draw.Color; +import ru.m.tankz.bundle.IConfigBundle; +import haxework.gui.skin.ColorSkin; +import haxework.gui.ButtonView; +import haxework.gui.HGroupView; +import haxework.gui.LabelView; +import haxework.gui.list.ListView; +import haxework.gui.skin.ButtonBitmapSkin; +import openfl.Assets; +import ru.m.tankz.control.Control; +import ru.m.tankz.game.GameState; +import ru.m.tankz.Type; + + +@:template class PlayerView extends HGroupView implements IListItemView { + + public var item_index(default, default):Int; + public var data(default, set):PlayerId; + + @:view("index") var indexLabel(default, null):LabelView; + @:view var control(default, null):ButtonView; + + @:provide var state:GameState; + @:provide var configBundle:IConfigBundle; + + private function init():Void { + control.onPress = this; + } + + private function set_data(value:PlayerId):PlayerId { + data = value; + indexLabel.text = '${value.team} ${Std.string(data.index + 1)}'; + var color:Color = 0xffffff; + var config = configBundle.get(state.type); + var preset = config.getPreset(state.presetId); + for (team in preset.teams) { + if (team.id == data.team) { + color = team.color; + for (player in team.players) { + if (player.index == data.index) { + if (!player.color.zero) { + color = player.color; + } + break; + } + } + preset.teams; + } + } + indexLabel.fontColor = cast color; + var controlType = state.control.get(value); + control.skin = new ButtonBitmapSkin(Assets.getBitmapData('resources/image/ui/control/${controlType}.png')); + return data; + } + + public function onPress(view:ButtonView):Void { + if (data != null && data.index > -1) { + var controlType = switch state.control.get(data) { + case Control.BOT: Control.HUMAN; + case Control.HUMAN: Control.BOT; + case _: Control.BOT; + } + state.control.set(data, controlType); + this.data = data; + } + } +} \ No newline at end of file diff --git a/src/client/haxe/ru/m/tankz/frame/level/PlayerView.yaml b/src/client/haxe/ru/m/tankz/frame/start/PlayerView.yaml similarity index 50% rename from src/client/haxe/ru/m/tankz/frame/level/PlayerView.yaml rename to src/client/haxe/ru/m/tankz/frame/start/PlayerView.yaml index 655127d..52b528b 100644 --- a/src/client/haxe/ru/m/tankz/frame/level/PlayerView.yaml +++ b/src/client/haxe/ru/m/tankz/frame/start/PlayerView.yaml @@ -1,19 +1,20 @@ --- -pWidth: 100 +pWidth: 50 height: 44 margins: 5 +layoutMargin: 10 views: - id: index $type: haxework.gui.LabelView $style: label pHeight: 100 - width: 50 + pWidth: 100 + skin: + $type: haxework.gui.skin.ColorSkin + color: 0x000000 + alpha: 0.2 + shadow: true + shadowColor: 0x000000 - id: control $type: haxework.gui.ButtonView - $style: label - pHeight: 100 - pWidth: 100 -skin: - $type: haxework.gui.skin.ColorSkin - color: "#000000" - alpha: 0.2 + contentSize: true diff --git a/src/client/haxe/ru/m/tankz/frame/level/PresetsView.hx b/src/client/haxe/ru/m/tankz/frame/start/PresetsView.hx similarity index 87% rename from src/client/haxe/ru/m/tankz/frame/level/PresetsView.hx rename to src/client/haxe/ru/m/tankz/frame/start/PresetsView.hx index 1b604f3..2c0291e 100644 --- a/src/client/haxe/ru/m/tankz/frame/level/PresetsView.hx +++ b/src/client/haxe/ru/m/tankz/frame/start/PresetsView.hx @@ -1,4 +1,4 @@ -package ru.m.tankz.frame.level; +package ru.m.tankz.frame.start; import haxework.resources.IResources; import haxework.provider.Provider; @@ -34,10 +34,10 @@ class PresetsView extends HGroupView { view.text = item.id; view.width = 250; view.height = 36; - view.fontFamily = Provider.get(IResources).text.get("font"); - view.fontEmbed = true; - view.fontColor = 0x95937D; - view.fontSize = 20; + view.fontFamily = "Courirer New"; + view.fontColor = 0xffffff; + view.fontSize = 18; + view.shadowColor = 0x000000; view.onPress = this; view.update(); addView(view); diff --git a/src/client/resources/image/ui/close.source.png b/src/client/resources/image/ui/close.source.png deleted file mode 100644 index a379169..0000000 Binary files a/src/client/resources/image/ui/close.source.png and /dev/null differ diff --git a/src/client/resources/image/ui/control/bot.png b/src/client/resources/image/ui/control/bot.png new file mode 100644 index 0000000..b559495 Binary files /dev/null and b/src/client/resources/image/ui/control/bot.png differ diff --git a/src/client/resources/image/ui/control/human.png b/src/client/resources/image/ui/control/human.png new file mode 100644 index 0000000..7121610 Binary files /dev/null and b/src/client/resources/image/ui/control/human.png differ diff --git a/src/client/resources/image/ui/control/null.png b/src/client/resources/image/ui/control/null.png new file mode 100644 index 0000000..de831b2 Binary files /dev/null and b/src/client/resources/image/ui/control/null.png differ diff --git a/src/client/resources/image/ui/settings.source.png b/src/client/resources/image/ui/settings.source.png deleted file mode 100644 index 5afd6fe..0000000 Binary files a/src/client/resources/image/ui/settings.source.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-0.png b/src/client/resources/images/tank/bot/tank_b0_0-0.png deleted file mode 100644 index 51192e5..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b0_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-1.png b/src/client/resources/images/tank/bot/tank_b0_0-1.png deleted file mode 100644 index a86501b..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b0_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-2.png b/src/client/resources/images/tank/bot/tank_b0_0-2.png deleted file mode 100644 index 45f96f0..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b0_0-2.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-3.png b/src/client/resources/images/tank/bot/tank_b0_0-3.png deleted file mode 100644 index e868972..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b0_0-3.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-0.png b/src/client/resources/images/tank/bot/tank_b1_0-0.png deleted file mode 100644 index 7bf3b5f..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-1.png b/src/client/resources/images/tank/bot/tank_b1_0-1.png deleted file mode 100644 index f3648cb..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-2.png b/src/client/resources/images/tank/bot/tank_b1_0-2.png deleted file mode 100644 index 2e3bc62..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-2.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-3.png b/src/client/resources/images/tank/bot/tank_b1_0-3.png deleted file mode 100644 index 919f23f..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-3.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-4.png b/src/client/resources/images/tank/bot/tank_b1_0-4.png deleted file mode 100644 index 936d030..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-4.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-5.png b/src/client/resources/images/tank/bot/tank_b1_0-5.png deleted file mode 100644 index 22bb7c8..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b1_0-5.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-0.png b/src/client/resources/images/tank/bot/tank_b2_0-0.png deleted file mode 100644 index 7c4b37c..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b2_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-1.png b/src/client/resources/images/tank/bot/tank_b2_0-1.png deleted file mode 100644 index 5eae1c7..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b2_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-2.png b/src/client/resources/images/tank/bot/tank_b2_0-2.png deleted file mode 100644 index f16f08d..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b2_0-2.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-3.png b/src/client/resources/images/tank/bot/tank_b2_0-3.png deleted file mode 100644 index 1390f38..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b2_0-3.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-0.png b/src/client/resources/images/tank/bot/tank_b3_0-0.png deleted file mode 100644 index a1bcb78..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-1.png b/src/client/resources/images/tank/bot/tank_b3_0-1.png deleted file mode 100644 index cd2a683..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-2.png b/src/client/resources/images/tank/bot/tank_b3_0-2.png deleted file mode 100644 index 8559ffd..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_0-2.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-3.png b/src/client/resources/images/tank/bot/tank_b3_0-3.png deleted file mode 100644 index 30ac685..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_0-3.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_1-0.png b/src/client/resources/images/tank/bot/tank_b3_1-0.png deleted file mode 100644 index 0c68a8c..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_1-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_1-1.png b/src/client/resources/images/tank/bot/tank_b3_1-1.png deleted file mode 100644 index 38fe3f0..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_1-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_2-0.png b/src/client/resources/images/tank/bot/tank_b3_2-0.png deleted file mode 100644 index 80e526c..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_2-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_2-1.png b/src/client/resources/images/tank/bot/tank_b3_2-1.png deleted file mode 100644 index 29d81db..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_2-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_3-0.png b/src/client/resources/images/tank/bot/tank_b3_3-0.png deleted file mode 100644 index 086dd3b..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_3-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/bot/tank_b3_3-1.png b/src/client/resources/images/tank/bot/tank_b3_3-1.png deleted file mode 100644 index 5fc5144..0000000 Binary files a/src/client/resources/images/tank/bot/tank_b3_3-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p0_0-0.png b/src/client/resources/images/tank/player/tank_p0_0-0.png deleted file mode 100644 index 8ad71cc..0000000 Binary files a/src/client/resources/images/tank/player/tank_p0_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p0_0-1.png b/src/client/resources/images/tank/player/tank_p0_0-1.png deleted file mode 100644 index 22efcf4..0000000 Binary files a/src/client/resources/images/tank/player/tank_p0_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p0_1-0.png b/src/client/resources/images/tank/player/tank_p0_1-0.png deleted file mode 100644 index 16833f3..0000000 Binary files a/src/client/resources/images/tank/player/tank_p0_1-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p0_1-1.png b/src/client/resources/images/tank/player/tank_p0_1-1.png deleted file mode 100644 index 11e74f4..0000000 Binary files a/src/client/resources/images/tank/player/tank_p0_1-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p1_0-0.png b/src/client/resources/images/tank/player/tank_p1_0-0.png deleted file mode 100644 index 6f9d3e2..0000000 Binary files a/src/client/resources/images/tank/player/tank_p1_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p1_0-1.png b/src/client/resources/images/tank/player/tank_p1_0-1.png deleted file mode 100644 index a19cd03..0000000 Binary files a/src/client/resources/images/tank/player/tank_p1_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p1_1-0.png b/src/client/resources/images/tank/player/tank_p1_1-0.png deleted file mode 100644 index 11b875f..0000000 Binary files a/src/client/resources/images/tank/player/tank_p1_1-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p1_1-1.png b/src/client/resources/images/tank/player/tank_p1_1-1.png deleted file mode 100644 index 8f2430c..0000000 Binary files a/src/client/resources/images/tank/player/tank_p1_1-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p2_0-0.png b/src/client/resources/images/tank/player/tank_p2_0-0.png deleted file mode 100644 index fb0887c..0000000 Binary files a/src/client/resources/images/tank/player/tank_p2_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p2_0-1.png b/src/client/resources/images/tank/player/tank_p2_0-1.png deleted file mode 100644 index e874352..0000000 Binary files a/src/client/resources/images/tank/player/tank_p2_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p2_1-0.png b/src/client/resources/images/tank/player/tank_p2_1-0.png deleted file mode 100644 index 123035a..0000000 Binary files a/src/client/resources/images/tank/player/tank_p2_1-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p2_1-1.png b/src/client/resources/images/tank/player/tank_p2_1-1.png deleted file mode 100644 index bc0258d..0000000 Binary files a/src/client/resources/images/tank/player/tank_p2_1-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p3_0-0.png b/src/client/resources/images/tank/player/tank_p3_0-0.png deleted file mode 100644 index 64d6086..0000000 Binary files a/src/client/resources/images/tank/player/tank_p3_0-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p3_0-1.png b/src/client/resources/images/tank/player/tank_p3_0-1.png deleted file mode 100644 index 66b82df..0000000 Binary files a/src/client/resources/images/tank/player/tank_p3_0-1.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p3_1-0.png b/src/client/resources/images/tank/player/tank_p3_1-0.png deleted file mode 100644 index e0148c6..0000000 Binary files a/src/client/resources/images/tank/player/tank_p3_1-0.png and /dev/null differ diff --git a/src/client/resources/images/tank/player/tank_p3_1-1.png b/src/client/resources/images/tank/player/tank_p3_1-1.png deleted file mode 100644 index 0425369..0000000 Binary files a/src/client/resources/images/tank/player/tank_p3_1-1.png and /dev/null differ diff --git a/src/common/haxe/ru/m/tankz/game/Game.hx b/src/common/haxe/ru/m/tankz/game/Game.hx index 74eb412..18b11db 100644 --- a/src/common/haxe/ru/m/tankz/game/Game.hx +++ b/src/common/haxe/ru/m/tankz/game/Game.hx @@ -39,9 +39,11 @@ class Game { private var deferred:Deferred; private var stream:Stream; + @:provide var configBundle:IConfigBundle; + public function new(type:GameType) { this.type = type; - this.config = Provider.get(IConfigBundle).get(type); + this.config = configBundle.get(type); this.engine = new Engine(config); engine.connect(this); } diff --git a/src/common/resources/dota/config.yaml b/src/common/resources/dota/config.yaml index 49c9e26..9850b0d 100644 --- a/src/common/resources/dota/config.yaml +++ b/src/common/resources/dota/config.yaml @@ -45,7 +45,7 @@ team: <<: *team dire: &dire id: dire - color: 0x2244ff + color: 0x3284ff <<: *team presets: