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
7c0c8b30
Commit
7c0c8b30
authored
Apr 12, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev commit
parent
f4f1e030
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
play.component.ts
src/app/play/play.component.ts
+5
-1
No files found.
src/app/play/play.component.ts
View file @
7c0c8b30
...
@@ -427,7 +427,11 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -427,7 +427,11 @@ export class PlayComponent implements OnInit, OnDestroy {
}
else
{
}
else
{
if
(
cardContent
.
parentID
&&
this
.
m_currentPickupCardID
){
if
(
cardContent
.
parentID
&&
this
.
m_currentPickupCardID
){
let
pickupCard
=
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_currentPickupCardID
)
let
pickupCard
=
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_currentPickupCardID
)
if
(
cardContent
.
parentID
.
indexOf
(
"
hotzone
"
)
!=
-
1
&&
pickupCard
.
parentID
.
indexOf
(
"
hotzone
"
)
!=
-
1
){
// if( cardContent.parentID.indexOf("hotzone") != -1 && pickupCard.parentID.indexOf("hotzone") != -1 )
// if( cardContent.parentID.indexOf("hotzone") != -1 )
if
(
cardContent
.
parentID
.
indexOf
(
"
card-bckground
"
)
!=
-
1
&&
pickupCard
.
parentID
.
indexOf
(
"
card-bckground
"
)
!=
-
1
){
}
else
{
let
temp
=
pickupCard
.
parentID
let
temp
=
pickupCard
.
parentID
pickupCard
.
parentID
=
cardContent
.
parentID
pickupCard
.
parentID
=
cardContent
.
parentID
cardContent
.
parentID
=
temp
cardContent
.
parentID
=
temp
...
...
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