Commit 92beb98b authored by 李维's avatar 李维

Bug fix

parent 6fc8f78d
...@@ -473,7 +473,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -473,7 +473,7 @@ export class PlayComponent implements OnInit, OnDestroy {
sliderBottom.update(); sliderBottom.update();
} }
scrollPannel.ref.y = 78 * this.g_mapScale - (scrollPannel.currentY - (this.g_canvasHeight - 78 * this.g_mapScale)) * sliderBG.getCurrentProgress() scrollPannel.ref.y = 52 * this.g_mapScale - (scrollPannel.currentY - (this.g_canvasHeight - 52 * this.g_mapScale)) * sliderBG.getCurrentProgress()
}, ()=>{ }, ()=>{
this.g_enableMapUp = true; this.g_enableMapUp = true;
this.g_enableMapDown = true; this.g_enableMapDown = true;
...@@ -517,6 +517,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -517,6 +517,7 @@ export class PlayComponent implements OnInit, OnDestroy {
pannel.ref.setSize(this.g_canvasWidth - 180 * this.g_mapScale, pannel.currentY) pannel.ref.setSize(this.g_canvasWidth - 180 * this.g_mapScale, pannel.currentY)
this.g_cartoon.getCartoonElement("slider-background").initSlider(pannel.windowHeight, pannel.currentY, 1) this.g_cartoon.getCartoonElement("slider-background").initSlider(pannel.windowHeight, pannel.currentY, 1)
this.g_cartoon.getCartoonElement("slider-background").show() this.g_cartoon.getCartoonElement("slider-background").show()
pannel.canScroll = true;
} }
pannel.ref.addChild(label.ref); pannel.ref.addChild(label.ref);
pannel.lastInserType = "Q"; pannel.lastInserType = "Q";
...@@ -561,6 +562,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -561,6 +562,9 @@ export class PlayComponent implements OnInit, OnDestroy {
clickSY = this.g_clickY; clickSY = this.g_clickY;
baseY = pannel.ref.y; baseY = pannel.ref.y;
}, ()=>{ }, ()=>{
if(!pannel.canScroll) {
return
}
let dis = clickSY - this.g_clickY; let dis = clickSY - this.g_clickY;
let _t = pannel.topY - (pannel.currentY - pannel.windowHeight) let _t = pannel.topY - (pannel.currentY - pannel.windowHeight)
if(pannel.topY <= (baseY - dis)) { if(pannel.topY <= (baseY - dis)) {
...@@ -790,10 +794,10 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -790,10 +794,10 @@ export class PlayComponent implements OnInit, OnDestroy {
mask.ref.y = startY mask.ref.y = startY
line.mask = mask; line.mask = mask;
let target = this.g_cartoon.createCartoonElementShapeRect(`lebel-answer-${index}-target-${uuidv4()}`, this.g_canvasWidth - 200 * this.g_mapScale, 64 * this.g_mapScale, "#FFFFFF") let target = this.g_cartoon.createCartoonElementShapeRect(`lebel-answer-${index}-target-${uuidv4()}`, this.g_canvasWidth - 200 * this.g_mapScale, 64 * this.g_mapScale, "#FFFF00") // FFFFFF
target.ref.x = startX target.ref.x = startX
target.ref.y = startY; target.ref.y = startY;
target.ref.alpha = 0; target.ref.alpha = 1;
line.target = target; line.target = target;
this.subscribeMapDownEvent(target.id, ()=>{ this.subscribeMapDownEvent(target.id, ()=>{
...@@ -1008,7 +1012,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -1008,7 +1012,9 @@ export class PlayComponent implements OnInit, OnDestroy {
if (this.checkClickTarget(this.g_cartoon.getCartoonElementRef(item.id))) { if (this.checkClickTarget(this.g_cartoon.getCartoonElementRef(item.id))) {
this.g_enableMapDown = false; this.g_enableMapDown = false;
if(this.m_mapDragObject[item.id]){ if(this.m_mapDragObject[item.id]){
this.m_mapDragObject[item.id].trigger() if(this.m_mapDragObject[item.id].trigger()) {
myStopPropagation = true;
}
let dragElement = this.g_cartoon.getCartoonElement(item.id) let dragElement = this.g_cartoon.getCartoonElement(item.id)
if(dragElement){ if(dragElement){
this.g_currentDragElementID = item.id this.g_currentDragElementID = item.id
...@@ -1017,8 +1023,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -1017,8 +1023,7 @@ export class PlayComponent implements OnInit, OnDestroy {
this.enableMoveAsstant(()=>{ this.enableMoveAsstant(()=>{
this.m_mapDragObject[item.id].move(dragElement) this.m_mapDragObject[item.id].move(dragElement)
}) })
} }
myStopPropagation = true;
}else{ }else{
if(item.callback()){ if(item.callback()){
myStopPropagation = true; myStopPropagation = 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