|
|
@ -522,7 +522,7 @@ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
isOverlap(a, b) { |
|
|
isOverlap(a, b) { |
|
|
return Math.abs(a.x - b.x) < 74 && Math.abs(a.y - b.y) < 74 |
|
|
return Math.abs(a.x - b.x) < 82 && Math.abs(a.y - b.y) < 82 |
|
|
}, |
|
|
}, |
|
|
cardZIndex(card) { |
|
|
cardZIndex(card) { |
|
|
return (card.layer || 0) * 100 + (card.order || 0) + 1 |
|
|
return (card.layer || 0) * 100 + (card.order || 0) + 1 |
|
|
@ -561,7 +561,7 @@ |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
this.refreshCardState() |
|
|
this.refreshCardState() |
|
|
if (card.removed || card.selected || card.locked) { |
|
|
if (card.removed || card.selected || card.locked || this.isLocked(card)) { |
|
|
this.tui.toast('这张还被压住,先消上面的牌') |
|
|
this.tui.toast('这张还被压住,先消上面的牌') |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
@ -773,7 +773,8 @@ |
|
|
.tile { position: absolute; width: 76rpx; height: 76rpx; border-radius: 22rpx; background: #fff; display: flex; align-items: center; justify-content: center; box-shadow: 0 10rpx 22rpx rgba(66,99,94,0.12); border: 2rpx solid rgba(255,255,255,0.9); transition: transform .12s ease, opacity .12s ease; } |
|
|
.tile { position: absolute; width: 76rpx; height: 76rpx; border-radius: 22rpx; background: #fff; display: flex; align-items: center; justify-content: center; box-shadow: 0 10rpx 22rpx rgba(66,99,94,0.12); border: 2rpx solid rgba(255,255,255,0.9); transition: transform .12s ease, opacity .12s ease; } |
|
|
.tile text { font-size: 42rpx; } |
|
|
.tile text { font-size: 42rpx; } |
|
|
.tile.locked { |
|
|
.tile.locked { |
|
|
opacity:.42 |
|
|
opacity: .42; |
|
|
|
|
|
pointer-events: none; |
|
|
} |
|
|
} |
|
|
.tile.selected { opacity: 0; transform: scale(.5); pointer-events: none; } |
|
|
.tile.selected { opacity: 0; transform: scale(.5); pointer-events: none; } |
|
|
.slot-wrap { margin-top: 24rpx; } |
|
|
.slot-wrap { margin-top: 24rpx; } |
|
|
|