diff --git a/package1/planet/adventure.vue b/package1/planet/adventure.vue
index 9a9a4cb..25c02e8 100644
--- a/package1/planet/adventure.vue
+++ b/package1/planet/adventure.vue
@@ -72,7 +72,7 @@
:class="card.className"
:style="card.style"
@tap="pickCard(card)">
- {{card.icon}}
+ {{card.displayIcon}}
@@ -80,7 +80,7 @@
助推槽 {{slots.length}}/{{slotLimit}}
- {{slots[i - 1].icon}}
+ {{slots[i - 1].displayIcon}}
@@ -421,6 +421,7 @@
if (!card.icon) {
card.icon = icons[(index + Math.floor(rand() * icons.length)) % icons.length]
}
+ card.displayIcon = this.displayIcon(card.icon)
card.style = `left:${card.x}rpx;top:${card.y}rpx;z-index:${this.cardZIndex(card)};`
})
return cards
@@ -428,6 +429,7 @@
assignEmergencyIcons(positions, icons, garbageIcons) {
positions.forEach((card, index) => {
card.icon = index < 6 ? garbageIcons[Math.floor(index / 2) % garbageIcons.length] : icons[Math.floor((index - 6) / 3) % icons.length]
+ card.displayIcon = this.displayIcon(card.icon)
card.trap = index >= 6 && index < 42
card.keyCard = card.trap && card.layer === 0 && this.isCenterCard(card)
card.garbage = index < 6
@@ -512,16 +514,22 @@
return Math.abs(a.x - b.x) < 74 && Math.abs(a.y - b.y) < 74
},
cardZIndex(card) {
- return (card.layer || 0) * 1000 + (card.order || 0) + 1
+ return (card.layer || 0) * 100 + (card.order || 0) + 1
},
normalizeCards(icons) {
this.cards.forEach((card, index) => {
if (!card.icon) card.icon = icons[index % icons.length]
+ card.displayIcon = this.displayIcon(card.icon)
card.locked = false
card.className = ''
card.style = `left:${card.x}rpx;top:${card.y}rpx;z-index:${this.cardZIndex(card)};`
})
},
+ displayIcon(icon) {
+ if (!icon) return '？'
+ if (this.isGarbageIcon(icon)) return icon
+ return icon
+ },
refreshCardState() {
this.cards.forEach(card => {
const locked = !card.removed && !card.selected && this.isLocked(card)
@@ -547,6 +555,7 @@
return
}
if (this.slots.length >= this.slotLimit) return
+ card.displayIcon = this.displayIcon(card.icon)
card.selected = true
this.slots.push(card)
this.moveCount++
@@ -716,7 +725,7 @@