From 779b3395db549f236c63b8c9882134870fa92384 Mon Sep 17 00:00:00 2001 From: kron Date: Fri, 16 May 2025 15:56:54 +0800 Subject: [PATCH] =?UTF-8?q?UI=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 5 +- src/components/BattleFooter.vue | 102 ++++++++++++++++++++ src/components/BattleHeader.vue | 86 +++++++++++++++++ src/components/BowPower.vue | 28 ++++++ src/components/BowTarget.vue | 31 ++---- src/components/CoachComment.vue | 1 + src/components/CreateRoom.vue | 126 ++++++++++++++++++++++++ src/components/Guide.vue | 5 + src/components/PlayerScore.vue | 86 +++++++++++++++++ src/components/PlayersRow.vue | 122 +++++++++++++++++++++++ src/components/SModal.vue | 82 ++++++++++++++++ src/components/ShootProgress.vue | 14 ++- src/pages.json | 12 +++ src/pages/battle-room.vue | 149 +++++++++++++++++++++++++++++ src/pages/friend-battle.vue | 46 ++++++++- src/pages/match-room.vue | 108 +++++++++++++++++++++ src/pages/practise-one.vue | 9 +- src/pages/ranking.vue | 31 ++++-- src/static/battle-header-melee.png | Bin 0 -> 55045 bytes src/static/battle-header.png | Bin 0 -> 58300 bytes src/static/choose-battle-mode.png | Bin 0 -> 21777 bytes src/static/close-yellow.png | Bin 0 -> 664 bytes src/static/modal-content-bg.png | Bin 0 -> 146388 bytes src/static/player-1.png | Bin 0 -> 1487 bytes src/static/player-10.png | Bin 0 -> 2649 bytes src/static/player-2.png | Bin 0 -> 1922 bytes src/static/player-3.png | Bin 0 -> 1980 bytes src/static/player-4.png | Bin 0 -> 1896 bytes src/static/player-5.png | Bin 0 -> 1797 bytes src/static/player-6.png | Bin 0 -> 2016 bytes src/static/player-7.png | Bin 0 -> 1529 bytes src/static/player-8.png | Bin 0 -> 2136 bytes src/static/player-9.png | Bin 0 -> 1999 bytes src/static/player-bg.png | Bin 0 -> 36563 bytes src/static/row-bg.png | Bin 0 -> 3221 bytes 35 files changed, 1003 insertions(+), 40 deletions(-) create mode 100644 src/components/BattleFooter.vue create mode 100644 src/components/BattleHeader.vue create mode 100644 src/components/BowPower.vue create mode 100644 src/components/CreateRoom.vue create mode 100644 src/components/PlayerScore.vue create mode 100644 src/components/PlayersRow.vue create mode 100644 src/components/SModal.vue create mode 100644 src/pages/battle-room.vue create mode 100644 src/pages/match-room.vue create mode 100644 src/static/battle-header-melee.png create mode 100644 src/static/battle-header.png create mode 100644 src/static/choose-battle-mode.png create mode 100644 src/static/close-yellow.png create mode 100644 src/static/modal-content-bg.png create mode 100644 src/static/player-1.png create mode 100644 src/static/player-10.png create mode 100644 src/static/player-2.png create mode 100644 src/static/player-3.png create mode 100644 src/static/player-4.png create mode 100644 src/static/player-5.png create mode 100644 src/static/player-6.png create mode 100644 src/static/player-7.png create mode 100644 src/static/player-8.png create mode 100644 src/static/player-9.png create mode 100644 src/static/player-bg.png create mode 100644 src/static/row-bg.png diff --git a/project.config.json b/project.config.json index 8358dab..d9cfe28 100644 --- a/project.config.json +++ b/project.config.json @@ -23,6 +23,7 @@ "condition": {}, "editorSetting": { "tabIndent": "insertSpaces", - "tabSize": 2 + "tabSize": 2, + "printWidth": 120 } -} \ No newline at end of file +} diff --git a/src/components/BattleFooter.vue b/src/components/BattleFooter.vue new file mode 100644 index 0000000..74b6fbc --- /dev/null +++ b/src/components/BattleFooter.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/components/BattleHeader.vue b/src/components/BattleHeader.vue new file mode 100644 index 0000000..03c9b9c --- /dev/null +++ b/src/components/BattleHeader.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/components/BowPower.vue b/src/components/BowPower.vue new file mode 100644 index 0000000..d43ce57 --- /dev/null +++ b/src/components/BowPower.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue index 74cf163..791e239 100644 --- a/src/components/BowTarget.vue +++ b/src/components/BowTarget.vue @@ -1,4 +1,5 @@ + + + diff --git a/src/components/Guide.vue b/src/components/Guide.vue index cd1da1c..819d2e4 100644 --- a/src/components/Guide.vue +++ b/src/components/Guide.vue @@ -4,6 +4,10 @@ defineProps({ type: Boolean, default: false, }, + noBg: { + type: Boolean, + default: false, + }, }); @@ -12,6 +16,7 @@ defineProps({ +defineProps({ + avatar: { + type: String, + default: "", + }, + name: { + type: String, + default: "", + }, + scores: { + type: Array, + default: () => [], + }, +}); +const rowCount = new Array(6).fill(0); + + + + + diff --git a/src/components/PlayersRow.vue b/src/components/PlayersRow.vue new file mode 100644 index 0000000..55044d0 --- /dev/null +++ b/src/components/PlayersRow.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/components/SModal.vue b/src/components/SModal.vue new file mode 100644 index 0000000..41fe01b --- /dev/null +++ b/src/components/SModal.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue index 0e25dd4..68ea817 100644 --- a/src/components/ShootProgress.vue +++ b/src/components/ShootProgress.vue @@ -7,9 +7,12 @@ const props = defineProps({ }, total: { type: Number, - default: 0, + default: 90, }, }); +let barColor = "#fed847"; +if (props.tips.includes("红队")) barColor = "#FF6060"; +if (props.tips.includes("蓝队")) barColor = "#5FADFF"; const remain = ref(0); onMounted(() => { remain.value = props.total; @@ -31,7 +34,13 @@ onMounted(() => { - + 剩余{{ remain }}秒 @@ -73,7 +82,6 @@ onMounted(() => { .container > view:last-child > view { position: absolute; height: 20px; - background-color: #fed847; border-radius: 20px; z-index: -1; } diff --git a/src/pages.json b/src/pages.json index adc4779..f3233e5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -42,12 +42,24 @@ "navigationBarTitleText": "好友约战" } }, + { + "path": "pages/battle-room", + "style": { + "navigationBarTitleText": "对战房间" + } + }, { "path": "pages/ranking", "style": { "navigationBarTitleText": "排行榜" } }, + { + "path": "pages/match-room", + "style": { + "navigationBarTitleText": "排位赛" + } + }, { "path": "pages/equipment-debug", "style": { diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue new file mode 100644 index 0000000..6f27578 --- /dev/null +++ b/src/pages/battle-room.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue index 3c511a5..aa6e10a 100644 --- a/src/pages/friend-battle.vue +++ b/src/pages/friend-battle.vue @@ -1,8 +1,29 @@ @@ -69,7 +98,7 @@ import SButton from "@/components/SButton.vue"; font-size: 14px; height: 40px; } -.founded-room > view > button { +.founded-room > view > view { background-color: #fed847; width: 30%; line-height: 40px; @@ -78,6 +107,7 @@ import SButton from "@/components/SButton.vue"; padding: 3px 0; font-weight: bold; color: #000; + text-align: center; } .create-room { position: relative; @@ -118,4 +148,12 @@ import SButton from "@/components/SButton.vue"; .create-room > view:last-child { transform: translateY(-110%); } +.warnning { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + color: #fff9; +} diff --git a/src/pages/match-room.vue b/src/pages/match-room.vue new file mode 100644 index 0000000..a8b757a --- /dev/null +++ b/src/pages/match-room.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue index 533e35e..e97f9ba 100644 --- a/src/pages/practise-one.vue +++ b/src/pages/practise-one.vue @@ -5,6 +5,7 @@ import Header from "@/components/Header.vue"; import ShootProgress from "@/components/ShootProgress.vue"; import BowTarget from "@/components/BowTarget.vue"; import ScorePanel2 from "@/components/ScorePanel2.vue"; +import ScoreResult from "@/components/ScoreResult.vue"; const showScore = ref(false); setTimeout(() => { @@ -16,7 +17,7 @@ setTimeout(() => {
- + { power="45" /> + diff --git a/src/pages/ranking.vue b/src/pages/ranking.vue index 3b2d408..63770f6 100644 --- a/src/pages/ranking.vue +++ b/src/pages/ranking.vue @@ -1,13 +1,19 @@