Commit c2ae8507 authored by 李维's avatar 李维

bug fix

parent d2be6932
...@@ -498,11 +498,6 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -498,11 +498,6 @@ export class PlayComponent implements OnInit, OnDestroy {
cardContent.ref.x = this.g_clickX cardContent.ref.x = this.g_clickX
cardContent.ref.y = this.g_clickY cardContent.ref.y = this.g_clickY
} }
// else{
// if(dis>(50*this.g_mapScale)){
// cardContent.canMove = true;
// }
// }
this.g_enableMapMove = true; this.g_enableMapMove = true;
}) })
...@@ -518,8 +513,6 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -518,8 +513,6 @@ 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 )
if( cardContent.parentID.indexOf("card-bckground") != -1 && pickupCard.parentID.indexOf("card-bckground") != -1 ){ if( cardContent.parentID.indexOf("card-bckground") != -1 && pickupCard.parentID.indexOf("card-bckground") != -1 ){
}else{ }else{
...@@ -542,6 +535,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -542,6 +535,7 @@ export class PlayComponent implements OnInit, OnDestroy {
this.g_cartoon.getCartoonElement(cardContent.parentID).setContent(cardContent) this.g_cartoon.getCartoonElement(cardContent.parentID).setContent(cardContent)
} }
hilightBackground.ref.visible = false; hilightBackground.ref.visible = false;
this.m_currentPickupCardID = null;
} }
this.render(cardContent.ref,999) this.render(cardContent.ref,999)
// //
...@@ -600,7 +594,6 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -600,7 +594,6 @@ export class PlayComponent implements OnInit, OnDestroy {
} }
element.setContent(this.g_cartoon.getCartoonElement(this.m_currentPickupCardID)) element.setContent(this.g_cartoon.getCartoonElement(this.m_currentPickupCardID))
this.g_cartoon.getCartoonElement("start-button").showHideCheck() this.g_cartoon.getCartoonElement("start-button").showHideCheck()
this.m_currentPickupCardID = null;
} }
} }
this.g_enableMapUp = true; this.g_enableMapUp = true;
...@@ -823,7 +816,6 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -823,7 +816,6 @@ export class PlayComponent implements OnInit, OnDestroy {
} }
element.setContent(this.g_cartoon.getCartoonElement(this.m_currentPickupCardID)) element.setContent(this.g_cartoon.getCartoonElement(this.m_currentPickupCardID))
this.g_cartoon.getCartoonElement("start-button").showHideCheck() this.g_cartoon.getCartoonElement("start-button").showHideCheck()
this.m_currentPickupCardID = null;
} }
} }
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