From 7c128cd5d1cd673e9ca2c512eeb27f296ea56c94 Mon Sep 17 00:00:00 2001 From: cldupland Date: Fri, 29 Nov 2019 12:04:25 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20des=20fractions,=20du=20logo=20(=C3=A0?= =?UTF-8?q?=20finir=20de=20placer=20et=20redimensionner)=20et=20correction?= =?UTF-8?q?=20de=20design=20et=20d'erreur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Documentations/Instruction | 24 +--- .../Properties/AndroidManifest.xml | 10 +- .../Resources/Resource.designer.cs | 8 +- TheGameExtreme/Media/TrierImageB.png | Bin 0 -> 11443 bytes TheGameExtreme/TheGameExtreme.csproj | 2 + .../model/Card/cardType/FractionCard.cs | 6 +- TheGameExtreme/model/Fraction.cs | 28 ++--- .../model/gameActions/classic/GameMode.cs | 16 +-- .../gameActions/classic/JouerUneCarte.cs | 2 +- TheGameExtreme/view/GamePreparationPage.xaml | 19 +-- .../view/GamePreparationPage.xaml.cs | 4 +- TheGameExtreme/view/HomePage.xaml | 118 ++++++++++-------- TheGameExtreme/view/MainPage.xaml.cs | 12 ++ TheGameExtreme/view/TouchManipulationCard.cs | 58 ++++++++- 14 files changed, 174 insertions(+), 133 deletions(-) create mode 100644 TheGameExtreme/Media/TrierImageB.png diff --git a/Documentations/Instruction b/Documentations/Instruction index cf5eaac..8ba492a 100644 --- a/Documentations/Instruction +++ b/Documentations/Instruction @@ -1,24 +1,6 @@ -Passer sur git - Mono-utilisateur: - Multilangue - - Changer les thèmes et les couleurs (en option) - - jeu classique pas extreme - - Thème dark - - Jeu solo complet - - Push version sur les stores pour la semaine pro - - Rendre abstract la creation deck V - - Drag and drop + - Changer les thèmes et les couleurs (en option) V => pour l'instant thème blanc et noir - Option pour mettre/enlever le pas de 10 - - Menu de choix de partie - - Menu des règles - - Plus de com (1 mail chaque soir) - - Faire une classe règle abstraite: - - Faire une list de règle devant toute être vérifier à chaque carte joué - - Faire une list de règle devant toute être vérifier à chaque fin de tour - - Skia - - GameMaster implémentera un ModeDeJeu qui implémentera des règles du jeu - - - The game -> déposé? - avant faire fonctionner en local puis on choisira ensemble \ No newline at end of file + - Logo entre les piles (à finir de placer et de redimensionner) + - nb carte \ No newline at end of file diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml index 41828fb..f0a1626 100644 --- a/TheGameExtreme.Android/Properties/AndroidManifest.xml +++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml @@ -3,13 +3,9 @@ - - - - - - - + + + \ No newline at end of file diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs index 3e31455..27e2d81 100644 --- a/TheGameExtreme.Android/Resources/Resource.designer.cs +++ b/TheGameExtreme.Android/Resources/Resource.designer.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/TheGameExtreme/Media/TrierImageB.png b/TheGameExtreme/Media/TrierImageB.png new file mode 100644 index 0000000000000000000000000000000000000000..3a216ac084c681cc5ff62230f1a221bd6a01a4a3 GIT binary patch literal 11443 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 literal 0 HcmV?d00001 diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index 3781ebb..a5ff2d1 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -44,9 +44,11 @@ + + diff --git a/TheGameExtreme/model/Card/cardType/FractionCard.cs b/TheGameExtreme/model/Card/cardType/FractionCard.cs index 266c700..62b1cc1 100644 --- a/TheGameExtreme/model/Card/cardType/FractionCard.cs +++ b/TheGameExtreme/model/Card/cardType/FractionCard.cs @@ -5,11 +5,11 @@ namespace TheGameExtreme.model.card.cardType { public static readonly string CARD_FRACTION = "FractionCard"; - private Fraction fraction; + public Fraction Fraction { get; set; } public FractionCard(Fraction value) : base(value.Result()) { - fraction = value; + Fraction = value; } public override bool rapidEffect() @@ -24,7 +24,7 @@ namespace TheGameExtreme.model.card.cardType public override string ToString() { - return fraction.ToString(); + return Fraction.ToString(); } } } diff --git a/TheGameExtreme/model/Fraction.cs b/TheGameExtreme/model/Fraction.cs index 6683fe4..f4e0ca4 100644 --- a/TheGameExtreme/model/Fraction.cs +++ b/TheGameExtreme/model/Fraction.cs @@ -13,22 +13,18 @@ namespace TheGameExtreme.model Denominateur = denominateur; } - //public int CompareTo(Fraction fraction) - //{ - // decimal d = (Numerateur / Denominateur) - (fraction.Numerateur / fraction.Denominateur); - // if (d > 0) - // { - // return 1; - // } - // else if (d < 0) - // { - // return -1; - // } - // else - // { - // return 0; - // } - //} + public bool isMultiple(Fraction fraction) + { + if (Numerateur % fraction.Numerateur == 0) + { + return true; + } + if (Denominateur % fraction.Denominateur == 0) + { + return true; + } + return false; + } public bool testDiviseurCommun(Fraction fraction) { diff --git a/TheGameExtreme/model/gameActions/classic/GameMode.cs b/TheGameExtreme/model/gameActions/classic/GameMode.cs index 32fea88..f615fb9 100644 --- a/TheGameExtreme/model/gameActions/classic/GameMode.cs +++ b/TheGameExtreme/model/gameActions/classic/GameMode.cs @@ -75,23 +75,23 @@ namespace TheGameExtreme.model.gameActions.classic { if (start < end) { - decimal pivot = ar[end].Value; + Card pivot = ar[end]; int pIndex = start; - decimal swap; + Card swap; for (int i = start; i < end; i++) { - if (ar[i].Value < pivot) + if (ar[i].Value.CompareTo(pivot.Value) < 0) { - swap = ar[pIndex].Value; - ar[pIndex].Value = ar[i].Value; - ar[i].Value = swap; + swap = ar[pIndex]; + ar[pIndex] = ar[i]; + ar[i] = swap; pIndex++; } } - ar[end].Value = ar[pIndex].Value; - ar[pIndex].Value = pivot; + ar[end] = ar[pIndex]; + ar[pIndex] = pivot; quickSort(ar, start, pIndex - 1); quickSort(ar, pIndex + 1, end); diff --git a/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs b/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs index 9c8e1e2..9f8c7f3 100644 --- a/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs +++ b/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs @@ -52,7 +52,7 @@ namespace TheGameExtreme.model.gameActions.classic protected bool Rule(Card card, Stack stack, bool bottomUp, Player player, List CurrentCardPlayed) { - if ((bottomUp && card.Value > stack.Peek().Value) || (!bottomUp && card.Value < stack.Peek().Value) || card.Value.CompareTo(stack.Peek().Value - 10) == 0 || card.Value.CompareTo(stack.Peek().Value + 10) == 0) + if ((bottomUp && card.Value.CompareTo(stack.Peek().Value) > 0) || (!bottomUp && card.Value.CompareTo(stack.Peek().Value) < 0)) // || card.Value.CompareTo(stack.Peek().Value - 10) == 0 || card.Value.CompareTo(stack.Peek().Value + 10) == 0 => creer classe abstraite decimal carte qui pour contenir isMultiple { OldCard = stack.Peek(); player.joue(card); diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml index 33a7fa4..04ae228 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml +++ b/TheGameExtreme/view/GamePreparationPage.xaml @@ -140,22 +140,6 @@ - - - - - - - + WidthRequest="200" + MaxLength="18"/> diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs index 605d4f5..17d8ffa 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml.cs +++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs @@ -85,8 +85,8 @@ namespace TheGameExtreme.view BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"], WidthRequest = 200, MinimumWidthRequest = 50, - HorizontalOptions = LayoutOptions.Center - + HorizontalOptions = LayoutOptions.Center, + MaxLength = 18 }; diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml index 4baa5d0..66da2c4 100644 --- a/TheGameExtreme/view/HomePage.xaml +++ b/TheGameExtreme/view/HomePage.xaml @@ -1,70 +1,88 @@  - + + - - - + + + - - - - + + + + -