Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
evalulu
Manage
Activity
Members
Labels
Plan
Issues
6
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Luciole
evalulu
Commits
d3c877ed
Commit
d3c877ed
authored
1 year ago
by
Guillaume Meinesz
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into sampleData
parents
3f71f2e9
280d616c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/GD_manager.cs
+1
-13
1 addition, 13 deletions
Assets/GD_manager.cs
Assets/QCM_manager.cs
+1
-12
1 addition, 12 deletions
Assets/QCM_manager.cs
with
2 additions
and
25 deletions
Assets/GD_manager.cs
+
1
−
13
View file @
d3c877ed
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Assets/QCM_manager.cs
+
1
−
12
View file @
d3c877ed
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment