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
c2ae8507
Commit
c2ae8507
authored
Apr 13, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
d2be6932
Changes
1
Hide 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 @
c2ae8507
...
...
@@ -498,11 +498,6 @@ export class PlayComponent implements OnInit, OnDestroy {
cardContent
.
ref
.
x
=
this
.
g_clickX
cardContent
.
ref
.
y
=
this
.
g_clickY
}
// else{
// if(dis>(50*this.g_mapScale)){
// cardContent.canMove = true;
// }
// }
this
.
g_enableMapMove
=
true
;
})
...
...
@@ -518,8 +513,6 @@ export class PlayComponent implements OnInit, OnDestroy {
}
else
{
if
(
cardContent
.
parentID
&&
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 )
if
(
cardContent
.
parentID
.
indexOf
(
"
card-bckground
"
)
!=
-
1
&&
pickupCard
.
parentID
.
indexOf
(
"
card-bckground
"
)
!=
-
1
){
}
else
{
...
...
@@ -542,6 +535,7 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
g_cartoon
.
getCartoonElement
(
cardContent
.
parentID
).
setContent
(
cardContent
)
}
hilightBackground
.
ref
.
visible
=
false
;
this
.
m_currentPickupCardID
=
null
;
}
this
.
render
(
cardContent
.
ref
,
999
)
//
...
...
@@ -600,7 +594,6 @@ export class PlayComponent implements OnInit, OnDestroy {
}
element
.
setContent
(
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_currentPickupCardID
))
this
.
g_cartoon
.
getCartoonElement
(
"
start-button
"
).
showHideCheck
()
this
.
m_currentPickupCardID
=
null
;
}
}
this
.
g_enableMapUp
=
true
;
...
...
@@ -823,7 +816,6 @@ export class PlayComponent implements OnInit, OnDestroy {
}
element
.
setContent
(
this
.
g_cartoon
.
getCartoonElement
(
this
.
m_currentPickupCardID
))
this
.
g_cartoon
.
getCartoonElement
(
"
start-button
"
).
showHideCheck
()
this
.
m_currentPickupCardID
=
null
;
}
}
this
.
g_enableMapUp
=
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