Commit 7c0c8b30 authored by 李维's avatar 李维

dev commit

parent f4f1e030
...@@ -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
......
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