Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
East_L215
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_L215
Commits
27d276db
Commit
27d276db
authored
Apr 15, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev done
parent
cbb980a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
play.component.ts
src/app/play/play.component.ts
+10
-5
box.png
src/assets/play/box.png
+0
-0
card.png
src/assets/play/card.png
+0
-0
No files found.
src/app/play/play.component.ts
View file @
27d276db
...
@@ -440,8 +440,8 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -440,8 +440,8 @@ export class PlayComponent implements OnInit, OnDestroy {
// 可移动卡片
// 可移动卡片
let
cardContent
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
`card-content-
${
index
}
`
,
"
card
"
,
(
w
,
h
)
=>
{
let
cardContent
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
`card-content-
${
index
}
`
,
"
card
"
,
(
w
,
h
)
=>
{
return
{
return
{
sx
:
(
18
0
*
this
.
g_mapScale
)
/
w
,
sx
:
(
18
4
*
this
.
g_mapScale
)
/
w
,
sy
:
(
18
0
*
this
.
g_mapScale
)
/
h
sy
:
(
18
5
*
this
.
g_mapScale
)
/
h
}
}
},
(
w
,
h
)
=>
{
},
(
w
,
h
)
=>
{
return
{
return
{
...
@@ -490,19 +490,22 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -490,19 +490,22 @@ export class PlayComponent implements OnInit, OnDestroy {
if
(
!
isSaveCurrentPickupCardID
){
if
(
!
isSaveCurrentPickupCardID
){
this
.
disableMoveAsstant
()
this
.
disableMoveAsstant
()
this
.
g_enableMapUp
=
true
;
this
.
g_enableMapUp
=
true
;
// this.g_cartoon.playAudio(data.audio_url)
}
}
}
}
this
.
subscribeMapDownEvent
(
`card-content-
${
index
}
`
,
()
=>
{
this
.
subscribeMapDownEvent
(
`card-content-
${
index
}
`
,
()
=>
{
if
(
this
.
m_endGame
){
if
(
this
.
m_endGame
){
if
(
cardContent
.
parentID
.
indexOf
(
"
hot
"
)
!=
-
1
){
if
(
cardContent
.
parentID
.
indexOf
(
"
pos
"
)
!=
-
1
){
this
.
g_cartoon
.
playAudio
(
data
.
audio_url
);
this
.
g_cartoon
.
playAudio
(
data
.
audio_url
);
}
}
this
.
g_enableMapDown
=
true
;
this
.
g_enableMapDown
=
true
;
return
return
}
}
if
(
cardContent
.
parentID
.
indexOf
(
"
hot
"
)
!=
-
1
){
if
(
cardContent
.
parentID
.
indexOf
(
"
pos
"
)
!=
-
1
){
// if( this.m_renderArr.indexOf(cardContent.ref) == this.m_renderArr.length-1 ){
this
.
g_cartoon
.
playAudio
(
data
.
audio_url
)
this
.
g_cartoon
.
playAudio
(
data
.
audio_url
)
// }
cardContent
.
clickTime
=
new
Date
().
getTime
()
cardContent
.
clickTime
=
new
Date
().
getTime
()
}
else
{
}
else
{
cardContent
.
handleClick
()
cardContent
.
handleClick
()
...
@@ -541,7 +544,9 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -541,7 +544,9 @@ export class PlayComponent implements OnInit, OnDestroy {
if
(
cardContent
.
parentID
){
if
(
cardContent
.
parentID
){
if
(
cardContent
.
parentID
.
indexOf
(
"
pos_
"
)
==
-
1
){
if
(
cardContent
.
parentID
.
indexOf
(
"
pos_
"
)
==
-
1
){
this
.
g_cartoon
.
getCartoonElement
(
cardContent
.
parentID
).
setContent
(
cardContent
)
this
.
g_cartoon
.
getCartoonElement
(
cardContent
.
parentID
).
setContent
(
cardContent
)
tweenChange
(
cardContent
.
ref
,
{
scaleX
:
cardContent
.
ref
.
initScaleX
,
scaleY
:
cardContent
.
ref
.
initScaleY
},
0.1
)
}
else
{
}
else
{
tweenChange
(
cardContent
.
ref
,
{
scaleX
:
cardContent
.
ref
.
initScaleX
*
0.7
,
scaleY
:
cardContent
.
ref
.
initScaleY
*
0.7
},
0.1
)
tweenChange
(
cardContent
.
ref
,
{
x
:
cardContent
.
parentID
.
split
(
"
_
"
)[
1
],
y
:
cardContent
.
parentID
.
split
(
"
_
"
)[
2
]},
0.1
)
tweenChange
(
cardContent
.
ref
,
{
x
:
cardContent
.
parentID
.
split
(
"
_
"
)[
1
],
y
:
cardContent
.
parentID
.
split
(
"
_
"
)[
2
]},
0.1
)
}
}
}
}
...
...
src/assets/play/box.png
View replaced file @
cbb980a3
View file @
27d276db
144 KB
|
W:
|
H:
134 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/assets/play/card.png
View replaced file @
cbb980a3
View file @
27d276db
9.63 KB
|
W:
|
H:
9.74 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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