Commit ec991ba5 authored 5 months ago by diegval

Merge branch 'develop' into 'tienda'

Feature:

See merge request !46

parents 478ef5c0 2b45689e

No related branches found

No related tags found

3 merge requests!65Feature:,!51Tienda to guapa,!46Feature:

Hide whitespace changes

Inline Side-by-side

Showing

.idea/deploymentTargetSelector.xml 10 additions, 0 deletions

.idea/deploymentTargetSelector.xml
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt 53 additions, 8 deletions

.../example/ellegadodepintia/exploradoresDePintia/Resumen.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 13 additions, 3 deletions

...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoEscalar.kt 0 additions, 22 deletions

...pintia/exploradoresDePintia/model/efecto/EfectoEscalar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoFuerzaBruta.kt 0 additions, 16 deletions

...ia/exploradoresDePintia/model/efecto/EfectoFuerzaBruta.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoResolverTrampaConAtributo.kt 29 additions, 0 deletions

...sDePintia/model/efecto/EfectoResolverTrampaConAtributo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt 4 additions, 2 deletions

...epintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoUtilizarObjetoUtil.kt 16 additions, 0 deletions

...oradoresDePintia/model/efecto/EfectoUtilizarObjetoUtil.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt 2 additions, 2 deletions

...oresDePintia/model/eventoFactory/EventoFactorySelector.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt 15 additions, 1 deletion

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

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

...exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TiendaFactory.kt 6 additions, 30 deletions

...exploradoresDePintia/model/eventoFactory/TiendaFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TrampaFactory.kt 26 additions, 8 deletions

...exploradoresDePintia/model/eventoFactory/TrampaFactory.kt
app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt 7 additions, 4 deletions

...legadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt 5 additions, 0 deletions

...ample/ellegadodepintia/repositorios/RepositorioObjetos.kt
app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt 15 additions, 3 deletions

...c/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
app/src/main/res/asi_objeto_ticker.png 0 additions, 0 deletions

app/src/main/res/asi_objeto_ticker.png
app/src/main/res/drawable/asi_objeto_ticket.png 0 additions, 0 deletions

app/src/main/res/drawable/asi_objeto_ticket.png
app/src/main/res/drawable/asi_reparar_palo.png 0 additions, 0 deletions

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

with 260 additions and 149 deletions

Please register or to comment