Skip to content

Commit 612074f

Browse files
committed
Debug GameScene, GameScoreText
1 parent 5bd843e commit 612074f

2 files changed

Lines changed: 26 additions & 10 deletions

File tree

src/ru/nsu/ccfit/zuev/osu/game/GameScene.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -968,19 +968,23 @@ public void onUpdate(final float pSecondsElapsed) {
968968
scoreShadow.attachToScene(bgScene);
969969
passiveObjects.add(scoreShadow);
970970
}
971-
972-
if (Config.isComboburst()) {
973-
comboBurst = new ComboBurst(Config.getRES_WIDTH(), Config.getRES_HEIGHT());
974-
comboBurst.attachAll(bgScene);
975-
}
976971
}
977972

978973
if(Config.getHideInGameUI() == 1) {
974+
removePassiveObject(scorebar);
979975
scorebar = null;
980976
setUIVisible(false);
981977
ToastLogger.showText("ghigui " + Config.getHideInGameUI(), false);
982978
}
983979

980+
if(Config.getHideInGameUI() == 0) {
981+
if (Config.isComboburst()) {
982+
comboBurst = new ComboBurst(Config.getRES_WIDTH(), Config.getRES_HEIGHT());
983+
comboBurst.attachAll(bgScene);
984+
}
985+
ToastLogger.showText("ghigui " + Config.getHideInGameUI(), false);
986+
}
987+
984988
if (stat.getMod().contains(GameMod.MOD_AUTO)) {
985989
final Sprite autoIcon = new Sprite(Utils.toRes(Config.getRES_WIDTH() - 140),
986990
Utils.toRes(100), ResourceManager.getInstance().getTexture(
@@ -1477,7 +1481,9 @@ public void onUpdate(final float pSecondsElapsed) {
14771481
if(GameHelper.isFlashLight()){
14781482
flashlightSprite.onBreak(true);
14791483
}
1480-
setUIVisible(true);
1484+
if(Config.getHideInGameUI() == 1) {
1485+
setUIVisible(true);
1486+
}
14811487
if(scorebar != null) scorebar.setVisible(false);
14821488
breakPeriods.poll();
14831489
}
@@ -1488,7 +1494,9 @@ public void onUpdate(final float pSecondsElapsed) {
14881494
if(GameHelper.isFlashLight()){
14891495
flashlightSprite.onBreak(false);
14901496
}
1491-
setUIVisible(false);
1497+
if(Config.getHideInGameUI() == 1) {
1498+
setUIVisible(false);
1499+
}
14921500
}
14931501

14941502
if (objects.isEmpty() && activeObjects.isEmpty()) {

src/ru/nsu/ccfit/zuev/osu/game/GameScoreText.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class GameScoreText {
1515
private final ArrayList<AnimSprite> digits = new ArrayList<AnimSprite>();
1616
private float scale = 0;
1717
private boolean hasX = false;
18+
private boolean visible = true;
1819

1920
public GameScoreText(final float x, final float y, final String mask,
2021
final float scale) {
@@ -58,14 +59,20 @@ public void changeText(final StringBuilder text) {
5859
}
5960
if (text.charAt(i) >= '0' && text.charAt(i) <= '9') {
6061
int digit = text.charAt(i) - '0';
61-
digits.get(j).setVisible(true);
62+
63+
if(visible) {
64+
digits.get(j).setVisible(true);
65+
}
66+
6267
digits.get(j).setFrame(digit);
6368
digits.get(j).setWidth(digits.get(j).getFrameWidth() * scale);
6469
digits.get(j).setPosition(digits.get(0).getX() + digitsWidth, digits.get(j).getY());
6570
digitsWidth += digits.get(j).getWidth();
6671
j++;
6772
} else if (text.charAt(i) == '*') {
68-
digits.get(j).setVisible(false);
73+
if(visible) {
74+
digits.get(j).setVisible(false);
75+
}
6976
j++;
7077
// TODO
7178
} else {
@@ -84,8 +91,9 @@ public void changeText(final StringBuilder text) {
8491
}
8592

8693
public void setVisible(final boolean visible) {
94+
this.visible = visible;
8795
for(AnimSprite digit : digits) {
88-
digit.setVisible(visible);
96+
digit.setVisible(false);
8997
}
9098
}
9199

0 commit comments

Comments
 (0)