From 431496aeacb183fdfb9c2580a81d52b98f06a2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Fri, 17 Jun 2016 17:18:11 +0200 Subject: [PATCH] visual: ajout d'un bouton (info_upgrade) et de son texte --- android/assets/i18n/messages/messages_en.properties | 1 + android/assets/i18n/messages/messages_fr.properties | 1 + android/assets/textures/level.json | 2 +- android/assets/textures/ui.json | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/android/assets/i18n/messages/messages_en.properties b/android/assets/i18n/messages/messages_en.properties index 390248f..70d808c 100644 --- a/android/assets/i18n/messages/messages_en.properties +++ b/android/assets/i18n/messages/messages_en.properties @@ -62,6 +62,7 @@ [dialog-levelscreen-errornoworld]=No campaign is selected ! [dialog-levelscreen-errorlevels]=Impossible to use the game with this database configuration, you can use the "Reinit" button to obtain the initial configuration of the databases. [dialog-gamescreen-preference]=You need to relaunch the game in order to apply the new preferences. +[info_choose-gamescreen]=Choose this transmuter [WinOptions-gamescreen-Video]=Video [WinOptions-gamescreen-Audio]=Audio [WinOptions-gamescreen-Game]=Game diff --git a/android/assets/i18n/messages/messages_fr.properties b/android/assets/i18n/messages/messages_fr.properties index ce26431..2ce34aa 100644 --- a/android/assets/i18n/messages/messages_fr.properties +++ b/android/assets/i18n/messages/messages_fr.properties @@ -62,6 +62,7 @@ [dialog-levelscreen-errornoworld]=Aucune campagne n'a été sélectionné [dialog-levelscreen-errorlevels]=Impossible de jouer sans bases de données correctement configurée, cliquer sur "Réinitialisation" si vous ne savez pas revenir à une situation jouable. [dialog-gamescreen-preference]=Veuillez relancer le jeu pour que les préférences soient appliquées. +[info_choose-gamescreen]=Choisir ce transmuteur [WinOptions-gamescreen-Video]=Video [WinOptions-gamescreen-Audio]=Audio [WinOptions-gamescreen-Game]=Jeu diff --git a/android/assets/textures/level.json b/android/assets/textures/level.json index 6615480..4be80ad 100644 --- a/android/assets/textures/level.json +++ b/android/assets/textures/level.json @@ -19,7 +19,7 @@ blue: { a: 1, b: 1, g: 0, r: 0 }, white: { a: 1, b: 1, g: 1, r: 1 }, black: { a: 1, b: 0, g: 0, r: 0 }, - grey: { a: 1, b: 0, g: 0, r: 0 }, + grey: { a: 0.15, b: 0.25, g: 0.25, r: 0.25 }, lowgrey: { a: 1, b: 0.352, g: 0.352, r: 0.352 }, world0: { r:0.843, g:0.129, b:1, a:1}, world1: { r:0, g:0.752, b:0.956, a:1}, diff --git a/android/assets/textures/ui.json b/android/assets/textures/ui.json index 7db9338..bee6ec3 100644 --- a/android/assets/textures/ui.json +++ b/android/assets/textures/ui.json @@ -5,6 +5,7 @@ com.badlogic.gdx.graphics.Color: { white: { a: 1, b: 1, g: 1, r: 1 }, red: { a: 1, b: 0, g: 0, r: 1 }, grey: { a: 1, b: 0.75, g: 0.75, r: 0.75 }, + lowgrey: { a: 1, b: 0.25, g: 0.25, r: 0.25 }, black: { a: 1, b: 0, g: 0, r: 0 } }, com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: { @@ -15,7 +16,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: { toggle: { down: default-round-down, checked: default-round-down, up: default-round } }, com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: { - default: { down: default-round-down, up: default-round, font: default-font, fontColor: white }, + default: { down: default-round-down, up: default-round, font: default-font, fontColor: white, disabledFontColor:lowgrey }, toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: white, downFontColor: red } },