zfc/bindbox-mini
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.1024tool.vip/zfc/bindbox-mini

Browse Source 
# Conflicts:
#	pages-game/game/minesweeper/play.vue
This commit is contained in:
tsui110 2026-01-03 16:39:36 +08:00
commit 9309277047
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pages-game/game/minesweeper/play.vue
View File

@ -232,6 +232,7 @@
</view>
<!-- 结算弹窗 -->
<<<<<<< HEAD
<view v-if="shouldShowResultModal" class="modal-overlay">
<view class="modal-content glass-card">
<text class="modal-emoji">{{ gameState.winnerId === myUserId ? '🏆' : '💀' }}</text>
@ -241,6 +242,14 @@
</view>
<view
class="btn-primary"
=======
<view v-if="gameState && !gameState.gameStarted && gameState.winnerId" class="modal-overlay">
<view class="modal-content glass-card">
<text class="modal-emoji">{{ gameState.winnerId === 'draw' ? '🤝' : (gameState.winnerId === myUserId ? '🏆' : '💀') }}</text>
<text class="modal-title">{{ gameState.winnerId === 'draw' ? '平局' : (gameState.winnerId === myUserId ? '胜利！' : '很遗憾失败了') }}</text>
<view
class="btn-primary"
>>>>>>> c028a29943b7b201a73114cb14a1109deb3af339
:class="{ disabled: isRefreshing }"
@tap="refreshAndPlayAgain"
>
@ -661,6 +670,13 @@ export default {
} else {
uni.vibrateShort({ type: 'fail' });
}
<<<<<<< HEAD
=======
let endMsg = '';
if (data.winnerId === 'draw') endMsg = '平局：无人幸存';
else endMsg = `战局结束：${data.winnerId === this.myUserId ? '您获得了胜利！' : '很遗憾失败了'}`;
this.addLog('system', endMsg);
>>>>>>> c028a29943b7b201a73114cb14a1109deb3af339
}
},
handleEvent(event) {