From 781f6b29588809b9f0ae2f23b8b8cc10f8865868 Mon Sep 17 00:00:00 2001
From: Nongma SORGHO <sorghocharles8@gmail.com>
Date: Sat, 13 May 2023 17:18:52 +0200
Subject: [PATCH] (fix: all) fixing 4 players game routine
---
App/Assets/AddressableAssetsData/link.xml | 25 -------------------
.../AddressableAssetsData/link.xml.meta | 7 ------
App/Assets/Scripts/Joueur.cs | 7 +++---
Server/Assets/Script/Partie.cs | 2 +-
4 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 App/Assets/AddressableAssetsData/link.xml
delete mode 100644 App/Assets/AddressableAssetsData/link.xml.meta
diff --git a/App/Assets/AddressableAssetsData/link.xml b/App/Assets/AddressableAssetsData/link.xml
deleted file mode 100644
index 66763552e..000000000
--- a/App/Assets/AddressableAssetsData/link.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<linker>
- <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
- <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
- </assembly>
- <assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
- <type fullname="UnityEngine.Localization.Locale" preserve="all" />
- <type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
- <type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
- <type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
- <type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
- <type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
- <type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
- <type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
- </assembly>
- <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
- <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
- <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
- <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
- <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
- <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
- </assembly>
- <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
- <type fullname="UnityEngine.Object" preserve="all" />
- </assembly>
-</linker>
\ No newline at end of file
diff --git a/App/Assets/AddressableAssetsData/link.xml.meta b/App/Assets/AddressableAssetsData/link.xml.meta
deleted file mode 100644
index 2f68a6420..000000000
--- a/App/Assets/AddressableAssetsData/link.xml.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8244ed2312f2335588e921c4c5ca6009
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/App/Assets/Scripts/Joueur.cs b/App/Assets/Scripts/Joueur.cs
index b554425ff..43bd50cfa 100644
--- a/App/Assets/Scripts/Joueur.cs
+++ b/App/Assets/Scripts/Joueur.cs
@@ -205,7 +205,7 @@ public class Joueur : MonoBehaviour
{
// if it is not this player's turn disable the dice button
float[] timerInfo = client.getTimerInfo(ID_joueur-1);
- if (tour + 1 != ID_joueur || hasChosen || timerInfo[0] == 2.0f)
+ if (cient.get_ID_tour() + 1 != ID_joueur || hasChosen || timerInfo[0] == 2.0f)
{
choiceButton.interactable = false;
}
@@ -213,7 +213,7 @@ public class Joueur : MonoBehaviour
{
choiceButton.interactable = true;
}
- if (tour + 1 == ID_joueur && gameStarted)
+ if (cient.get_ID_tour() + 1 == ID_joueur && gameStarted)
{
choiceButton.gameObject.SetActive(true);
}
@@ -221,6 +221,7 @@ public class Joueur : MonoBehaviour
{
choiceButton.gameObject.SetActive(false);
}
+ UnityEngine.Debug.Log("id du joueur : " + ID_joueur + " tour : " + client.get_ID_tour());
}
/**
@@ -246,4 +247,4 @@ public class Joueur : MonoBehaviour
{
return count_pion;
}
-}
+}
\ No newline at end of file
diff --git a/Server/Assets/Script/Partie.cs b/Server/Assets/Script/Partie.cs
index 40b6efa0a..965668463 100644
--- a/Server/Assets/Script/Partie.cs
+++ b/Server/Assets/Script/Partie.cs
@@ -148,7 +148,7 @@ public class Partie : MonoBehaviour
this.nb_joueur = joueurs.Length;
- for (int i = 0; i < 1; i++)
+ for (int i = 0; i < 4; i++)
{
this.clientSockets[i] = clients[i];
}
--
GitLab