mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Mobile UI fixes

Browse Source
This commit is contained in:
Anuken 2018-11-27 12:31:45 -05:00
parent b45368342d
commit 19c17e96de
9 changed files with 925 additions and 918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/button-edge-4.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 B

1820
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 102 KiB

1
core/assets/ui/uiskin.json
View File

@ -25,6 +25,7 @@ ButtonStyle: {
},
TextButtonStyle: {
default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, down: button-down, up: button},
wave: {font: default-font, fontColor: white, disabledFontColor: gray, up: button-edge-4},
clear: {over: flat-over, font: default-font, fontColor: white, disabledFontColor: gray, down: pane, up: flat},
discord: {font: default-font, fontColor: white, up: discord-banner},
info: {font: default-font, fontColor: white, up: info-banner},

1
core/src/io/anuke/mindustry/core/Control.java
View File

@ -53,7 +53,6 @@ public class Control extends Module{
private Throwable error;
public Control(){
saves = new Saves();
unlocks = new Unlocks();

9
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@ -11,6 +11,7 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.AdminAction;
import io.anuke.mindustry.type.Recipe;
@ -94,6 +95,8 @@ public class HudFragment extends Fragment{
i.getStyle().imageUp = Core.skin.getDrawable("icon-unlocks");
}
}).get();
select.addImage("blank").color(Palette.accent).width(6f).fillY();
});
cont.row();
@ -106,7 +109,7 @@ public class HudFragment extends Fragment{
});
Stack stack = new Stack();
TextButton waves = new TextButton("");
TextButton waves = new TextButton("", "wave");
Table btable = new Table().margin(0);
stack.add(waves);
@ -116,7 +119,7 @@ public class HudFragment extends Fragment{
addWaveTable(waves);
addPlayButton(btable);
cont.add(stack).width(dsize * 4);
cont.add(stack).width(dsize * 4 + 6f);
cont.row();
@ -361,8 +364,6 @@ public class HudFragment extends Fragment{
table.clearChildren();
table.setTouchable(Touchable.enabled);
table.background("button");
table.labelWrap(() ->
world.getSector() == null ?
(state.enemies() > 0 && state.mode.disableWaveTimer ?

1
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@ -165,6 +165,7 @@ public class PlacementFragment extends Fragment{
frame.addImage("blank").color(Palette.accent).colspan(3).height(3*2).growX();
frame.row();
frame.table("pane-2", blocksSelect -> {
blocksSelect.margin(4).marginTop(0);
blocksSelect.table(blocks -> blockTable = blocks).grow();
blocksSelect.row();
blocksSelect.table(input::buildUI).growX();

6
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@ -105,12 +105,12 @@ public class PlayerListFragment extends Fragment{
float bs = (h + 14) / 2f;
button.table(t -> {
t.defaults().size(bs - 1, bs + 3);
t.defaults().size(bs);
t.addImageButton("icon-ban", 14 * 2,
() -> ui.showConfirm("$text.confirm", "$text.confirmban", () -> Call.onAdminRequest(player, AdminAction.ban))).padBottom(-5.1f);
() -> ui.showConfirm("$text.confirm", "$text.confirmban", () -> Call.onAdminRequest(player, AdminAction.ban)));
t.addImageButton("icon-cancel", 16 * 2,
() -> ui.showConfirm("$text.confirm", "$text.confirmkick", () -> Call.onAdminRequest(player, AdminAction.kick))).padBottom(-5.1f);
() -> ui.showConfirm("$text.confirm", "$text.confirmkick", () -> Call.onAdminRequest(player, AdminAction.kick)));
t.row();

5
core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
View File

@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.storage;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockGroup;
public abstract class Unloader extends Block{
protected final int timerUnload = timers++;
@ -13,7 +12,6 @@ public abstract class Unloader extends Block{
update = true;
solid = true;
health = 70;
group = BlockGroup.transportation;
hasItems = true;
}
@ -24,6 +22,5 @@ public abstract class Unloader extends Block{
}
@Override
public void setBars(){
}
public void setBars(){}
}