Skip to content
Snippets Groups Projects
Commit d3c877ed authored by Guillaume Meinesz's avatar Guillaume Meinesz
Browse files

Merge branch 'main' into sampleData

parents 3f71f2e9 280d616c
No related branches found
No related tags found
No related merge requests found
...@@ -245,19 +245,7 @@ public class GD_manager : MonoBehaviour ...@@ -245,19 +245,7 @@ public class GD_manager : MonoBehaviour
case -1: case -1:
mM.texteCheat.text += "\npret"; mM.texteCheat.text += "\npret";
bool uneImageExiste = mM.executeAsset(mM.i.pret, null, true); bool uneImageExiste = mM.executeAsset(mM.i.pret, null, true);
bool unSonExiste = mM.executeAsset(mM.i.pret, mM.flecheReadyDisplayed, false); mM.executeAsset(mM.i.pret, mM.flecheReadyDisplayed, false);
if (!unSonExiste || !uneImageExiste)
{
mM.playerTurn = false;
//Debug.LogError("pas d'image ou pas de son pour le bouton pret on poursuit");
// si il n'y a ni image ni son dans cet asset, on poursuit :
playswitch = true;
} // correspond aux step 0 et 1 du droulement dans
else
{
//Debug.LogError("quelquechose existe");
}
break; break;
case 0: case 0:
if (mM.posScript.currentlyInstanciatedprefabImagePrincipale != null) if (mM.posScript.currentlyInstanciatedprefabImagePrincipale != null)
......
...@@ -19,18 +19,7 @@ public class QCM_manager : MonoBehaviour ...@@ -19,18 +19,7 @@ public class QCM_manager : MonoBehaviour
case -1: case -1:
mM.texteCheat.text += "\nPret"; mM.texteCheat.text += "\nPret";
bool uneImageExiste = mM.executeAsset(mM.i.pret, null,true); bool uneImageExiste = mM.executeAsset(mM.i.pret, null,true);
bool unSonExiste = mM.executeAsset(mM.i.pret, mM.flecheReadyDisplayed,false); mM.executeAsset(mM.i.pret, mM.flecheReadyDisplayed,false);
if (!unSonExiste || !uneImageExiste)
{
mM.playerTurn = false;
//Debug.LogError("pas d'image on poursuit");
// si il n'y a ni image ni son dans cet asset, on poursuit :
playswitch = true;
} // correspond aux step 0 et 1 du droulement dans
else
{
//Debug.LogError("quelquechose existe");
}
break; break;
case 0: case 0:
Debug.Log("on destroy image pricnipale"); Debug.Log("on destroy image pricnipale");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment