diff --git a/src/components/GuideTwo.vue b/src/components/GuideTwo.vue
new file mode 100644
index 0000000..6f27e4b
--- /dev/null
+++ b/src/components/GuideTwo.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index caaa6a7..316229a 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -3,7 +3,7 @@ import { ref, onMounted, computed, onBeforeUnmount } from "vue";
import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import PlayerSeats from "@/components/PlayerSeats.vue";
-import Guide from "@/components/Guide.vue";
+import GuideTwo from "@/components/GuideTwo.vue";
import SButton from "@/components/SButton.vue";
import Avatar from "@/components/Avatar.vue";
import {
@@ -238,7 +238,7 @@ onBeforeUnmount(() => {
-
+
弓箭手们,人都到齐了吗?
@@ -247,48 +247,29 @@ onBeforeUnmount(() => {
}}
大乱斗即将开始!
-
+
-
+
-
+
-
+
管理员
{{ owner.name }}
-
+
-
+
已准备
{{ opponent.name }}
-
@@ -299,31 +280,15 @@ onBeforeUnmount(() => {
-
-
-
+
+
+
管理员
- removePlayer(item)"
- :style="{ top: '-10rpx', right: '-10rpx' }"
- >
+ removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
@@ -331,16 +296,8 @@ onBeforeUnmount(() => {
-
-
+
+
{{ item.name || "我要加入" }}
@@ -354,11 +311,7 @@ onBeforeUnmount(() => {
-
+
已准备
@@ -367,31 +320,23 @@ onBeforeUnmount(() => {
{{ item.name || "我要加入" }}
-
+
-
+
{{
allReady.value
? "即将进入对局..."
: owner.id === user.id
- ? "开始对局"
- : "我准备好了"
+ ? "开始对局"
+ : "我准备好了"
}}
所有人准备好后由房主点击开始
@@ -406,6 +351,7 @@ onBeforeUnmount(() => {
height: calc(100% - 40px);
overflow-x: hidden;
}
+
.tips {
color: #fff9;
width: 100%;
@@ -414,6 +360,7 @@ onBeforeUnmount(() => {
margin-top: 10px;
font-size: 12px;
}
+
.player-unknow {
width: 40px;
height: 40px;
@@ -425,25 +372,30 @@ onBeforeUnmount(() => {
justify-content: center;
background-color: #69686866;
}
-.player-unknow > image {
+
+.player-unknow>image {
width: 40%;
}
+
.team-mode {
width: calc(100vw - 30px);
height: 125vw;
margin: 15px;
}
-.team-mode > image:first-child {
+
+.team-mode>image:first-child {
position: absolute;
width: calc(100vw - 30px);
z-index: -1;
}
-.team-mode > view {
+
+.team-mode>view {
display: flex;
justify-content: center;
align-items: center;
height: 95%;
}
+
.player {
width: 70px;
display: flex;
@@ -455,14 +407,16 @@ onBeforeUnmount(() => {
font-size: 14px;
position: relative;
}
-.player > image {
+
+.player>image {
width: 70px;
height: 70px;
border-radius: 50%;
background-color: #ccc;
margin-bottom: 5px;
}
-.player > text:nth-child(2) {
+
+.player>text:nth-child(2) {
color: #000;
background-color: #fed847;
font-size: 16rpx;
@@ -472,21 +426,25 @@ onBeforeUnmount(() => {
margin-top: -16rpx;
position: relative;
}
-.player > text:nth-child(3) {
+
+.player>text:nth-child(3) {
margin-top: 6rpx;
}
-.player > text {
+
+.player>text {
max-width: 100px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: center;
}
+
.player .ready {
background-color: #2c261fb3 !important;
border: 1rpx solid #a3793f66 !important;
color: #fed847 !important;
}
+
.remove-player {
width: 40rpx;
height: 40rpx;
@@ -499,13 +457,16 @@ onBeforeUnmount(() => {
top: 0;
right: 0;
}
-.remove-player > image {
+
+.remove-player>image {
width: 90%;
height: 90%;
}
-.team-mode > view > image:nth-child(2) {
+
+.team-mode>view>image:nth-child(2) {
width: 120px;
}
+
.no-player {
width: 70px;
height: 70px;
@@ -516,10 +477,12 @@ onBeforeUnmount(() => {
align-items: center;
transform: translateY(60px);
}
-.no-player > image {
+
+.no-player>image {
width: 20px;
margin-right: 2px;
}
+
.btns {
height: 100%;
display: flex;
@@ -527,12 +490,14 @@ onBeforeUnmount(() => {
align-items: center;
justify-content: center;
}
+
.battle-guide {
display: flex;
align-items: center;
justify-content: space-between;
}
-.battle-guide > button:last-child {
+
+.battle-guide>button:last-child {
color: #fed847;
border: 1px solid #fed847;
margin-right: 10px;
@@ -541,6 +506,7 @@ onBeforeUnmount(() => {
position: relative;
font-size: 28rpx;
}
+
.all-players {
position: relative;
display: flex;
@@ -548,68 +514,73 @@ onBeforeUnmount(() => {
align-items: center;
height: 83vw;
}
-.all-players > image:first-child {
+
+.all-players>image:first-child {
position: absolute;
width: 100%;
}
-.all-players > image:nth-child(2) {
+
+.all-players>image:nth-child(2) {
width: 25vw;
position: relative;
}
-.all-players > view {
+
+.all-players>view {
position: relative;
width: 42vw;
height: 42vw;
margin-top: 7vw;
}
-.all-players > view > view {
+
+.all-players>view>view {
position: absolute;
left: 50%;
top: 50%;
}
+
/* 4个头像 - 正方形排列 */
-.all-players > view > view:nth-child(1):nth-last-child(4) {
- transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw)
- rotate(30deg);
+.all-players>view>view:nth-child(1):nth-last-child(4) {
+ transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw) rotate(30deg);
}
-.all-players > view > view:nth-child(2):nth-last-child(3) {
- transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw)
- rotate(120deg);
+
+.all-players>view>view:nth-child(2):nth-last-child(3) {
+ transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw) rotate(120deg);
}
-.all-players > view > view:nth-child(3):nth-last-child(2) {
- transform: translate(-50%, -50%) rotate(-210deg) translateY(-21.5vw)
- rotate(210deg);
+
+.all-players>view>view:nth-child(3):nth-last-child(2) {
+ transform: translate(-50%, -50%) rotate(-210deg) translateY(-21.5vw) rotate(210deg);
}
-.all-players > view > view:nth-child(4):nth-last-child(1) {
- transform: translate(-50%, -50%) rotate(-300deg) translateY(-21.5vw)
- rotate(300deg);
+
+.all-players>view>view:nth-child(4):nth-last-child(1) {
+ transform: translate(-50%, -50%) rotate(-300deg) translateY(-21.5vw) rotate(300deg);
}
+
/* 6个头像 - 六边形排列 */
-.all-players > view > view:nth-child(1):nth-last-child(6) {
- transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw)
- rotate(30deg);
+.all-players>view>view:nth-child(1):nth-last-child(6) {
+ transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw) rotate(30deg);
}
-.all-players > view > view:nth-child(2):nth-last-child(5) {
- transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw)
- rotate(90deg);
+
+.all-players>view>view:nth-child(2):nth-last-child(5) {
+ transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw) rotate(90deg);
}
-.all-players > view > view:nth-child(3):nth-last-child(4) {
- transform: translate(-50%, -50%) rotate(-150deg) translateY(-21vw)
- rotate(150deg);
+
+.all-players>view>view:nth-child(3):nth-last-child(4) {
+ transform: translate(-50%, -50%) rotate(-150deg) translateY(-21vw) rotate(150deg);
}
-.all-players > view > view:nth-child(4):nth-last-child(3) {
- transform: translate(-50%, -50%) rotate(-210deg) translateY(-21vw)
- rotate(210deg);
+
+.all-players>view>view:nth-child(4):nth-last-child(3) {
+ transform: translate(-50%, -50%) rotate(-210deg) translateY(-21vw) rotate(210deg);
}
-.all-players > view > view:nth-child(5):nth-last-child(2) {
- transform: translate(-50%, -50%) rotate(-270deg) translateY(-21vw)
- rotate(270deg);
+
+.all-players>view>view:nth-child(5):nth-last-child(2) {
+ transform: translate(-50%, -50%) rotate(-270deg) translateY(-21vw) rotate(270deg);
}
-.all-players > view > view:nth-child(6):nth-last-child(1) {
- transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw)
- rotate(330deg);
+
+.all-players>view>view:nth-child(6):nth-last-child(1) {
+ transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw) rotate(330deg);
}
-.all-players > view > view > text {
+
+.all-players>view>view>text {
position: absolute;
background-color: #fed847;
font-size: 8px;
@@ -621,18 +592,23 @@ onBeforeUnmount(() => {
text-align: center;
color: #333;
}
+
.choose-side {
display: flex;
}
-.choose-side > view {
+
+.choose-side>view {
width: 50%;
}
-.choose-side > view:first-child > view {
+
+.choose-side>view:first-child>view {
background: linear-gradient(270deg, #6a1212 0%, rgba(74, 0, 0, 0) 100%);
}
-.choose-side > view:last-child > view {
+
+.choose-side>view:last-child>view {
background: linear-gradient(270deg, rgba(13, 0, 74, 0) 0%, #172a86 100%);
}
+
.choose-side-left-item,
.choose-side-right-item {
display: flex;
@@ -644,33 +620,39 @@ onBeforeUnmount(() => {
margin: 10px 5px;
position: relative;
}
+
.choose-side-left-item {
justify-content: flex-end;
}
-.choose-side-left-item > text,
-.choose-side-right-item > text {
+
+.choose-side-left-item>text,
+.choose-side-right-item>text {
margin: 10px;
max-width: 100px;
font-size: 14px;
}
-.choose-side-left-item > button:first-child,
-.choose-side-right-item > button:last-child {
+
+.choose-side-left-item>button:first-child,
+.choose-side-right-item>button:last-child {
position: absolute;
top: 0;
}
-.choose-side-left-item > button:first-child > image,
-.choose-side-right-item > button:last-child > image {
+
+.choose-side-left-item>button:first-child>image,
+.choose-side-right-item>button:last-child>image {
width: 28px;
}
-.choose-side-left-item > button:first-child {
+
+.choose-side-left-item>button:first-child {
left: 0;
}
-.choose-side-right-item > button:last-child {
+.choose-side-right-item>button:last-child {
right: 0;
}
-.choose-side-left-item > button:last-child,
-.choose-side-right-item > button:first-child {
+
+.choose-side-left-item>button:last-child,
+.choose-side-right-item>button:first-child {
background-color: #fff;
border-radius: 50%;
width: 38px;
@@ -680,18 +662,21 @@ onBeforeUnmount(() => {
align-items: center;
margin-bottom: 14rpx;
}
-.choose-side-left-item > button:last-child > image,
-.choose-side-right-item > button:first-child > image {
+
+.choose-side-left-item>button:last-child>image,
+.choose-side-right-item>button:first-child>image {
width: 18px;
}
-.choose-side-left-item > view,
-.choose-side-right-item > view {
+
+.choose-side-left-item>view,
+.choose-side-right-item>view {
display: flex;
flex-direction: column;
align-items: center;
}
-.choose-side-left-item > view > text,
-.choose-side-right-item > view > text {
+
+.choose-side-left-item>view>text,
+.choose-side-right-item>view>text {
font-size: 16rpx;
border-radius: 20rpx;
line-height: 26rpx;
diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue
index b7e4072..919ae4d 100644
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -2,7 +2,7 @@
import { ref } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
-import Guide from "@/components/Guide.vue";
+import GuideTwo from "@/components/GuideTwo.vue";
import SButton from "@/components/SButton.vue";
import SModal from "@/components/SModal.vue";
import Signin from "@/components/Signin.vue";
@@ -72,6 +72,13 @@ const onSignin = () => {
if (roomID.value && user.value.id) enterRoom(roomID.value);
showSignin.value = false;
};
+
+/** 跳转到我的战绩页面 */
+const goMyRecord = () => {
+ uni.navigateTo({
+ url: '/pages/my-growth',
+ });
+};
onShow(async () => {
if (user.value.id) {
const result = await getBattleDataAPI();
@@ -90,16 +97,15 @@ onLoad(async (options) => {
-
-
- 约上朋友开几局,欢乐多,不寂寞
- 一起练升级更快,早日加入全国排位赛!
-
-
+
+ 约上朋友开几局,欢乐多,不寂寞
+ 一起练升级更快,早日加入全国排位赛!
+
{{ user.nickName }}
+ 我的战绩
@@ -119,16 +125,9 @@ onLoad(async (options) => {
-
-
+
+
@@ -139,19 +138,12 @@ onLoad(async (options) => {
-
+
进入房间
-
+
@@ -166,11 +158,7 @@ onLoad(async (options) => {
-
+
{{ warnning }}
@@ -192,10 +180,12 @@ onLoad(async (options) => {
border-radius: 10px;
padding: 15px;
}
-.founded-room > image {
+
+.founded-room>image {
width: 16vw;
}
-.founded-room > view {
+
+.founded-room>view {
display: flex;
justify-content: space-between;
align-items: center;
@@ -205,14 +195,16 @@ onLoad(async (options) => {
width: 100%;
overflow: hidden;
}
-.founded-room > view > input {
+
+.founded-room>view>input {
width: 70%;
text-align: center;
font-size: 14px;
height: 40px;
color: #000;
}
-.founded-room > view > view {
+
+.founded-room>view>view {
background-color: #fed847;
width: 30%;
line-height: 40px;
@@ -223,38 +215,45 @@ onLoad(async (options) => {
color: #000;
text-align: center;
}
+
.create-room {
position: relative;
margin: 15px;
height: 50vw;
}
-.create-room > image:first-of-type {
+
+.create-room>image:first-of-type {
position: absolute;
width: 100%;
}
-.create-room > image:nth-of-type(2) {
+
+.create-room>image:nth-of-type(2) {
padding: 15px;
width: 25vw;
position: relative;
}
-.create-room > view:nth-child(3) {
+
+.create-room>view:nth-child(3) {
margin: 12vw auto;
position: relative;
display: flex;
align-items: center;
justify-content: center;
}
-.create-room > view > image:first-child {
+
+.create-room>view>image:first-child {
width: 19vw;
transform: translateY(-60%);
border-radius: 50%;
position: relative;
}
-.create-room > view > image:nth-child(2) {
+
+.create-room>view>image:nth-child(2) {
width: 37vw;
position: relative;
}
-.create-room > view > view:nth-child(3) {
+
+.create-room>view>view:nth-child(3) {
position: relative;
width: 19vw;
height: 19vw;
@@ -265,10 +264,12 @@ onLoad(async (options) => {
align-items: center;
transform: translateY(60%);
}
-.create-room > view > view:nth-child(3) > image {
+
+.create-room>view>view:nth-child(3)>image {
width: 20px;
margin-right: 2px;
}
+
.warnning {
width: 100%;
height: 100%;
@@ -277,6 +278,7 @@ onLoad(async (options) => {
align-items: center;
color: #fff9;
}
+
.my-data {
width: calc(100% - 30px);
margin: 15px;
@@ -286,12 +288,14 @@ onLoad(async (options) => {
overflow: hidden;
background-color: #54431d33;
}
-.my-data > view {
+
+.my-data>view {
width: 100%;
display: flex;
color: #fff9;
}
-.my-data > view:first-child {
+
+.my-data>view:first-child {
width: calc(100% - 30px);
align-items: flex-end;
padding-bottom: 15px;
@@ -299,16 +303,29 @@ onLoad(async (options) => {
margin: 15px;
margin-bottom: 0;
}
-.my-data > view:first-child > text {
+
+.my-data>view:first-child>.my-record-btn {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #76D4FF;
+ text-align: center;
+ font-style: normal;
+ width: auto;
+ margin-left: auto;
+}
+
+.my-data>view:first-child>text {
color: #fff;
font-size: 17px;
margin-left: 10px;
width: 120px;
}
-.my-data > view:last-child {
+
+.my-data>view:last-child {
margin-bottom: 15px;
}
-.my-data > view:last-child > view {
+
+.my-data>view:last-child>view {
width: 33%;
margin-top: 15px;
display: flex;
@@ -316,25 +333,30 @@ onLoad(async (options) => {
align-items: center;
font-size: 12px;
}
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
margin-bottom: 5px;
}
-.my-data > view:last-child > view > view > text:first-child {
+
+.my-data>view:last-child>view>view>text:first-child {
color: #fff;
font-size: 20px;
margin-right: 5px;
transform: translateY(4px);
}
-.my-data > view:last-child > view:nth-child(2) {
+
+.my-data>view:last-child>view:nth-child(2) {
border-left: 1px solid #48494e;
border-right: 1px solid #48494e;
}
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
display: flex;
align-items: flex-end;
height: 20px;
}
-.stars > image {
+
+.stars>image {
width: 4vw;
height: 4vw;
margin: 0 1px;
diff --git a/src/static/long-bubble-border.png b/src/static/long-bubble-border.png
new file mode 100644
index 0000000..391bff1
Binary files /dev/null and b/src/static/long-bubble-border.png differ
diff --git a/src/static/share2.png b/src/static/share2.png
new file mode 100644
index 0000000..284631a
Binary files /dev/null and b/src/static/share2.png differ
diff --git a/src/static/shooter2.png b/src/static/shooter2.png
new file mode 100644
index 0000000..1fb3622
Binary files /dev/null and b/src/static/shooter2.png differ