Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
LST-05
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
template admin
LST-05
Commits
0d999088
Commit
0d999088
authored
Nov 20, 2020
by
Chen Jiping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复显示问题
parent
c85320c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
33 deletions
+50
-33
Card.ts
src/app/play/Card.ts
+4
-0
play.component.ts
src/app/play/play.component.ts
+46
-33
No files found.
src/app/play/Card.ts
View file @
0d999088
...
@@ -128,6 +128,10 @@ export class Card {
...
@@ -128,6 +128,10 @@ export class Card {
this
.
bgWord
.
addChild
(
label
);
this
.
bgWord
.
addChild
(
label
);
this
.
h
=
this
.
bgWord
.
getBoundingBox
().
height
;
this
.
h
=
this
.
bgWord
.
getBoundingBox
().
height
;
}
}
if
(
callback
)
{
callback
();
}
}
}
...
...
src/app/play/play.component.ts
View file @
0d999088
...
@@ -91,7 +91,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -91,7 +91,7 @@ export class PlayComponent implements OnInit, OnDestroy {
gameEndFlag
=
false
;
gameEndFlag
=
false
;
showCardTimeId
Arr
=
[]
;
showCardTimeId
;
@
HostListener
(
'
window:resize
'
,
[
'
$event
'
])
@
HostListener
(
'
window:resize
'
,
[
'
$event
'
])
onResize
(
event
)
{
onResize
(
event
)
{
...
@@ -559,21 +559,18 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -559,21 +559,18 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
answerArr
.
push
(...
this
.
data
.
answerArr
);
this
.
answerArr
.
push
(...
this
.
data
.
answerArr
);
this
.
answerArr2
.
push
(...
this
.
answerArr
)
;
this
.
answerArr2
=
[]
;
this
.
holeExistArr
=
[];
this
.
holeExistArr
=
[];
this
.
cardExistArr
=
[];
this
.
cardExistArr
=
[];
console
.
log
(
this
.
showCardTimeIdArr
);
if
(
this
.
showCardTimeId
Arr
)
{
if
(
this
.
showCardTimeId
)
{
this
.
showCardTimeIdArr
.
forEach
((
showCardTimeId
)
=>
{
clearTimeout
(
this
.
showCardTimeId
);
clearTimeout
(
showCardTimeId
);
});
}
}
this
.
showCardTimeIdArr
=
[];
}
}
...
@@ -772,6 +769,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -772,6 +769,7 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
cardArr
=
[];
this
.
cardArr
=
[];
this
.
holePosArr
=
[];
this
.
holePosArr
=
[];
this
.
answerArr2
=
[];
const
rightNum
=
Math
.
ceil
(
Math
.
random
()
*
3
);
const
rightNum
=
Math
.
ceil
(
Math
.
random
()
*
3
);
const
idArr
=
randomSortByArr
([
1
,
2
,
3
]);
const
idArr
=
randomSortByArr
([
1
,
2
,
3
]);
...
@@ -837,7 +835,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -837,7 +835,7 @@ export class PlayComponent implements OnInit, OnDestroy {
for
(
let
i
=
0
;
i
<
this
.
cardArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
cardArr
.
length
;
i
++
)
{
clearTimeout
(
this
.
cardArr
[
i
].
timeId
);
clearTimeout
(
this
.
cardArr
[
i
].
timeId
);
if
(
this
.
cardArr
[
i
].
tween
)
{
if
(
this
.
cardArr
[
i
].
tween
)
{
//
this.cardArr[i].tween.stop();
this
.
cardArr
[
i
].
tween
.
stop
();
}
}
}
}
...
@@ -857,8 +855,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -857,8 +855,6 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
gameEndFlag
=
false
;
this
.
gameEndFlag
=
false
;
this
.
answerArr
=
randomSortByArr
(
this
.
answerArr2
);
this
.
answerArr
.
forEach
((
val
)
=>
{
this
.
answerArr
.
forEach
((
val
)
=>
{
val
.
endFlag
=
false
;
val
.
endFlag
=
false
;
})
})
...
@@ -871,18 +867,31 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -871,18 +867,31 @@ export class PlayComponent implements OnInit, OnDestroy {
}
}
getAnswer
(
callback
)
{
getAnswer
(
callback
)
{
if
(
this
.
answerArr
.
length
<=
0
)
{
setTimeout
(()
=>
{
let
answer
=
this
.
getRandomItemFromArr
(
this
.
answerArr
);
if
(
!
answer
){
setTimeout
(()
=>
{
this
.
getAnswer
(
callback
);
this
.
getAnswer
(
callback
);
},
2
0
);
},
1
0
);
return
;
}
}
else
{
let
index
=
this
.
answerArr2
.
indexOf
(
answer
);
if
(
index
==
-
1
&&
!
answer
.
endFlag
){
let
answer
=
this
.
answerArr
.
shift
();
this
.
answerArr2
.
push
(
answer
);
callback
(
answer
);
callback
(
answer
);
}
else
{
setTimeout
(()
=>
{
this
.
getAnswer
(
callback
);
},
10
);
}
}
}
}
getRandomItemFromArr
(
arr
)
{
getRandomItemFromArr
(
arr
)
{
...
@@ -903,12 +912,13 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -903,12 +912,13 @@ export class PlayComponent implements OnInit, OnDestroy {
if
(
this
.
gameEndFlag
)
{
if
(
this
.
gameEndFlag
)
{
return
;
return
;
}
}
if
(
this
.
holeExistArr
.
length
>=
2
)
{
if
(
this
.
holeExistArr
.
length
>=
3
)
{
return
;
return
;
}
}
this
.
getAnswer
((
answer
)
=>
{
this
.
getAnswer
((
answer
)
=>
{
const
holeArr
=
[
0
,
1
,
2
,
3
,
4
];
const
holeArr
=
[
0
,
1
,
2
,
3
,
4
];
for
(
let
i
=
0
;
i
<
this
.
holeExistArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
holeExistArr
.
length
;
i
++
)
{
removeItemFromArr
(
holeArr
,
this
.
holeExistArr
[
i
]);
removeItemFromArr
(
holeArr
,
this
.
holeExistArr
[
i
]);
...
@@ -922,11 +932,12 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -922,11 +932,12 @@ export class PlayComponent implements OnInit, OnDestroy {
for
(
let
i
=
0
;
i
<
this
.
cardExistArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
cardExistArr
.
length
;
i
++
)
{
removeItemFromArr
(
cardIndexArr
,
this
.
cardExistArr
[
i
]);
removeItemFromArr
(
cardIndexArr
,
this
.
cardExistArr
[
i
]);
}
}
for
(
let
i
=
0
;
i
<
cardIndexArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
cardIndexArr
.
length
;
i
++
)
{
const
cardIndex
=
cardIndexArr
[
i
];
const
cardIndex
=
cardIndexArr
[
i
];
if
(
cardIndex
)
{
if
(
cardIndex
)
{
const
card
=
this
.
cardArr
[
cardIndex
];
const
card
=
this
.
cardArr
[
cardIndex
];
if
(
card
.
canHit
)
{
if
(
card
.
canHit
)
{
cardIndexArr
.
splice
(
i
,
1
);
cardIndexArr
.
splice
(
i
,
1
);
i
--
;
i
--
;
...
@@ -934,7 +945,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -934,7 +945,7 @@ export class PlayComponent implements OnInit, OnDestroy {
}
}
}
}
if
(
cardIndexArr
.
length
==
0
)
{
if
(
cardIndexArr
.
length
==
0
)
{
return
;
return
;
}
}
...
@@ -954,20 +965,19 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -954,20 +965,19 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
sortRenderZ
(
this
.
renderArr
);
this
.
sortRenderZ
(
this
.
renderArr
);
card
.
showNext
(
answer
);
card
.
showNext
(
answer
);
this
.
cardUp
(
card
);
this
.
cardUp
(
card
);
this
.
holeExistArr
.
push
(
holeIndex
);
this
.
holeExistArr
.
push
(
holeIndex
);
this
.
cardExistArr
.
push
(
cardIndex
);
this
.
cardExistArr
.
push
(
cardIndex
);
let
showCardTimeId
=
setTimeout
(()
=>
{
this
.
showCardTimeId
=
setTimeout
(()
=>
{
// console.log(' in timeout')
// console.log(' in timeout')
this
.
showCard
();
this
.
showCard
();
removeItemFromArr
(
this
.
showCardTimeIdArr
,
showCardTimeId
);
},
500
+
1500
*
Math
.
random
());
},
500
+
1500
*
Math
.
random
());
this
.
showCardTimeIdArr
.
push
(
showCardTimeId
);
});
});
}
}
...
@@ -1000,13 +1010,16 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -1000,13 +1010,16 @@ export class PlayComponent implements OnInit, OnDestroy {
card
.
canHit
=
false
;
card
.
canHit
=
false
;
if
(
!
card
.
curAnswer
.
endFlag
)
{
if
(
!
card
.
curAnswer
.
endFlag
)
{
removeItemFromArr
(
this
.
cardExistArr
,
card
.
id
);
}
else
{
}
else
{
this
.
checkGameEnd
();
this
.
checkGameEnd
();
}
}
removeItemFromArr
(
this
.
cardExistArr
,
card
.
id
);
removeItemFromArr
(
this
.
holeExistArr
,
card
.
holeId
);
removeItemFromArr
(
this
.
holeExistArr
,
card
.
holeId
);
this
.
answerArr
.
push
(
card
.
curAnswer
);
removeItemFromArr
(
this
.
answerArr2
,
card
.
curAnswer
);
if
(
this
.
holeExistArr
.
length
<=
1
)
{
if
(
this
.
holeExistArr
.
length
<=
1
)
{
this
.
showCard
();
this
.
showCard
();
...
@@ -1050,8 +1063,8 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -1050,8 +1063,8 @@ export class PlayComponent implements OnInit, OnDestroy {
}
}
checkGameEnd
()
{
checkGameEnd
()
{
for
(
let
i
=
0
;
i
<
this
.
answerArr
2
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
answerArr
.
length
;
i
++
)
{
if
(
this
.
answerArr
2
[
i
].
isRight
==
'
1
'
&&
!
this
.
answerArr2
[
i
].
endFlag
)
{
if
(
this
.
answerArr
[
i
].
isRight
==
'
1
'
&&
!
this
.
answerArr
[
i
].
endFlag
)
{
return
;
return
;
}
}
}
}
...
@@ -1065,8 +1078,8 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -1065,8 +1078,8 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
audioAni
.
pauseAudio
();
this
.
audioAni
.
pauseAudio
();
for
(
let
i
=
0
;
i
<
this
.
cardArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
cardArr
.
length
;
i
++
)
{
this
.
cardArr
[
i
].
bg
.
childDepandAlpha
=
true
;
//hideItem(this.cardArr[i].bg, 0.3)
;
hideItem
(
this
.
cardArr
[
i
].
bg
,
0.3
)
;
this
.
cardArr
[
i
].
bg
.
visible
=
false
;
}
}
this
.
gameEndFlag
=
true
;
this
.
gameEndFlag
=
true
;
...
...
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