From 823799e8fb8e284cf0142ab37ef1941bfc213a10 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Sun, 10 Dec 2017 21:36:43 +0300
Subject: [PATCH] update

---
 project.xml                             |  4 ++--
 src/client/haxe/layout/frames/auth.json | 14 ++-----------
 src/client/haxe/layout/main.json        |  2 +-
 src/client/haxe/layout/other.json       |  5 -----
 src/client/haxe/layout/styles.json      | 27 +++++++++++++++++++++++--
 src/client/haxe/ru/m/tankz/Client.hx    |  5 +++--
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/project.xml b/project.xml
index 13e48ff..727e606 100755
--- a/project.xml
+++ b/project.xml
@@ -8,7 +8,7 @@
   <assets path="src/client/resources" rename="resources" include="*"/>
   <haxelib name="openfl"/>
   <haxelib name="protohx"/>
-  <haxelib name="haxework" version="git"/>
+  <haxelib name="haxework"/>
   <window width="760" height="600"/>
   <haxeflag name="-D" value="swf-gpu"/>
   <haxeflag name="-D" value="native-trace"/>
@@ -17,5 +17,5 @@
   <haxeflag name="-debug"/>
   <haxeflag name="--macro" value="Meta.set('0.0.0')"/>
 
-  <template path="src/client/webapp/index_template.html" rename="index.html"/>
+  <!--<template path="src/client/webapp/index_template.html" rename="index.html"/>-->
 </project>
\ No newline at end of file
diff --git a/src/client/haxe/layout/frames/auth.json b/src/client/haxe/layout/frames/auth.json
index da6f75b..fceed27 100644
--- a/src/client/haxe/layout/frames/auth.json
+++ b/src/client/haxe/layout/frames/auth.json
@@ -17,13 +17,8 @@
         },
         {
           "id": "loginInput", "@type": "haxework.gui.InputView",
-          "skin": {
-            "@type": "haxework.gui.skin.BitmapSkin",
-            "image": "@asset:image:resources/images/map/map_3-0.png",
-            "fillType": "REPEAT"
-          },
           "width": 220, "height": 44, "text": "",
-          "@style": "label"
+          "@style": "input"
         }
       ]
     },
@@ -38,13 +33,8 @@
         },
         {
           "id": "passwordInput", "@type": "haxework.gui.InputView",
-          "skin": {
-            "@type": "haxework.gui.skin.BitmapSkin",
-            "image": "@asset:image:resources/images/map/map_3-0.png",
-            "fillType": "REPEAT"
-          },
           "width": 220, "height": 44, "text": "",
-          "@style": "label"
+          "@style": "input"
         }
       ]
     },
diff --git a/src/client/haxe/layout/main.json b/src/client/haxe/layout/main.json
index 6438736..9e09253 100755
--- a/src/client/haxe/layout/main.json
+++ b/src/client/haxe/layout/main.json
@@ -30,7 +30,7 @@
       "pWidth": 100, "pHeight": 100,
       "skin": {
         "@type": "haxework.gui.skin.BitmapSkin",
-        "image": "@asset:image:resources/images/map/map_1.png",
+        "image": "@asset:image:resources/images/background.png",
         "fillType": "REPEAT"
       },
       "views": [
diff --git a/src/client/haxe/layout/other.json b/src/client/haxe/layout/other.json
index 1290909..bf66831 100644
--- a/src/client/haxe/layout/other.json
+++ b/src/client/haxe/layout/other.json
@@ -1,11 +1,6 @@
 {
   "person": {
     "width": 440, "height": 44,
-    "skin": {
-      "@type": "haxework.gui.skin.BitmapSkin",
-      "image": "@asset:image:resources/images/map/map_3-0.png",
-      "fillType": "REPEAT"
-    },
     "views": [
       {
         "id": "nameLabel",
diff --git a/src/client/haxe/layout/styles.json b/src/client/haxe/layout/styles.json
index 715f02e..e3e32e8 100644
--- a/src/client/haxe/layout/styles.json
+++ b/src/client/haxe/layout/styles.json
@@ -1,5 +1,5 @@
 {
-  "button_skin": {
+  "_button_skin": {
     "skin": {
       "@type": "haxework.gui.skin.ButtonBitmapSkin",
       "image": "@asset:image:resources/images/map/map_4.png",
@@ -12,11 +12,34 @@
     "shadowColor": "0x000000"
   },
 
+  "button_skin": {
+    "skin": {
+      "@type": "haxework.gui.skin.ButtonBitmapSkin",
+      "upImage": "@asset:image:resources/images/control/button_normal.png",
+      "downImage": "@asset:image:resources/images/control/button_down.png",
+      "overImage": "@asset:image:resources/images/control/button_over.png",
+      "fillType": "NINEPATH"
+    },
+    "fontColor": "0xffffff"
+  },
+
   "label": {
     "fontColor": "0xffffff",
-    "fontEmbed": true,
+    "fontEmbed": false,
     "fontFamily": "@res:text:fontName",
     "fontSize": 16,
     "shadowColor": "0x000000"
+  },
+
+  "input": {
+    "fontColor": "0xffffff",
+    "fontEmbed": false,
+    "fontFamily": "@res:text:fontName",
+    "fontSize": 16,
+    "shadowColor": "0x000000",
+    "skin": {
+      "@type": "haxework.gui.skin.ColorSkin",
+      "color": "0x000000"
+    }
   }
 }
\ No newline at end of file
diff --git a/src/client/haxe/ru/m/tankz/Client.hx b/src/client/haxe/ru/m/tankz/Client.hx
index c552ac6..77c53c3 100755
--- a/src/client/haxe/ru/m/tankz/Client.hx
+++ b/src/client/haxe/ru/m/tankz/Client.hx
@@ -42,8 +42,9 @@ class Client implements IConnectionHandler {
     Provider.setFactory(IResources, Resources);
     Provider.setFactory(GameData, GameData);
 
-    var font = Assets.getFont("resources/fonts/8-BIT WONDER.TTF");
-    Provider.get(IResources).text.put("fontName", font.fontName);
+    //var font = Assets.getFont("resources/fonts/8-BIT WONDER.TTF");
+    //Provider.get(IResources).text.put("fontName", font.fontName);
+    Provider.get(IResources).text.put("fontName", "Arial");
 
     Provider.set(IPacketBuilder, new PacketBuilder());
     #if flash