diff --git a/shoot.http b/shoot.http deleted file mode 100644 index 39ab0c3..0000000 --- a/shoot.http +++ /dev/null @@ -1,9 +0,0 @@ -@serverUrl = http://120.79.241.5:8000/api/shoot - -### 模拟射箭 -POST {{serverUrl}}/index/arrow -Content-Type: application/json - -{ - "device_id": "H9hL8GaA" -} \ No newline at end of file diff --git a/src/apis.js b/src/apis.js index fba5ec9..142eb09 100644 --- a/src/apis.js +++ b/src/apis.js @@ -170,8 +170,8 @@ export const getGameAPI = async (battleId) => { goldenRoundRecords = [], } = result; const data = { - mode: battleStats.mode, - gameMode: battleStats.gameMode, + mode: battleStats.mode, // 1.几V几 2.大乱斗 + gameMode: battleStats.gameMode, // 1.约战 2.排位 }; if (battleStats && battleStats.mode === 1) { data.winner = battleStats.winner; diff --git a/src/components/AppBackground.vue b/src/components/AppBackground.vue index cae3cf8..d060f2a 100644 --- a/src/components/AppBackground.vue +++ b/src/components/AppBackground.vue @@ -6,12 +6,22 @@ const props = defineProps({ default: 0, }, }); -const bgs = ref(["../static/app-bg.png", "../static/app-bg2.png"]); diff --git a/src/components/BackToGame.vue b/src/components/BackToGame.vue index f8158d1..1a45a97 100644 --- a/src/components/BackToGame.vue +++ b/src/components/BackToGame.vue @@ -45,7 +45,7 @@ const onClick = async () => { } .back-to-game > image:nth-child(2) { position: relative; - width: 50px; + width: 60px; } .back-to-game > text:nth-child(3) { position: relative; diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue index 2fe597a..fea26d4 100644 --- a/src/components/BowTarget.vue +++ b/src/components/BowTarget.vue @@ -198,7 +198,7 @@ const simulShoot2 = async () => { ? 'green' : 'red', }" - >{{ index + 1 }}{{ index + 1 }} @@ -214,7 +214,7 @@ const simulShoot2 = async () => { top: calcRealY(bow.y), backgroundColor: 'blue', }" - >{{ index + 1 }}{{ index + 1 }} @@ -288,6 +288,10 @@ const simulShoot2 = async () => { transition: all 0.3s ease; box-sizing: border-box; } +.hit > text { + transform: scaleX(0.7); + display: block; +} .header { width: 100%; display: flex; diff --git a/src/components/Container.vue b/src/components/Container.vue index b434554..d78e11f 100644 --- a/src/components/Container.vue +++ b/src/components/Container.vue @@ -40,12 +40,16 @@ const showGlobalHint = (type) => { hintType.value = type; showHint.value = true; }; +const hideGlobalHint = () => { + showHint.value = false; +}; onMounted(() => { const deviceInfo = uni.getDeviceInfo(); isIos.value = deviceInfo.osName === "ios"; }); onShow(() => { uni.$showHint = showGlobalHint; + uni.$hideHint = hideGlobalHint; showHint.value = false; }); const backToGame = debounce(async () => { @@ -86,10 +90,10 @@ const goBack = () => { 离开比赛可能会导致比赛失败, 确认离开吗? - + diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue index 7a4cb77..92c8242 100644 --- a/src/pages/battle-room.vue +++ b/src/pages/battle-room.vue @@ -551,7 +551,11 @@ onUnmounted(() => { :round="currentRound - 1" :bluePoint="currentBluePoint" :redPoint="currentRedPoint" - :roundData="roundResults[roundResults.length - 1]" + :roundData=" + roundResults[roundResults.length - 2] + ? roundResults[roundResults.length - 2] + : [] + " :onAutoClose="() => (showRoundTip = false)" /> diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue index 8433871..eb17a08 100644 --- a/src/pages/friend-battle.vue +++ b/src/pages/friend-battle.vue @@ -77,10 +77,7 @@ const onCreateRoom = async () => { - + @@ -151,6 +148,7 @@ const onCreateRoom = async () => { .create-room > image:first-of-type { position: absolute; width: 100%; + border-radius: 50%; } .create-room > view { margin: 0 30px; diff --git a/src/pages/melee-bow-data.vue b/src/pages/melee-bow-data.vue index a9f6011..d26b842 100644 --- a/src/pages/melee-bow-data.vue +++ b/src/pages/melee-bow-data.vue @@ -31,7 +31,7 @@ onLoad(async (options) => {