Commit 8105b048 authored 5 months ago by victogo

Merge remote-tracking branch 'origin/eventoTrampa' into eventoTrampa

parents e94108db 8b7b3653

No related branches found

No related tags found

2 merge requests!65Feature:,!40Feature: nueva opcion agregada al evento trampa, gastas dos de energía a...

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt 2 additions, 0 deletions

...main/java/com/example/ellegadodepintia/ListaMinijuegos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ResumenAdapter.kt 2 additions, 2 deletions

...e/ellegadodepintia/exploradoresDePintia/ResumenAdapter.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt 1 addition, 1 deletion

...depintia/exploradoresDePintia/model/GeneradorDeEventos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt 1 addition, 2 deletions

...adodepintia/exploradoresDePintia/model/GestorDeEventos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt 1 addition, 0 deletions

...ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDestruir.kt 12 additions, 3 deletions

...intia/exploradoresDePintia/model/efecto/EfectoDestruir.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoReparar.kt 5 additions, 0 deletions

...pintia/exploradoresDePintia/model/efecto/EfectoReparar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt 47 additions, 0 deletions

...epintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt 1 addition, 0 deletions

...oresDePintia/model/eventoFactory/EventoFactorySelector.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt 11 additions, 0 deletions

.../exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt 4 additions, 5 deletions

...ploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt 63 additions, 0 deletions

...exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/objeto/ObjetoDeValor.kt 5 additions, 2 deletions

...pintia/exploradoresDePintia/model/objeto/ObjetoDeValor.kt
app/src/main/java/com/example/ellegadodepintia/minijuego1/Minijuego1.kt 65 additions, 40 deletions

...ava/com/example/ellegadodepintia/minijuego1/Minijuego1.kt
app/src/main/java/com/example/ellegadodepintia/minijuego2/Minijuego2.kt 7 additions, 0 deletions

...ava/com/example/ellegadodepintia/minijuego2/Minijuego2.kt
app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt 17 additions, 1 deletion

...legadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
app/src/main/java/com/example/ellegadodepintia/soundManager/SoundManager.kt 40 additions, 0 deletions

...com/example/ellegadodepintia/soundManager/SoundManager.kt
app/src/main/res/drawable/asi_fragmento_reliquia.png 0 additions, 0 deletions

app/src/main/res/drawable/asi_fragmento_reliquia.png
app/src/main/res/drawable/cofre_madera_00.png 0 additions, 0 deletions

app/src/main/res/drawable/cofre_madera_00.png
app/src/main/res/drawable/cofre_madera_01.png 0 additions, 0 deletions

app/src/main/res/drawable/cofre_madera_01.png

with 284 additions and 56 deletions

Please register or to comment