Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
GCompris
Commits
6bcc3128
Commit
6bcc3128
authored
Jun 21, 2020
by
Manuel Tondeur
Committed by
Johnny Jazeix
Jun 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gnumch, init level after bonus fades out
parent
a255ebff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
src/activities/gnumch-equality/Gnumch.qml
src/activities/gnumch-equality/Gnumch.qml
+13
-6
No files found.
src/activities/gnumch-equality/Gnumch.qml
View file @
6bcc3128
...
@@ -48,9 +48,8 @@ ActivityBase {
...
@@ -48,9 +48,8 @@ ActivityBase {
// Set the cell invisible if it's the correct answer.
// Set the cell invisible if it's the correct answer.
if
(
Activity
.
isAnswerCorrect
(
muncher
.
index
))
{
if
(
Activity
.
isAnswerCorrect
(
muncher
.
index
))
{
modelCells
.
get
(
muncher
.
index
).
show
=
false
modelCells
.
get
(
muncher
.
index
).
show
=
false
var
levelDone
=
gridPart
.
isLevelDone
()
if
(
gridPart
.
isLevelDone
())
{
if
(
levelDone
)
{
stopLevel
();
nextLevel
()
}
}
}
else
{
}
else
{
modelCells
.
get
(
muncher
.
index
).
show
=
false
modelCells
.
get
(
muncher
.
index
).
show
=
false
...
@@ -74,14 +73,18 @@ ActivityBase {
...
@@ -74,14 +73,18 @@ ActivityBase {
Activity
.
initLevel
();
Activity
.
initLevel
();
operator
=
Activity
.
_operator
;
operator
=
Activity
.
_operator
;
topPanel
.
goal
=
Activity
.
getGoal
();
topPanel
.
goal
=
Activity
.
getGoal
();
monsters
.
destroyAll
();
stopLevel
();
spawningMonsters
.
stop
();
timerActivateWarn
.
stop
();
if
(
Activity
.
_currentLevel
%
6
!==
0
)
{
if
(
Activity
.
_currentLevel
%
6
!==
0
)
{
spawningMonsters
.
restart
();
spawningMonsters
.
restart
();
}
}
}
}
function
stopLevel
()
{
monsters
.
destroyAll
();
spawningMonsters
.
stop
();
timerActivateWarn
.
stop
();
}
anchors.fill
:
parent
anchors.fill
:
parent
color
:
"
#ABCDEF
"
color
:
"
#ABCDEF
"
signal
start
signal
start
...
@@ -384,6 +387,10 @@ ActivityBase {
...
@@ -384,6 +387,10 @@ ActivityBase {
Bonus
{
Bonus
{
id
:
bonus
id
:
bonus
onStop
:
{
parent
.
nextLevel
();
}
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment