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
fa4bed9c
Commit
fa4bed9c
authored
1 year ago
by
Guillaume Meinesz
Browse files
Options
Downloads
Patches
Plain Diff
pause le son et les animations quand on est sur l'écran de l'engrenage
parent
768d7ac3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/NewSystemeDeTraces.cs
+22
-4
22 additions, 4 deletions
Assets/NewSystemeDeTraces.cs
Assets/mainManager.cs
+20
-6
20 additions, 6 deletions
Assets/mainManager.cs
with
42 additions
and
10 deletions
Assets/NewSystemeDeTraces.cs
+
22
−
4
View file @
fa4bed9c
...
@@ -393,10 +393,28 @@ public class NewSystemeDeTraces : MonoBehaviour
...
@@ -393,10 +393,28 @@ public class NewSystemeDeTraces : MonoBehaviour
{
{
NewSystemeDeTracesJSONRoot
tracesJson
=
new
NewSystemeDeTracesJSONRoot
();
NewSystemeDeTracesJSONRoot
tracesJson
=
new
NewSystemeDeTracesJSONRoot
();
tracesJson
.
fluenceId
=
returnUserIDFLuence_or_UserIDHM
();
tracesJson
.
fluenceId
=
returnUserIDFLuence_or_UserIDHM
();
tracesJson
.
teacherCode
=
HM_DataController
.
currentTeacherAccount
.
teacherCode
.
ToString
();
if
(
HM_DataController
.
currentTeacherAccount
!=
null
)
tracesJson
.
loginCode
=
HM_DataController
.
currentChildUser
.
loginCode
.
ToString
();
{
tracesJson
.
userID
=
HM_DataController
.
currentChildUser
.
userID
.
ToString
();
tracesJson
.
teacherCode
=
HM_DataController
.
currentTeacherAccount
.
teacherCode
.
ToString
();
tracesJson
.
userIconID
=
HM_DataController
.
currentChildUser
.
userIconID
.
ToString
();
}
else
{
tracesJson
.
teacherCode
=
"missingHMdataController"
;
}
if
(
HM_DataController
.
currentChildUser
!=
null
)
{
tracesJson
.
loginCode
=
HM_DataController
.
currentChildUser
.
loginCode
.
ToString
();
tracesJson
.
userID
=
HM_DataController
.
currentChildUser
.
userID
.
ToString
();
tracesJson
.
userIconID
=
HM_DataController
.
currentChildUser
.
userIconID
.
ToString
();
}
else
{
tracesJson
.
loginCode
=
"missing"
;
tracesJson
.
userID
=
"missing"
;
tracesJson
.
userIconID
=
"missing"
;
}
tracesJson
.
deviceUniqueID
=
SystemInfo
.
deviceUniqueIdentifier
;
tracesJson
.
deviceUniqueID
=
SystemInfo
.
deviceUniqueIdentifier
;
tracesJson
.
versionsLuciole
=
new
List
<
NewSystemeDeTraces_appliVersionLuciole
>();
tracesJson
.
versionsLuciole
=
new
List
<
NewSystemeDeTraces_appliVersionLuciole
>();
NewSystemeDeTraces_appliVersionLuciole
versionCourante
=
new
NewSystemeDeTraces_appliVersionLuciole
();
NewSystemeDeTraces_appliVersionLuciole
versionCourante
=
new
NewSystemeDeTraces_appliVersionLuciole
();
...
...
This diff is collapsed.
Click to expand it.
Assets/mainManager.cs
+
20
−
6
View file @
fa4bed9c
...
@@ -63,9 +63,9 @@ public class mainManager : MonoBehaviour
...
@@ -63,9 +63,9 @@ public class mainManager : MonoBehaviour
Debug
.
Log
(
"start"
);
Debug
.
Log
(
"start"
);
resetClasse
();
resetClasse
();
currentSession
=
0
;
currentSession
=
0
;
Time
.
timeScale
=
1.0f
;
// Vérifier si la clé existe dans le dictionnaire
// Vérifier si la clé existe dans le dictionnaire
clefPourSauvegardeUtilisateur
=
"gm2023"
;
clefPourSauvegardeUtilisateur
=
"gm2023"
;
if
(
HM_DataController
.
currentTeacherAccount
!=
null
&&
HM_DataController
.
currentChildUser
!=
null
)
if
(
HM_DataController
.
currentTeacherAccount
!=
null
&&
HM_DataController
.
currentChildUser
!=
null
)
...
@@ -370,10 +370,10 @@ public class mainManager : MonoBehaviour
...
@@ -370,10 +370,10 @@ public class mainManager : MonoBehaviour
else
else
{
{
// il y a une autre liste d'items dans cette epreuve, on la charge
// il y a une autre liste d'items dans cette epreuve, on la charge
Debug
.
LogError
(
"reinit with new item"
);
//
Debug.LogError("reinit with new item");
currentItem
++;
currentItem
++;
i
=
epreuvesitemsCurrent
[
currentItem
];
i
=
epreuvesitemsCurrent
[
currentItem
];
Debug
.
Log
(
"i="
+
i
+
" currentItem="
+
currentItem
+
" current_step="
+
current_step
);
//
Debug.Log("i=" + i+ " currentItem="+ currentItem+ " current_step="+ current_step);
current_step
=
-
1
;
current_step
=
-
1
;
resetItem
();
resetItem
();
playSteps
();
playSteps
();
...
@@ -457,6 +457,7 @@ public class mainManager : MonoBehaviour
...
@@ -457,6 +457,7 @@ public class mainManager : MonoBehaviour
}
}
OnGoingTapToUnlockCheat
=
false
;
OnGoingTapToUnlockCheat
=
false
;
}
}
private
bool
audioIsPaused
=
false
;
private
IEnumerator
replayButtonPlaySound
(
AudioClip
unCLipSound
,
Action
mafonction
)
private
IEnumerator
replayButtonPlaySound
(
AudioClip
unCLipSound
,
Action
mafonction
)
{
{
...
@@ -464,11 +465,20 @@ public class mainManager : MonoBehaviour
...
@@ -464,11 +465,20 @@ public class mainManager : MonoBehaviour
mainAudioSource
.
clip
=
unCLipSound
;
mainAudioSource
.
clip
=
unCLipSound
;
mainAudioSource
.
Play
();
mainAudioSource
.
Play
();
while
(!
boutonCheatNext
&&
mainAudioSource
.
isPlaying
)
while
(
audioIsPaused
||
(!
boutonCheatNext
&&
mainAudioSource
.
isPlaying
)
)
{
{
yield
return
new
WaitForEndOfFrame
();
if
(
Time
.
timeScale
!=
0
)
{
// Si le Time.timeScale n'est pas zéro et que l'AudioSource est en pause, le reprendre
if
(
audioIsPaused
)
{
mainAudioSource
.
UnPause
();
audioIsPaused
=
false
;
}
}
yield
return
null
;
}
}
if
(!
boutonCheatNext
)
if
(!
boutonCheatNext
)
{
{
yield
return
new
WaitForSeconds
(
0.5f
);
yield
return
new
WaitForSeconds
(
0.5f
);
...
@@ -658,12 +668,16 @@ public class mainManager : MonoBehaviour
...
@@ -658,12 +668,16 @@ public class mainManager : MonoBehaviour
}
}
else
else
{
{
Time
.
timeScale
=
0.0f
;
audioIsPaused
=
true
;
mainAudioSource
.
Pause
();
newSystemeDeTraces
.
sendThisUserTracesToHMPlugin
(
false
);
newSystemeDeTraces
.
sendThisUserTracesToHMPlugin
(
false
);
}
}
}
}
public
void
clicRetourSessionEnCOurs
()
public
void
clicRetourSessionEnCOurs
()
{
{
Time
.
timeScale
=
1.0f
;
Debug
.
Log
(
"clicRetourSessionEnCOurs"
);
Debug
.
Log
(
"clicRetourSessionEnCOurs"
);
gameObjFin
.
SetActive
(
false
);
gameObjFin
.
SetActive
(
false
);
}
}
...
...
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