fix：合并代码并解决冲突

src/components/AppBackground.vue

@@ -18,31 +18,31 @@ const props = defineProps({
     <image
       class="bg-image"
       v-if="type === 0"
-      src="../static/app-bg.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 1"
-      src="../static/app-bg2.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg2.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 2"
-      src="../static/app-bg3.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg3.png"
       :style="{ height: capsuleHeight + 50 + 'px' }"
     />
     <image
       class="bg-image"
       v-if="type === 3"
-      src="../static/app-bg4.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg4.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 4"
-      src="../static/app-bg5.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
       mode="widthFix"
     />
     <image
@@ -51,6 +51,12 @@ const props = defineProps({
       src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
       mode="widthFix"
     />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
     <view class="bg-overlay" v-if="type === 0"></view>
   </view>
 </template>
@@ -67,7 +73,7 @@ const props = defineProps({
 
 .bg-image {
   width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }
 
 .bg-overlay {

src/components/ShootProgress.vue

@@ -139,7 +139,7 @@ async function onReceiveMessage(msg) {
     halfTime.value = false;
     audioManager.play("比赛开始");
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束");
+    audioManager.play("比赛结束", false);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     let arrow = {};
     if (msg.details && Array.isArray(msg.details)) {