Commit 56d69ff6 authored by 李维's avatar 李维

dev commit

parent d0e39d58
...@@ -364,14 +364,26 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -364,14 +364,26 @@ export class PlayComponent implements OnInit, OnDestroy {
}) })
this.subscribeMapUpEvent(`card-content-${index}`, ()=>{ this.subscribeMapUpEvent(`card-content-${index}`, ()=>{
let card = cardContent
if(card.canMove){ if(cardContent.canMove){
setTimeout(()=>{ setTimeout(()=>{
card.canMove = false; cardContent.canMove = false;
card.backToParent() cardContent.backToParent()
this.g_cartoon.getCartoonElement(`selected-card-hotzone`).hide() this.g_cartoon.getCartoonElement(`selected-card-hotzone`).hide()
this.m_pickupCard = false; this.m_pickupCard = false;
},100) },100)
}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 ){
let temp = pickupCard.parentID
pickupCard.parentID = cardContent.parentID
cardContent.parentID =temp
cardContent.backToParent()
}
}
} }
this.g_enableMapUp = true; this.g_enableMapUp = true;
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment