diff --git a/lumpundform-android/assets/data/hitbox_samus.xml b/lumpundform-android/assets/data/hitbox_samus.xml
new file mode 100644
index 0000000..5848e5b
--- /dev/null
+++ b/lumpundform-android/assets/data/hitbox_samus.xml
@@ -0,0 +1,91 @@
+
+
+
+
+ 31
+ 5
+ 108
+ 35
+
+
+ 31
+ 0
+ 113
+ 35
+
+
+ 31
+ 18
+ 95
+ 35
+
+
+ 31
+ 20
+ 93
+ 35
+
+
+ 31
+ 13
+ 100
+ 35
+
+
+ 31
+ 0
+ 113
+ 35
+
+
+ 31
+ 113
+ 100
+ 35
+
+
+ 31
+ 5
+ 108
+ 35
+
+
+ 31
+ 5
+ 108
+ 35
+
+
+
+
+
+ 33
+ 8
+ 105
+ 30
+
+
+
+
+ 33
+ 8
+ 105
+ 30
+
+
+
+
+ 35
+ 5
+ 108
+ 30
+
+
+
+
+ 8
+ 5
+ 78
+ 78
+
+
\ No newline at end of file
diff --git a/lumpundform-android/assets/personajes/heroe_spritesheet.png b/lumpundform-android/assets/personajes/heroe_spritesheet.png
new file mode 100644
index 0000000..c4fb597
Binary files /dev/null and b/lumpundform-android/assets/personajes/heroe_spritesheet.png differ
diff --git a/lumpundform/src/com/lumpundform/interfaz/BotonBase.java b/lumpundform/src/com/lumpundform/interfaz/BotonBase.java
index a56e236..5f06cc6 100644
--- a/lumpundform/src/com/lumpundform/interfaz/BotonBase.java
+++ b/lumpundform/src/com/lumpundform/interfaz/BotonBase.java
@@ -60,7 +60,7 @@ private void fadeIn() {
alfa = alfa + (Gdx.graphics.getDeltaTime() * velocidadFade);
else if (alfa > 0.0f && alfa < 1.0f)
alfa = alfa + (Gdx.graphics.getDeltaTime() * velocidadFade);
- else if (alfa >= 1.0f) {
+ if (alfa >= 1.0f) {
alfa = 1.0f;
fadeIn = false;
fadeOut = false;
@@ -73,7 +73,7 @@ private void fadeOut() {
alfa = alfa - (Gdx.graphics.getDeltaTime() * velocidadFade);
else if (alfa < 1.0f && alfa > 0.0f)
alfa = alfa - (Gdx.graphics.getDeltaTime() * velocidadFade);
- else if (alfa <= 0.0f) {
+ if (alfa <= 0.0f) {
alfa = 0.0f;
fadeIn = false;
fadeOut = false;
diff --git a/lumpundform/src/com/lumpundform/interfaz/BotonMenu.java b/lumpundform/src/com/lumpundform/interfaz/BotonMenu.java
index f70c8fb..10a6be2 100644
--- a/lumpundform/src/com/lumpundform/interfaz/BotonMenu.java
+++ b/lumpundform/src/com/lumpundform/interfaz/BotonMenu.java
@@ -23,10 +23,10 @@ public void draw(SpriteBatch batch, float parentAlpha) {
CharSequence msg = "Menú";
TextBounds tb = bmf.getBounds(msg);
- fade();
float xMenu = getX() + (anchoBoton() / 2) - (tb.width / 2);
float yMenu = getY() + (UI.altoBoton / 2) + (tb.height / 2);
bmf.draw(batch, msg, xMenu, yMenu);
+ fade();
}
}
diff --git a/lumpundform/src/com/lumpundform/interfaz/BotonPocionBase.java b/lumpundform/src/com/lumpundform/interfaz/BotonPocionBase.java
index a89cc80..3a0bdd3 100644
--- a/lumpundform/src/com/lumpundform/interfaz/BotonPocionBase.java
+++ b/lumpundform/src/com/lumpundform/interfaz/BotonPocionBase.java
@@ -29,10 +29,10 @@ public void draw(SpriteBatch batch, float parentAlpha) {
super.draw(batch, parentAlpha);
bmf.setScale(0.5f);
- fade();
float xCant = getX() + UI.anchoPocion + UI.margenChico;
float yCant = getY() + bmf.getCapHeight();
bmf.draw(batch, getCantidad() + "", xCant, yCant);
+ fade();
}
public String getTipo() {