From d523037dd8a1fc43e0ba3e2247fafcc7d59c4dcd Mon Sep 17 00:00:00 2001 From: Yoan Date: Sat, 8 Apr 2023 18:18:11 +0200 Subject: [PATCH] =?UTF-8?q?Collection=20d'objet=20Fruit=20du=20d=C3=A9mon?= =?UTF-8?q?=20+=20affichage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Model/Stub/StubFruitDuDemon.cs | 6 +- Sources/Ohara/MainPage.xaml.cs | 2 - Sources/Ohara/NewPage3.xaml | 174 ++++++++++---------- Sources/Ohara/NewPage3.xaml.cs | 27 +-- Sources/Ohara/Ohara.csproj | 4 + Sources/Ohara/Resources/Images/eclosion.png | Bin 0 -> 992813 bytes Sources/Ohara/Resources/Images/feu.png | Bin 0 -> 1668524 bytes Sources/Ohara/Resources/Images/fumer.jpg | Bin 6471 -> 0 bytes Sources/Ohara/Resources/Images/fumer.png | Bin 0 -> 37064 bytes Sources/Ohara/Resources/Images/leopard.png | Bin 0 -> 567888 bytes Sources/Ohara/Resources/Images/nika.png | Bin 0 -> 105817 bytes 11 files changed, 116 insertions(+), 97 deletions(-) create mode 100644 Sources/Ohara/Resources/Images/eclosion.png create mode 100644 Sources/Ohara/Resources/Images/feu.png delete mode 100644 Sources/Ohara/Resources/Images/fumer.jpg create mode 100644 Sources/Ohara/Resources/Images/fumer.png create mode 100644 Sources/Ohara/Resources/Images/leopard.png create mode 100644 Sources/Ohara/Resources/Images/nika.png diff --git a/Sources/Model/Stub/StubFruitDuDemon.cs b/Sources/Model/Stub/StubFruitDuDemon.cs index d127427..061a22b 100644 --- a/Sources/Model/Stub/StubFruitDuDemon.cs +++ b/Sources/Model/Stub/StubFruitDuDemon.cs @@ -12,7 +12,11 @@ namespace Model.Stub { List fdd = new List() { - + new FruitDuDemon("Fruit de la fumée", "Moku Moky No Mi", "Logia", 97, 48, "Le fruit est ..", "Forces :", "Faiblesses :","fumer.png"), + new FruitDuDemon("Fruit de l'humain modèle Nika", "Nika Nika No Mi", "Zoan Mythique", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :","nika.png"), + new FruitDuDemon("Pyro fruit", "Nika Nika No Mi", "Logia", 158, 94, "Le fruit ...", "Forces :", "Faiblesses :","feu.png"), + new FruitDuDemon("Fruit des Éclosions", "Hana Hana no Mi", "Paramecia", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :","eclosion.png"), + new FruitDuDemon("Fruit du Félin, modèle Léopard", "Neko Neko no Mi", "Zoan Carnivore", 348, 245, "Le fruit ...", "Forces :", "Faiblesses :","leopard.png"), }; return fdd; } diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs index c4e9194..7e17a15 100644 --- a/Sources/Ohara/MainPage.xaml.cs +++ b/Sources/Ohara/MainPage.xaml.cs @@ -4,8 +4,6 @@ namespace Ohara; public partial class MainPage : ContentPage { - int count = 0; - public MainPage() { InitializeComponent(); diff --git a/Sources/Ohara/NewPage3.xaml b/Sources/Ohara/NewPage3.xaml index 3bc4383..51b18c7 100644 --- a/Sources/Ohara/NewPage3.xaml +++ b/Sources/Ohara/NewPage3.xaml @@ -1,85 +1,93 @@ - - - - - - - - - - - - - - - - - - - - - - -