Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
East_L228
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
East_L228
Commits
6801ce0b
Commit
6801ce0b
authored
May 13, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev commit
parent
608beb26
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
9 deletions
+1
-9
play.component.ts
src/app/play/play.component.ts
+1
-9
No files found.
src/app/play/play.component.ts
View file @
6801ce0b
...
@@ -224,7 +224,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -224,7 +224,6 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
initCamera
();
this
.
initCamera
();
this
.
initCards
();
this
.
initCards
();
this
.
m_enableAutoRunFocus
=
true
;
this
.
m_enableAutoRunFocus
=
true
;
console
.
log
(
"
Init auto
"
)
this
.
autoRunFocus
()
this
.
autoRunFocus
()
this
.
initShowCard
();
this
.
initShowCard
();
this
.
g_cartoon
.
playAudio
(
"
sm-run
"
,
false
,
null
,
true
,
(
audio
)
=>
{
this
.
g_cartoon
.
playAudio
(
"
sm-run
"
,
false
,
null
,
true
,
(
audio
)
=>
{
...
@@ -303,7 +302,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -303,7 +302,6 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
subscribeMapDownEvent
(
element
.
id
,
()
=>
{
this
.
subscribeMapDownEvent
(
element
.
id
,
()
=>
{
if
(
this
.
m_enableCamera
){
if
(
this
.
m_enableCamera
){
console
.
log
(
"
Enable camera -> 1 false
"
)
this
.
m_enableCamera
=
false
;
this
.
m_enableCamera
=
false
;
this
.
g_cartoon
.
stopAudio
(
"
sm-run
"
)
this
.
g_cartoon
.
stopAudio
(
"
sm-run
"
)
clearTimeout
(
this
.
m_autoFocusID
)
clearTimeout
(
this
.
m_autoFocusID
)
...
@@ -497,7 +495,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -497,7 +495,6 @@ export class PlayComponent implements OnInit, OnDestroy {
}
}
if
(
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
next
]).
ref
.
x
>=
this
.
g_canvasWidth
-
300
*
this
.
g_mapScale
){
if
(
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
next
]).
ref
.
x
>=
this
.
g_canvasWidth
-
300
*
this
.
g_mapScale
){
console
.
log
(
"
Enable camera -> 2 false
"
)
this
.
m_enableCamera
=
false
;
this
.
m_enableCamera
=
false
;
this
.
g_enableMapDown
=
false
;
this
.
g_enableMapDown
=
false
;
let
distance
=
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
current
]).
ref
.
x
/
2
let
distance
=
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
current
]).
ref
.
x
/
2
...
@@ -506,7 +503,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -506,7 +503,6 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
current
]).
hideHighlight
()
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
current
]).
hideHighlight
()
}
}
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
next
]).
showHighlight
(()
=>
{
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_allCardIds
[
next
]).
showHighlight
(()
=>
{
console
.
log
(
"
Enable camera -> 3 true
"
)
this
.
m_enableCamera
=
true
;
this
.
m_enableCamera
=
true
;
this
.
g_enableMapDown
=
true
;
this
.
g_enableMapDown
=
true
;
callback
&&
callback
()
callback
&&
callback
()
...
@@ -530,7 +526,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -530,7 +526,6 @@ export class PlayComponent implements OnInit, OnDestroy {
if
(
this
.
m_enableAutoRunFocus
){
if
(
this
.
m_enableAutoRunFocus
){
this
.
m_autoFocusID
=
setTimeout
(()
=>
{
this
.
m_autoFocusID
=
setTimeout
(()
=>
{
if
(
this
.
m_enableAutoRunFocus
){
if
(
this
.
m_enableAutoRunFocus
){
console
.
log
(
"
Set timeout auto
"
)
this
.
autoRunFocus
()
this
.
autoRunFocus
()
}
}
},
3000
)
},
3000
)
...
@@ -614,7 +609,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -614,7 +609,6 @@ export class PlayComponent implements OnInit, OnDestroy {
let
text
=
this
.
g_cartoon
.
createLabel
(
data
.
text
,
"
BerlinSansFBDemi-Bold
"
,
null
,
50
)
let
text
=
this
.
g_cartoon
.
createLabel
(
data
.
text
,
"
BerlinSansFBDemi-Bold
"
,
null
,
50
)
let
lineNum
=
data
.
text
.
split
(
"
"
).
length
let
lineNum
=
data
.
text
.
split
(
"
"
).
length
console
.
log
(
lineNum
)
text
.
maxSingalLineWidth
=
165
text
.
maxSingalLineWidth
=
165
text
.
fontColor
=
"
#e05e14
"
;
text
.
fontColor
=
"
#e05e14
"
;
if
(
lineNum
>
1
){
if
(
lineNum
>
1
){
...
@@ -644,7 +638,6 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -644,7 +638,6 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
m_enableAutoRunFocus
=
true
;
this
.
m_enableAutoRunFocus
=
true
;
element
.
audio_url
=
null
;
element
.
audio_url
=
null
;
this
.
g_cartoon
.
stopAudio
(
element
.
audio_url
)
this
.
g_cartoon
.
stopAudio
(
element
.
audio_url
)
console
.
log
(
"
Close auto
"
)
this
.
autoRunFocus
()
this
.
autoRunFocus
()
tweenChange
(
element
.
ref
,
{
scaleX
:
0
,
scaleY
:
0
},
0.3
,
()
=>
{
tweenChange
(
element
.
ref
,
{
scaleX
:
0
,
scaleY
:
0
},
0.3
,
()
=>
{
element
.
ref
.
visible
=
false
;
element
.
ref
.
visible
=
false
;
...
@@ -671,8 +664,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -671,8 +664,7 @@ export class PlayComponent implements OnInit, OnDestroy {
})
})
this
.
subscribeMapDownEvent
(
closeBntton
.
id
,
()
=>
{
this
.
subscribeMapDownEvent
(
closeBntton
.
id
,
()
=>
{
this
.
g_cartoon
.
playAudio
(
"
sm-camera
"
)
this
.
g_cartoon
.
stopAudio
(
element
.
audio_url
)
console
.
log
(
"
Enable camera -> 4 true
"
)
this
.
m_enableCamera
=
true
;
this
.
m_enableCamera
=
true
;
element
.
hide
(()
=>
{
element
.
hide
(()
=>
{
this
.
g_enableMapDown
=
true
this
.
g_enableMapDown
=
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