diff --git a/src/components/BattleHeader.vue b/src/components/BattleHeader.vue
index fc5b2ba..16be7de 100644
--- a/src/components/BattleHeader.vue
+++ b/src/components/BattleHeader.vue
@@ -46,17 +46,18 @@ defineProps({
v-for="(player, index) in blueTeam"
:key="index"
:style="{
- margin: blueTeam.length === 2 ? '0 12px' : '0 6px',
+ margin: blueTeam.length === 2 ? '0 -5px' : '0 6px',
width: `${100 / blueTeam.length - blueTeam.length * 3}%`,
}"
>
-
+
{{ player.name }}
@@ -64,17 +65,18 @@ defineProps({
v-for="(player, index) in redTeam"
:key="index"
:style="{
- margin: redTeam.length === 2 ? '0 12px' : '0 6px',
+ margin: redTeam.length === 2 ? '0 -5px' : '0 6px',
width: `${100 / redTeam.length - redTeam.length * 3}%`,
}"
>
-
+
{{ player.name }}
@@ -93,7 +95,7 @@ defineProps({
>
@@ -120,12 +122,12 @@ defineProps({
}
.players > view {
width: 50%;
- height: 80px;
+ height: 75px;
color: #fff9;
font-size: 12px;
overflow: hidden;
position: relative;
- padding-top: 7px;
+ padding-top: 5px;
display: flex;
justify-content: center;
}
@@ -135,13 +137,6 @@ defineProps({
.players > view:last-child {
background-color: #692735;
}
-.players > view > image:last-child {
- position: absolute;
- width: 50px;
- top: -10%;
- left: -5%;
- transform: rotate(-12deg);
-}
.players > view > view {
display: flex;
flex-direction: column;
@@ -170,11 +165,25 @@ defineProps({
flex: 0 0 auto;
}
.player-name {
- margin-top: 5px;
+ margin-top: 3px;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: center;
}
+.left-winner-badge {
+ position: absolute;
+ width: 50px;
+ top: -12%;
+ left: -5%;
+ transform: rotate(-12deg);
+}
+.right-winner-badge {
+ position: absolute;
+ width: 50px;
+ top: -12%;
+ right: -5%;
+ transform: rotate(36deg);
+}
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 9378110..34ba5cf 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -205,13 +205,14 @@ onMounted(() => {
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index cc68b32..d060384 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -5,7 +5,6 @@ import Container from "@/components/Container.vue";
import BowTarget from "@/components/BowTarget.vue";
import ShootProgress from "@/components/ShootProgress.vue";
import BattleHeader from "@/components/BattleHeader.vue";
-import Timer from "@/components/Timer.vue";
import PlayerScore from "@/components/PlayerScore.vue";
import SButton from "@/components/SButton.vue";
import Avatar from "@/components/Avatar.vue";
@@ -193,7 +192,7 @@ onHide(() => {
-
+
{
:scores="playersScores[player.id] || []"
/>
-
{
:blueTeam="item.bluePlayers"
:redTeam="item.redPlayers"
:winner="item.winner"
+ :showRank="item.mode === 2"
:showHeader="false"
/>
@@ -106,6 +107,7 @@ const onPractiseLoading = async (page) => {
:blueTeam="item.bluePlayers"
:redTeam="item.redPlayers"
:winner="item.winner"
+ :showRank="item.mode === 2"
:showHeader="false"
/>
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index 4168b0b..332ccda 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -6,7 +6,6 @@ import BattleHeader from "@/components/BattleHeader.vue";
import BowTarget from "@/components/BowTarget.vue";
import ShootProgress from "@/components/ShootProgress.vue";
import PlayersRow from "@/components/PlayersRow.vue";
-import Timer from "@/components/Timer.vue";
import BattleFooter from "@/components/BattleFooter.vue";
import ScreenHint from "@/components/ScreenHint.vue";
import SButton from "@/components/SButton.vue";
@@ -301,10 +300,10 @@ onHide(() => {
-
+
-
+
{
:goldenRound="goldenRound"
:power="power"
/>
-