diff --git a/core/assets/cs/screen/panorama/gfx/balcony_news_title.png b/core/assets/cs/screen/panorama/gfx/balcony_news_title.png
index fe233a7101279e2e494f7dcba9247574376ed118..6a0f6357734678d4c47e8831c48d02f513d66c92 100644
Binary files a/core/assets/cs/screen/panorama/gfx/balcony_news_title.png and b/core/assets/cs/screen/panorama/gfx/balcony_news_title.png differ
diff --git a/core/assets/cs/screen/panorama/gfx/swipe/tile2_title.png b/core/assets/cs/screen/panorama/gfx/swipe/tile2_title.png
index 95fa2d79722b22e4e7e4405f73240baf952984e7..9cc493e8d5629ed37bd4bebd376e9de4d6b5595c 100644
Binary files a/core/assets/cs/screen/panorama/gfx/swipe/tile2_title.png and b/core/assets/cs/screen/panorama/gfx/swipe/tile2_title.png differ
diff --git a/core/assets/cs/screen/panorama/gfx/swipe/tile3_door_sign.png b/core/assets/cs/screen/panorama/gfx/swipe/tile3_door_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef786db738960c2a35cbeaef079cbd723fd9a3cf
Binary files /dev/null and b/core/assets/cs/screen/panorama/gfx/swipe/tile3_door_sign.png differ
diff --git a/core/assets/cs/screen/panorama/gfx/swipe/tile3_plate_title.png b/core/assets/cs/screen/panorama/gfx/swipe/tile3_plate_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd982ab6049741041ee44deedab26dc4feb119ba
Binary files /dev/null and b/core/assets/cs/screen/panorama/gfx/swipe/tile3_plate_title.png differ
diff --git a/core/assets/cs/screen/panorama/gfx/swipe/tile3_title.png b/core/assets/cs/screen/panorama/gfx/swipe/tile3_title.png
deleted file mode 100644
index ed8da8f1e1ff9410dd8617ea7434ef9923571c22..0000000000000000000000000000000000000000
Binary files a/core/assets/cs/screen/panorama/gfx/swipe/tile3_title.png and /dev/null differ
diff --git a/core/assets/de/screen/panorama/gfx/balcony_news_title.png b/core/assets/de/screen/panorama/gfx/balcony_news_title.png
index c262cb965cbb710249fdcdb4942a4900f3f2c578..0ad70bd338e9e876d1f5759d5ee0d86329036da5 100644
Binary files a/core/assets/de/screen/panorama/gfx/balcony_news_title.png and b/core/assets/de/screen/panorama/gfx/balcony_news_title.png differ
diff --git a/core/assets/de/screen/panorama/gfx/swipe/door.png b/core/assets/de/screen/panorama/gfx/swipe/door.png
deleted file mode 100644
index f0981fda9a7613b3cf2440f3e27e54d24c782f80..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/panorama/gfx/swipe/door.png and /dev/null differ
diff --git a/core/assets/de/screen/panorama/gfx/swipe/tile2_title.png b/core/assets/de/screen/panorama/gfx/swipe/tile2_title.png
index f1c77c6b6e80f235a7c75a751b3ae53830e30bc6..d0feab46fee405d1741b247b9b7acd38937ef819 100644
Binary files a/core/assets/de/screen/panorama/gfx/swipe/tile2_title.png and b/core/assets/de/screen/panorama/gfx/swipe/tile2_title.png differ
diff --git a/core/assets/de/screen/panorama/gfx/swipe/tile3_door_sign.png b/core/assets/de/screen/panorama/gfx/swipe/tile3_door_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a37c5b75f84ca21c2a80bf8decea0b72b86e7e3a
Binary files /dev/null and b/core/assets/de/screen/panorama/gfx/swipe/tile3_door_sign.png differ
diff --git a/core/assets/de/screen/panorama/gfx/swipe/tile3_plate_title.png b/core/assets/de/screen/panorama/gfx/swipe/tile3_plate_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..75e982adfabe9e3df90679103346e63f3bbc24d2
Binary files /dev/null and b/core/assets/de/screen/panorama/gfx/swipe/tile3_plate_title.png differ
diff --git a/core/assets/de/screen/panorama/gfx/swipe/tile3_title.png b/core/assets/de/screen/panorama/gfx/swipe/tile3_title.png
deleted file mode 100644
index be19c5e7c7fe9d0502d0c067fa785bf8959db925..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/panorama/gfx/swipe/tile3_title.png and /dev/null differ
diff --git a/core/assets/sk/screen/panorama/gfx/balcony_news_title.png b/core/assets/sk/screen/panorama/gfx/balcony_news_title.png
index 34307ef3a8de9e79a28e51d3396960d7c37dcf18..6a0f6357734678d4c47e8831c48d02f513d66c92 100644
Binary files a/core/assets/sk/screen/panorama/gfx/balcony_news_title.png and b/core/assets/sk/screen/panorama/gfx/balcony_news_title.png differ
diff --git a/core/assets/sk/screen/panorama/gfx/swipe/tile2_title.png b/core/assets/sk/screen/panorama/gfx/swipe/tile2_title.png
index 94b9a33b715ad3cbdc9d164d971d6c7f32dee8af..142128fce43e62210311d47699acfd94f643ac26 100644
Binary files a/core/assets/sk/screen/panorama/gfx/swipe/tile2_title.png and b/core/assets/sk/screen/panorama/gfx/swipe/tile2_title.png differ
diff --git a/core/assets/sk/screen/panorama/gfx/swipe/tile3_door_sign.png b/core/assets/sk/screen/panorama/gfx/swipe/tile3_door_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..3848211bf75a2c37be2cd335636af97a950246d2
Binary files /dev/null and b/core/assets/sk/screen/panorama/gfx/swipe/tile3_door_sign.png differ
diff --git a/core/assets/sk/screen/panorama/gfx/swipe/tile3_plate_title.png b/core/assets/sk/screen/panorama/gfx/swipe/tile3_plate_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..718b46e61fffd96730ad02c391379b86c3dc843a
Binary files /dev/null and b/core/assets/sk/screen/panorama/gfx/swipe/tile3_plate_title.png differ
diff --git a/core/assets/sk/screen/panorama/gfx/swipe/tile3_title.png b/core/assets/sk/screen/panorama/gfx/swipe/tile3_title.png
deleted file mode 100644
index 0d3d72c58958a451464799a4b1c0649821fae6ff..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/panorama/gfx/swipe/tile3_title.png and /dev/null differ
diff --git a/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java b/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java
index 197390c65b84b56aad685dd3d5e92e43c1198a91..3c525b293c927195d79f0e3777aea5dca34f2fbe 100644
--- a/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java
+++ b/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java
@@ -61,6 +61,11 @@ import cz.nic.tablexia.util.ui.dialog.components.ViewportMaximumSizeComponent;
* Screen showing street animation and office before user create form
*/
public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
+
+ private static Vector2 NEWSPAPER_TITLE_POSITION = new Vector2(0.26f, 0.197f);
+ private static Vector2 SIGN_POSITION = new Vector2(0.30f, 0.285f);
+ private static Vector2 PLATE_TITLE_POSITION = new Vector2(0.368f, 0.638f);
+ private static Vector2 DOOR_SIGN_POSITION = new Vector2(0.575f, 0f);
public static final String GFX_PATH = "gfx/";
public static final String SFX_PATH = "sfx/";
@@ -166,8 +171,10 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
setActorToFullScene(balcony);
getStage().addActor(balcony);
- Image balconyNewsTitle = new Image(getScreenTextureRegion(BALCONY_NEWS_TITLE));
- setActorToFullScene(balconyNewsTitle);
+ Image balconyNewsTitle = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(BALCONY_NEWS_TITLE),
+ balcony.getWidth() * PanoramaActorsLayout.NEWSPAPERS_TITLE_WIDTH,
+ NEWSPAPER_TITLE_POSITION.x * balcony.getWidth(),
+ NEWSPAPER_TITLE_POSITION.y * balcony.getHeight());
balconyNewsTitle.setTouchable(Touchable.disabled);
getStage().addActor(balconyNewsTitle);
@@ -742,37 +749,43 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
group.add(tile00).height(tile00.getHeight()).width(tile00.getWidth());
group.add(tile01).height(tile01.getHeight()).width(tile01.getWidth());
-
//tile2
- Stack tile2 = new Stack();
- TablexiaNoBlendingImage tile02 = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile2"));
- tile02.setSize((int) (panel.getHeight() * (tile02.getWidth() / tile02.getHeight())), panel.getHeight());
- tile2.add(tile02);
-
- Image tile02_title = new Image(getScreenTextureRegion(GFX_PATH + "swipe/tile2_title"));
- tile02_title.setSize((int) (panel.getHeight() * (tile02_title.getWidth() / tile02_title.getHeight())), panel.getHeight());
- tile2.add(tile02_title);
+ Group tile2 = new Group();
+ TablexiaNoBlendingImage tile02 = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile2"));
+ tile02.setSize((int) (panel.getHeight() * (tile02.getWidth() / tile02.getHeight())), panel.getHeight());
+ tile2.addActor(tile02);
+ Image tile02_title = ScaleUtil.createImageWidthPosition(
+ getScreenTextureRegion(GFX_PATH + "swipe/tile2_title"),
+ tile02.getWidth() * PanoramaActorsLayout.STREET_TILE2_TITLE_IMAGE_WIDTH,
+ SIGN_POSITION.x*tile02.getWidth(),
+ SIGN_POSITION.y*tile02.getHeight());
+
+ tile2.addActor(tile02_title);
group.add(tile2).width(tile02.getWidth()).height(tile02.getHeight());
-
//tile3
final TablexiaNoBlendingImage tile3Background = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "swipe/tile3"));
- final Image tile3Title = new Image(getScreenTextureRegion(GFX_PATH + "swipe/tile3_title"));
-
tile3Background.setSize((int) (panel.getHeight() * (tile3Background.getWidth() / tile3Background.getHeight())), panel.getHeight());
- tile3Title.setSize((int) (panel.getHeight() * (tile3Title.getWidth() / tile3Title.getHeight())), panel.getHeight());
-
+ final Image tile3DoorSign = ScaleUtil.createImageHeightPosition(getScreenTextureRegion(GFX_PATH + "swipe/tile3_door_sign"),
+ tile3Background.getHeight() * PanoramaActorsLayout.STREET_TILE3_DOOR_SIGN_IMAGE_HEIGHT,
+ DOOR_SIGN_POSITION.x * tile3Background.getWidth(),
+ DOOR_SIGN_POSITION.y * tile3Background.getHeight());
+ Image tile3PlateTitle = ScaleUtil.createImageWidthPosition(
+ getScreenTextureRegion(GFX_PATH + "swipe/tile3_plate_title"),
+ tile3Background.getWidth() * PanoramaActorsLayout.STREET_TILE3_PLATE_TITLE_IMAGE_WIDTH,
+ PLATE_TITLE_POSITION.x * tile3Background.getWidth(),
+ PLATE_TITLE_POSITION.y * tile3Background.getHeight());
//Detective door group
final Group detectiveDoor = new Group();
- tile3Title.addListener(new ClickListener() {
+ tile3DoorSign.addListener(new ClickListener() {
private int knockCount = 0;
@Override
public void clicked(InputEvent event, float x, float y) {
super.clicked(event, x, y);
- if (x > tile3Background.getWidth() * PanoramaActorsLayout.STREET_DOOR_KNOCK_X && knockCount < NUMBER_OF_OFFICE_KNOCKS) {
+ if (knockCount < NUMBER_OF_OFFICE_KNOCKS) {
knockCount++;
- Image knock = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "swipe/knock"), getStage().getWidth() * PanoramaActorsLayout.STREET_KNOCK_IMAGE_WIDTH, x, y);
+ Image knock = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "swipe/knock"), getStage().getWidth() * PanoramaActorsLayout.STREET_KNOCK_IMAGE_WIDTH, tile3DoorSign.getX() + x, tile3DoorSign.getY() + y);
detectiveDoor.addActor(knock);
RunnableAction moveToOffice = new RunnableAction();
@@ -809,7 +822,8 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
});
detectiveDoor.addActor(tile3Background);
- detectiveDoor.addActor(tile3Title);
+ detectiveDoor.addActor(tile3DoorSign);
+ detectiveDoor.addActor(tile3PlateTitle);
detectiveDoor.setSize(tile3Background.getWidth(), tile3Background.getHeight());
group.add(detectiveDoor);
diff --git a/core/src/cz/nic/tablexia/screen/createuser/panorama/PanoramaActorsLayout.java b/core/src/cz/nic/tablexia/screen/createuser/panorama/PanoramaActorsLayout.java
index 9fc247a2cfb9629e292f36c9fcb5914c9f0ef43b..1962716cafeb70f617dc3aab90f58e75d0b1190a 100644
--- a/core/src/cz/nic/tablexia/screen/createuser/panorama/PanoramaActorsLayout.java
+++ b/core/src/cz/nic/tablexia/screen/createuser/panorama/PanoramaActorsLayout.java
@@ -40,6 +40,8 @@ public class PanoramaActorsLayout {
public static final float RIGHT_FINGER_MOVE_TO = 0.6f;
public static final float HINT_WIDTH = 0.5f;
+
+ public static final float NEWSPAPERS_TITLE_WIDTH = 0.095f;
public static final float NEWSPAPERS_OPEN_STAGE_1 = 0.0025f;
public static final float NEWSPAPERS_OPEN_STAGE_2 = 0.05f;
@@ -63,9 +65,12 @@ public class PanoramaActorsLayout {
public static final float OFFICE_DIALOG_WIDTH = 0.3f;
public static final float OFFICE_DIALOG_HEIGHT = 0.085f;
- public static final float STREET_DOOR_KNOCK_X = 0.3f;
public static final float STREET_KNOCK_IMAGE_WIDTH = 0.2f;
-
+
+ public static final float STREET_TILE2_TITLE_IMAGE_WIDTH = 0.15f;
+ public static final float STREET_TILE3_PLATE_TITLE_IMAGE_WIDTH = 0.13f;
+ public static final float STREET_TILE3_DOOR_SIGN_IMAGE_HEIGHT = 0.8f;
+
public static final float STREET_OFFICE_TRANSITION_DURATION = 0.5f;
public static final float OFFICE_FIRST_DIALOG_DELAY = 0.25f;