fix：解决合并冲突

src/pages/melee-battle.vue

@@ -24,17 +24,6 @@ const battleId = ref("");
 /** 对战模式：1=好友约战 2=排位赛，用于结算页跳转判断 */
 const way = ref(0);
 const currentRound = ref(1);
-/** 控制设备离线提示弹窗的显示状态 */
-const showOfflineModal = ref(false);
-
-/**
- * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
- */
-watch(online, (newVal, oldVal) => {
-  if (!newVal && oldVal && start.value === true) {
-    showOfflineModal.value = true;
-  }
-});
 const tips = ref("即将开始...");
 const players = ref([]);
 const playersSorted = ref([]);