36 Commits

Author SHA1 Message Date
2780d1a6df update:代码备份 2026-05-26 10:23:31 +08:00
2a53f6739e update:对接个人训练难度页 2026-05-26 09:33:28 +08:00
bae31add22 update:对接个人训练首页 2026-05-20 16:36:07 +08:00
465b9c8dc7 update:代码备份 2026-05-18 16:39:36 +08:00
3ff11df1d7 update:代码备份 2026-05-18 11:05:13 +08:00
21d8d0fbdb update:代码备份 2026-05-18 09:20:07 +08:00
fc7149121b update:优化 2026-05-15 10:23:59 +08:00
8061ddbed5 update:训练难度展示ui完成 2026-05-15 09:46:33 +08:00
bb50c7ca10 update:删除个人训练首页的无用组件 2026-05-13 10:54:15 +08:00
1bca5977c1 个人训练改版首页存档 2026-05-13 10:49:31 +08:00
19391808ef Merge branch 'feat-zhangyi' 2026-05-11 09:23:19 +08:00
24314e5ec8 update:36箭倒计时优化 2026-05-09 15:25:37 +08:00
31361cff1e update: 替换背景图片地址 2026-05-09 13:50:55 +08:00
0a8c6e7477 update: 优化图片 2026-05-09 13:44:07 +08:00
0e936b8e20 update:排位赛界面、排行榜界面改版,新增agents描述文档 2026-05-09 10:04:15 +08:00
4dcfdeda68 feat: 添加分支管理说明 2026-05-07 21:04:10 +08:00
a6becf67ff fix: 个人练习报环完成之后再弹练习结果弹窗 2026-05-07 18:30:46 +08:00
8c66ef78c6 fix:房间号更新改为pinia 2026-05-07 17:15:28 +08:00
29a6f46a0d Merge remote-tracking branch 'origin/new-race-mode' into new-race-mode 2026-05-07 16:54:32 +08:00
895be17f7c pref: 进度条倒计时 2026-05-07 16:49:09 +08:00
7c8fd9395b fix:踢出功能二次确认弹窗完成 2026-05-07 14:31:17 +08:00
972d817629 bug:修复房间号模块显示问题 2026-05-07 14:03:53 +08:00
31140c7ae2 fix:好友约战,我的战绩按钮跳转完成 2026-05-07 13:53:51 +08:00
542ee5f031 fix:好友约战首页调整完成 2026-05-07 11:13:18 +08:00
e28424456f Merge branch 'new-race-mode' of https://git.shelingxingqiu.com/laoma/shoot-miniprograms into new-race-mode 2026-05-06 18:11:02 +08:00
e037c02888 fix:好友约战新头部完成 2026-05-06 18:10:49 +08:00
9a5d64cc9e pref: 进度条变化 2026-05-06 17:57:02 +08:00
1beb1009b3 pref: 比赛结束 2026-05-06 16:15:39 +08:00
9cd32a7aa6 Merge remote-tracking branch 'origin/new-race-mode' into new-race-mode 2026-05-06 14:20:41 +08:00
473e6df77b pref: 匹配成功展示准备页面 2026-05-06 14:20:06 +08:00
088cd33b0a fix:解决后端返回null数据报错问题 2026-05-06 11:55:46 +08:00
51fd4acd8b fix:添加git忽略提交配置2 2026-05-06 10:15:13 +08:00
691e33a84e fix:添加git忽略提交配置 2026-05-06 10:12:41 +08:00
e60d24d56c fix:配置文件提交 2026-05-06 10:03:20 +08:00
e1a9d97596 pref: 小程序添加静默登录 2026-04-28 10:31:54 +08:00
f07facd98b pref: 绑定设备、匹配pk 2026-04-28 08:59:16 +08:00
116 changed files with 8196 additions and 3197 deletions

5
.gitignore vendored
View File

@@ -8,6 +8,11 @@ pnpm-debug.log*
lerna-debug.log* lerna-debug.log*
node_modules node_modules
.history
.github
openspec
CLAUDE.md
dosc
.DS_Store .DS_Store
dist dist
*.local *.local

270
AGENTS.md Normal file
View File

@@ -0,0 +1,270 @@
# AI Agent 企业级行为策略Ultimate Edition
## 核心目标
AI 应:
* 像高级工程师一样思考
* 保持智能
* 保持上下文理解能力
* 保持组件联动能力
* 同时避免无意义 token 消耗
目标不是限制 AI。
目标是:
* 智能
* 克制
* 稳定
* 高效
---
# AI 工作模式
默认采用:
Think First
Explore Second
Modify Last
即:
1. 先理解需求
2. 再推理可能相关文件
3. 再最小化读取
4. 最后修改代码
禁止:
* 无脑全项目扫描
* 不经思考直接 grep
* 无限递归读取
---
# 智能按需扫描(核心规则)
允许 AI 自动:
* 分析当前任务
* 分析 import
* 分析组件依赖
* 分析 store 依赖
* 分析 api 依赖
* 分析 types 依赖
* 分析 utils 依赖
允许:
* 自动读取直接依赖文件
* 自动修复 import
* 自动修复类型引用
* 自动分析运行链路
但必须:
* 最小化扫描范围
* 最小化 token 消耗
* 禁止无限递归探索
---
# 扫描深度限制
默认最大依赖深度:
2 层
例如:
index.vue
-> ProductCard.vue
-> product.ts
允许读取:
* ProductCard.vue
* product.ts
禁止继续无限扫描。
如果任务复杂:
必须先输出分析计划,
等待确认后再扩大扫描范围。
---
# AI 自由发挥边界
允许:
* 合理重构
* 合理组件化
* 合理优化结构
* 合理优化样式
* 合理优化复用
* 合理修复低级问题
* 合理修复 import
* 合理修复类型错误
禁止:
* 为了炫技重构项目
* 无意义抽象
* 过度设计
* 无意义拆分
* 无意义新增依赖
* 自动升级依赖
---
# Token 经济策略
Token 应优先用于:
* 推理
* 架构理解
* 业务逻辑
* UI 结构优化
* 类型安全
* 组件联动
禁止浪费在:
* 全项目 grep
* 重复读取
* 重复输出
* 重复解释
* 输出完整项目
* 输出未修改代码
---
# 页面生成规则Figma / uni-app
允许:
* 自动组件化
* 自动布局优化
* 自动结构优化
* 自动提取公共组件
优先:
* flex 布局
* 可维护性
* uni-app 最佳实践
* 低嵌套结构
* 高复用结构
禁止:
* div 套 div
* 全 absolute 页面
* 垃圾 HTML
* 无意义嵌套
* 内联 style 泛滥
---
# uni-app 规则
必须:
* 使用 view/text/image
* px 转 rpx
* 使用 script setup
* scoped scss
* 兼容:
* H5
* 微信小程序
* App
---
# 大任务策略
复杂任务:
必须:
1. 先分析
2. 先规划
3. 先输出方案
4. 等待确认
再:
5. 编码
禁止直接进入大规模代码生成。
---
# 修改策略
优先:
* diff 修改
* 小范围 patch
* 保持现有架构
* 保持现有组件体系
* 保持现有 API 结构
允许:
* 小范围智能优化
禁止:
* 全项目重构
* 无关文件修改
---
# 高级工程师行为模式
AI 应像高级工程师:
* 先思考
* 再探索
* 再修改
而不是:
* 无脑扫描器
* Token 消耗机器
* 低级代码生成器
AI 应主动:
* 控制扫描范围
* 控制输出长度
* 控制修改范围
* 控制复杂度
同时保持:
* 智能
* 联动能力
* 架构理解能力
---
# 默认输出规则
默认:
* 仅输出修改部分
* 不重复未修改代码
* 少解释
* 优先 patch
* 优先 diff
* 写好中文注释
除非用户明确要求:
否则不要输出完整项目。

116
doc.md Normal file
View File

@@ -0,0 +1,116 @@
# 微信小程序多人协作分支管理规范
## 一、分支结构
```
main (主分支/生产环境)
└── test (测试分支)
└── feature/xxx (个人开发分支)
```
| 分支 | 用途 | 稳定性 |
|------|------|--------|
| main | 生产环境代码 | 最高,仅接受测试通过的代码合并 |
| test | 测试环境,用于体验版发布 | 中,需验证后合并到 main |
| feature/xxx | 个人开发分支 | 低,按需命名,如 `feature/user-center` |
---
## 二、开发流程
### 1. 开始开发
```bash
# 确保本地 main 最新
git checkout main
git pull origin main
# 从 main 创建自己的开发分支
git checkout -b feature/your-name-work
```
### 2. 开发阶段
- 在个人分支上开发功能
- 频繁提交,保持原子性提交
- 定期 `git pull origin main` 同步主线变更,避免合并冲突累积
```bash
git add .
git commit -m "feat: 完成xxx功能"
```
### 3. 合并到 test 分支
```bash
# 切换到 test
git checkout test
git pull origin test
# 合并个人分支
git merge feature/your-name-work
# 推送 test 分支
git push origin test
```
### 4. 打包上传体验版
```bash
# 执行打包
npm run build
```
打包完成后:
1. 打开 **微信开发者工具**
2. 导入项目,选择 `dist/build/mp-weixin` 目录
3. 在开发者工具中点击 **上传**
4. 登录 [微信公众平台](https://mp.weixin.qq.com)
5. 进入 **管理->版本管理**
6. 找到刚上传的版本,点击 **选为体验版**
---
## 三、合并到 main 分支
当 test 分支验证通过后,将其合并到 main
```bash
git checkout main
git pull origin main
git merge origin/test
git push origin main
```
---
## 四、冲突处理
合并时如有冲突,在个人分支解决后再合并:
```bash
git checkout feature/your-name-work
git merge main
# 解决冲突后
git add .
git commit -m "merge: 解决与main的冲突"
git push origin feature/your-name-work
# 重新合并到 test
git checkout test
git merge feature/your-name-work
git push origin test
```
---
## 五、注意事项
1. **禁止直接向 main 和 test 分支提交代码**,必须通过合并
2. **每次合并前先拉取最新代码**,避免覆盖他人改动
3. **体验版发布前确认代码已提交**,避免遗漏
4. **开发分支命名建议**`feature/姓名-功能名`,如 `feature/zhangsan-login`
5. **删除已合并的开发分支**`git branch -d feature/your-name-work`

View File

@@ -52,7 +52,7 @@
} }
function onDeviceShoot() { function onDeviceShoot() {
audioManager.play("射箭声音") // audioManager.play("射箭声音")
} }
function onShootWsMsg(content) { function onShootWsMsg(content) {

View File

@@ -6,8 +6,8 @@ try {
switch (envVersion) { switch (envVersion) {
case "develop": // 开发版 case "develop": // 开发版
BASE_URL = "http://localhost:8000/api/shoot"; // BASE_URL = "http://localhost:8000/api/shoot";
// BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot"; BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
break; break;
case "trial": // 体验版 case "trial": // 体验版
BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot"; BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
@@ -38,7 +38,7 @@ function request(method, url, data = {}) {
timeout: 10000, timeout: 10000,
success: (res) => { success: (res) => {
if (res.data) { if (res.data) {
const { code, data, message } = res.data; const {code, data, message} = res.data;
if (code === 0) resolve(data); if (code === 0) resolve(data);
else if (message) { else if (message) {
if (message.indexOf("登录身份已失效") !== -1) { if (message.indexOf("登录身份已失效") !== -1) {
@@ -48,11 +48,11 @@ function request(method, url, data = {}) {
uni.$emit("update-user"); uni.$emit("update-user");
} }
if (message === "ROOM_FULL") { if (message === "ROOM_FULL") {
resolve({ full: true }); resolve({full: true});
return; return;
} }
if (message === "ERROR_ROOM_GAME_START") { if (message === "ERROR_ROOM_GAME_START") {
resolve({ started: true }); resolve({started: true});
return; return;
} }
if (url.indexOf("/user/room") !== -1 && method === "GET") { if (url.indexOf("/user/room") !== -1 && method === "GET") {
@@ -64,7 +64,7 @@ function request(method, url, data = {}) {
return; return;
} }
if (message === "BIND_DEVICE") { if (message === "BIND_DEVICE") {
resolve({ binded: true }); resolve({binded: true});
return; return;
} }
if (message === "ERROR_ORDER_UNPAY") { if (message === "ERROR_ORDER_UNPAY") {
@@ -99,7 +99,7 @@ function request(method, url, data = {}) {
// 统一的错误处理函数 // 统一的错误处理函数
function handleRequestError(err, url) { function handleRequestError(err, url) {
console.log("请求失败:", { err, url }); console.log("请求失败:", {err, url});
// 根据错误类型显示不同提示 // 根据错误类型显示不同提示
if (err.errMsg) { if (err.errMsg) {
@@ -179,12 +179,39 @@ export const loginAPI = async (phone, nickName, avatarData, code) => {
return result; return result;
}; };
export const silentLoginAPI = async (code) => {
const result = await request("POST", "/index/code", {
appName: "shoot",
appId: "wxa8f5989dcd45cc23",
code,
});
uni.setStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
result.token
);
return result;
};
export const checkUserBindAPI = async (code) => {
return request("POST", "/index/checkBind", {
appName: "shoot",
appId: "wxa8f5989dcd45cc23",
code,
});
};
export const bindDeviceAPI = (device) => { export const bindDeviceAPI = (device) => {
return request("POST", "/user/device/bindDevice", { return request("POST", "/user/device/bindDevice", {
device, device,
}); });
}; };
export const bindDeviceAPIV2 = (token) => {
return request("POST", "/user/device/bindDevice/v2", {
token: token,
});
};
export const unbindDeviceAPI = (deviceId) => { export const unbindDeviceAPI = (deviceId) => {
return request("POST", "/user/device/unbindDevice", { return request("POST", "/user/device/unbindDevice", {
deviceId, deviceId,
@@ -200,7 +227,7 @@ export const createPractiseAPI = (arrows, time, target) => {
return request("POST", "/user/practice/create", { return request("POST", "/user/practice/create", {
shootNumber: arrows, shootNumber: arrows,
shootTime: time, shootTime: time,
targetType: target*20, targetType: target * 20,
}); });
}; };
@@ -229,7 +256,7 @@ export const getRoomAPI = (number) => {
}; };
export const joinRoomAPI = (number) => { export const joinRoomAPI = (number) => {
return request("POST", `/user/room/join`, { number }); return request("POST", `/user/room/join`, {number});
}; };
export const destroyRoomAPI = (roomNumber) => { export const destroyRoomAPI = (roomNumber) => {
@@ -246,7 +273,7 @@ export const exitRoomAPI = (number, userId) => {
}; };
export const startRoomAPI = (number) => { export const startRoomAPI = (number) => {
return request("POST", "/user/room/start", { number }); return request("POST", "/user/room/start", {number});
}; };
export const getPractiseResultListAPI = async (page = 1, page_size = 15) => { export const getPractiseResultListAPI = async (page = 1, page_size = 15) => {
@@ -262,7 +289,8 @@ export const matchGameAPI = (match, gameType, teamSize) => {
match, match,
gameType, gameType,
teamSize, teamSize,
readyTime: 1.5, readyTime: 15,
targetType: 20,
}); });
}; };
@@ -319,7 +347,7 @@ export const getOrderListAPI = async (page) => {
}; };
export const cancelOrderListAPI = async (id) => { export const cancelOrderListAPI = async (id) => {
return request("POST", "/user/order/cancelOrder", { id }); return request("POST", "/user/order/cancelOrder", {id});
}; };
export const getUserGameState = () => { export const getUserGameState = () => {
@@ -379,12 +407,21 @@ export const getPractiseDataAPI = async () => {
return request("GET", "/user/practice/statistics"); return request("GET", "/user/practice/statistics");
}; };
export const getPersonalTrainingAPI = async () => {
return request("GET", "/personal/training");
};
export const getTrainingDifficultyListAPI = async (type) => {
const query = type ? `?type=${encodeURIComponent(type)}` : "";
return request("GET", `/training/difficulty/list${query}`);
};
export const getBattleDataAPI = async () => { export const getBattleDataAPI = async () => {
return request("GET", "/user/fight/statistics"); return request("GET", "/user/fight/statistics");
}; };
export const chooseTeamAPI = async (number, group) => { export const chooseTeamAPI = async (number, group) => {
return request("POST", "/user/room/group", { number, group }); return request("POST", "/user/room/group", {number, group});
}; };
export const getVIPDescAPI = async () => { export const getVIPDescAPI = async () => {
@@ -418,7 +455,7 @@ export const getDeviceBatteryAPI = async () => {
}; };
export const addNoteAPI = async (id, remark) => { export const addNoteAPI = async (id, remark) => {
return request("POST", "/user/score/sheet/remark", { id, remark }); return request("POST", "/user/score/sheet/remark", {id, remark});
}; };
export const removePointRecord = async (id) => { export const removePointRecord = async (id) => {
@@ -468,3 +505,63 @@ export const kickPlayerAPI = (number, userId) => {
userId, userId,
}); });
}; };
// 获取赛季列表
export const getSeasonList = () => {
return request("GET", "/index/season/list");
};
// 获取赛季统计
export const getSeasonStats = (seasonId) => {
const data = {};
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/season/stats", data);
};
//获取积分榜
export const getScoreRankList = (seasonId, page, perPage) => {
return request("GET", "/index/score/rank/list", {
seasonId,
page,
perPage
});
};
// 获取10环排行榜
export const getTenRingRankList = (seasonId, page, perPage) => {
return request("GET", "/index/tenRing/rank/list", {
seasonId,
page,
perPage
});
};
// 获取MVP排行榜
export const getMvpRankList = (seasonId, page, perPage) => {
return request("GET", "/index/mvp/rank/list", {
seasonId,
page,
perPage
});
};
// 获取我的积分排名
export const getMyScoreRank = (seasonId) => {
const data = {};
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myScoreRank", data);
};
// 获取我的MVP排名
export const getMyMvpRank = (seasonId) => {
const data = {};
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myMvpRank", data);
};
// 获取我的10环排名
export const getMyTenRingRank = (seasonId) => {
const data = {};
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myTenRingRank", data);
};

View File

@@ -362,6 +362,7 @@ class AudioManager {
} }
this.allowPlayMap.set(key, false); this.allowPlayMap.set(key, false);
this.onAudioEnded(key); this.onAudioEnded(key);
uni.$emit('audioEnded', key);
}); });
audio.onStop(() => { audio.onStop(() => {

View File

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

View File

@@ -5,7 +5,7 @@ import AppBackground from "@/components/AppBackground.vue";
import Header from "@/components/Header.vue"; import Header from "@/components/Header.vue";
import ScreenHint from "@/components/ScreenHint.vue"; import ScreenHint from "@/components/ScreenHint.vue";
import BackToGame from "@/components/BackToGame.vue"; import BackToGame from "@/components/BackToGame.vue";
import { laserAimAPI, getBattleAPI } from "@/apis"; import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
import { capsuleHeight, debounce } from "@/util"; import { capsuleHeight, debounce } from "@/util";
import AudioManager from "@/audioManager"; import AudioManager from "@/audioManager";
const props = defineProps({ const props = defineProps({
@@ -135,6 +135,10 @@ const goBack = () => {
uni.navigateBack(); uni.navigateBack();
}; };
const cancelMatching = async () => {
uni.$emit("cancelMatching");
}
const goCalibration = async () => { const goCalibration = async () => {
await laserAimAPI(); await laserAimAPI();
uni.navigateTo({ uni.navigateTo({
@@ -202,7 +206,7 @@ const goCalibration = async () => {
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">
取消 取消
</button> </button>
<button hover-class="none" @click="goBack">确认</button> <button hover-class="none" @click="cancelMatching">确认</button>
</view> </view>
</view> </view>
<view v-if="hintType === 4" class="tip-content"> <view v-if="hintType === 4" class="tip-content">

View File

@@ -0,0 +1,54 @@
<script setup>
defineProps({
noBg: {
type: Boolean,
default: false,
}
});
</script>
<template>
<view class="container">
<image class="shooter2" src="../static/shooter2.png" mode="widthFix" />
<view class="bg-box">
<image
class="bg"
v-if="!noBg"
src="../static/long-bubble-border.png"
mode="widthFix"
/>
<slot />
</view>
</view>
</template>
<style scoped>
.container {
display: flex;
align-items: center;
padding: 0 15px;
margin-bottom: 14rpx;
width: clac(100% - 30px);
}
.container .shooter2 {
width: 150rpx;
height: 162rpx;
}
.container .bg-box {
color: #fff;
font-size: 28rpx;
position: relative;
flex: 1;
min-height: 55px;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.container .bg-box .bg {
position: absolute;
left: 0;
right: 0;
width: 100%;
}
</style>

View File

@@ -6,7 +6,7 @@ import Avatar from "@/components/Avatar.vue";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
const { user } = storeToRefs(store); const { user, game } = storeToRefs(store);
const currentPage = computed(() => { const currentPage = computed(() => {
const pages = getCurrentPages(); const pages = getCurrentPages();
@@ -59,6 +59,7 @@ const loading = ref(false);
const pointBook = ref(null); const pointBook = ref(null);
const showProgress = ref(false); const showProgress = ref(false);
const heat = ref(0); const heat = ref(0);
const updateLoading = (value) => { const updateLoading = (value) => {
loading.value = value; loading.value = value;
}; };
@@ -172,6 +173,16 @@ onBeforeUnmount(() => {
<view v-if="showProgress" class="battle-progress"> <view v-if="showProgress" class="battle-progress">
<HeaderProgress /> <HeaderProgress />
</view> </view>
<!-- 对战房间:整个胶囊为分享按钮,房号从 Store 读取 -->
<button
v-if="currentPage === 'pages/battle-room' && game.roomNumber"
open-type="share"
hover-class="none"
class="battle-room-number"
>
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
<image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
</button>
</view> </view>
</template> </template>
@@ -259,4 +270,37 @@ onBeforeUnmount(() => {
margin: 0 20rpx; margin: 0 20rpx;
max-width: 300rpx; max-width: 300rpx;
} }
/* 对战房间:整个胶囊作为分享按钮,靠右对齐 */
.battle-room-number {
margin-left: auto;
margin-right: 10rpx;
display: flex;
align-items: center;
justify-content: center;
width: 240rpx;
height: 64rpx;
background: rgba(0, 0, 0, 0.15);
border-radius: 96rpx;
border: 1rpx solid #5b5758;
flex-shrink: 0;
padding: 0;
line-height: normal;
}
/* 重置 button 默认边框 */
.battle-room-number::after {
border: none;
}
.battle-room-number__text {
width: 156rpx;
height: 28rpx;
font-weight: 400;
font-size: 20rpx;
color: #ffffff;
text-align: center;
line-height: 28rpx;
}
.battle-room-number__icon {
width: 25rpx;
height: 26rpx;
}
</style> </style>

View File

@@ -56,7 +56,7 @@ async function onReceiveMessage(message) {
currentRoundEnded.value = true; currentRoundEnded.value = true;
audioManager.play("比赛开始"); audioManager.play("比赛开始");
} else if (type === MESSAGETYPESV2.BattleEnd) { } else if (type === MESSAGETYPESV2.BattleEnd) {
audioManager.play("比赛结束"); audioManager.play("比赛结束", false);
} else if (type === MESSAGETYPESV2.ShootResult) { } else if (type === MESSAGETYPESV2.ShootResult) {
if (melee.value && current.playerId !== user.value.id) return; if (melee.value && current.playerId !== user.value.id) return;
if (current.playerId === user.value.id) currentShot.value++; if (current.playerId === user.value.id) currentShot.value++;

View File

@@ -53,6 +53,7 @@ const currentRoundEnded = ref(false);
const ended = ref(false); const ended = ref(false);
const halfTime = ref(false); const halfTime = ref(false);
const wait = ref(0); const wait = ref(0);
const transitionStyle = ref("all 1s linear");
watch( watch(
() => props.tips, () => props.tips,
@@ -81,7 +82,19 @@ watch(
const resetTimer = (count) => { const resetTimer = (count) => {
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
remain.value = Math.round(count); const newVal = Math.round(count);
// 如果剩余时间增加(如重置),瞬间变化无动画
if (newVal >= remain.value) {
transitionStyle.value = "none";
remain.value = newVal;
setTimeout(() => {
transitionStyle.value = "all 1s linear";
}, 50);
} else {
remain.value = newVal;
}
if (remain.value > 0) { if (remain.value > 0) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
if (remain.value === 0) { if (remain.value === 0) {
@@ -126,7 +139,7 @@ async function onReceiveMessage(msg) {
halfTime.value = false; halfTime.value = false;
audioManager.play("比赛开始"); audioManager.play("比赛开始");
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
audioManager.play("比赛结束"); audioManager.play("比赛结束", false);
} else if (msg.type === MESSAGETYPESV2.ShootResult) { } else if (msg.type === MESSAGETYPESV2.ShootResult) {
let arrow = {}; let arrow = {};
if (msg.details && Array.isArray(msg.details)) { if (msg.details && Array.isArray(msg.details)) {
@@ -188,6 +201,7 @@ onBeforeUnmount(() => {
width: `${(remain / total) * 100}%`, width: `${(remain / total) * 100}%`,
backgroundColor: barColor, backgroundColor: barColor,
right: tips.includes('红队') ? 0 : 'unset', right: tips.includes('红队') ? 0 : 'unset',
transition: transitionStyle,
}" }"
/> />
<text>剩余{{ remain }}</text> <text>剩余{{ remain }}</text>
@@ -242,7 +256,6 @@ onBeforeUnmount(() => {
height: 15px; height: 15px;
border-radius: 15px; border-radius: 15px;
z-index: -1; z-index: -1;
transition: all 1s linear;
} }
.container > view:last-child > text { .container > view:last-child > text {
font-size: 10px; font-size: 10px;

View File

@@ -1,6 +1,7 @@
<script setup> <script setup>
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import {ref, watch, onMounted, onBeforeUnmount} from "vue";
import { RoundGoldImages } from "@/constants"; import {RoundGoldImages} from "@/constants";
const props = defineProps({ const props = defineProps({
tips: { tips: {
type: String, type: String,
@@ -19,15 +20,39 @@ const props = defineProps({
const barColor = ref(""); const barColor = ref("");
const remain = ref(15); const remain = ref(15);
const timer = ref(null); const timer = ref(null);
const laoding = ref(false); const loading = ref(false);
const transitionStyle = ref("all 1s linear");
const currentTeam = ref(null);
const updateRemain = (value) => { const updateRemain = (value) => {
// if (Math.ceil(value) === remain.value || Math.floor(value) === remain.value) if (value.stop) {
// return;
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
remain.value = Math.round(value); return
}
loading.value = false;
currentTeam.value = value.team
if (value.team === 'red')
barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
if (value.team === 'blue')
barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
if (value.reset) {
remain.value = value.value;
return;
}
const newVal = Math.round(value.value);
// 如果剩余时间增加(如轮次切换重置),瞬间变化无动画;否则保持动画
if (newVal >= remain.value) {
transitionStyle.value = "none";
remain.value = newVal;
setTimeout(() => {
transitionStyle.value = "all 1s linear";
}, 50);
} else {
remain.value = newVal;
}
timer.value = setInterval(() => { timer.value = setInterval(() => {
laoding.value = remain.value === 0; loading.value = remain.value === 0;
if (remain.value > 0) remain.value--; if (remain.value > 0) remain.value--;
}, 1000); }, 1000);
}; };
@@ -35,14 +60,7 @@ const updateRemain = (value) => {
watch( watch(
() => props.tips, () => props.tips,
(newVal) => { (newVal) => {
if (newVal.includes("红队"))
barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
if (newVal.includes("蓝队"))
barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
if (newVal.includes("重回")) return;
if (newVal.includes("红队") || newVal.includes("蓝队")) {
updateRemain(props.total);
}
}, },
{ {
immediate: true, immediate: true,
@@ -61,20 +79,21 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container"> <view class="container">
<image :src="RoundGoldImages[props.currentRound]" mode="widthFix" /> <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
<view <view
:style="{ :style="{
justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start', justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
}" }"
> >
<view <view
:style="{ :style="{
width: `${(remain / total) * 100}%`, width: `${(remain / total) * 100}%`,
background: barColor, background: barColor,
right: tips.includes('红队') ? 0 : 'unset', right: currentTeam==='red' ? 0 : 'unset',
transition: transitionStyle,
}" }"
/> />
<text v-if="!laoding">剩余{{ remain }}</text> <text v-if="!loading">剩余{{ remain }}</text>
<text v-else>···</text> <text v-else>···</text>
</view> </view>
</view> </view>
@@ -87,11 +106,13 @@ onBeforeUnmount(() => {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.container > image { .container > image {
width: 380rpx; width: 380rpx;
height: 80rpx; height: 80rpx;
transform: translateY(18rpx); transform: translateY(18rpx);
} }
.container > view:last-child { .container > view:last-child {
width: 100%; width: 100%;
text-align: center; text-align: center;
@@ -103,11 +124,12 @@ onBeforeUnmount(() => {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.container > view:last-child > view { .container > view:last-child > view {
height: 24rpx; height: 24rpx;
border-radius: 15px; border-radius: 15px;
transition: all 1s linear;
} }
.container > view:last-child > text { .container > view:last-child > text {
font-size: 18rpx; font-size: 18rpx;
color: #fff; color: #fff;

View File

@@ -86,18 +86,17 @@ const handleLogin = async () => {
icon: "none", icon: "none",
}); });
} }
await doLogin();
};
async function doLogin() {
loading.value = true; loading.value = true;
try { try {
const wxResult = await wxLogin(); const wxResult = await wxLogin();
const fileManager = uni.getFileSystemManager(); const fileManager = uni.getFileSystemManager();
const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64"); const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
const base64Url = `data:image/png;base64,${avatarBase64}`; const base64Url = `data:image/png;base64,${avatarBase64}`;
const result = await loginAPI( await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
phone.value,
nickName.value,
base64Url,
wxResult.code
);
const data = await getHomeData(); const data = await getHomeData();
if (data.user) updateUser(data.user); if (data.user) updateUser(data.user);
const devices = await getMyDevicesAPI(); const devices = await getMyDevicesAPI();
@@ -139,6 +138,10 @@ const openPrivacyLink = () => {
onShow(() => { onShow(() => {
loading.value = false; loading.value = false;
agree.value = false;
phone.value = "";
avatarUrl.value = "";
nickName.value = "";
}); });
</script> </script>

View File

@@ -0,0 +1,327 @@
<script setup>
import { computed } from "vue";
const lockedBadgeBackground =
"/static/training-difficulty-design/unlock.svg";
const unlockedBadgeBackground =
"/static/training-difficulty-design/lock.svg";
const props = defineProps({
node: {
type: Object,
required: true,
},
active: {
type: Boolean,
default: false,
},
completedProgress: {
type: Number,
default: 0,
},
locked: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["click"]);
const badgeStyle = computed(() => {
const { left, top } = props.node.style || {};
return {
left,
top,
};
});
const progressValue = computed(() => {
const value = Number(props.completedProgress);
if (!Number.isFinite(value)) return 0;
return Math.max(0, Math.min(100, value));
});
const badgeStateStyle = computed(() => {
const label = String(props.node?.label || "");
const estimatedLabelWidthRpx = Math.max(36, label.length * 14);
const labelCircleSizeRpx = Math.max(58, estimatedLabelWidthRpx + 18);
const badgeSizeRpx = Math.max(
124,
Math.round(labelCircleSizeRpx / 0.4727)
);
return {
"--badge-progress": progressValue.value,
"--badge-size": `${badgeSizeRpx}rpx`,
"--badge-label-size": `${labelCircleSizeRpx}rpx`,
"--badge-orbit-offset": "12rpx",
"--badge-locked-ring-offset": "12rpx",
};
});
const showProgress = computed(() => {
return !props.locked;
});
const badgeFillSrc = computed(() => {
return props.locked ? lockedBadgeBackground : unlockedBadgeBackground;
});
const handleClick = () => {
emit("click", props.node);
};
</script>
<template>
<view
class="difficulty-badge"
:class="{
'difficulty-badge--active': active,
'difficulty-badge--progress': showProgress,
'difficulty-badge--locked': locked,
}"
:style="[badgeStyle, badgeStateStyle]"
@click="handleClick"
>
<view class="difficulty-badge__fill">
<image class="difficulty-badge__bg" :src="badgeFillSrc" mode="aspectFit" />
<view v-if="active" class="difficulty-badge__active-orbit">
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--top"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--right"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--bottom"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--left"
></view>
</view>
<view class="difficulty-badge__label-wrap">
<view class="difficulty-badge__label">{{ node.label }}</view>
</view>
</view>
</view>
</template>
<style scoped>
.difficulty-badge,
.difficulty-badge__fill,
.difficulty-badge__label-wrap {
box-sizing: border-box;
}
.difficulty-badge {
position: absolute;
transform: translate(-50%, -50%);
z-index: 2;
display: flex;
align-items: center;
justify-content: center;
transition: transform 0.2s ease, opacity 0.2s ease;
}
.difficulty-badge--active {
transform: translate(-50%, -50%) scale(1.04);
}
.difficulty-badge--active::before {
content: "";
position: absolute;
inset: calc(var(--badge-orbit-offset) * -1);
border: 4rpx solid transparent;
border-radius: 50%;
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge--active::after {
content: "";
position: absolute;
inset: -24rpx;
border: 4rpx solid rgba(254, 208, 152, 0.96);
border-radius: 50%;
box-shadow: inset 0 0 10rpx rgba(254, 208, 152, 0.88),
inset 0 0 22rpx rgba(254, 208, 152, 0.32),
0 0 14rpx rgba(254, 208, 152, 0.92),
0 0 32rpx rgba(254, 208, 152, 0.52),
0 0 52rpx rgba(254, 208, 152, 0.22);
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge__active-orbit {
position: absolute;
top: 50%;
left: 50%;
width: calc(100% + var(--badge-orbit-offset) * 2);
height: calc(100% + var(--badge-orbit-offset) * 2);
border-radius: 50%;
z-index: 3;
pointer-events: none;
transform: translate(-50%, -50%);
animation: badge-orbit-spin 5.4s linear infinite;
transform-origin: center;
}
.difficulty-badge__active-triangle {
position: absolute;
width: 0;
height: 0;
border-style: solid;
z-index: 2;
pointer-events: none;
opacity: 0.92;
filter: drop-shadow(0 0 8rpx rgba(255, 255, 255, 0.45));
}
.difficulty-badge__active-triangle--top {
top: -3rpx;
left: 50%;
transform: translateX(-50%);
border-width: 11rpx 8rpx 0 8rpx;
border-color: #ffffff transparent transparent transparent;
}
.difficulty-badge__active-triangle--right {
right: -3rpx;
top: 50%;
transform: translateY(-50%);
border-width: 8rpx 11rpx 8rpx 0;
border-color: transparent #ffffff transparent transparent;
}
.difficulty-badge__active-triangle--bottom {
bottom: -3rpx;
left: 50%;
transform: translateX(-50%);
border-width: 0 8rpx 11rpx 8rpx;
border-color: transparent transparent #ffffff transparent;
}
.difficulty-badge__active-triangle--left {
left: -3rpx;
top: 50%;
transform: translateY(-50%);
border-width: 8rpx 0 8rpx 11rpx;
border-color: transparent transparent transparent #ffffff;
}
.difficulty-badge__fill {
width: var(--badge-size);
height: var(--badge-size);
position: relative;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
}
.difficulty-badge__bg {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
display: block;
z-index: 1;
}
.difficulty-badge--active .difficulty-badge__fill::before,
.difficulty-badge--active .difficulty-badge__fill::after {
content: none;
}
.difficulty-badge--progress .difficulty-badge__fill::before,
.difficulty-badge--progress .difficulty-badge__fill::after {
content: "";
position: absolute;
inset: -12rpx;
padding: 6rpx;
border-radius: inherit;
-webkit-mask: linear-gradient(#fff 0 0) content-box,
linear-gradient(#fff 0 0);
-webkit-mask-composite: xor;
mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
mask-composite: exclude;
pointer-events: none;
}
.difficulty-badge--progress .difficulty-badge__fill::before {
background: rgba(255, 255, 255, 0.35);
}
.difficulty-badge--progress .difficulty-badge__fill::after {
background: conic-gradient(
from -90deg,
rgba(254, 208, 152, 1) 0,
rgba(255, 229, 198, 1) calc(var(--badge-progress) * 1%),
transparent calc(var(--badge-progress) * 1%) 100%
);
}
.difficulty-badge--active .difficulty-badge__label,
.difficulty-badge--progress .difficulty-badge__label {
color: #333333;
}
.difficulty-badge--locked {
opacity: 1;
}
.difficulty-badge--locked::before {
content: "";
position: absolute;
inset: calc(var(--badge-locked-ring-offset) * -1);
border: 2rpx solid rgba(160, 160, 160, 0.5);
border-radius: 50%;
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge--locked .difficulty-badge__label {
color: rgba(51, 51, 51, 0.54);
}
.difficulty-badge__label-wrap {
width: var(--badge-label-size);
height: var(--badge-label-size);
border-radius: 50%;
position: relative;
z-index: 2;
display: flex;
align-items: center;
justify-content: center;
margin-top: -5rpx;
}
.difficulty-badge__label {
color: rgba(51, 51, 51, 0.7);
font-size: 24rpx;
max-width: 100%;
height: 34rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
font-weight: 600;
text-align: center;
white-space: nowrap;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
@keyframes badge-orbit-spin {
from {
transform: translate(-50%, -50%) rotate(0deg);
}
to {
transform: translate(-50%, -50%) rotate(360deg);
}
}
</style>

View File

@@ -0,0 +1,86 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
title: {
type: String,
default: "",
},
lines: {
type: Array,
default: () => [],
},
});
const previewLines = computed(() => {
return props.lines.map((line) => String(line || "").trim()).filter(Boolean);
});
</script>
<template>
<view class="difficulty-preview">
<image
class="difficulty-preview__bg"
src="/static/training-difficulty-design/text.png"
mode="widthFix"
/>
<view class="difficulty-preview__content">
<text class="difficulty-preview__title">{{ title }}</text>
<view class="difficulty-preview__copy">
<text
v-for="(line, index) in previewLines"
:key="`${line}-${index}`"
class="difficulty-preview__line"
>
{{ line }}
</text>
</view>
</view>
</view>
</template>
<style scoped>
.difficulty-preview {
position: relative;
width: 100%;
}
.difficulty-preview__bg {
display: block;
width: 100%;
}
.difficulty-preview__content {
position: absolute;
top: 28rpx;
left: 30rpx;
box-sizing: border-box;
width: 486rpx;
}
.difficulty-preview__title {
display: block;
color: #ffd543;
font-size: 24rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
text-align: center;
}
.difficulty-preview__copy {
width: 80%;
margin: 0 auto;
display: block;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
text-align: center;
}
.difficulty-preview__line {
display: block;
}
</style>

View File

@@ -0,0 +1,81 @@
<script setup>
const props = defineProps({
text: {
type: String,
default: "开始",
},
});
const emit = defineEmits(["click"]);
const handleClick = () => {
emit("click");
};
</script>
<template>
<button
class="difficulty-start"
hover-class="difficulty-start--hover"
@click="handleClick"
>
<image
class="difficulty-start__button"
src="/static/training-difficulty-design/btn.png"
mode="widthFix"
/>
</button>
</template>
<style scoped>
.difficulty-start {
position: relative;
width: 302rpx;
height: 170rpx;
padding: 0;
border: 0;
background: transparent;
margin: 0 auto;
}
.difficulty-start::after {
border: 0;
}
.difficulty-start--hover {
transform: translateY(2rpx) scale(0.99);
}
.difficulty-start__mascot {
position: absolute;
left: 50%;
top: 0;
z-index: 1;
width: 112rpx;
transform: translateX(-50%);
}
.difficulty-start__button {
position: absolute;
left: 0;
right: 0;
bottom: 0;
z-index: 2;
width: 100%;
}
.difficulty-start__text {
position: absolute;
left: 0;
right: 0;
bottom: 58rpx;
z-index: 3;
color: #9f4d00;
font-size: 64rpx;
line-height: 76rpx;
text-align: center;
font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
font-weight: 800;
text-shadow: 0 3rpx 0 rgba(255, 245, 205, 0.78);
}
</style>

View File

@@ -1,28 +1,28 @@
{ {
"name": "shoot-miniprograms", "name" : "shoot-miniprograms",
"appid": "", "appid" : "__UNI__B03E251",
"description": "", "description" : "",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"app-plus": { "app-plus" : {
"bounce": "none", "bounce" : "none",
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"modules": {}, "modules" : {},
"distribute": { "distribute" : {
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -40,29 +40,31 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
"ios": {}, "ios" : {
"sdkConfigs": {} "dSYMs" : false
},
"sdkConfigs" : {}
} }
}, },
"h5": { "h5" : {
"darkmode": true, "darkmode" : true,
"themeLocation": "theme.json" "themeLocation" : "theme.json"
}, },
"quickapp": {}, "quickapp" : {},
"mp-weixin": { "mp-weixin" : {
"appid": "wxa8f5989dcd45cc23", "appid" : "wxa8f5989dcd45cc23",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"minified": true, "minified" : true,
"uglifyFileName": true, "uglifyFileName" : true,
"useCompilerModule": true, "useCompilerModule" : true,
"useIsolateContext": true "useIsolateContext" : true
}, },
"lazyCodeLoading": "requiredComponents", "lazyCodeLoading" : "requiredComponents",
"usingComponents": true, "usingComponents" : true,
"darkmode": true, "darkmode" : true,
"themeLocation": "theme.json", "themeLocation" : "theme.json",
"permission": {}, "permission" : {},
"requiredPrivateInfos": ["getLocation", "chooseLocation"] "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
} }
} }

104
src/mock/index.js Normal file
View File

@@ -0,0 +1,104 @@
// 首页一周打卡展示数据,直接对应顶部 7 个日期卡片。
export const trainingHomeWeekSchedule = [
{
key: "mon",
label: "周一",
status: "done",
icon: "../../static/training-home/done.png",
},
{
key: "tue",
label: "周二",
status: "done",
icon: "../../static/training-home/done.png",
},
{
key: "wed",
label: "周三",
status: "missed",
icon: "../../static/training-home/missed.png",
},
{
key: "thu",
label: "周四",
status: "missed",
icon: "../../static/training-home/missed.png",
},
{
key: "fri",
label: "周五",
status: "done",
icon: "../../static/training-home/done.png",
},
{
key: "sat",
label: "周六",
status: "done",
icon: "../../static/training-home/done.png",
},
{
key: "sun",
label: "周日",
status: "missed",
icon: "../../static/training-home/missed.png",
},
];
// 首页统计卡数据,按设计稿从左到右展示。
export const trainingHomeStats = [
{ key: "days", value: "12", unit: "天", label: "共训练" },
{ key: "shots", value: "112", unit: "支", label: "累计射箭" },
{ key: "hitRate", value: "30", unit: "%", label: "命中率" },
{ key: "endurance", value: "6", unit: "支/分钟", label: "耐力射击" },
{ key: "calories", value: "31W", unit: "卡路里", label: "共消耗" },
];
// 雷达图区文案与数值配置。
export const trainingHomeRadar = {
labels: ["基础", "精准", "力量", "节奏", "耐力"],
values: [5.5, 6.3, 10, 4.5, 6],
maxValue: 10,
surpassValue: '80%'
};
// 首页主推荐训练卡数据。
export const trainingHomeFeatured = {
title: "基础训练",
progressText: "当前进度 LV7 >",
};
// 首页四个训练入口卡片数据。
export const trainingHomeModes = [
{
key: "endurance",
title: "耐力训练",
progressText: "当前进度 LV5 >",
icon: "../../static/training-home/img_3.png",
recommended: true,
disabled: false,
},
{
key: "precision",
title: "精准训练",
progressText: "当前进度 LV3 >",
icon: "../../static/training-home/img_4.png",
recommended: false,
disabled: false,
},
{
key: "rhythm",
title: "节奏训练",
progressText: "当前进度 LV6 >",
icon: "../../static/training-home/img_5.png",
recommended: false,
disabled: false,
},
{
key: "power",
title: "力量训练",
progressText: "Coming! LV10",
icon: "../../static/training-home/img_6.png",
recommended: false,
disabled: true,
},
];

View File

@@ -0,0 +1,113 @@
// 难度页当前用于保存“开始训练前上下文”的本地存储 key。
export const trainingDifficultyStorageKey = "training-selection";
// 当前是页面联调用的模拟数据:
// 1. 总难度 20 级
// 2. 已解锁到 Lv3
// 3. 前三关展示不同完成进度
const totalDifficultyLevel = 20;
const mockedUnlockedDifficultyId = "lv3";
const mockedDifficultyProgressMap = {
lv1: 100,
lv2: 90,
lv3: 70,
};
const modeList = [
{
key: "endurance",
title: "耐力训练",
},
{
key: "precision",
title: "精准训练",
},
{
key: "rhythm",
title: "节奏训练",
},
{
key: "basic",
title: "基础训练",
},
{
key: "power",
title: "力量训练",
},
{
key: "focus",
title: "专注训练",
},
];
const createDifficultyId = (level) => `lv${level}`;
const createDifficultyLabel = (level) => `Lv${level}`;
// 根据等级生成模拟文案,方便一次性扩展到更多关卡。
const createDifficultySummary = (level) => {
return [
`箭靶划分为${Math.min(1 + Math.floor((level - 1) / 5), 4)}个区域`,
`${4 + level}次命中目标`,
`${100 + Math.floor((level - 1) / 2) * 10}秒内完成所有射击`,
"需使用20CM全环靶",
];
};
// 难度页的节点位置已经在页面内统一计算,
// 这里保留最核心的 id / label 即可,不再维护无效的 left / top / style 字段。
const createDifficultyNode = (level) => {
return {
id: createDifficultyId(level),
label: createDifficultyLabel(level),
};
};
const createDifficultyDetail = (level) => {
const id = createDifficultyId(level);
const label = createDifficultyLabel(level);
return {
id,
label,
title: `${label}难度`,
summary: createDifficultySummary(level),
startText: "开始",
targetPaperType: "20CM全环靶",
};
};
// 所有训练模式当前共用同一套难度定义。
const sharedDifficultyNodes = Array.from(
{ length: totalDifficultyLevel },
(_, index) => createDifficultyNode(index + 1)
);
const sharedDifficultyDetails = Object.fromEntries(
Array.from({ length: totalDifficultyLevel }, (_, index) => {
const detail = createDifficultyDetail(index + 1);
return [detail.id, detail];
})
);
const createModeConfig = ({ key, title, reward = null }) => {
return {
key,
title,
nodes: sharedDifficultyNodes,
details: sharedDifficultyDetails,
activeDifficultyId: mockedUnlockedDifficultyId,
progressMap: mockedDifficultyProgressMap,
reward,
};
};
// 难度页数据源入口:
// 页面通过 getTrainingDifficultyModeConfig(modeKey) 获取当前模式完整配置。
export const trainingDifficultyModeMap = Object.fromEntries(
modeList.map((mode) => [mode.key, createModeConfig(mode)])
);
export const getTrainingDifficultyModeConfig = (modeKey) => {
return trainingDifficultyModeMap[modeKey] || trainingDifficultyModeMap.precision;
};

View File

@@ -116,6 +116,15 @@
}, },
{ {
"path": "pages/mine-bow-data" "path": "pages/mine-bow-data"
},
{
"path": "pages/training/difficulty"
},
{
"path": "pages/training/index"
},
{
"path": "pages/training/practise-one"
} }
], ],
"globalStyle": { "globalStyle": {

View File

@@ -3,9 +3,10 @@ import { ref, onMounted, computed, onBeforeUnmount } from "vue";
import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app"; import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import PlayerSeats from "@/components/PlayerSeats.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 SButton from "@/components/SButton.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import ScreenHint from "@/components/ScreenHint.vue";
import { import {
getRoomAPI, getRoomAPI,
destroyRoomAPI, destroyRoomAPI,
@@ -29,11 +30,27 @@ const players = ref([]);
const blueTeam = ref([]); const blueTeam = ref([]);
const redTeam = ref([]); const redTeam = ref([]);
/**
* 根据对战类型和房间人数动态生成页面标题
* battleType=1: 组队对战count 2/4/6 分别对应 1v1/2v2/3v3
* battleType=2: 多人乱斗
*/
const battleTitle = computed(() => {
if (!room.value.battleType) return "好友约战";
if (room.value.battleType === 2) return "多人乱斗";
const half = room.value.count / 2;
return `${half}v${half}对抗赛`;
});
const ready = ref(false); const ready = ref(false);
const allReady = ref(false); const allReady = ref(false);
const timer = ref(null); const timer = ref(null);
const goBattle = ref(false); const goBattle = ref(false);
/**
* 从服务端刷新当前房间数据,更新成员列表、准备状态等信息
* 仅在 roomNumber 有效且房间未开始时执行
*/
async function refreshRoomData() { async function refreshRoomData() {
if (!roomNumber.value) return; if (!roomNumber.value) return;
const result = await getRoomAPI(roomNumber.value); const result = await getRoomAPI(roomNumber.value);
@@ -184,8 +201,32 @@ const exitRoom = async () => {
uni.navigateBack(); uni.navigateBack();
}; };
const removePlayer = async (player) => { /** 待确认踢出的玩家信息 */
await kickPlayerAPI(roomNumber.value, player.id); const playerToKick = ref(null);
/** 控制踢出确认弹窗的显示状态 */
const showKickConfirm = ref(false);
/**
* 点击踢出按钮,弹出二次确认弹窗
* @param {object} player - 被踢的玩家信息
*/
const removePlayer = (player) => {
playerToKick.value = player;
showKickConfirm.value = true;
};
/** 确认踢出:调用 API 并关闭弹窗 */
const confirmKick = async () => {
if (!playerToKick.value) return;
await kickPlayerAPI(roomNumber.value, playerToKick.value.id);
showKickConfirm.value = false;
playerToKick.value = null;
};
/** 取消踢出:关闭弹窗 */
const cancelKick = () => {
showKickConfirm.value = false;
playerToKick.value = null;
}; };
const canClick = computed(() => { const canClick = computed(() => {
@@ -208,15 +249,32 @@ onShareAppMessage(() => {
}; };
}); });
/**
* onShow 生命周期:页面显示时刷新房间数据
* 注uni-app 中 onShow 可能早于 onLoad 执行,此时 roomNumber 尚未赋值,
* refreshRoomData 会提前 return。
*/
onShow(() => { onShow(() => {
goBattle.value = false; goBattle.value = false;
refreshRoomData(); refreshRoomData();
}); });
/**
* 页面加载时解析路由参数,初始化房间号
* - 存入本地 ref供页面内部逻辑使用
* - 同步到 Pinia Store供 Header 组件展示房号胶囊)
*/
onLoad(async (options) => { onLoad(async (options) => {
if (options.roomNumber) roomNumber.value = options.roomNumber; if (options.roomNumber) {
roomNumber.value = options.roomNumber;
store.updateRoomNumber(options.roomNumber);
}
}); });
/**
* 组件挂载后:保持屏幕常亮、注册 WebSocket 消息监听
* 房间号已通过 onLoad 同步到 StoreHeader 从 Store 直接读取,无需额外通知
*/
onMounted(() => { onMounted(() => {
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: true, keepScreenOn: true,
@@ -236,9 +294,9 @@ onBeforeUnmount(() => {
</script> </script>
<template> <template>
<Container :title="`好友约战 - ${roomNumber}`"> <Container :title="battleTitle">
<view class="standby-phase"> <view class="standby-phase">
<Guide> <GuideTwo>
<view class="battle-guide"> <view class="battle-guide">
<view class="guide-tips"> <view class="guide-tips">
<text>弓箭手们人都到齐了吗?</text> <text>弓箭手们人都到齐了吗?</text>
@@ -247,48 +305,28 @@ onBeforeUnmount(() => {
}}</text> }}</text>
<text v-if="room.battleType === 2">大乱斗即将开始! </text> <text v-if="room.battleType === 2">大乱斗即将开始! </text>
</view> </view>
<button hover-class="none" open-type="share">邀请</button>
</view> </view>
</Guide> </GuideTwo>
<view v-if="room.battleType === 1 && room.count === 2" class="team-mode"> <view v-if="room.battleType === 1 && room.count === 2" class="team-mode">
<image <image src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png" mode="widthFix" />
src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png"
mode="widthFix"
/>
<view> <view>
<view <view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }">
v-if="owner.id"
class="player"
:style="{ transform: 'translateY(-60px)' }"
>
<Avatar :src="owner.avatar" :size="60" /> <Avatar :src="owner.avatar" :size="60" />
<text>管理员</text> <text>管理员</text>
<text>{{ owner.name }}</text> <text>{{ owner.name }}</text>
</view> </view>
<view <view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
v-else
class="no-player"
:style="{ transform: 'translateY(-60px)' }"
>
<image src="../static/question-mark.png" mode="widthFix" /> <image src="../static/question-mark.png" mode="widthFix" />
</view> </view>
<image src="../static/versus.png" mode="widthFix" /> <image src="../static/versus.png" mode="widthFix" />
<view <view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }">
v-if="opponent.id"
class="player"
:style="{ transform: 'translateY(60px)' }"
>
<Avatar :src="opponent.avatar" :size="60" /> <Avatar :src="opponent.avatar" :size="60" />
<text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }"> <text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }">
已准备 已准备
</text> </text>
<text>{{ opponent.name }}</text> <text>{{ opponent.name }}</text>
<button <button v-if="owner.id === user.id" hover-class="none" class="remove-player"
v-if="owner.id === user.id" @click="() => removePlayer(opponent)">
hover-class="none"
class="remove-player"
@click="() => removePlayer(opponent)"
>
<image src="../static/close-white.png" mode="widthFix" /> <image src="../static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
@@ -299,31 +337,15 @@ onBeforeUnmount(() => {
</view> </view>
<block v-if="room.battleType === 1 && room.count >= 4"> <block v-if="room.battleType === 1 && room.count >= 4">
<view class="all-players"> <view class="all-players">
<image <image src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" mode="widthFix" />
src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" <image v-if="room.count === 4" src="../static/title-2v2.png" mode="widthFix" />
mode="widthFix" <image v-if="room.count === 6" src="../static/title-3v3.png" mode="widthFix" />
/>
<image
v-if="room.count === 4"
src="../static/title-2v2.png"
mode="widthFix"
/>
<image
v-if="room.count === 6"
src="../static/title-3v3.png"
mode="widthFix"
/>
<view> <view>
<view v-for="(item, index) in players" :key="index"> <view v-for="(item, index) in players" :key="index">
<Avatar v-if="item.id" :src="item.avatar" :size="36" /> <Avatar v-if="item.id" :src="item.avatar" :size="36" />
<text v-if="owner.id === item.id">管理员</text> <text v-if="owner.id === item.id">管理员</text>
<button <button v-if="owner.id !== item.id && item.id" hover-class="none" class="remove-player"
v-if="owner.id !== item.id && item.id" @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
hover-class="none"
class="remove-player"
@click="() => removePlayer(item)"
:style="{ top: '-10rpx', right: '-10rpx' }"
>
<image src="../static/close-white.png" mode="widthFix" /> <image src="../static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
@@ -331,16 +353,8 @@ onBeforeUnmount(() => {
</view> </view>
<view class="choose-side"> <view class="choose-side">
<view> <view>
<view <view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item">
v-for="(item, index) in redTeam" <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
:key="index"
class="choose-side-left-item"
>
<button
hover-class="none"
v-if="item.id === user.id"
@click="chooseTeam(0)"
>
<image src="../static/close-grey.png" mode="widthFix" /> <image src="../static/close-grey.png" mode="widthFix" />
</button> </button>
<text class="truncate">{{ item.name || "我要加入" }}</text> <text class="truncate">{{ item.name || "我要加入" }}</text>
@@ -354,11 +368,7 @@ onBeforeUnmount(() => {
</view> </view>
</view> </view>
<view> <view>
<view <view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item">
v-for="(item, index) in blueTeam"
:key="index"
class="choose-side-right-item"
>
<view v-if="item.id"> <view v-if="item.id">
<Avatar :src="item.avatar" :size="36" /> <Avatar :src="item.avatar" :size="36" />
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text> <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
@@ -367,23 +377,15 @@ onBeforeUnmount(() => {
<image src="../static/add-grey.png" mode="widthFix" /> <image src="../static/add-grey.png" mode="widthFix" />
</button> </button>
<text class="truncate">{{ item.name || "我要加入" }}</text> <text class="truncate">{{ item.name || "我要加入" }}</text>
<button <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
hover-class="none"
v-if="item.id === user.id"
@click="chooseTeam(0)"
>
<image src="../static/close-grey.png" mode="widthFix" /> <image src="../static/close-grey.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<PlayerSeats <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
v-if="room.battleType === 2" :removePlayer="removePlayer" />
:total="room.count || 10"
:players="players"
:removePlayer="removePlayer"
/>
<view> <view>
<SButton :disabled="!canClick" :onClick="getReady"> <SButton :disabled="!canClick" :onClick="getReady">
{{ {{
@@ -398,6 +400,20 @@ onBeforeUnmount(() => {
</view> </view>
</view> </view>
</Container> </Container>
<!-- 踢出玩家二次确认弹窗不传 onClose屏蔽 X 关闭按钮 -->
<ScreenHint :show="showKickConfirm">
<view class="kick-confirm">
<!-- 弹窗标题玩家名字高亮显示 -->
<text class="kick-confirm__title">
是否把<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>移出房间
</text>
<!-- 按钮区确认在左取消在右 -->
<view class="kick-confirm__btns">
<button hover-class="none" class="kick-confirm__btn kick-confirm__btn--confirm" @click="confirmKick">确定</button>
<button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">取消</button>
</view>
</view>
</ScreenHint>
</template> </template>
<style scoped> <style scoped>
@@ -406,6 +422,7 @@ onBeforeUnmount(() => {
height: calc(100% - 40px); height: calc(100% - 40px);
overflow-x: hidden; overflow-x: hidden;
} }
.tips { .tips {
color: #fff9; color: #fff9;
width: 100%; width: 100%;
@@ -414,6 +431,7 @@ onBeforeUnmount(() => {
margin-top: 10px; margin-top: 10px;
font-size: 12px; font-size: 12px;
} }
.player-unknow { .player-unknow {
width: 40px; width: 40px;
height: 40px; height: 40px;
@@ -425,25 +443,30 @@ onBeforeUnmount(() => {
justify-content: center; justify-content: center;
background-color: #69686866; background-color: #69686866;
} }
.player-unknow > image {
.player-unknow>image {
width: 40%; width: 40%;
} }
.team-mode { .team-mode {
width: calc(100vw - 30px); width: calc(100vw - 30px);
height: 125vw; height: 125vw;
margin: 15px; margin: 0 15px 15px 15px;
} }
.team-mode > image:first-child {
.team-mode>image:first-child {
position: absolute; position: absolute;
width: calc(100vw - 30px); width: calc(100vw - 30px);
z-index: -1; z-index: -1;
} }
.team-mode > view {
.team-mode>view {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 95%; height: 95%;
} }
.player { .player {
width: 70px; width: 70px;
display: flex; display: flex;
@@ -455,14 +478,16 @@ onBeforeUnmount(() => {
font-size: 14px; font-size: 14px;
position: relative; position: relative;
} }
.player > image {
.player>image {
width: 70px; width: 70px;
height: 70px; height: 70px;
border-radius: 50%; border-radius: 50%;
background-color: #ccc; background-color: #ccc;
margin-bottom: 5px; margin-bottom: 5px;
} }
.player > text:nth-child(2) {
.player>text:nth-child(2) {
color: #000; color: #000;
background-color: #fed847; background-color: #fed847;
font-size: 16rpx; font-size: 16rpx;
@@ -472,21 +497,85 @@ onBeforeUnmount(() => {
margin-top: -16rpx; margin-top: -16rpx;
position: relative; position: relative;
} }
.player > text:nth-child(3) {
.player>text:nth-child(3) {
margin-top: 6rpx; margin-top: 6rpx;
} }
.player > text {
.player>text {
max-width: 100px; max-width: 100px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
text-align: center; text-align: center;
} }
.player .ready { .player .ready {
background-color: #2c261fb3 !important; background-color: #2c261fb3 !important;
border: 1rpx solid #a3793f66 !important; border: 1rpx solid #a3793f66 !important;
color: #fed847 !important; color: #fed847 !important;
} }
/* 踢出确认弹窗内容 */
.kick-confirm {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 20rpx 30rpx;
color: #fff;
}
.kick-confirm__title {
font-size: 30rpx;
font-weight: 500;
text-align: center;
line-height: 1.5;
/* 标题与按钮区间距 */
margin-bottom: 58rpx;
}
.kick-confirm__btns {
display: flex;
/* 两个按钮间距 */
gap: 16rpx;
}
/* 按钮公共基础样式:固定宽高与圆角 */
.kick-confirm__btn {
font-size: 28rpx;
width: 232rpx;
height: 70rpx;
border-radius: 44rpx;
line-height: 70rpx;
display: flex;
align-items: center;
justify-content: center;
}
/* 取消按钮:白色半透明背景(用 rgba 避免 opacity 平铺到文字) */
.kick-confirm__btn--cancel {
background: rgba(255, 255, 255, 0.2);
border: none;
color: #FFFFFF;
font-weight: 500;
font-size: 28rpx;
text-align: center;
border-radius: 44rpx;
}
.kick-confirm__btn--cancel::after {
border: none;
}
/* 确认按钮:黄色实心背景 */
.kick-confirm__btn--confirm {
background: #FED847;
border: none;
color: #000000;
font-weight: 500;
font-size: 28rpx;
text-align: center;
border-radius: 44rpx;
}
.kick-confirm__btn--confirm::after {
border: none;
}
.remove-player { .remove-player {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
@@ -499,13 +588,16 @@ onBeforeUnmount(() => {
top: 0; top: 0;
right: 0; right: 0;
} }
.remove-player > image {
.remove-player>image {
width: 90%; width: 90%;
height: 90%; height: 90%;
} }
.team-mode > view > image:nth-child(2) {
.team-mode>view>image:nth-child(2) {
width: 120px; width: 120px;
} }
.no-player { .no-player {
width: 70px; width: 70px;
height: 70px; height: 70px;
@@ -516,10 +608,12 @@ onBeforeUnmount(() => {
align-items: center; align-items: center;
transform: translateY(60px); transform: translateY(60px);
} }
.no-player > image {
.no-player>image {
width: 20px; width: 20px;
margin-right: 2px; margin-right: 2px;
} }
.btns { .btns {
height: 100%; height: 100%;
display: flex; display: flex;
@@ -527,12 +621,14 @@ onBeforeUnmount(() => {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.battle-guide { .battle-guide {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.battle-guide > button:last-child {
.battle-guide>button:last-child {
color: #fed847; color: #fed847;
border: 1px solid #fed847; border: 1px solid #fed847;
margin-right: 10px; margin-right: 10px;
@@ -541,6 +637,7 @@ onBeforeUnmount(() => {
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
} }
.all-players { .all-players {
position: relative; position: relative;
display: flex; display: flex;
@@ -548,68 +645,73 @@ onBeforeUnmount(() => {
align-items: center; align-items: center;
height: 83vw; height: 83vw;
} }
.all-players > image:first-child {
.all-players>image:first-child {
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
.all-players > image:nth-child(2) {
.all-players>image:nth-child(2) {
width: 25vw; width: 25vw;
position: relative; position: relative;
} }
.all-players > view {
.all-players>view {
position: relative; position: relative;
width: 42vw; width: 42vw;
height: 42vw; height: 42vw;
margin-top: 7vw; margin-top: 7vw;
} }
.all-players > view > view {
.all-players>view>view {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
} }
/* 4个头像 - 正方形排列 */ /* 4个头像 - 正方形排列 */
.all-players > view > view:nth-child(1):nth-last-child(4) { .all-players>view>view:nth-child(1):nth-last-child(4) {
transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw) transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw) rotate(30deg);
rotate(30deg);
} }
.all-players > view > view:nth-child(2):nth-last-child(3) {
transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw) .all-players>view>view:nth-child(2):nth-last-child(3) {
rotate(120deg); 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) .all-players>view>view:nth-child(3):nth-last-child(2) {
rotate(210deg); 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) .all-players>view>view:nth-child(4):nth-last-child(1) {
rotate(300deg); transform: translate(-50%, -50%) rotate(-300deg) translateY(-21.5vw) rotate(300deg);
} }
/* 6个头像 - 六边形排列 */ /* 6个头像 - 六边形排列 */
.all-players > view > view:nth-child(1):nth-last-child(6) { .all-players>view>view:nth-child(1):nth-last-child(6) {
transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw) transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw) rotate(30deg);
rotate(30deg);
} }
.all-players > view > view:nth-child(2):nth-last-child(5) {
transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw) .all-players>view>view:nth-child(2):nth-last-child(5) {
rotate(90deg); 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) .all-players>view>view:nth-child(3):nth-last-child(4) {
rotate(150deg); 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) .all-players>view>view:nth-child(4):nth-last-child(3) {
rotate(210deg); 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) .all-players>view>view:nth-child(5):nth-last-child(2) {
rotate(270deg); 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) .all-players>view>view:nth-child(6):nth-last-child(1) {
rotate(330deg); transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw) rotate(330deg);
} }
.all-players > view > view > text {
.all-players>view>view>text {
position: absolute; position: absolute;
background-color: #fed847; background-color: #fed847;
font-size: 8px; font-size: 8px;
@@ -621,18 +723,23 @@ onBeforeUnmount(() => {
text-align: center; text-align: center;
color: #333; color: #333;
} }
.choose-side { .choose-side {
display: flex; display: flex;
} }
.choose-side > view {
.choose-side>view {
width: 50%; 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%); 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%); background: linear-gradient(270deg, rgba(13, 0, 74, 0) 0%, #172a86 100%);
} }
.choose-side-left-item, .choose-side-left-item,
.choose-side-right-item { .choose-side-right-item {
display: flex; display: flex;
@@ -644,33 +751,39 @@ onBeforeUnmount(() => {
margin: 10px 5px; margin: 10px 5px;
position: relative; position: relative;
} }
.choose-side-left-item { .choose-side-left-item {
justify-content: flex-end; 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; margin: 10px;
max-width: 100px; max-width: 100px;
font-size: 14px; 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; position: absolute;
top: 0; 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; width: 28px;
} }
.choose-side-left-item > button:first-child {
.choose-side-left-item>button:first-child {
left: 0; left: 0;
} }
.choose-side-right-item > button:last-child { .choose-side-right-item>button:last-child {
right: 0; 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; background-color: #fff;
border-radius: 50%; border-radius: 50%;
width: 38px; width: 38px;
@@ -680,18 +793,21 @@ onBeforeUnmount(() => {
align-items: center; align-items: center;
margin-bottom: 14rpx; 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; width: 18px;
} }
.choose-side-left-item > view,
.choose-side-right-item > view { .choose-side-left-item>view,
.choose-side-right-item>view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; 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; font-size: 16rpx;
border-radius: 20rpx; border-radius: 20rpx;
line-height: 26rpx; line-height: 26rpx;

View File

@@ -33,7 +33,7 @@ const onScrollView = (e) => {
> >
<image <image
:style="{ opacity: addBg ? 1 : 0 }" :style="{ opacity: addBg ? 1 : 0 }"
src="../static/app-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
mode="widthFix" mode="widthFix"
/> />
<navigator open-type="navigateBack"> <navigator open-type="navigateBack">

View File

@@ -2,7 +2,7 @@
import { ref } from "vue"; import { ref } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app"; import { onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; 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 SButton from "@/components/SButton.vue";
import SModal from "@/components/SModal.vue"; import SModal from "@/components/SModal.vue";
import Signin from "@/components/Signin.vue"; import Signin from "@/components/Signin.vue";
@@ -72,6 +72,13 @@ const onSignin = () => {
if (roomID.value && user.value.id) enterRoom(roomID.value); if (roomID.value && user.value.id) enterRoom(roomID.value);
showSignin.value = false; showSignin.value = false;
}; };
/** 跳转到我的战绩页面默认展示「好友约战」tab */
const goMyRecord = () => {
uni.navigateTo({
url: '/pages/my-growth?tab=1',
});
};
onShow(async () => { onShow(async () => {
if (user.value.id) { if (user.value.id) {
const result = await getBattleDataAPI(); const result = await getBattleDataAPI();
@@ -90,16 +97,15 @@ onLoad(async (options) => {
<template> <template>
<Container title="好友约战" :showBackToGame="true"> <Container title="好友约战" :showBackToGame="true">
<view :style="{ width: '100%', height: '100%' }"> <view :style="{ width: '100%', height: '100%' }">
<Guide> <GuideTwo>
<view class="guide-tips"> <text :style="{color: 'rgba(255,217,71,0.8)'}">约上朋友开几局欢乐多不寂寞</text>
<text>约上朋友开几局欢乐多不寂寞</text>
<text>一起练升级更快早日加入全国排位赛</text> <text>一起练升级更快早日加入全国排位赛</text>
</view> </GuideTwo>
</Guide>
<view class="my-data"> <view class="my-data">
<view> <view>
<Avatar :rankLvl="user.rankLvl" :src="user.avatar" :size="30" /> <Avatar :rankLvl="user.rankLvl" :src="user.avatar" :size="30" />
<text class="truncate">{{ user.nickName }}</text> <text class="truncate">{{ user.nickName }}</text>
<text class="my-record-btn" @click="goMyRecord">我的战绩</text>
</view> </view>
<view> <view>
<view> <view>
@@ -119,16 +125,9 @@ onLoad(async (options) => {
<view> <view>
<view class="stars"> <view class="stars">
<block v-for="i in 5" :key="i"> <block v-for="i in 5" :key="i">
<image <image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" mode="widthFix" />
v-if="data.totalWinningRate >= i * 0.2" <image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="../static/star-half.png"
src="../static/star-full.png" mode="widthFix" />
mode="widthFix"
/>
<image
v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1"
src="../static/star-half.png"
mode="widthFix"
/>
<image v-else src="../static/star-empty.png" mode="widthFix" /> <image v-else src="../static/star-empty.png" mode="widthFix" />
</block> </block>
</view> </view>
@@ -139,19 +138,12 @@ onLoad(async (options) => {
<view class="founded-room"> <view class="founded-room">
<image src="../static/founded-room.png" mode="widthFix" /> <image src="../static/founded-room.png" mode="widthFix" />
<view> <view>
<input <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
placeholder="输入房间号"
v-model="roomNumber"
placeholder-style="color: #ccc"
/>
<view @click="enterRoom(roomNumber)">进入房间</view> <view @click="enterRoom(roomNumber)">进入房间</view>
</view> </view>
</view> </view>
<view class="create-room"> <view class="create-room">
<image <image src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png" mode="widthFix" />
src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png"
mode="widthFix"
/>
<image src="../static/room-notfound-title.png" mode="widthFix" /> <image src="../static/room-notfound-title.png" mode="widthFix" />
<view> <view>
<image :src="user.avatar" mode="widthFix" /> <image :src="user.avatar" mode="widthFix" />
@@ -166,11 +158,7 @@ onLoad(async (options) => {
</SButton> </SButton>
</view> </view>
</view> </view>
<SModal <SModal :show="showModal" :onClose="() => (showModal = false)" height="716rpx">
:show="showModal"
:onClose="() => (showModal = false)"
height="716rpx"
>
<view v-if="warnning" class="warnning"> <view v-if="warnning" class="warnning">
{{ warnning }} {{ warnning }}
</view> </view>
@@ -192,10 +180,12 @@ onLoad(async (options) => {
border-radius: 10px; border-radius: 10px;
padding: 15px; padding: 15px;
} }
.founded-room > image {
.founded-room>image {
width: 16vw; width: 16vw;
} }
.founded-room > view {
.founded-room>view {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
@@ -205,14 +195,16 @@ onLoad(async (options) => {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
} }
.founded-room > view > input {
.founded-room>view>input {
width: 70%; width: 70%;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
height: 40px; height: 40px;
color: #000; color: #000;
} }
.founded-room > view > view {
.founded-room>view>view {
background-color: #fed847; background-color: #fed847;
width: 30%; width: 30%;
line-height: 40px; line-height: 40px;
@@ -223,38 +215,45 @@ onLoad(async (options) => {
color: #000; color: #000;
text-align: center; text-align: center;
} }
.create-room { .create-room {
position: relative; position: relative;
margin: 15px; margin: 15px;
height: 50vw; height: 50vw;
} }
.create-room > image:first-of-type {
.create-room>image:first-of-type {
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
.create-room > image:nth-of-type(2) {
.create-room>image:nth-of-type(2) {
padding: 15px; padding: 15px;
width: 25vw; width: 25vw;
position: relative; position: relative;
} }
.create-room > view:nth-child(3) {
.create-room>view:nth-child(3) {
margin: 12vw auto; margin: 12vw auto;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.create-room > view > image:first-child {
.create-room>view>image:first-child {
width: 19vw; width: 19vw;
transform: translateY(-60%); transform: translateY(-60%);
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
} }
.create-room > view > image:nth-child(2) {
.create-room>view>image:nth-child(2) {
width: 37vw; width: 37vw;
position: relative; position: relative;
} }
.create-room > view > view:nth-child(3) {
.create-room>view>view:nth-child(3) {
position: relative; position: relative;
width: 19vw; width: 19vw;
height: 19vw; height: 19vw;
@@ -265,10 +264,12 @@ onLoad(async (options) => {
align-items: center; align-items: center;
transform: translateY(60%); transform: translateY(60%);
} }
.create-room > view > view:nth-child(3) > image {
.create-room>view>view:nth-child(3)>image {
width: 20px; width: 20px;
margin-right: 2px; margin-right: 2px;
} }
.warnning { .warnning {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -277,6 +278,7 @@ onLoad(async (options) => {
align-items: center; align-items: center;
color: #fff9; color: #fff9;
} }
.my-data { .my-data {
width: calc(100% - 30px); width: calc(100% - 30px);
margin: 15px; margin: 15px;
@@ -286,12 +288,14 @@ onLoad(async (options) => {
overflow: hidden; overflow: hidden;
background-color: #54431d33; background-color: #54431d33;
} }
.my-data > view {
.my-data>view {
width: 100%; width: 100%;
display: flex; display: flex;
color: #fff9; color: #fff9;
} }
.my-data > view:first-child {
.my-data>view:first-child {
width: calc(100% - 30px); width: calc(100% - 30px);
align-items: flex-end; align-items: flex-end;
padding-bottom: 15px; padding-bottom: 15px;
@@ -299,16 +303,29 @@ onLoad(async (options) => {
margin: 15px; margin: 15px;
margin-bottom: 0; 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; color: #fff;
font-size: 17px; font-size: 17px;
margin-left: 10px; margin-left: 10px;
width: 120px; width: 120px;
} }
.my-data > view:last-child {
.my-data>view:last-child {
margin-bottom: 15px; margin-bottom: 15px;
} }
.my-data > view:last-child > view {
.my-data>view:last-child>view {
width: 33%; width: 33%;
margin-top: 15px; margin-top: 15px;
display: flex; display: flex;
@@ -316,25 +333,30 @@ onLoad(async (options) => {
align-items: center; align-items: center;
font-size: 12px; font-size: 12px;
} }
.my-data > view:last-child > view > view {
.my-data>view:last-child>view>view {
margin-bottom: 5px; 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; color: #fff;
font-size: 20px; font-size: 20px;
margin-right: 5px; margin-right: 5px;
transform: translateY(4px); 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-left: 1px solid #48494e;
border-right: 1px solid #48494e; border-right: 1px solid #48494e;
} }
.my-data > view:last-child > view > view {
.my-data>view:last-child>view>view {
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
height: 20px; height: 20px;
} }
.stars > image {
.stars>image {
width: 4vw; width: 4vw;
height: 4vw; height: 4vw;
margin: 0 1px; margin: 0 1px;

View File

@@ -1,38 +1,48 @@
<script setup> <script setup>
import { ref, onMounted } from "vue"; import {onMounted, ref} from "vue";
import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app"; import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import AppFooter from "@/components/AppFooter.vue"; import AppFooter from "@/components/AppFooter.vue";
import AppBackground from "@/components/AppBackground.vue";
import UserHeader from "@/components/UserHeader.vue"; import UserHeader from "@/components/UserHeader.vue";
import Signin from "@/components/Signin.vue"; import Signin from "@/components/Signin.vue";
import BubbleTip from "@/components/BubbleTip.vue"; import BubbleTip from "@/components/BubbleTip.vue";
import { import {
checkUserBindAPI,
getAppConfig, getAppConfig,
getRankListAPI, getDeviceBatteryAPI,
getHomeData, getHomeData,
getMyDevicesAPI, getMyDevicesAPI,
getDeviceBatteryAPI, getScoreRankList,
silentLoginAPI,
} from "@/apis"; } from "@/apis";
import { topThreeColors } from "@/constants"; import {topThreeColors} from "@/constants";
import { canEenter } from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import {storeToRefs} from "pinia";
const store = useStore(); const store = useStore();
const { const {
updateConfig, updateConfig,
updateUser, updateUser,
updateDevice, updateDevice,
updateRank,
getLvlName, getLvlName,
getLvlNameByScore,
updateOnline, updateOnline,
} = store; } = store;
const { user, device, rankData, online, game } = storeToRefs(store); const {user, device, online, game} = storeToRefs(store);
const showModal = ref(false); const showModal = ref(false);
const showGuide = ref(false); const showGuide = ref(false);
const scoreRankList = ref([]);
// 提取积分榜接口返回的榜单数组,兼容数组和对象两种返回格式。
const getScoreRankData = (result) => {
if (Array.isArray(result)) return result;
if (Array.isArray(result?.list)) return result.list;
if (Array.isArray(result?.items)) return result.items;
return [];
};
const toPage = async (path) => { const toPage = async (path) => {
if (!user.value.id) { if (!user.value.id) {
@@ -44,7 +54,7 @@ const toPage = async (path) => {
// await uni.$checkAudio(); // await uni.$checkAudio();
// } // }
// } // }
uni.navigateTo({ url: path }); uni.navigateTo({url: path});
}; };
const toRankListPage = () => { const toRankListPage = () => {
@@ -54,19 +64,43 @@ const toRankListPage = () => {
}; };
onShow(async () => { onShow(async () => {
const token = uni.getStorageSync( const env = uni.getAccountInfoSync().miniProgram.envVersion;
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` const token = uni.getStorageSync(`${env}_token`);
);
const promises = [getRankListAPI()]; if (!user.value.id && !token) {
if (token) { try {
const wxResult = await uni.login({provider: "weixin"});
const bindResult = await checkUserBindAPI(wxResult.code);
if (bindResult.binded) {
const newResult = await uni.login({provider: "weixin"});
const silentResult = await silentLoginAPI(newResult.code);
if (silentResult.user) updateUser(silentResult.user);
const devices = await getMyDevicesAPI();
if (devices.bindings && devices.bindings.length) {
updateDevice(
devices.bindings[0].deviceId,
devices.bindings[0].deviceName
);
const data = await getDeviceBatteryAPI();
updateOnline(data.online);
}
} else {
showModal.value = true;
}
} catch (e) {
console.log("检查绑定状态失败", e);
}
}
const promises = [getScoreRankList(undefined, 1, 10)];
if (token || user.value.id) {
promises.push(getHomeData()); promises.push(getHomeData());
} }
const [rankList, homeData] = await Promise.all(promises); const [rankList, homeData] = await Promise.all(promises);
console.log("排行数据", rankList); console.log("积分榜数据", rankList);
updateRank(rankList); scoreRankList.value = getScoreRankData(rankList).slice(0, 10);
if (homeData) { if (homeData) {
console.log("首页数据:", homeData); console.log("首页数据:", homeData);
@@ -130,7 +164,7 @@ onShareTimeline(() => {
mode="widthFix" mode="widthFix"
/> />
</view> </view>
<UserHeader showRank :onSignin="() => (showModal = true)" /> <UserHeader showRank :onSignin="() => (showModal = true)"/>
<view :style="{ padding: '12px 10px' }"> <view :style="{ padding: '12px 10px' }">
<view class="feature-grid"> <view class="feature-grid">
<view class="bow-card"> <view class="bow-card">
@@ -162,11 +196,12 @@ onShareTimeline(() => {
</BubbleTip> </BubbleTip>
</view> </view>
<view class="play-card"> <view class="play-card">
<view @click="() => toPage('/pages/practise')"> <!-- toPage('/pages/practise') -->
<image src="../static/my-practise.png" mode="widthFix" /> <view @click="() => toPage('/pages/training/index')">
<image src="../static/my-practise.png" mode="widthFix"/>
</view> </view>
<view @click="() => toPage('/pages/friend-battle')"> <view @click="() => toPage('/pages/friend-battle')">
<image src="../static/friend-battle.png" mode="widthFix" /> <image src="../static/friend-battle.png" mode="widthFix"/>
</view> </view>
</view> </view>
</view> </view>
@@ -181,7 +216,7 @@ onShareTimeline(() => {
hover-class="none" hover-class="none"
></button> ></button>
<view class="ranking-players" @click="toRankListPage"> <view class="ranking-players" @click="toRankListPage">
<img src="../static/juezhanbang.png" mode="widthFix" /> <img src="../static/juezhanbang.png" mode="widthFix"/>
<view class="divide-line"></view> <view class="divide-line"></view>
<view class="player-avatars"> <view class="player-avatars">
<view <view
@@ -190,39 +225,40 @@ onShareTimeline(() => {
class="player-avatar" class="player-avatar"
:style="{ :style="{
zIndex: 8 - i, zIndex: 8 - i,
borderColor: rankData.rank[i - 1] borderColor: scoreRankList[i - 1]
? topThreeColors[i - 1] || '#000' ? topThreeColors[i - 1] || '#000'
: '#000', : '#000',
}" }"
> >
<image v-if="i === 1" src="../static/champ1.png" /> <image v-if="i === 1" src="../static/champ1.png"/>
<image v-if="i === 2" src="../static/champ2.png" /> <image v-if="i === 2" src="../static/champ2.png"/>
<image v-if="i === 3" src="../static/champ3.png" /> <image v-if="i === 3" src="../static/champ3.png"/>
<view v-if="i > 3">{{ i }}</view> <view v-if="i > 3">{{ i }}</view>
<image <image
:src=" :src="
rankData.rank[i - 1] scoreRankList[i - 1]
? rankData.rank[i - 1].avatar ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
: '../static/user-icon-dark.png' : '../static/user-icon-dark.png'
" "
mode="aspectFill" mode="aspectFill"
/> />
</view> </view>
<view class="more-players"> <view class="more-players">
<text>{{ rankData.rank.length }}</text> <text>{{ scoreRankList.length }}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="my-data"> <view class="my-data">
<view @click="() => toPage('/pages/my-growth')"> <view @click="() => toPage('/pages/my-growth')">
<image src="../static/my-growth.png" mode="widthFix" /> <image src="../static/my-growth.png" mode="widthFix"/>
</view> </view>
<view @click="() => toPage('/pages/ranking')"> <view @click="() => toPage('/pages/ranking')">
<view> <view>
<text>段位</text> <text>段位</text>
<text>{{ <text>{{
user.rankLvl ? getLvlName(user.rankLvl) : "暂无" user.lvlName || "暂无"
}}</text> }}
</text>
</view> </view>
<view> <view>
<text>赛季平均环数</text> <text>赛季平均环数</text>
@@ -234,15 +270,16 @@ onShareTimeline(() => {
user.avg_win user.avg_win
? Number((user.avg_win * 100).toFixed(2)) + "%" ? Number((user.avg_win * 100).toFixed(2)) + "%"
: "暂无" : "暂无"
}}</text> }}
</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<Signin :show="showModal" :onClose="() => (showModal = false)" /> <Signin :show="showModal" :onClose="() => (showModal = false)"/>
</view> </view>
<AppFooter /> <AppFooter/>
</Container> </Container>
</template> </template>
@@ -363,6 +400,7 @@ onShareTimeline(() => {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.player-avatar > view:first-child { .player-avatar > view:first-child {
border-radius: 50%; border-radius: 50%;
background: #777777; background: #777777;
@@ -373,6 +411,7 @@ onShareTimeline(() => {
height: 18px; height: 18px;
color: #fff; color: #fff;
} }
.player-avatar > image:last-child { .player-avatar > image:last-child {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -391,18 +430,22 @@ onShareTimeline(() => {
margin-left: 2px; margin-left: 2px;
color: #fff; color: #fff;
} }
.my-data { .my-data {
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;
justify-content: space-between; justify-content: space-between;
} }
.my-data > view:first-child { .my-data > view:first-child {
width: 28%; width: 28%;
} }
.my-data > view:first-child > image { .my-data > view:first-child > image {
width: 100%; width: 100%;
transform: translateX(-8px); transform: translateX(-8px);
} }
.my-data > view:nth-child(2) { .my-data > view:nth-child(2) {
width: 68%; width: 68%;
font-size: 12px; font-size: 12px;
@@ -410,9 +453,11 @@ onShareTimeline(() => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.my-data > view:nth-child(2) > view:nth-child(2) { .my-data > view:nth-child(2) > view:nth-child(2) {
width: 38%; width: 38%;
} }
.my-data > view:nth-child(2) > view { .my-data > view:nth-child(2) > view {
width: 28%; width: 28%;
border-radius: 10px; border-radius: 10px;
@@ -422,11 +467,13 @@ onShareTimeline(() => {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.my-data > view:nth-child(2) > view > text:last-child { .my-data > view:nth-child(2) > view > text:last-child {
color: #fff; color: #fff;
line-height: 25px; line-height: 25px;
font-weight: 500; font-weight: 500;
} }
.top-theme { .top-theme {
position: absolute; position: absolute;
display: flex; display: flex;
@@ -436,6 +483,7 @@ onShareTimeline(() => {
height: 60px; height: 60px;
z-index: -1; z-index: -1;
} }
.top-theme > image { .top-theme > image {
width: 300rpx; width: 300rpx;
transform: translate(-4%, -14%); transform: translate(-4%, -14%);

View File

@@ -3,24 +3,29 @@ import { ref, onMounted, onBeforeUnmount } from "vue";
import { onLoad, onShow, onHide } from "@dcloudio/uni-app"; import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import Matching from "@/components/Matching.vue"; import Matching from "@/components/Matching.vue";
import RoundEndTip from "@/components/RoundEndTip.vue";
import TestDistance from "@/components/TestDistance.vue";
import { matchGameAPI } from "@/apis"; import { matchGameAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
const gameType = ref(0); const gameType = ref(0);
const teamSize = ref(0); const teamSize = ref(0);
const onComplete = ref(null); const onComplete = ref(null);
const matchSuccess = ref(false);
async function stopMatch() { async function stopMatch() {
uni.$showHint(3); uni.$showHint(3);
} }
async function cancelMatch() {
if (gameType.value && teamSize.value) {
await matchGameAPI(false, gameType.value, teamSize.value);
}
uni.navigateBack()
}
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (msg.type === MESSAGETYPESV2.MatchSuccess) { if (msg.type === MESSAGETYPESV2.MatchSuccess) {
matchSuccess.value = true; onComplete.value = () => {}
onComplete.value = () => { }
if (msg.type === MESSAGETYPESV2.AboutToStart) {
if (gameType.value == 1) { if (gameType.value == 1) {
uni.redirectTo({ uni.redirectTo({
url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`, url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
@@ -30,7 +35,6 @@ async function onReceiveMessage(msg) {
url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`, url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
}); });
} }
};
} }
} }
@@ -46,6 +50,7 @@ onMounted(() => {
keepScreenOn: true, keepScreenOn: true,
}); });
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
uni.$on("cancelMatching", cancelMatch);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
@@ -53,9 +58,7 @@ onBeforeUnmount(() => {
keepScreenOn: false, keepScreenOn: false,
}); });
uni.$off("socket-inbox", onReceiveMessage); uni.$off("socket-inbox", onReceiveMessage);
if (gameType.value && teamSize.value && !matchSuccess.value) { uni.$off("cancelMatching", cancelMatch);
matchGameAPI(false, gameType.value, teamSize.value);
}
}); });
onShow(async () => { onShow(async () => {
@@ -65,9 +68,7 @@ onShow(async () => {
}); });
onHide(() => { onHide(() => {
if (gameType.value && teamSize.value && !matchSuccess.value) {
matchGameAPI(false, gameType.value, teamSize.value);
}
}); });
</script> </script>

View File

@@ -28,21 +28,37 @@ const playersScores = ref([]);
const halfTimeTip = ref(false); const halfTimeTip = ref(false);
const halfRest = ref(false); const halfRest = ref(false);
const navigateToResult = () => {
uni.redirectTo({ url: `/pages/battle-result?battleId=${battleId.value}` });
};
function recoverData(battleInfo, { force = false } = {}) { function recoverData(battleInfo, { force = false } = {}) {
if (!battleInfo) return;
try {
if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗"; if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗"; if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
players.value = battleInfo.teams[0].players;
// 优先使用接口数据,否则使用缓存
if (battleInfo.teams?.[0]?.players) {
players.value = [...battleInfo.teams[0].players];
} else {
// 大乱斗可能存的是 players 列表
// 这里的缓存逻辑根据 AboutToStart 消息结构可能不同,假设也是 teams[0]
// 如果是从 match-page 过来的match-page 只存了 teams[1] 和 [2] 给对抗模式
// 大乱斗的匹配逻辑可能不同,暂时保持原样,只做安全保护
players.value = [];
}
start.value = battleInfo.status !== 0; start.value = battleInfo.status !== 0;
if (battleInfo.status === 0) { if (battleInfo.status === 0) {
const readyRemain = (Date.now() - battleInfo.createTime) / 1000; const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
console.log(`对局已进行${readyRemain}`);
if (readyRemain > 0 && readyRemain < 15) { if (readyRemain > 0 && readyRemain < 15) {
setTimeout(() => { setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
uni.$emit("update-timer", 15 - readyRemain - 0.2);
}, 200);
} }
return; return;
} }
tips.value = tips.value =
(battleInfo.rounds.length !== 2 ? "上" : "下") + "半场请先射6箭"; (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场请先射6箭";
playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots })); playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
@@ -69,7 +85,7 @@ function recoverData(battleInfo, { force = false } = {}) {
return; return;
} }
if (force) { if (force) {
const remain = (Date.now() - battleInfo.current.startTime) / 1000; const remain = (Date.now() - (battleInfo.current?.startTime || Date.now())) / 1000;
console.log(`当前轮已进行${remain}`); console.log(`当前轮已进行${remain}`);
if (remain > 0 && remain < 90) { if (remain > 0 && remain < 90) {
setTimeout(() => { setTimeout(() => {
@@ -77,6 +93,9 @@ function recoverData(battleInfo, { force = false } = {}) {
}, 200); }, 200);
} }
} }
} catch (err) {
console.error("recoverData error:", err);
}
} }
onLoad(async (options) => { onLoad(async (options) => {
@@ -127,6 +146,7 @@ onBeforeUnmount(() => {
onShow(async () => { onShow(async () => {
if (battleId.value) { if (battleId.value) {
const result = await getBattleAPI(battleId.value); const result = await getBattleAPI(battleId.value);
if (!result) return;
if (result.status === 2) { if (result.status === 2) {
uni.showToast({ uni.showToast({
title: "比赛已结束", title: "比赛已结束",

View File

@@ -8,7 +8,7 @@ import {
bindDeviceAPI, bindDeviceAPI,
getMyDevicesAPI, getMyDevicesAPI,
unbindDeviceAPI, unbindDeviceAPI,
laserAimAPI, laserAimAPI, bindDeviceAPIV2,
} from "@/apis"; } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -20,6 +20,7 @@ const { updateDevice } = store;
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const justBind = ref(false); const justBind = ref(false);
const calibration = ref(false); const calibration = ref(false);
const token = ref(null);
// 扫描二维码方法 // 扫描二维码方法
const handleScan = () => { const handleScan = () => {
@@ -30,13 +31,14 @@ const handleScan = () => {
scanType: ["qrCode"], scanType: ["qrCode"],
success: async (res) => { success: async (res) => {
try { try {
const base64Decode = (str) => { // const base64Decode = (str) => {
// 将 base64 转换为 utf8 字符串 // // 将 base64 转换为 utf8 字符串
const bytes = wx.base64ToArrayBuffer(str); // const bytes = wx.base64ToArrayBuffer(str);
return String.fromCharCode.apply(null, new Uint8Array(bytes)); // return String.fromCharCode.apply(null, new Uint8Array(bytes));
}; // };
//
addDevice.value = JSON.parse(base64Decode(res.result)); // addDevice.value = JSON.parse(base64Decode(res.result));
token.value = res.result;
confirmBindTip.value = true; confirmBindTip.value = true;
} catch (err) { } catch (err) {
uni.showToast({ uni.showToast({
@@ -57,8 +59,8 @@ const handleScan = () => {
}; };
const confirmBind = async () => { const confirmBind = async () => {
if (!justBind.value && addDevice.value.id) { if (!justBind.value && token.value) {
const result = await bindDeviceAPI(addDevice.value); const result = await bindDeviceAPIV2(token.value);
confirmBindTip.value = false; confirmBindTip.value = false;
if (result.binded) { if (result.binded) {
return uni.showToast({ return uni.showToast({
@@ -66,7 +68,7 @@ const confirmBind = async () => {
icon: "none", icon: "none",
}); });
} }
updateDevice(addDevice.value.id, addDevice.value.name); updateDevice(result.deviceId, result.name);
justBind.value = true; justBind.value = true;
uni.showToast({ uni.showToast({
title: "绑定成功", title: "绑定成功",

View File

@@ -1,5 +1,6 @@
<script setup> <script setup>
import { onMounted } from "vue"; import { onMounted } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import BowData from "@/components/BowData.vue"; import BowData from "@/components/BowData.vue";
@@ -56,6 +57,17 @@ const getName = (battle) => {
if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`; if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
return battle.mode + "人大乱斗"; return battle.mode + "人大乱斗";
}; };
/**
* 支持通过 URL 参数指定初始 tab
* @example /pages/my-growth?tab=1 跳转到「好友约战」tab
*/
onLoad((options) => {
if (options && options.tab !== undefined) {
const tabIndex = parseInt(options.tab, 10);
if (!isNaN(tabIndex)) selectedIndex.value = tabIndex;
}
});
</script> </script>
<template> <template>

View File

@@ -107,7 +107,7 @@ const targetTypeName = computed(() => {
<template> <template>
<view class="container" :style="{ paddingTop: paddingTop + 'px' }"> <view class="container" :style="{ paddingTop: paddingTop + 'px' }">
<image <image
src="../static/app-bg5.png" src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
class="bg-image" class="bg-image"
mode="aspectFill" mode="aspectFill"
:style="{ height: paddingTop + 60 + 'px' }" :style="{ height: paddingTop + 60 + 'px' }"

View File

@@ -59,7 +59,7 @@ async function onReceiveMessage(msg) {
if (msg.type === MESSAGETYPESV2.ShootResult) { if (msg.type === MESSAGETYPESV2.ShootResult) {
scores.value = msg.details; scores.value = msg.details;
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
setTimeout(onOver, 1500); // setTimeout(onOver, 1500);
} }
} }
@@ -84,6 +84,12 @@ const onClickShare = debounce(async () => {
await wxShare("shareCanvas"); await wxShare("shareCanvas");
}); });
function onAudioEnded(s) {
if (s.indexOf("比赛结束") >= 0) {
onOver()
}
}
onMounted(async () => { onMounted(async () => {
// audioManager.play("第一轮"); // audioManager.play("第一轮");
uni.setKeepScreenOn({ uni.setKeepScreenOn({
@@ -91,6 +97,7 @@ onMounted(async () => {
}); });
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
uni.$on("share-image", onClickShare); uni.$on("share-image", onClickShare);
uni.$on("audioEnded", onAudioEnded);
const result = await createPractiseAPI(total, 120, targetType.value); const result = await createPractiseAPI(total, 120, targetType.value);
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
}); });
@@ -101,6 +108,7 @@ onBeforeUnmount(() => {
}); });
uni.$off("socket-inbox", onReceiveMessage); uni.$off("socket-inbox", onReceiveMessage);
uni.$off("share-image", onClickShare); uni.$off("share-image", onClickShare);
uni.$off("audioEnded", onAudioEnded);
audioManager.stopAll(); audioManager.stopAll();
endPractiseAPI(); endPractiseAPI();
}); });

View File

@@ -89,7 +89,7 @@ async function onComplete() {
practiseResult.value = {}; practiseResult.value = {};
start.value = false; start.value = false;
scores.value = []; scores.value = [];
const result = await createPractiseAPI(total, 360); const result = await createPractiseAPI(total, 3600);
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
} }
} }
@@ -105,7 +105,7 @@ onMounted(async () => {
}); });
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
uni.$on("share-image", onClickShare); uni.$on("share-image", onClickShare);
const result = await createPractiseAPI(total, 360, targetType.value); const result = await createPractiseAPI(total, 3600, targetType.value);
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
}); });
@@ -132,7 +132,7 @@ onBeforeUnmount(() => {
<ShootProgress <ShootProgress
:tips="`请连续射${total}支箭`" :tips="`请连续射${total}支箭`"
:start="start" :start="start"
:total="360" :total="3600"
:onStop="onOver" :onStop="onOver"
/> />
<view class="user-row"> <view class="user-row">

View File

@@ -1,58 +1,333 @@
<script setup> <script setup>
import { ref, onMounted } from "vue"; import { computed, nextTick, onMounted, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import {
getMvpRankList,
getMyMvpRank,
getMyScoreRank,
getMyTenRingRank,
getScoreRankList,
getTenRingRankList,
} from "@/apis";
import { capsuleHeight } from "@/util"; import { capsuleHeight } from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const PAGE_SIZE = 10;
const store = useStore(); const store = useStore();
const { user, rankData } = storeToRefs(store); const { user } = storeToRefs(store);
const { getLvlName } = store; const { getLvlName } = store;
const selectedIndex = ref(0); const createRankState = () => ({
const currentList = ref([]); list: [],
const myData = ref({}); page: 0,
const addBg = ref(false); pageSize: PAGE_SIZE,
loading: false,
onMounted(async () => { noMore: false,
handleSelect(0); loaded: false,
scrollTop: 0,
myData: null,
myDataLoaded: false,
}); });
const handleSelect = (index) => { const rankTabs = [
selectedIndex.value = index; {
myData.value = {}; key: "score",
currentList.value = []; title: "积分榜",
if (index === 0) { subTitle: "排位赛积分",
currentList.value = rankData.value.rank; listApi: getScoreRankList,
} else if (index === 1) { myApi: getMyScoreRank,
currentList.value = rankData.value.mvpRank; },
} else if (index === 2) { {
currentList.value = rankData.value.ringRank; key: "mvp",
} title: "MVP榜",
if (user.value.id) { subTitle: "MVP次数",
currentList.value.some((item) => { listApi: getMvpRankList,
if (item.userId === user.value.id) { myApi: getMyMvpRank,
myData.value = item; },
return true; {
} key: "tenRing",
return false; title: "十环榜",
}); subTitle: "十环次数",
if (!myData.value.userId) { listApi: getTenRingRankList,
myData.value = { myApi: getMyTenRingRank,
},
];
// 解析 ranking 页面传入的榜单参数,进入页面时默认选中对应 tab。
const getTabIndexByRouteParam = (tab) => {
if (tab === "mvp") return 1;
if (tab === "tenRing") return 2;
return 0;
};
const rankStates = ref({
score: createRankState(),
mvp: createRankState(),
tenRing: createRankState(),
});
const selectedIndex = ref(0);
const initialTabIndex = ref(0);
const pageMounted = ref(false);
const initializedFromRoute = ref(false);
const addBg = ref(false);
const currentScrollTop = ref(0);
const restoreScrollTop = ref(0);
const tabSwitchAnimating = ref(false);
const suppressScrollSync = ref(false);
const suppressLoadMore = ref(false);
const stickyTabsTop = capsuleHeight + 50;
const stickyTabsActive = ref(false);
const tabsStickyThreshold = ref(0);
const tabsStickyReady = ref(false);
const tabsHeight = ref(0);
const getTabConfig = (index = selectedIndex.value) => rankTabs[index];
const getTabKey = (index = selectedIndex.value) => getTabConfig(index).key;
// 统一提取榜单接口返回的列表数据,兼容数组和对象两种返回格式。
const getRankListFromResponse = (result) => {
if (Array.isArray(result)) return result;
if (Array.isArray(result?.list)) return result.list;
if (Array.isArray(result?.items)) return result.items;
return [];
};
// 为当前登录用户构造默认的个人榜单信息,避免接口未返回时底部区域缺数据。
const buildDefaultMyData = () => ({
rank: null,
userId: user.value.id, userId: user.value.id,
TotalGames: 0, name: user.value.nickName,
avatar: user.value.avatar,
totalScore: 0, totalScore: 0,
mvpCount: 0, mvpCount: 0,
TenRings: 0, tenRings: 0,
totalGames: 0,
totalCount: 0,
rankName: user.value.lvlName,
rankLvl: user.value.rankLvl,
});
const currentTabKey = computed(() => getTabKey(selectedIndex.value));
const currentState = computed(() => rankStates.value[currentTabKey.value]);
const currentList = computed(() => currentState.value.list);
const currentSubTitle = computed(() => getTabConfig(selectedIndex.value).subTitle);
const currentMyData = computed(() => {
if (!user.value.id) return null;
return currentState.value.myData || buildDefaultMyData();
});
// 统一格式化段位和场次文案,兼容不同接口的字段命名。
const formatLevelText = (item = {}) => {
const levelName = item.rankName || getLvlName(item.rankLvl) || "暂无段位";
const totalGames = item.totalGames ?? item.TotalGames ?? 0;
return `${levelName}${totalGames}`;
};
// 统一读取榜单项的排名字段,没有后端 rank 时回退到前端序号。
const getDisplayRank = (item = {}, index = 0) => {
return item.rank ?? index + 1;
};
// 底部个人排名在未上榜时展示占位符,而不是空白。
const getDisplayMyRank = (item = {}) => {
return item.rank ?? "-";
};
const getScoreValue = (item = {}) => item.totalScore ?? 0;
const getMvpValue = (item = {}) => item.mvpCount ?? item.totalScore ?? 0;
const getTenRingValue = (item = {}) =>
item.tenRings ?? item.TenRings ?? item.totalScore ?? 0;
// 根据当前选中的榜单类型,读取对应的展示值。
const getRankValue = (item = {}, index = selectedIndex.value) => {
if (index === 0) return getScoreValue(item);
if (index === 1) return getMvpValue(item);
return getTenRingValue(item);
};
const getRankUnit = (index = selectedIndex.value) => {
if (index === 0) return "分";
return "次";
};
// 统一设置页面当前的视觉滚动状态,避免吸顶和顶部背景不同步。
const syncScrollVisualState = (scrollTop = 0) => {
currentScrollTop.value = scrollTop;
addBg.value = scrollTop > 100;
if (!tabsStickyReady.value) {
stickyTabsActive.value = false;
return;
}
stickyTabsActive.value = scrollTop >= tabsStickyThreshold.value;
};
// 只保留一条滚动恢复链路:从当前滚动位置平滑滚到目标位置,避免多套控制同时生效造成闪烁。
const applyScrollPosition = async (
fromScrollTop = currentScrollTop.value,
toScrollTop = 0,
withAnimation = false
) => {
tabSwitchAnimating.value = withAnimation;
restoreScrollTop.value = fromScrollTop;
await nextTick();
restoreScrollTop.value = toScrollTop;
syncScrollVisualState(toScrollTop);
};
// 请求指定榜单的某一页数据,只有当前榜单会追加分页,不影响其他榜单的浏览状态。
const loadRankPage = async (tabKey, { reset = false } = {}) => {
const state = rankStates.value[tabKey];
const config = rankTabs.find((item) => item.key === tabKey);
if (!config || state.loading) return;
if (!reset && state.noMore) return;
const nextPage = reset ? 1 : state.page + 1;
state.loading = true;
if (reset) state.noMore = false;
try {
const result = await config.listApi(undefined, nextPage, PAGE_SIZE);
const list = getRankListFromResponse(result);
state.list = reset ? list : state.list.concat(list);
state.page = nextPage;
state.loaded = true;
state.noMore = list.length < PAGE_SIZE;
} catch (error) {
if (reset) {
state.list = [];
state.page = 0;
state.loaded = false;
state.noMore = false;
}
uni.showToast({
title: "排行榜加载失败",
icon: "none",
});
console.error("load rank page error", error);
} finally {
state.loading = false;
}
};
// 每个榜单独立请求一次个人排名信息,切回该榜单时直接复用,避免打断浏览上下文。
const loadMyRankData = async (tabKey) => {
if (!user.value.id) return;
const state = rankStates.value[tabKey];
const config = rankTabs.find((item) => item.key === tabKey);
if (!config || state.myDataLoaded) return;
try {
const result = await config.myApi();
state.myData = {
...buildDefaultMyData(),
...(result || {}),
}; };
} } catch (error) {
state.myData = buildDefaultMyData();
console.error("load my rank data error", error);
} finally {
state.myDataLoaded = true;
} }
}; };
// 首次进入或切换到未加载过的榜单时,初始化它的分页数据和个人横条数据。
const ensureTabReady = async (index = selectedIndex.value) => {
const tabKey = getTabKey(index);
const state = rankStates.value[tabKey];
if (!state.loaded) {
await loadRankPage(tabKey, { reset: true });
}
if (user.value.id && !state.myDataLoaded) {
await loadMyRankData(tabKey);
}
await nextTick();
return state.scrollTop || 0;
};
onLoad((options = {}) => {
initialTabIndex.value = getTabIndexByRouteParam(options.tab);
selectedIndex.value = initialTabIndex.value;
if (pageMounted.value && !initializedFromRoute.value) {
initializePage();
}
});
// 页面初始化同时兼容 onLoad 和 onMounted 的先后顺序,确保首屏一定落到路由指定的榜单。
const initializePage = async () => {
if (initializedFromRoute.value) return;
initializedFromRoute.value = true;
const nextScrollTop = await ensureTabReady(selectedIndex.value);
await applyScrollPosition(0, nextScrollTop, false);
setTimeout(() => {
measureTabsMetrics();
}, 0);
};
onMounted(async () => {
pageMounted.value = true;
await initializePage();
});
// 切换榜单时保留原榜单的列表和滚动位置,切回来后继续从之前的位置浏览。
const handleSelect = async (index) => {
if (index === selectedIndex.value) return;
const previousTabKey = currentTabKey.value;
rankStates.value[previousTabKey].scrollTop = currentScrollTop.value;
const previousScrollTop = currentScrollTop.value;
suppressScrollSync.value = true;
suppressLoadMore.value = true;
selectedIndex.value = index;
const nextScrollTop = await ensureTabReady(index);
await applyScrollPosition(previousScrollTop, nextScrollTop, false);
setTimeout(() => {
tabSwitchAnimating.value = false;
suppressScrollSync.value = false;
suppressLoadMore.value = false;
}, 220);
};
// 触底后只加载当前榜单的下一页数据,其他榜单的数据和页码保持不变。
const loadMore = async () => {
if (suppressLoadMore.value) return;
await loadRankPage(currentTabKey.value);
};
// 实时记录当前榜单的滚动位置,切换回来时恢复到上一次浏览位置。
const onScrollView = (e) => { const onScrollView = (e) => {
addBg.value = e.detail.scrollTop > 100; const scrollTop = e.detail.scrollTop || 0;
if (suppressScrollSync.value) return;
syncScrollVisualState(scrollTop);
rankStates.value[currentTabKey.value].scrollTop = scrollTop;
}; };
const subTitles = ["排位赛积分", "MVP次数", "十环次数"]; // 计算 tab 在滚动内容中的真实位置和高度,作为吸顶切换的唯一依据。
const measureTabsMetrics = () => {
const query = uni.createSelectorQuery();
query
.select("#rank-list-content-start")
.boundingClientRect()
.select(".rank-tabs-anchor")
.boundingClientRect()
.exec((res = []) => {
const [startRect, rect] = res;
if (!startRect || !rect) return;
const tabOffset = rect.top - startRect.top;
tabsStickyThreshold.value = Math.max(0, tabOffset - 92);
tabsHeight.value = rect.height || 0;
tabsStickyReady.value = true;
syncScrollVisualState(currentScrollTop.value);
});
};
</script> </script>
<template> <template>
@@ -65,7 +340,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
> >
<image <image
:style="{ opacity: addBg ? 1 : 0 }" :style="{ opacity: addBg ? 1 : 0 }"
src="../static/app-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
mode="widthFix" mode="widthFix"
/> />
<navigator open-type="navigateBack"> <navigator open-type="navigateBack">
@@ -75,18 +350,32 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
</view> </view>
<scroll-view <scroll-view
scroll-y scroll-y
:scroll-with-animation="tabSwitchAnimating"
:scroll-top="restoreScrollTop"
@scroll="onScrollView" @scroll="onScrollView"
:style="{ height: myData.userId ? '90vh' : '100vh' }" @scrolltolower="loadMore"
:style="{ height: user.id ? '90vh' : '100vh' }"
> >
<view id="rank-list-content-start" class="content-start-anchor"></view>
<image <image
src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9b3wcrwnlnghiq.png" src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9b3wcrwnlnghiq.png"
mode="widthFix" mode="widthFix"
class="header-bg" class="header-bg"
@load="measureTabsMetrics"
/> />
<view class="rank-tabs">
<view <view
v-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']" v-if="stickyTabsActive"
:key="index" class="rank-tabs-placeholder"
:style="{ height: `${tabsHeight}px` }"
/>
<view
class="rank-tabs rank-tabs-anchor"
:class="{ 'rank-tabs-anchor-fixed': stickyTabsActive }"
:style="stickyTabsActive ? { top: `${stickyTabsTop}px` } : {}"
>
<view
v-for="(rankType, index) in rankTabs"
:key="rankType.key"
:style="{ :style="{
fontSize: index === selectedIndex ? '16px' : '14px', fontSize: index === selectedIndex ? '16px' : '14px',
color: index === selectedIndex ? '#000' : '#fff', color: index === selectedIndex ? '#000' : '#fff',
@@ -94,18 +383,18 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
}" }"
@tap="handleSelect(index)" @tap="handleSelect(index)"
> >
{{ rankType }} {{ rankType.title }}
</view> </view>
</view> </view>
<view class="rank-list"> <view class="rank-list">
<view class="rank-list-header"> <view class="rank-list-header">
<text>排名</text> <text>排名</text>
<text>用户ID</text> <text>用户ID</text>
<text>{{ subTitles[selectedIndex] }}</text> <text>{{ currentSubTitle }}</text>
</view> </view>
<view <view
v-for="(item, index) in currentList" v-for="(item, index) in currentList"
:key="index" :key="`${currentTabKey}-${index}-${item.userId || item.name}`"
class="rank-list-item" class="rank-list-item"
:style="{ :style="{
backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent', backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent',
@@ -147,65 +436,60 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
src="../static/champ3.png" src="../static/champ3.png"
mode="widthFix" mode="widthFix"
/> />
<view v-if="index > 2" class="view-crown">{{ index + 1 }}</view> <view v-if="index > 2" class="view-crown">
{{ getDisplayRank(item, index) }}
</view>
<Avatar :src="item.avatar" /> <Avatar :src="item.avatar" />
<view class="rank-item-content"> <view class="rank-item-content">
<text class="truncate">{{ item.name }}</text> <text class="truncate">{{ item.name }}</text>
<text>{{ getLvlName(item.rankLvl) }}{{ item.TotalGames }}</text> <text>{{ formatLevelText(item) }}</text>
</view> </view>
<text class="rank-item-integral" v-if="selectedIndex === 0"> <text class="rank-item-integral">
<text <text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }" :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ item.totalScore }} </text >
> {{ getRankValue(item) }}
</text> </text>
<text class="rank-item-integral" v-if="selectedIndex === 1"> {{ getRankUnit() }}
<text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ item.mvpCount }} </text
>
</text>
<text class="rank-item-integral" v-if="selectedIndex === 2">
<text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ item.TenRings }} </text
>
</text> </text>
</view> </view>
<view v-if="!currentList.length" class="no-data"> <view
<text>筹备中...</text> v-if="currentState.loading && !currentList.length"
class="no-data"
>
<text>加载中...</text>
</view>
<view
v-else-if="!currentState.loading && !currentList.length"
class="no-data"
>
<text>暂无数据</text>
</view>
<view v-else class="list-tip">
<text v-if="currentState.loading">加载中...</text>
<text v-else-if="currentState.noMore">没有更多了</text>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="my-rank-data" v-if="myData.userId"> <view class="my-rank-data" v-if="currentMyData">
<image <image
src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png" src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png"
mode="widthFix" mode="widthFix"
/> />
<text>{{ myData.rank }}</text> <text>{{ getDisplayMyRank(currentMyData) }}</text>
<Avatar :src="user.avatar" /> <Avatar :src="currentMyData.avatar || user.avatar" />
<view class="rank-item-content"> <view class="rank-item-content">
<text class="truncate">{{ user.nickName }}</text> <text class="truncate">{{ currentMyData.name || user.nickName }}</text>
<text>{{ user.lvlName }}{{ myData.TotalGames }}</text> <text>{{ formatLevelText(currentMyData) }}</text>
</view> </view>
<text class="rank-item-integral" v-if="selectedIndex === 0"> <text class="rank-item-integral">
<text <text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }" :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ myData.totalScore || 0 }}</text
></text
>
<text class="rank-item-integral" v-if="selectedIndex === 1">
<text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ myData.mvpCount || 0 }}</text
></text
>
<text class="rank-item-integral" v-if="selectedIndex === 2">
<text
:style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
>{{ myData.TenRings || 0 }}</text
></text
> >
{{ getRankValue(currentMyData) }}
</text>
{{ getRankUnit() }}
</text>
</view> </view>
</view> </view>
</template> </template>
@@ -214,9 +498,16 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
.container { .container {
width: 100%; width: 100%;
} }
.content-start-anchor {
width: 100%;
height: 0;
}
.header-bg { .header-bg {
width: 100%; width: 100%;
} }
.header { .header {
width: 100%; width: 100%;
height: 50px; height: 50px;
@@ -227,6 +518,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
z-index: 10; z-index: 10;
overflow: hidden; overflow: hidden;
} }
.header-back { .header-back {
width: 22px; width: 22px;
height: 22px; height: 22px;
@@ -234,6 +526,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
margin-top: 5px; margin-top: 5px;
position: relative; position: relative;
} }
.header > image:first-child { .header > image:first-child {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
@@ -242,25 +535,40 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
left: 0; left: 0;
transition: all 0.5s ease; transition: all 0.5s ease;
} }
.header > text { .header > text {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
transition: all 0.5s ease; transition: all 0.5s ease;
position: relative; position: relative;
} }
.rank-tabs { .rank-tabs {
width: calc(100% - 20px); width: calc(100% - 20px);
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
padding: 0 10px; padding: 20rpx 10px;
margin-top: -15px;
} }
.rank-tabs > view { .rank-tabs > view {
width: 25%; width: 25%;
padding: 10px; padding: 10px;
text-align: center; text-align: center;
border-radius: 20px; border-radius: 20px;
} }
.rank-tabs-placeholder {
width: 100%;
}
.rank-tabs-anchor-fixed {
position: fixed;
left: 0;
z-index: 11;
background: #000000;
backdrop-filter: blur(8px);
}
.rank-list { .rank-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -268,11 +576,12 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
width: calc(100% - 20px); width: calc(100% - 20px);
color: #fff9; color: #fff9;
font-size: 12px; font-size: 12px;
margin: 10px; margin: 0 10px 10px 10px;
border: 1px solid rgb(255 217 71 / 0.2); border: 1px solid rgb(255 217 71 / 0.2);
border-radius: 10px; border-radius: 10px;
background-color: #313131; background-color: #313131;
} }
.rank-list > view { .rank-list > view {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -281,20 +590,25 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.rank-list-header { .rank-list-header {
width: calc(100% - 20px) !important; width: calc(100% - 20px) !important;
padding: 10px; padding: 10px;
} }
.rank-list-header > text:nth-child(2) { .rank-list-header > text:nth-child(2) {
width: 14%; width: 14%;
} }
.rank-list-header > text:last-child { .rank-list-header > text:last-child {
width: 30%; width: 30%;
text-align: right; text-align: right;
} }
.rank-list-item { .rank-list-item {
padding: 10px 0; padding: 10px 0;
} }
.player-bg { .player-bg {
position: absolute; position: absolute;
width: 100%; width: 100%;
@@ -302,12 +616,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
top: 0; top: 0;
left: 0; left: 0;
} }
.player-crown { .player-crown {
position: relative; position: relative;
width: 27px; width: 27px;
height: 27px; height: 27px;
margin: 0 15px; margin: 0 15px;
} }
.view-crown { .view-crown {
width: 27px; width: 27px;
height: 27px; height: 27px;
@@ -319,6 +635,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
background-color: #676767; background-color: #676767;
position: relative; position: relative;
} }
.rank-item-content { .rank-item-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -328,17 +645,20 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
position: relative; position: relative;
padding-left: 10px; padding-left: 10px;
} }
.rank-item-content > text:first-child { .rank-item-content > text:first-child {
color: #fff; color: #fff;
font-size: 14px; font-size: 14px;
margin-bottom: 3px; margin-bottom: 3px;
width: 120px; width: 120px;
} }
.rank-list-item > text:last-child { .rank-list-item > text:last-child {
margin-right: 10px; margin-right: 10px;
width: 56px; width: 56px;
text-align: right; text-align: right;
} }
.my-rank-data { .my-rank-data {
width: calc(100% - 30px); width: calc(100% - 30px);
padding: 15px; padding: 15px;
@@ -352,12 +672,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
overflow: hidden; overflow: hidden;
border-radius: 10px; border-radius: 10px;
} }
.my-rank-data > image:first-child { .my-rank-data > image:first-child {
position: absolute; position: absolute;
width: 100%; width: 100%;
left: 0; left: 0;
top: -5px; top: -5px;
} }
.my-rank-data > text:nth-child(2) { .my-rank-data > text:nth-child(2) {
background-color: #c1a434; background-color: #c1a434;
position: relative; position: relative;
@@ -369,20 +691,24 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
min-width: 15px; min-width: 15px;
text-align: center; text-align: center;
} }
.my-rank-data > text:last-child { .my-rank-data > text:last-child {
position: relative; position: relative;
margin-right: 10px; margin-right: 10px;
width: 65px; width: 65px;
text-align: right; text-align: right;
} }
.my-rank-data > .rank-item-content > text:first-child { .my-rank-data > .rank-item-content > text:first-child {
color: #fed847; color: #fed847;
} }
.my-rank-data > .rank-item-integral { .my-rank-data > .rank-item-integral {
color: #fff9; color: #fff9;
font-size: 12px; font-size: 12px;
margin-right: 0 !important; margin-right: 0 !important;
} }
.no-data { .no-data {
width: 100%; width: 100%;
height: 400px; height: 400px;
@@ -392,4 +718,11 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
color: #fff9; color: #fff9;
font-size: 14px; font-size: 14px;
} }
.list-tip {
justify-content: center !important;
color: #fff9;
font-size: 12px;
min-height: 60rpx;
}
</style> </style>

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount, nextTick } from "vue"; import {ref, onMounted, onBeforeUnmount, nextTick} from "vue";
import { onLoad, onShow, onHide } from "@dcloudio/uni-app"; import {onLoad, onShow, onHide} from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import BattleHeader from "@/components/BattleHeader.vue"; import BattleHeader from "@/components/BattleHeader.vue";
import BowTarget from "@/components/BowTarget.vue"; import BowTarget from "@/components/BowTarget.vue";
@@ -11,13 +11,14 @@ import RoundEndTip from "@/components/RoundEndTip.vue";
import TestDistance from "@/components/TestDistance.vue"; import TestDistance from "@/components/TestDistance.vue";
import TeamAvatars from "@/components/TeamAvatars.vue"; import TeamAvatars from "@/components/TeamAvatars.vue";
import ShootProgress2 from "@/components/ShootProgress2.vue"; import ShootProgress2 from "@/components/ShootProgress2.vue";
import { laserCloseAPI, getBattleAPI } from "@/apis"; import {laserCloseAPI, getBattleAPI} from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import {MESSAGETYPESV2} from "@/constants";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import {storeToRefs} from "pinia";
const store = useStore(); const store = useStore();
const { user } = storeToRefs(store); const {user} = storeToRefs(store);
const start = ref(null); const start = ref(null);
const tips = ref(""); const tips = ref("");
const battleId = ref(""); const battleId = ref("");
@@ -35,16 +36,33 @@ const redPoints = ref(0);
const bluePoints = ref(0); const bluePoints = ref(0);
const showRoundTip = ref(false); const showRoundTip = ref(false);
const isFinalShoot = ref(false); const isFinalShoot = ref(false);
const matchStatus = ref(undefined);
const updateRemainSecond = ref(0);
const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => { const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
try { try {
battleId.value = battleInfo.matchId; battleId.value = battleInfo.matchId;
blueTeam.value = battleInfo.teams[1].players || [];
redTeam.value = battleInfo.teams[2].players || []; // 优先使用接口返回的队伍数据,如果没有则尝试从缓存读取(应对匹配刚完成接口未就绪的情况)
const t1 = battleInfo.teams?.[1] || {};
const t2 = battleInfo.teams?.[2] || {};
if (t1.players) blueTeam.value = [...t1.players];
else {
const cached = uni.getStorageSync("blue-team");
if (cached && cached.length) blueTeam.value = cached;
}
if (t2.players) redTeam.value = [...t2.players];
else {
const cached = uni.getStorageSync("red-team");
if (cached && cached.length) redTeam.value = cached;
}
start.value = battleInfo.status !== 0; start.value = battleInfo.status !== 0;
if (battleInfo.status === 0) { if (battleInfo.status === 0) {
const readyRemain = (Date.now() - battleInfo.createTime) / 1000; const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
console.log(`对局已进行${readyRemain}`);
if (readyRemain > 0 && readyRemain < 15) { if (readyRemain > 0 && readyRemain < 15) {
setTimeout(() => { setTimeout(() => {
uni.$emit("update-timer", 15 - readyRemain - 0.2); uni.$emit("update-timer", 15 - readyRemain - 0.2);
@@ -67,16 +85,15 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
} }
tips.value = nextTips; tips.value = nextTips;
uni.$emit("update-tips", nextTips); uni.$emit("update-tips", nextTips);
uni.$emit("update-remain", {reset: true, value: 15, team: redTeam?'red':'blue'});
if (force) { if (force) {
const remain = (Date.now() - battleInfo.current.startTime) / 1000; const remain = (Date.now() - battleInfo.current.startTime) / 1000;
console.log(`当前轮已进行${remain}`); console.log(`当前轮已进行${remain}`);
if (remain > 0 && remain < 15) { if (remain > 0 && remain < 15) {
setTimeout(() => { updateRemainSecond.value = 15 - remain - 0.2
uni.$emit("update-remain", 15 - remain - 0.2);
}, 200);
} }
} else { } else {
uni.$emit("update-remain", battleInfo.readyTime); updateRemainSecond.value = battleInfo.readyTime
} }
} else { } else {
currentRound.value = battleInfo.current.round || 1; currentRound.value = battleInfo.current.round || 1;
@@ -95,16 +112,25 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
} }
}; };
async function onReceiveMessage(msg) { function onAudioEnded(s) {
if (Array.isArray(msg)) return; if (s.indexOf('请红方射箭') >= 0 || s.indexOf('请蓝方射箭') >= 0) {
if (msg.type === MESSAGETYPESV2.BattleStart) { let team = s.indexOf('请红方射箭') >= 0 ? 'red' : 'blue';
start.value = true; uni.$emit("update-remain", {stop: false, value: updateRemainSecond.value, team: team});
} else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) { }
recoverData(msg); if (s.indexOf("比赛结束") >= 0) {
} else if (msg.type === MESSAGETYPESV2.ShootResult) { onBattleEnd()
showRoundTip.value = false; }
recoverData(msg, { arrowOnly: true }); }
} else if (msg.type === MESSAGETYPESV2.NewRound) {
function onBattleEnd() {
if (matchStatus.value === 2) {
uni.redirectTo({
url: `/pages/battle-result?battleId=${battleId.value}`,
});
}
}
function onNewRound(msg) {
showRoundTip.value = true; showRoundTip.value = true;
isFinalShoot.value = msg.current.goldRound; isFinalShoot.value = msg.current.goldRound;
const latestRound = msg.rounds[currentRound.value - 1]; const latestRound = msg.rounds[currentRound.value - 1];
@@ -117,7 +143,24 @@ async function onReceiveMessage(msg) {
currentRedPoint.value = latestRound.scores[2].score; currentRedPoint.value = latestRound.scores[2].score;
} }
} }
}
async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.BattleStart) {
start.value = true;
} else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) {
recoverData(msg);
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
uni.$emit("update-remain", {stop: true})
showRoundTip.value = false;
recoverData(msg, {arrowOnly: true});
} else if (msg.type === MESSAGETYPESV2.NewRound) {
setTimeout(() => {
onNewRound(msg)
}, 800)
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
matchStatus.value = msg.status;
if (msg.status === 4) { if (msg.status === 4) {
showRoundTip.value = true; showRoundTip.value = true;
currentBluePoint.value = 0; currentBluePoint.value = 0;
@@ -125,13 +168,7 @@ async function onReceiveMessage(msg) {
setTimeout(() => { setTimeout(() => {
uni.navigateBack(); uni.navigateBack();
}, 2000); }, 2000);
return;
} }
setTimeout(() => {
uni.redirectTo({
url: "/pages/battle-result?battleId=" + msg.matchId,
});
}, 1000);
} }
} }
@@ -149,19 +186,21 @@ onMounted(async () => {
keepScreenOn: true, keepScreenOn: true,
}); });
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
uni.$on("audioEnded", onAudioEnded);
await laserCloseAPI(); await laserCloseAPI();
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: false, keepScreenOn: false,
}); });
uni.$off("socket-inbox", onReceiveMessage); uni.$off("audioEnded", onAudioEnded);
audioManager.stopAll(); audioManager.stopAll();
}); });
const refreshTimer = ref(null); const refreshTimer = ref(null);
onShow(async () => { onShow(async () => {
if (battleId.value) { if (battleId.value) {
const result = await getBattleAPI(battleId.value); const result = await getBattleAPI(battleId.value);
if (!result) return;
if (result.status === 2) { if (result.status === 2) {
uni.showToast({ uni.showToast({
title: "比赛已结束", title: "比赛已结束",
@@ -171,7 +210,7 @@ onShow(async () => {
delta: 2, delta: 2,
}); });
} else { } else {
recoverData(result, { force: true }); recoverData(result, {force: true});
} }
} }
}); });
@@ -185,7 +224,7 @@ onShow(async () => {
:redTeam="redTeam" :redTeam="redTeam"
:blueTeam="blueTeam" :blueTeam="blueTeam"
/> />
<TestDistance v-if="start === false" :guide="false" :isBattle="true" /> <TestDistance v-if="start === false" :guide="false" :isBattle="true"/>
<view v-if="start" class="players-row"> <view v-if="start" class="players-row">
<TeamAvatars <TeamAvatars
:team="blueTeam" :team="blueTeam"
@@ -198,7 +237,7 @@ onShow(async () => {
goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound
" "
/> />
<TeamAvatars :team="redTeam" :currentShooterId="currentShooterId" /> <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId"/>
</view> </view>
<BowTarget <BowTarget
v-if="start" v-if="start"
@@ -227,7 +266,7 @@ onShow(async () => {
:roundData=" :roundData="
roundResults[currentRound - 1] ? roundResults[currentRound - 1] : [] roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
" "
:onAutoClose="() => (showRoundTip = false)" :onAutoClose="()=>{ showRoundTip = false}"
/> />
</ScreenHint> </ScreenHint>
</view> </view>
@@ -239,6 +278,7 @@ onShow(async () => {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.players-row { .players-row {
display: flex; display: flex;
align-items: center; align-items: center;

View File

@@ -0,0 +1,456 @@
<script setup>
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
import PointSwitcher from "@/components/PointSwitcher.vue";
import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
import { simulShootAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user, device } = storeToRefs(store);
const props = defineProps({
currentRound: {
type: Number,
default: 0,
},
totalRound: {
type: Number,
default: 0,
},
scores: {
type: Array,
default: () => [],
},
blueScores: {
type: Array,
default: () => [],
},
mode: {
type: String,
default: "solo", // solo 单排team 双排
},
stop: {
type: Boolean,
default: false,
},
});
const pMode = ref(true);
const latestOne = ref(null);
const bluelatestOne = ref(null);
const prevScores = ref([]);
const prevBlueScores = ref([]);
const timer = ref(null);
const dirTimer = ref(null);
const angle = ref(null);
const circleColor = ref("");
watch(
() => props.scores,
(newVal) => {
if (newVal.length - prevScores.value.length === 1) {
latestOne.value = newVal[newVal.length - 1];
if (timer.value) clearTimeout(timer.value);
timer.value = setTimeout(() => {
latestOne.value = null;
}, 1000);
}
prevScores.value = [...newVal];
},
{
deep: true,
}
);
watch(
() => props.blueScores,
(newVal) => {
if (newVal.length - prevBlueScores.value.length === 1) {
bluelatestOne.value = newVal[newVal.length - 1];
if (timer.value) clearTimeout(timer.value);
timer.value = setTimeout(() => {
bluelatestOne.value = null;
}, 1000);
}
prevBlueScores.value = [...newVal];
},
{
deep: true,
}
);
function calcRealX(num, offset = 3.4) {
const len = 20.4 + num;
return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
}
function calcRealY(num, offset = 3.4) {
const len = num < 0 ? Math.abs(num) + 20.4 : 20.4 - num;
return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
}
const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
};
const simulShoot2 = async () => {
if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1);
}
};
const env = computed(() => {
const accountInfo = uni.getAccountInfoSync();
return accountInfo.miniProgram.envVersion;
});
const arrowStyle = computed(() => {
return {
transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
360 - angle.value
}deg) translateY(105%)`,
};
});
async function onReceiveMessage(message) {
if (Array.isArray(message)) return;
if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
if (
message.shootData.playerId === user.value.id &&
!message.shootData.ring &&
message.shootData.angle >= 0
) {
angle.value = null;
setTimeout(() => {
if (props.scores[0]) {
circleColor.value =
message.shootData.playerId === props.scores[0].playerId
? "#ff4444"
: "#1840FF";
}
angle.value = message.shootData.angle;
}, 200);
}
}
}
onMounted(() => {
uni.$on("socket-inbox", onReceiveMessage);
});
onBeforeUnmount(() => {
if (timer.value) {
clearTimeout(timer.value);
timer.value = null;
}
if (dirTimer.value) {
clearTimeout(dirTimer.value);
dirTimer.value = null;
}
uni.$off("socket-inbox", onReceiveMessage);
});
</script>
<template>
<view class="container">
<!-- <view class="header" v-if="totalRound > 0">
<text v-if="totalRound > 0" class="round-count">{{
(currentRound > totalRound ? totalRound : currentRound) +
"/" +
totalRound
}}</text>
</view> -->
<view class="target">
<view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
<view :style="{ background: circleColor }">
<image src="../../../static/dot-circle.png" mode="widthFix" />
</view>
</view>
<view v-if="stop" class="stop-sign">中场休息</view>
<view
v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
class="e-value fade-in-out"
:style="{
left: calcRealX(latestOne.ring ? latestOne.x : 0, 20),
top: calcRealY(latestOne.ring ? latestOne.y : 0, 40),
}"
>
经验 +1
</view>
<view
v-if="latestOne"
class="round-tip fade-in-out"
:style="{
left: calcRealX(latestOne.ring ? latestOne.x : 0, 28),
top: calcRealY(latestOne.ring ? latestOne.y : 0, 28),
}"
>{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
}}<text v-if="latestOne.ring"></text>
</view>
<view
v-if="
bluelatestOne &&
bluelatestOne.ring &&
user.id === bluelatestOne.playerId
"
class="e-value fade-in-out"
:style="{
left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 20),
top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 40),
}"
>
经验 +1
</view>
<view
v-if="bluelatestOne"
class="round-tip fade-in-out"
:style="{
left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 28),
top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 28),
}"
>{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
}}<text v-if="bluelatestOne.ring">环</text></view
>
<block v-for="(bow, index) in scores" :key="index">
<view
v-if="bow.ring > 0"
:class="`hit ${pMode ? 'b' : 's'}-point ${
index === scores.length - 1 && latestOne ? 'pump-in' : ''
}`"
:style="{
left: calcRealX(bow.x, pMode ? '3.4' : '2'),
top: calcRealY(bow.y, pMode ? '3.4' : '2'),
backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
}"
><text v-if="pMode">{{ index + 1 }}</text></view
>
</block>
<block v-for="(bow, index) in blueScores" :key="index">
<view
v-if="bow.ring > 0"
:class="`hit ${pMode ? 'b' : 's'}-point ${
index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
}`"
:style="{
left: calcRealX(bow.x, pMode ? '3.4' : '2'),
top: calcRealY(bow.y, pMode ? '3.4' : '2'),
backgroundColor: '#1840FF',
}"
>
<text v-if="pMode">{{ index + 1 }}</text>
</view>
</block>
<image src="../../../static/bow-target.png" mode="widthFix" />
</view>
<view class="footer">
<PointSwitcher
:onChange="(val) => (pMode = val)"
:style="{ zIndex: 999 }"
/>
</view>
<view class="simul" v-if="env !== 'release'">
<button @click="simulShoot">模拟</button>
<button @click="simulShoot2">射箭</button>
</view>
</view>
</template>
<style scoped>
.container {
width: calc(100vw - 30px);
height: calc(100vw - 30px);
padding: 0px 15px;
position: relative;
}
.target {
position: relative;
margin: 10px;
width: calc(100% - 20px);
height: calc(100% - 20px);
z-index: -1;
}
.e-value {
position: absolute;
background-color: #0006;
color: #fff;
font-size: 12px;
padding: 4px 7px;
border-radius: 5px;
z-index: 2;
width: 50px;
text-align: center;
}
.round-tip {
position: absolute;
color: #fff;
font-size: 30px;
font-weight: bold;
z-index: 2;
width: 100px;
text-align: center;
}
.round-tip > text {
font-size: 24px;
margin-left: 5px;
}
.target > image:last-child {
width: 100%;
height: 100%;
}
.hit {
position: absolute;
border-radius: 50%;
z-index: 1;
color: #fff;
transition: all 0.3s ease;
}
.s-point {
width: 4px;
height: 4px;
min-width: 4px;
min-height: 4px;
}
.b-point {
width: 10px;
height: 10px;
min-width: 10px;
min-height: 10px;
border: 1px solid #fff;
z-index: 1;
box-sizing: border-box;
display: flex;
justify-content: center;
align-items: center;
}
.b-point > text {
font-size: 16rpx;
color: #fff;
font-family: "DINCondensed";
/* text-align: center;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);*/
margin-top: 2rpx;
}
.header {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: -40px;
}
.header > image:first-child {
width: 40px;
height: 40px;
}
.round-count {
font-size: 20px;
color: #fed847;
top: 75px;
font-weight: bold;
}
.footer {
width: calc(100% - 20px);
padding: 0 10px;
display: flex;
margin-top: -40px;
justify-content: flex-end;
}
.footer > image {
width: 40px;
min-height: 40px;
max-height: 40px;
border-radius: 50%;
border: 1px solid #fff;
}
.simul {
position: absolute;
top: 0;
right: 20px;
margin-left: 20px;
z-index: 999;
}
.simul > button {
color: #fff;
}
.stop-sign {
position: absolute;
font-size: 44px;
color: #fff9;
text-align: center;
width: 200px;
height: 60px;
left: calc(50% - 100px);
top: calc(50% - 30px);
z-index: 99;
font-weight: bold;
}
.arrow-dir {
position: absolute;
width: 100%;
height: 52%;
left: 50%;
bottom: 50%;
display: flex;
align-items: center;
justify-content: center;
}
.arrow-dir > view {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
}
.arrow-dir > view > image {
width: 100rpx;
height: 100rpx;
transform: translate(-30%, -30%);
}
@keyframes spring-in {
0% {
transform: scale(2);
opacity: 0.4;
}
15% {
transform: scale(3);
opacity: 1;
}
30% {
transform: scale(2);
opacity: 0.4;
}
45% {
transform: scale(3);
opacity: 1;
}
60% {
transform: scale(2);
opacity: 0.4;
}
75% {
transform: scale(3);
opacity: 1;
}
100% {
transform: scale(1);
opacity: 0;
}
}
@keyframes disappear {
0% {
opacity: 1;
}
75% {
opacity: 1;
}
100% {
opacity: 0;
}
}
.arrow-dir > view {
animation: disappear 3s ease forwards;
}
.arrow-dir > view > image {
animation: spring-in 3s ease forwards;
width: 100%;
}
</style>

View File

@@ -0,0 +1,62 @@
<script setup>
const props = defineProps({
type: {
type: String,
default: "normal",
},
location: {
type: Object,
default: () => ({}),
},
});
</script>
<template>
<view :class="`container ${type}`" :style="{ ...location }">
<slot />
</view>
</template>
<style scoped>
.container {
position: absolute;
color: #fff;
display: flex;
flex-direction: column;
background-size: contain;
background-repeat: no-repeat;
background-position: center;
font-size: 24rpx;
}
.normal {
background-image: url("../static/bubble-tip.png");
width: 157rpx;
height: 105rpx;
padding-top: 10px;
padding-left: 30rpx;
}
.normal2 {
background-image: url("../static/bubble-tip4.png");
width: 190rpx;
height: 105rpx;
padding-top: 10px;
padding-left: 20rpx;
top: 0;
left: 15%;
z-index: 1;
}
.long {
background-image: url("../static/bubble-tip2.png");
width: 370rpx;
height: 70rpx;
top: -50%;
left: 49%;
}
.short {
background-image: url("../static/bubble-tip3.png");
width: 300rpx;
height: 70rpx;
top: -50%;
right: -1%;
}
</style>

View File

@@ -0,0 +1,109 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
arrows: {
type: Array,
default: () => [],
},
total: {
type: Number,
default: 0,
},
});
const getDisplayText = (arrow = {}) => {
if (!arrow) return "";
if (!arrow.ring) return "-";
return arrow.ringX ? "X" : String(arrow.ring);
};
const isLowScore = (arrow = {}) => {
if (!arrow || arrow.ringX) return false;
return Number(arrow.ring) < 6;
};
const displayArrows = computed(() => {
const list = [...props.arrows];
if (props.total > 0 && list.length < props.total) {
list.push(null);
}
return list;
});
</script>
<template>
<view v-if="displayArrows.length" class="score-panel">
<view class="score-grid">
<view
v-for="(arrow, index) in displayArrows"
:key="index"
class="score-card"
>
<image class="score-card-bg" :src="isLowScore(arrow)?'/static/training-difficulty-design/block-gray.png':'/static/training-difficulty-design/block-gold.png'"></image>
<text
class="score-value"
:class="{ 'score-value--low': isLowScore(arrow) }"
>
{{ getDisplayText(arrow) }}
</text>
</view>
</view>
</view>
</template>
<style scoped lang="scss">
.score-panel {
width: 100%;
padding: 30rpx 40rpx 0 40rpx;
box-sizing: border-box;
}
.score-grid {
display: flex;
flex-wrap: wrap;
}
.score-card {
position: relative;
width: 100rpx;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
margin-right: 14rpx;
margin-bottom: 14rpx;
}
.score-card:nth-child(6n) {
margin-right: 0;
}
.score-card-bg {
position: absolute;
top: 0;
left: 0;
width: 100rpx;
height: 56rpx;
}
.score-value {
position: relative;
z-index: 1;
min-width: 28rpx;
text-align: center;
font-size: 34rpx;
line-height: 1;
font-weight: 700;
font-style: italic;
color: #f6e3b2;
text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
margin-left: -10rpx;
}
.score-value--low {
color: #cfcfcf;
text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
}
</style>

View File

@@ -0,0 +1,628 @@
<script setup>
import { ref, onMounted, computed } from "vue";
import ScreenHint from "@/components/ScreenHint.vue";
import BowData from "@/components/BowData.vue";
import UserUpgrade from "@/components/UserUpgrade.vue";
import { directionAdjusts } from "@/constants";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user } = storeToRefs(store);
const props = defineProps({
onClose: {
type: Function,
default: () => { },
},
onRetry: {
type: Function,
default: () => { },
},
total: {
type: Number,
default: 0,
},
rowCount: {
type: Number,
default: 0,
},
result: {
type: Object,
default: () => ({}),
},
tipSrc: {
type: String,
default: "",
},
});
const showPanel = ref(true);
const showComment = ref(false);
const showBowData = ref(false);
const showUpgrade = ref(false);
const closePanel = () => {
showPanel.value = false;
setTimeout(() => {
props.onClose();
}, 300);
};
const retryPractice = () => {
showPanel.value = false;
setTimeout(() => {
props.onRetry();
}, 300);
};
function onClickShare() {
uni.$emit("share-image");
}
onMounted(() => {
if (props.result.lvl > user.value.lvl) {
showUpgrade.value = true;
}
});
const details = computed(() => props.result.details || []);
const arrows = computed(() => {
const data = new Array(props.total).fill(null);
details.value.forEach((arrow, index) => {
data[index] = arrow;
});
return data;
});
const validArrows = computed(() => arrows.value.filter((a) => !!a?.ring).length);
const totalRing = computed(() =>
details.value.reduce((last, next) => last + (Number(next.ring) || 0), 0)
);
const gainedExp = computed(
() => props.result.exp || props.result.experience || validArrows.value
);
const currentLevel = computed(
() => props.result.lvl || user.value.lvl || user.value.rankLvl || 1
);
const currentExp = computed(
() => props.result.currentExp || props.result.score || user.value.scores || 0
);
const nextExp = computed(
() => props.result.nextExp || props.result.upgradeScore || 100
);
const expPercent = computed(() => {
if (!nextExp.value) return 0;
return Math.min(100, Math.max(0, (currentExp.value / nextExp.value) * 100));
});
const findValue = (...keys) => {
const item = keys.find((key) => props.result[key] !== undefined);
return item ? props.result[item] : undefined;
};
const formatDuration = (value) => {
const seconds = Number(value || 0);
if (!seconds) return "--";
const minutes = Math.floor(seconds / 60);
const rest = seconds % 60;
return minutes ? `${minutes}${rest}` : `${rest}`;
};
const usedTime = computed(() =>
findValue("duration", "usedTime", "shootTime", "time")
);
const hitCompare = computed(
() => Number(findValue("hitCompare", "hitDiff", "hitDelta") || 0)
);
const timeCompare = computed(
() => Number(findValue("timeCompare", "timeDiff", "durationDiff") || 0)
);
const calories = computed(
() => Number(findValue("calories", "calorie", "kcal") || 0)
);
</script>
<template>
<view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']">
<image class="hero-glow" src="/static/training-difficulty-design/result-bg.png" mode="widthFix" />
<view class="result-title">
<image class="result-title-bg" src="/static/training-difficulty-design/result-t-bg.png" mode="widthFix" />
<view class="result-title-text">Lv{{ currentLevel }}</view>
</view>
<view class="result-panel">
<view class="line-top"></view>
<view class="line-bottom"></view>
<view class="stats">
<view class="stat-row">
<image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
<view class="stat-cell">
<text class="stat-label">共命中目标</text>
<view class="stat-value">
<text>{{ validArrows }}</text>
<text class="stat-unit"></text>
</view>
</view>
<view class="stat-divider"></view>
<view class="stat-cell stat-cell--compare">
<text class="stat-label">对比上次</text>
<view class="stat-value">
<text>{{ Math.abs(hitCompare) }}</text>
<text class="stat-unit"></text>
<image class="trend-icon" :class="{ 'trend-icon--down': hitCompare < 0 }"
src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
</view>
</view>
</view>
<view class="stat-row">
<image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
<view class="stat-cell">
<text class="stat-label">用时</text>
<view class="stat-value">
<text>{{ formatDuration(usedTime) }}</text>
</view>
</view>
<view class="stat-divider"></view>
<view class="stat-cell stat-cell--compare">
<text class="stat-label">对比上次</text>
<view class="stat-value">
<text>{{ formatDuration(Math.abs(timeCompare)) }}</text>
<image class="trend-icon" :class="{ 'trend-icon--down': timeCompare <= 0 }"
src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
</view>
</view>
</view>
<view class="stat-row">
<image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
<view class="stat-cell">
<text class="stat-label">消耗卡路里</text>
<view class="stat-value">
<text>{{ calories }}</text>
</view>
</view>
<text class="stat-equal"></text>
<!-- <view class="stat-divider"></view> -->
<view class="stat-cell stat-cell--compare">
<view class="stat-value">
<image v-for="index in 3" :key="index" class="rice-icon"
src="/static/training-difficulty-design/result-rice.png" mode="widthFix" />
</view>
</view>
</view>
<view class="actions">
<view class="action-item" @click="() => (showBowData = true)">
<image class="action-icon" src="/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
<text>查看靶纸</text>
</view>
<view v-if="validArrows === total" class="action-item" @click="() => (showComment = true)">
<image class="action-icon" src="/static/training-difficulty-design/result-icon-2.png" mode="widthFix" />
<text>教练点评</text>
</view>
<view v-if="validArrows === total" class="action-item" @click="onClickShare">
<image class="action-icon" src="/static/training-difficulty-design/result-icon-3.png" mode="widthFix" />
<text>分享成绩</text>
</view>
</view>
</view>
</view>
<view class="oper-box">
<view class="exp-area">
<text class="exp-gain">+{{ gainedExp }}经验</text>
<view class="level-progress">
<text class="level-text">LV.{{ currentLevel }}</text>
<view class="progress-track">
<view class="progress-fill" :style="{ width: `${expPercent}%` }"></view>
</view>
<text class="progress-text">{{ currentExp }} / {{ nextExp }}</text>
</view>
</view>
<view class="footer-actions">
<view class="result-btn result-btn--muted" @click="closePanel">
<text>{{ validArrows === total ? "完成" : "返回" }}</text>
</view>
<view class="result-btn result-btn--primary" @click="retryPractice">
<text>再来一次</text>
</view>
</view>
</view>
<ScreenHint :show="showComment" :onClose="() => (showComment = false)" mode="tall">
<view class="coach-comment">
<text>
您本次练习取得了<text class="gold-text">{{ totalRing }}</text>环的成绩所有箭支上靶后的平均点间距离为<text class="gold-text">{{
Number((result.average_distance || 0).toFixed(2))
}}</text>{{
result.spreadEvaluation === "Dispersed"
? "还需要持续改进哦~"
: "成绩优秀。"
}}
</text>
<view>
<image src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png" mode="widthFix" />
<text class="coach-suggestion">
针对您本次的练习{{
result.spreadEvaluation === "Dispersed"
? "我们建议您充分练习推弓、靠位以及撒放动作一致性。"
: totalRing >= 100
? "我们建议您继续保持即可。"
: `我们建议您将设备的瞄准器${directionAdjusts[result.adjustmentHint]
}调整。`
}}
</text>
</view>
</view>
</ScreenHint>
<BowData :total="arrows.length" :arrows="result.details" :show="showBowData"
:onClose="() => (showBowData = false)" />
<UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="result.lvl" />
</view>
</template>
<style scoped lang="scss">
.result-mask {
width: 100vw;
height: 100vh;
position: fixed;
top: 0;
left: 0;
overflow: hidden;
background:
linear-gradient(180deg,
rgba(24, 22, 17, 0.38) 0%,
rgba(24, 22, 17, 0.56) 28%,
rgba(17, 17, 25, 0.92) 58%),
rgba(0, 0, 0, 0.72);
z-index: 999;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.result-mask--show {
opacity: 1;
}
.result-mask--hide {
opacity: 0;
transition: opacity 0.3s ease;
}
.hero-glow {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
.result-title {
position: relative;
width: 100%;
height: 264rpx;
z-index: 2;
}
.result-title-bg {
width: 100%;
height: 264rpx;
display: block;
}
.result-title-text {
width: 100%;
font-size: 28rpx;
color: #FBFCE6;
font-weight: 600;
line-height: 40rpx;
text-align: center;
position: absolute;
top: 116rpx;
left: 0;
}
.result-panel {
width: 100vw;
height: 634rpx;
padding: 144rpx 80rpx 0 80rpx;
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
background: rgba(0, 0, 0, 0.8);
z-index: 1;
margin-top: -100rpx;
position: relative;
}
.stats {
width: 100%;
margin-top: 34rpx;
}
.line-top {
background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
width: 100%;
height: 4rpx;
opacity: 0.9;
position: absolute;
top: 2rpx;
left: 0;
}
.line-bottom {
background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
width: 100%;
height: 4rpx;
opacity: 0.9;
position: absolute;
bottom: 2rpx;
left: 0;
}
.stat-row {
width: 100%;
height: 62rpx;
position: relative;
display: flex;
align-items: center;
margin-bottom: 52rpx;
// border: 2rpx solid rgba(209, 184, 125, 0.72);
// border-radius: 14rpx;
transform: skewX(-12deg);
box-sizing: border-box;
}
.stat-cell {
flex: 1;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transform: skewX(12deg);
}
.stat-bg {
position: absolute;
top: 0;
left: 0;
width: 582rpx;
height: 62rpx;
}
.stat-cell--compare {
padding-left: 8rpx;
box-sizing: border-box;
}
.stat-label {
position: absolute;
top: -30rpx;
color: rgba(255, 255, 255, 0.7);
font-size: 20rpx;
line-height: 1;
}
.stat-value {
display: flex;
align-items: center;
justify-content: center;
min-width: 120rpx;
color: #F3E0B9;
font-size: 32rpx;
line-height: 1;
font-weight: 700;
font-style: italic;
}
.stat-unit {
margin-left: 4rpx;
font-size: 24rpx;
}
.stat-divider {
width: 2rpx;
height: 34rpx;
background: rgba(197, 160, 92, 0.64);
transform: skewX(12deg);
}
.stat-equal{
width: 30rpx;
height: 40rpx;
color: #F3E0B9;
font-size: 30rpx;
margin-left: 10rpx;
}
.trend-icon {
width: 28rpx;
height: 42rpx;
margin-left: 16rpx;
}
.trend-icon--down {
transform: rotate(180deg);
}
.stat-bg {
position: absolute;
top: 0;
left: 0;
width: 582rpx;
height: 62rpx;
}
.rice-list {
width: 160rpx;
display: flex;
align-items: center;
}
.rice-icon {
width: 36rpx;
height: 34rpx;
margin-right: 14rpx;
}
.oper-box {
position: relative;
z-index: 1;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 598rpx;
}
.actions {
width: 350rpx;
display: flex;
justify-content: space-between;
margin: 0 auto;
margin-top: 38rpx;
}
.action-item {
width: 80rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.action-icon {
width: 70rpx;
height: 68rpx;
}
.action-item>text {
margin-top: 4rpx;
color: #FAE6BC;
font-size: 20rpx;
line-height: 1;
white-space: nowrap;
}
.exp-area {
width: 100%;
margin-top: auto;
padding-top: 122rpx;
}
.exp-gain {
display: block;
margin-bottom: 14rpx;
color: #f6e3b2;
font-size: 22rpx;
line-height: 1;
text-align: center;
}
.level-progress {
display: flex;
align-items: center;
width: 100%;
}
.level-text,
.progress-text {
color: rgba(255, 255, 255, 0.86);
font-size: 24rpx;
line-height: 1;
}
.level-text {
min-width: 60rpx;
}
.progress-text {
min-width: 72rpx;
text-align: right;
}
.progress-track {
flex: 1;
height: 10rpx;
margin: 0 14rpx;
border-radius: 999rpx;
overflow: hidden;
background: rgba(255, 255, 255, 0.26);
}
.progress-fill {
height: 100%;
border-radius: 999rpx;
background: linear-gradient(90deg, #ff940f 0%, #ffbb33 58%, #fff0a7 100%);
}
.footer-actions {
width: 100%;
display: flex;
justify-content: center;
margin-top: 70rpx;
}
.result-btn {
width: 234rpx;
height: 72rpx;
border-radius: 999rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 0 18rpx;
}
.result-btn>text {
font-size: 28rpx;
line-height: 1;
font-weight: 700;
}
.result-btn--muted {
color: #ffffff;
background: rgba(255, 255, 255, 0.2);
}
.result-btn--primary {
background: #FED847;
color: #151515;
}
.gold-text {
color: #fed847;
}
.coach-comment {
display: flex;
flex-direction: column;
font-size: 14px;
}
.coach-comment>view {
display: flex;
}
.coach-comment>view>image {
width: 420rpx;
height: 420rpx;
margin-right: 20rpx;
}
.coach-suggestion {
margin-top: 12px;
}
</style>

View File

@@ -0,0 +1,379 @@
<script setup>
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util";
import Avatar from "@/components/Avatar.vue";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user } = storeToRefs(store);
const props = defineProps({
show: {
type: Boolean,
default: true,
},
start: {
type: Boolean,
default: false,
},
tips: {
type: String,
default: "",
},
total: {
type: Number,
default: 120,
},
currentRound: {
type: Number,
default: 0,
},
battleId: {
type: String,
default: "",
},
melee: {
type: Boolean,
default: false,
},
onStop: {
type: Function,
default: () => {},
},
});
const barColor = ref("#fed847");
const remain = ref(props.total);
const timer = ref(null);
const sound = ref(true);
const currentRound = ref(props.currentRound);
const currentRoundEnded = ref(false);
const halfTime = ref(false);
const wait = ref(0);
const transitionStyle = ref("all 1s linear");
const progressPercent = computed(() => {
if (!props.total) return 0;
return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
});
const displayName = computed(() => {
return (
user.value?.nickName ||
user.value?.nickname ||
user.value?.name ||
"Archer"
);
});
const avatarSrc = computed(() => {
return user.value?.avatar || "/static/shooter2.png";
});
watch(
() => props.tips,
(newVal) => {
let key = "";
if (newVal.includes("红队")) key = "请红方射箭";
if (newVal.includes("蓝队")) key = "请蓝方射箭";
if (key) {
if (currentRoundEnded.value) {
currentRound.value += 1;
currentRoundEnded.value = false;
if (currentRound.value === 1) audioManager.play("第一轮");
if (currentRound.value === 2) audioManager.play("第二轮");
if (currentRound.value === 3) audioManager.play("第三轮");
if (currentRound.value === 4) audioManager.play("第四轮");
if (currentRound.value === 5) audioManager.play("第五轮");
setTimeout(() => {
audioManager.play(key);
}, 1000);
} else {
audioManager.play(key);
}
}
}
);
const resetTimer = (count) => {
if (timer.value) clearInterval(timer.value);
const newVal = Math.round(count);
if (newVal >= remain.value) {
transitionStyle.value = "none";
remain.value = newVal;
setTimeout(() => {
transitionStyle.value = "all 1s linear";
}, 50);
} else {
remain.value = newVal;
}
if (remain.value > 0) {
timer.value = setInterval(() => {
if (remain.value === 0) {
clearInterval(timer.value);
props.onStop();
}
if (remain.value > 0) remain.value--;
}, 1000);
}
};
watch(
() => props.start,
(newVal) => {
if (newVal) {
resetTimer(props.total);
} else {
remain.value = 0;
clearInterval(timer.value);
}
},
{
immediate: true,
}
);
const tipContent = computed(() => {
if (halfTime.value) {
return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`;
}
return props.start && remain.value === 0 ? "时间到!" : props.tips;
});
const updateSound = () => {
sound.value = !sound.value;
audioManager.setMuted(!sound.value);
};
async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.BattleStart) {
halfTime.value = false;
audioManager.play("比赛开始");
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
audioManager.play("比赛结束", false);
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
let arrow = {};
if (msg.details && Array.isArray(msg.details)) {
arrow = msg.details[msg.details.length - 1];
} else {
if (msg.shootData.playerId !== user.value.id) return;
if (msg.shootData) arrow = msg.shootData;
}
let key = [];
key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}` : "未上靶");
if (arrow.angle !== null) {
key.push(`${getDirectionText(arrow.angle)}调整`);
}
audioManager.play(key, false);
} else if (msg.type === MESSAGETYPESV2.HalfRest) {
halfTime.value = true;
audioManager.play("中场休息");
} else if (msg.type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({
title: "距离不足,无效",
icon: "none",
});
audioManager.play("射击无效");
}
}
const playSound = (key) => {
audioManager.play(key);
};
onMounted(() => {
uni.$on("update-remain", resetTimer);
uni.$on("socket-inbox", onReceiveMessage);
uni.$on("play-sound", playSound);
});
onBeforeUnmount(() => {
uni.$off("update-remain", resetTimer);
uni.$off("socket-inbox", onReceiveMessage);
uni.$off("play-sound", playSound);
if (timer.value) clearInterval(timer.value);
});
</script>
<template>
<view v-if="show" class="progress-card">
<view class="progress-card__header">
<view class="progress-card__profile">
<view class="progress-card__avatar-shell">
<Avatar :src="user.avatar" :size="40" />
</view>
<text class="progress-card__name">{{ displayName }}</text>
</view>
<!-- <button class="progress-card__sound" hover-class="none" @click="updateSound">
<image
class="progress-card__sound-icon"
:src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="aspectFit"
/>
</button> -->
</view>
<view class="progress-card__track-wrap">
<image
class="progress-card__titile"
src="../../../static/training-difficulty-design/text-icon-cgxl.png"
mode="aspectFit"
/>
<view class="progress-card__track">
<view
class="progress-card__fill"
:style="{
width: `${progressPercent}%`,
backgroundColor: barColor,
right: tips.includes('红队') ? 0 : 'unset',
transition: transitionStyle,
}"
/>
<view class="progress-card__badge">
<text class="progress-card__badge-text">剩余{{ remain }}</text>
</view>
</view>
<!-- <text v-if="tipContent" class="progress-card__tip">{{ tipContent }}123</text> -->
</view>
</view>
</template>
<style scoped>
.progress-card {
box-sizing: border-box;
/* padding: 50rpx 30rpx 0 30rpx; */
margin: 70rpx 30rpx 0 30rpx;
}
.progress-card__header {
display: flex;
align-items: flex-start;
justify-content: space-between;
}
.progress-card__profile {
display: flex;
flex-direction: column;
align-items: flex-start;
}
.progress-card__avatar-shell {
width: 86rpx;
height: 86rpx;
padding: 3rpx;
box-sizing: border-box;
border-radius: 50%;
background: linear-gradient(180deg, rgba(255, 209, 153, 1), rgba(162, 119, 55, 1));
}
.progress-card__avatar {
width: 100%;
height: 100%;
display: block;
border-radius: 50%;
}
.progress-card__name {
width: 86rpx;
color: #E7BA80;
font-size: 18rpx;
line-height: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: center;
margin-top: 10rpx;
}
.progress-card__sound {
width: 68rpx;
height: 68rpx;
margin: 0;
padding: 0;
border: none;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
background: rgba(28, 24, 21, 0.72);
box-shadow: 0 8rpx 18rpx rgba(0, 0, 0, 0.18);
}
.progress-card__sound::after {
border: none;
}
.progress-card__sound-icon {
width: 34rpx;
height: 34rpx;
}
.progress-card__track-wrap {
margin-top: -156rpx;
padding-left: 102rpx;
}
.progress-card__titile{
width: 260rpx;
height: 72rpx;
margin-left: 110rpx;
}
.progress-card__track {
position: relative;
width: 100%;
height: 24rpx;
border-radius: 18rpx;
overflow: hidden;
background: #444444;
}
.progress-card__fill {
position: absolute;
top: 0;
left: 0;
bottom: 0;
border-radius: 18rpx;
background: linear-gradient( 133deg, #FFD19A 0%, #A17636 100%);
}
.progress-card__badge {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
min-width: 156rpx;
height: 40rpx;
padding: 0 24rpx;
box-sizing: border-box;
border-radius: 999rpx;
display: flex;
align-items: center;
justify-content: center;
/* background: rgba(164, 117, 47, 0.94); */
/* box-shadow: 0 4rpx 10rpx rgba(76, 45, 7, 0.22); */
}
.progress-card__badge-text {
color: #fff7de;
font-size: 18rpx;
line-height: 1;
white-space: nowrap;
}
.progress-card__tip {
display: block;
margin-top: 16rpx;
color: rgba(255, 243, 216, 0.88);
font-size: 24rpx;
line-height: 1.4;
text-align: center;
}
</style>

View File

@@ -0,0 +1,196 @@
<script setup>
import { ref, onMounted, onBeforeUnmount } from "vue";
import Guide from "@/components/Guide.vue";
import BowPower from "@/components/BowPower.vue";
import Avatar from "@/components/Avatar.vue";
import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user, device } = storeToRefs(store);
const props = defineProps({
guide: {
type: Boolean,
default: true,
},
isBattle: {
type: Boolean,
default: false,
},
count: {
type: Number,
default: 15,
},
});
const arrow = ref({});
const distance = ref(0);
const showsimul = ref(false);
const count = ref(props.count);
const timer = ref(null);
const updateTimer = (value) => {
count.value = Math.round(value);
};
onMounted(() => {
audioManager.play("请射箭测试距离");
if (props.isBattle) {
timer.value = setInterval(() => {
count.value -= 1;
if (count.value < 0) clearInterval(timer.value);
}, 1000);
}
uni.$on("update-timer", updateTimer);
});
onBeforeUnmount(() => {
if (timer.value) clearInterval(timer.value);
uni.$off("update-timer", updateTimer);
});
async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) {
distance.value = Number((msg.shootData.distance / 100).toFixed(2));
if (distance.value >= 5) audioManager.play("距离合格");
else audioManager.play("距离不足");
}
}
const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
};
onMounted(() => {
uni.$on("socket-inbox", onReceiveMessage);
const accountInfo = uni.getAccountInfoSync();
const envVersion = accountInfo.miniProgram.envVersion;
if (envVersion !== "release") showsimul.value = true;
});
onBeforeUnmount(() => {
uni.$off("socket-inbox", onReceiveMessage);
});
</script>
<template>
<view class="container">
<view class="test-area">
<image
class="text-bg"
src="../../../static/training-difficulty-design/par-bg.png"
mode="widthFix"
/>
<button
class="simul"
@click="simulShoot"
hover-class="none"
v-if="showsimul"
>
模拟射箭
</button>
<view class="warnning-text">
<view class="target-tip">当前靶子为<text class="text-yellow">20cm</text>全环靶,请更换靶子</view>
<block v-if="distance > 0">
<text>当前距离<text class="text-yellow">{{ distance }}</text></text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block>
<block v-else>
<text>请射箭测试站距</text>
</block>
</view>
<view class="user-row">
<Avatar :src="user.avatar" :size="35" />
<BowPower />
</view>
</view>
<view v-if="isBattle" class="ready-timer">
<image src="../../../static/test-tip.png" mode="widthFix" />
<view v-if="count >= 0">
<text>具体正式比赛还有</text>
<text>{{ count }}</text>
<text></text>
</view>
<view v-else> 进入中... </view>
</view>
</view>
</template>
<style scoped>
.container {
width: 100vw;
max-height: 70vh;
}
.ready-timer {
display: flex;
flex-direction: column;
align-items: center;
transform: translateY(-10vw);
}
.ready-timer > image:first-child {
width: 40%;
}
.ready-timer > view {
width: 80%;
height: 45px;
background-color: #545454;
border-radius: 30px;
display: flex;
justify-content: center;
align-items: center;
transform: translateY(-8vw);
color: #bebebe;
font-size: 15px;
}
.ready-timer > view > text:nth-child(2) {
color: #fed847;
font-size: 20px;
width: 22px;
text-align: center;
}
.test-area {
width: 100%;
height: auto;
position: relative;
}
.text-bg {
width: 100%;
position: relative;
}
.warnning-text {
color: #fff;
display: flex;
flex-direction: column;
height: 200rpx;
position: absolute;
top: 142rpx;
left: 0;
width: 100%;
font-size: 36rpx;
text-align: center;
}
.target-tip{
margin-bottom: 28rpx;
}
.text-yellow{
color: #FED847;
}
.simul {
position: absolute;
color: #fff;
right: 10px;
top: 30rpx;
}
.user-row{
position: absolute;
bottom: 34rpx;
left: 0rpx;
width: 100%;
padding: 0 34rpx;
box-sizing: border-box;
}
</style>

View File

@@ -0,0 +1,327 @@
<script setup>
import { computed } from "vue";
const lockedBadgeBackground =
"/static/training-difficulty-design/unlock.svg";
const unlockedBadgeBackground =
"/static/training-difficulty-design/lock.svg";
const props = defineProps({
node: {
type: Object,
required: true,
},
active: {
type: Boolean,
default: false,
},
completedProgress: {
type: Number,
default: 0,
},
locked: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["click"]);
const badgeStyle = computed(() => {
const { left, top } = props.node.style || {};
return {
left,
top,
};
});
const progressValue = computed(() => {
const value = Number(props.completedProgress);
if (!Number.isFinite(value)) return 0;
return Math.max(0, Math.min(100, value));
});
const badgeStateStyle = computed(() => {
const label = String(props.node?.label || "");
const estimatedLabelWidthRpx = Math.max(36, label.length * 14);
const labelCircleSizeRpx = Math.max(58, estimatedLabelWidthRpx + 18);
const badgeSizeRpx = Math.max(
124,
Math.round(labelCircleSizeRpx / 0.4727)
);
return {
"--badge-progress": progressValue.value,
"--badge-size": `${badgeSizeRpx}rpx`,
"--badge-label-size": `${labelCircleSizeRpx}rpx`,
"--badge-orbit-offset": "12rpx",
"--badge-locked-ring-offset": "12rpx",
};
});
const showProgress = computed(() => {
return !props.locked;
});
const badgeFillSrc = computed(() => {
return props.locked ? lockedBadgeBackground : unlockedBadgeBackground;
});
const handleClick = () => {
emit("click", props.node);
};
</script>
<template>
<view
class="difficulty-badge"
:class="{
'difficulty-badge--active': active,
'difficulty-badge--progress': showProgress,
'difficulty-badge--locked': locked,
}"
:style="[badgeStyle, badgeStateStyle]"
@click="handleClick"
>
<view class="difficulty-badge__fill">
<image class="difficulty-badge__bg" :src="badgeFillSrc" mode="aspectFit" />
<view v-if="active" class="difficulty-badge__active-orbit">
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--top"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--right"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--bottom"
></view>
<view
class="difficulty-badge__active-triangle difficulty-badge__active-triangle--left"
></view>
</view>
<view class="difficulty-badge__label-wrap">
<view class="difficulty-badge__label">{{ node.label }}</view>
</view>
</view>
</view>
</template>
<style scoped>
.difficulty-badge,
.difficulty-badge__fill,
.difficulty-badge__label-wrap {
box-sizing: border-box;
}
.difficulty-badge {
position: absolute;
transform: translate(-50%, -50%);
z-index: 2;
display: flex;
align-items: center;
justify-content: center;
transition: transform 0.2s ease, opacity 0.2s ease;
}
.difficulty-badge--active {
transform: translate(-50%, -50%) scale(1.04);
}
.difficulty-badge--active::before {
content: "";
position: absolute;
inset: calc(var(--badge-orbit-offset) * -1);
border: 4rpx solid transparent;
border-radius: 50%;
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge--active::after {
content: "";
position: absolute;
inset: -24rpx;
border: 4rpx solid rgba(254, 208, 152, 0.96);
border-radius: 50%;
box-shadow: inset 0 0 10rpx rgba(254, 208, 152, 0.88),
inset 0 0 22rpx rgba(254, 208, 152, 0.32),
0 0 14rpx rgba(254, 208, 152, 0.92),
0 0 32rpx rgba(254, 208, 152, 0.52),
0 0 52rpx rgba(254, 208, 152, 0.22);
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge__active-orbit {
position: absolute;
top: 50%;
left: 50%;
width: calc(100% + var(--badge-orbit-offset) * 2);
height: calc(100% + var(--badge-orbit-offset) * 2);
border-radius: 50%;
z-index: 3;
pointer-events: none;
transform: translate(-50%, -50%);
animation: badge-orbit-spin 5.4s linear infinite;
transform-origin: center;
}
.difficulty-badge__active-triangle {
position: absolute;
width: 0;
height: 0;
border-style: solid;
z-index: 2;
pointer-events: none;
opacity: 0.92;
filter: drop-shadow(0 0 8rpx rgba(255, 255, 255, 0.45));
}
.difficulty-badge__active-triangle--top {
top: -3rpx;
left: 50%;
transform: translateX(-50%);
border-width: 11rpx 8rpx 0 8rpx;
border-color: #ffffff transparent transparent transparent;
}
.difficulty-badge__active-triangle--right {
right: -3rpx;
top: 50%;
transform: translateY(-50%);
border-width: 8rpx 11rpx 8rpx 0;
border-color: transparent #ffffff transparent transparent;
}
.difficulty-badge__active-triangle--bottom {
bottom: -3rpx;
left: 50%;
transform: translateX(-50%);
border-width: 0 8rpx 11rpx 8rpx;
border-color: transparent transparent #ffffff transparent;
}
.difficulty-badge__active-triangle--left {
left: -3rpx;
top: 50%;
transform: translateY(-50%);
border-width: 8rpx 0 8rpx 11rpx;
border-color: transparent transparent transparent #ffffff;
}
.difficulty-badge__fill {
width: var(--badge-size);
height: var(--badge-size);
position: relative;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
}
.difficulty-badge__bg {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
display: block;
z-index: 1;
}
.difficulty-badge--active .difficulty-badge__fill::before,
.difficulty-badge--active .difficulty-badge__fill::after {
content: none;
}
.difficulty-badge--progress .difficulty-badge__fill::before,
.difficulty-badge--progress .difficulty-badge__fill::after {
content: "";
position: absolute;
inset: -12rpx;
padding: 6rpx;
border-radius: inherit;
-webkit-mask: linear-gradient(#fff 0 0) content-box,
linear-gradient(#fff 0 0);
-webkit-mask-composite: xor;
mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
mask-composite: exclude;
pointer-events: none;
}
.difficulty-badge--progress .difficulty-badge__fill::before {
background: rgba(255, 255, 255, 0.35);
}
.difficulty-badge--progress .difficulty-badge__fill::after {
background: conic-gradient(
from -90deg,
rgba(254, 208, 152, 1) 0,
rgba(255, 229, 198, 1) calc(var(--badge-progress) * 1%),
transparent calc(var(--badge-progress) * 1%) 100%
);
}
.difficulty-badge--active .difficulty-badge__label,
.difficulty-badge--progress .difficulty-badge__label {
color: #333333;
}
.difficulty-badge--locked {
opacity: 1;
}
.difficulty-badge--locked::before {
content: "";
position: absolute;
inset: calc(var(--badge-locked-ring-offset) * -1);
border: 2rpx solid rgba(160, 160, 160, 0.5);
border-radius: 50%;
pointer-events: none;
box-sizing: border-box;
}
.difficulty-badge--locked .difficulty-badge__label {
color: rgba(51, 51, 51, 0.54);
}
.difficulty-badge__label-wrap {
width: var(--badge-label-size);
height: var(--badge-label-size);
border-radius: 50%;
position: relative;
z-index: 2;
display: flex;
align-items: center;
justify-content: center;
margin-top: -5rpx;
}
.difficulty-badge__label {
color: rgba(51, 51, 51, 0.7);
font-size: 24rpx;
max-width: 100%;
height: 34rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
font-weight: 600;
text-align: center;
white-space: nowrap;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
@keyframes badge-orbit-spin {
from {
transform: translate(-50%, -50%) rotate(0deg);
}
to {
transform: translate(-50%, -50%) rotate(360deg);
}
}
</style>

View File

@@ -0,0 +1,86 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
title: {
type: String,
default: "",
},
lines: {
type: Array,
default: () => [],
},
});
const previewLines = computed(() => {
return props.lines.map((line) => String(line || "").trim()).filter(Boolean);
});
</script>
<template>
<view class="difficulty-preview">
<image
class="difficulty-preview__bg"
src="/static/training-difficulty-design/text.png"
mode="widthFix"
/>
<view class="difficulty-preview__content">
<text class="difficulty-preview__title">{{ title }}</text>
<view class="difficulty-preview__copy">
<text
v-for="(line, index) in previewLines"
:key="`${line}-${index}`"
class="difficulty-preview__line"
>
{{ line }}
</text>
</view>
</view>
</view>
</template>
<style scoped>
.difficulty-preview {
position: relative;
width: 100%;
}
.difficulty-preview__bg {
display: block;
width: 100%;
}
.difficulty-preview__content {
position: absolute;
top: 28rpx;
left: 30rpx;
box-sizing: border-box;
width: 486rpx;
}
.difficulty-preview__title {
display: block;
color: #ffd543;
font-size: 24rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
text-align: center;
}
.difficulty-preview__copy {
width: 80%;
margin: 0 auto;
display: block;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
font-family: "PingFang SC", sans-serif;
text-align: center;
}
.difficulty-preview__line {
display: block;
}
</style>

View File

@@ -0,0 +1,81 @@
<script setup>
const props = defineProps({
text: {
type: String,
default: "开始",
},
});
const emit = defineEmits(["click"]);
const handleClick = () => {
emit("click");
};
</script>
<template>
<button
class="difficulty-start"
hover-class="difficulty-start--hover"
@click="handleClick"
>
<image
class="difficulty-start__button"
src="/static/training-difficulty-design/btn.png"
mode="widthFix"
/>
</button>
</template>
<style scoped>
.difficulty-start {
position: relative;
width: 302rpx;
height: 170rpx;
padding: 0;
border: 0;
background: transparent;
margin: 0 auto;
}
.difficulty-start::after {
border: 0;
}
.difficulty-start--hover {
transform: translateY(2rpx) scale(0.99);
}
.difficulty-start__mascot {
position: absolute;
left: 50%;
top: 0;
z-index: 1;
width: 112rpx;
transform: translateX(-50%);
}
.difficulty-start__button {
position: absolute;
left: 0;
right: 0;
bottom: 0;
z-index: 2;
width: 100%;
}
.difficulty-start__text {
position: absolute;
left: 0;
right: 0;
bottom: 58rpx;
z-index: 3;
color: #9f4d00;
font-size: 64rpx;
line-height: 76rpx;
text-align: center;
font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
font-weight: 800;
text-shadow: 0 3rpx 0 rgba(255, 245, 205, 0.78);
}
</style>

View File

@@ -0,0 +1,778 @@
<script setup>
import { computed, nextTick, ref } from "vue";
import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import TargetPicker from "@/components/TargetPicker.vue";
import TrainingDifficultyBadge from "./components/TrainingDifficultyBadge.vue";
import TrainingDifficultyPreviewCard from "./components/TrainingDifficultyPreviewCard.vue";
import TrainingDifficultyStartButton from "./components/TrainingDifficultyStartButton.vue";
import { getTrainingDifficultyListAPI } from "@/apis";
// 难度页接口数据源:
// 1. 接口GET /training/difficulty/list?type=base/endurance/precision/rhythm
// 2. 当前进度:接口 user_levels / list.completed路由参数可覆盖选中难度
const trainingDifficultyStorageKey = "training-selection";
const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
const defaultTrainingType = "precision";
const defaultUnlockedDifficultyId = "lv1";
const trainingTypeMetaMap = {
base: {
key: "base",
title: "基础训练",
},
endurance: {
key: "endurance",
title: "耐力训练",
},
precision: {
key: "precision",
title: "精准训练",
},
rhythm: {
key: "rhythm",
title: "节奏训练",
},
};
const routeModeTypeMap = {
basic: "base",
base: "base",
endurance: "endurance",
precision: "precision",
rhythm: "rhythm",
};
const resolveTrainingType = (mode) => {
const normalizedMode = String(mode || "").toLowerCase();
return routeModeTypeMap[normalizedMode] || defaultTrainingType;
};
const createDifficultyId = (level) => `lv${level}`;
const toNumber = (value, fallback = 0) => {
const numberValue = Number(value);
return Number.isFinite(numberValue) ? numberValue : fallback;
};
const clampProgress = (value) => {
return Math.min(Math.max(value, 0), 100);
};
const getDifficultyProgress = (item = {}) => {
const completedCnt = toNumber(item.completed_cnt);
const promoteCnt = toNumber(item.promote_cnt);
if (item.completed) {
return 100;
}
if (promoteCnt <= 0) {
return 0;
}
return clampProgress(Math.round((completedCnt / promoteCnt) * 100));
};
const checkDifficultyCompleted = (item = {}) => {
const completedCnt = toNumber(item.completed_cnt);
const promoteCnt = toNumber(item.promote_cnt);
return Boolean(item.completed) || (promoteCnt > 0 && completedCnt >= promoteCnt);
};
const getDifficultyModeText = (mode) => {
return Number(mode) === 1 ? "随机区域+指定环数" : "随机区域命中";
};
const createEmptyModeConfig = (type = defaultTrainingType) => {
const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
return {
key: meta.key,
title: meta.title,
nodes: [],
details: {},
activeDifficultyId: defaultUnlockedDifficultyId,
progressMap: {},
};
};
const createDifficultySummary = (item = {}) => {
const desc = String(item.desc || "").trim();
const type = item.type;
const arrows = toNumber(item.arrows);
const timeLimit = toNumber(item.time_limit);
const hitReq = toNumber(item.hit_req);
const totalReq = toNumber(item.total_req);
const blocks = toNumber(item.blocks);
const promoteCnt = toNumber(item.promote_cnt);
const timeText = timeLimit > 0 ? `${timeLimit}秒内完成` : "不限时完成";
const promoteText = promoteCnt > 0 ? `完成${promoteCnt}次晋级` : "";
const summaryMap = {
base: [
desc || (hitReq > 0 ? `每箭命中${hitReq}环以上` : "上靶即可"),
[`${arrows}`, promoteText].filter(Boolean).join(" · "),
],
endurance: [
desc || `${timeText}${arrows}`,
[`累计${totalReq}`, promoteText].filter(Boolean).join(" · "),
],
precision: [
desc || `命中${blocks}个指定区域`,
[
`${arrows}`,
timeText,
getDifficultyModeText(item.mode),
promoteText,
]
.filter(Boolean)
.join(" · "),
],
rhythm: [
desc || `间隔${timeLimit}秒射击`,
[
`${arrows}`,
hitReq > 0 ? `每箭${hitReq}环以上` : "上靶即可",
getDifficultyModeText(item.mode),
promoteText,
]
.filter(Boolean)
.join(" · "),
],
};
return (summaryMap[type] || [desc]).filter(Boolean);
};
const normalizeTrainingDifficultyConfig = (result, type) => {
const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
const list = Array.isArray(result?.list) ? result.list : [];
const rawItems = list.filter((item) => !item?.type || item.type === meta.key);
const difficultyItems = rawItems
.map((item) => {
const level = toNumber(item?.difficulty);
if (level <= 0) {
return null;
}
const id = createDifficultyId(level);
const label = `Lv${level}`;
return {
...item,
recordId: item.id,
completedCnt: toNumber(item.completed_cnt),
promoteCnt: toNumber(item.promote_cnt),
id,
level,
label,
title: `${label}难度`,
summary: createDifficultySummary(item),
startText: "开始",
targetPaperType: "20CM全环靶",
};
})
.filter(Boolean)
.sort((first, second) => first.level - second.level);
const maxLevel = difficultyItems.reduce(
(currentMax, item) => Math.max(currentMax, item.level),
0
);
const completedLevelFromList = difficultyItems.reduce((currentMax, item) => {
return checkDifficultyCompleted(item)
? Math.max(currentMax, item.level)
: currentMax;
}, 0);
const userCompletedLevel = toNumber(result?.user_levels?.[meta.key]);
const highestCompletedLevel = userCompletedLevel || completedLevelFromList;
const unlockedLevel = maxLevel
? Math.min(Math.max(highestCompletedLevel + 1, 1), maxLevel)
: 1;
return {
key: meta.key,
title: meta.title,
nodes: difficultyItems.map((item) => ({
id: item.id,
label: item.label,
})),
details: Object.fromEntries(
difficultyItems.map((item) => [item.id, item])
),
activeDifficultyId: createDifficultyId(unlockedLevel),
progressMap: Object.fromEntries(
difficultyItems.map((item) => [item.id, getDifficultyProgress(item)])
),
};
};
// 难度轴布局参数,节点按“等级越低越靠下”的方式排列。
const nodesLayout = {
viewportHeightRpx: 1020,
topPaddingRpx: 136,
bottomPaddingRpx: 144,
verticalGapRpx: 188,
anchorOffsetRpx: 796,
horizontalPatternRpx: [388, 232, 516, 258, 458, 304],
nearHorizontalDistanceRpx: 170,
extraGapScale: 0.5,
};
const emptyDifficulty = {
id: "",
label: "",
title: "",
summary: [],
startText: "开始",
targetPaperType: "",
};
// 页面基础状态
const pageConfig = ref(createEmptyModeConfig(defaultTrainingType));
const unlockedDifficultyId = ref(defaultUnlockedDifficultyId);
const selectedDifficultyId = ref(defaultUnlockedDifficultyId);
const showTargetPicker = ref(false);
const nodesScrollTop = ref(0);
const nodesScrollWithAnimation = ref(false);
const routeOptions = ref({});
const needRefreshProgress = ref(false);
const difficultyProgressMap = computed(() => {
return pageConfig.value?.progressMap || {};
});
const clamp = (value, min, max) => {
return Math.min(Math.max(value, min), max);
};
// 从 lv1 / lv20 这类 id 中提取等级数值,统一用于排序、解锁判断和进度比较。
const getDifficultyLevel = (difficultyId = "") => {
const matched = String(difficultyId).match(/\d+/);
return matched ? Number(matched[0]) : 0;
};
// 合并节点基础信息和难度详情,并统一按等级升序整理。
const createDifficultyNodes = (config) => {
const details = config?.details || {};
const rawNodes = Array.isArray(config?.nodes) ? config.nodes : [];
const nodeMap = new Map(rawNodes.map((node) => [node.id, node]));
const difficultyIds = new Set([
...rawNodes.map((node) => node.id),
...Object.keys(details),
]);
return Array.from(difficultyIds)
.map((difficultyId) => {
const level = getDifficultyLevel(difficultyId);
const node = nodeMap.get(difficultyId) || {};
const detail = details[difficultyId] || {};
const label = node.label || detail.label || `Lv${level || ""}`;
return {
...node,
...detail,
id: difficultyId,
level,
label,
title: detail.title || `${label}难度`,
summary: Array.isArray(detail.summary) ? detail.summary : [],
startText: detail.startText || "开始",
targetPaperType: detail.targetPaperType || "",
};
})
.filter((node) => node.id && node.level > 0)
.sort((first, second) => first.level - second.level);
};
const findValidDifficultyId = (difficultyId, nodes) => {
return nodes.some((node) => node.id === difficultyId) ? difficultyId : "";
};
const getNextDifficultyId = (difficultyId, nodes) => {
const currentLevel = getDifficultyLevel(difficultyId);
return (
nodes.find((node) => node.level === currentLevel + 1)?.id || difficultyId
);
};
// 统一解析当前最新已解锁难度:
// completedDifficultyId 优先级最高,可在完成当前难度后自动推进到下一关。
const resolveUnlockedDifficultyId = (options, config, nodes) => {
const completedDifficultyId = findValidDifficultyId(
options.completedDifficultyId,
nodes
);
if (completedDifficultyId) {
return getNextDifficultyId(completedDifficultyId, nodes);
}
return (
[
options.currentDifficultyId,
options.latestDifficultyId,
options.activeDifficultyId,
config.activeDifficultyId,
defaultUnlockedDifficultyId,
].find((difficultyId) => findValidDifficultyId(difficultyId, nodes)) ||
nodes[0]?.id ||
defaultUnlockedDifficultyId
);
};
// 如果传入的默认选中项尚未解锁,则自动回退到当前最新已解锁难度。
const resolveSelectedDifficultyId = (difficultyId, nodes, currentUnlockedId) => {
const safeDifficultyId = findValidDifficultyId(difficultyId, nodes);
if (!safeDifficultyId) {
return currentUnlockedId;
}
return getDifficultyLevel(safeDifficultyId) <=
getDifficultyLevel(currentUnlockedId)
? safeDifficultyId
: currentUnlockedId;
};
// 页面渲染使用的难度节点列表,包含纵向轨道坐标。
const difficultyNodes = computed(() => {
const nodes = createDifficultyNodes(pageConfig.value);
const leftPositions = nodes.map((_, index) => {
return nodesLayout.horizontalPatternRpx[
index % nodesLayout.horizontalPatternRpx.length
];
});
const offsetsFromBottom = [];
let accumulatedOffsetRpx = 0;
nodes.forEach((node, index) => {
if (index > 0) {
const previousLeftRpx = leftPositions[index - 1];
const currentLeftRpx = leftPositions[index];
const horizontalDistanceRpx = Math.abs(currentLeftRpx - previousLeftRpx);
const extraGapRpx =
Math.max(
0,
nodesLayout.nearHorizontalDistanceRpx - horizontalDistanceRpx
) * nodesLayout.extraGapScale;
accumulatedOffsetRpx +=
nodesLayout.verticalGapRpx + Math.round(extraGapRpx);
}
offsetsFromBottom.push(accumulatedOffsetRpx);
});
const contentHeightRpx = Math.max(
nodesLayout.viewportHeightRpx,
nodesLayout.topPaddingRpx +
nodesLayout.bottomPaddingRpx +
(offsetsFromBottom[offsetsFromBottom.length - 1] || 0)
);
return nodes.map((node, index) => {
const leftRpx = leftPositions[index];
const topRpx =
contentHeightRpx -
nodesLayout.bottomPaddingRpx -
offsetsFromBottom[index];
return {
...node,
leftRpx,
topRpx,
style: {
left: `${leftRpx}rpx`,
top: `${topRpx}rpx`,
},
};
});
});
const difficultyConnectors = computed(() => {
const nodes = difficultyNodes.value;
return nodes.slice(1).map((currentNode, index) => {
const previousNode = nodes[index];
const startX = Number(previousNode?.leftRpx || 0);
const startY = Number(previousNode?.topRpx || 0);
const endX = Number(currentNode?.leftRpx || 0);
const endY = Number(currentNode?.topRpx || 0);
const midX = (startX + endX) / 2;
const midY = (startY + endY) / 2;
const angle =
(Math.atan2(endY - startY, endX - startX) * 180) / Math.PI + 90;
return {
id: `${previousNode.id}-${currentNode.id}`,
left: `${midX}rpx`,
top: `${midY}rpx`,
transform: `translate(-50%, -50%) rotate(${angle}deg)`,
};
});
});
const nodesTrackHeightRpx = computed(() => {
const bottomNode = difficultyNodes.value[0];
if (!bottomNode) {
return nodesLayout.viewportHeightRpx;
}
return Math.max(
nodesLayout.viewportHeightRpx,
bottomNode.topRpx + nodesLayout.bottomPaddingRpx
);
});
const nodesTrackStyle = computed(() => {
return {
height: `${nodesTrackHeightRpx.value}rpx`,
};
});
const selectedDifficulty = computed(() => {
return (
difficultyNodes.value.find((node) => node.id === selectedDifficultyId.value) ||
difficultyNodes.value[0] ||
emptyDifficulty
);
});
// 优先显示配置中的难度进度;没有配置时,再按已解锁等级推导完成态。
const getCompletedDifficultyProgress = (node) => {
const configuredProgress = Number(difficultyProgressMap.value[node?.id]);
if (Number.isFinite(configuredProgress) && configuredProgress > 0) {
return configuredProgress;
}
return getDifficultyLevel(node?.id) < getDifficultyLevel(unlockedDifficultyId.value)
? 100
: 0;
};
const checkDifficultyLocked = (node) => {
return getDifficultyLevel(node?.id) > getDifficultyLevel(unlockedDifficultyId.value);
};
// 根据目标难度计算 scroll-view 应滚动到的位置,顶部/底部会自动吸附边界。
const scrollToDifficulty = (difficultyId, animated = false) => {
const node = difficultyNodes.value.find((item) => item.id === difficultyId);
if (!node) {
return;
}
const maxScrollRpx = Math.max(
nodesTrackHeightRpx.value - nodesLayout.viewportHeightRpx,
0
);
const targetScrollRpx = clamp(
node.topRpx - nodesLayout.anchorOffsetRpx,
0,
maxScrollRpx
);
nodesScrollWithAnimation.value = animated;
nodesScrollTop.value = uni.upx2px(targetScrollRpx);
};
// 首次进入页面需要静默定位到默认难度;
// 定位完成后再开启滚动动画,避免第一次手动切换时丢失过渡效果。
const initScrollPosition = () => {
scrollToDifficulty(selectedDifficultyId.value, false);
nextTick(() => {
nodesScrollWithAnimation.value = true;
});
};
const normalizeRouteOptions = (options = {}) => {
const difficultyLevel = toNumber(options.difficulty);
const completedDifficultyLevel = toNumber(options.completedDifficulty);
return {
...options,
difficultyId:
options.difficultyId ||
(difficultyLevel > 0 ? createDifficultyId(difficultyLevel) : ""),
completedDifficultyId:
options.completedDifficultyId ||
(completedDifficultyLevel > 0
? createDifficultyId(completedDifficultyLevel)
: ""),
};
};
const applyPageState = (options = {}, config) => {
const safeOptions = normalizeRouteOptions(options);
const nodes = createDifficultyNodes(config);
const currentUnlockedId = resolveUnlockedDifficultyId(
safeOptions,
config,
nodes
);
pageConfig.value = config;
unlockedDifficultyId.value = currentUnlockedId;
selectedDifficultyId.value = resolveSelectedDifficultyId(
safeOptions.difficultyId,
nodes,
currentUnlockedId
);
nextTick(() => {
initScrollPosition();
});
};
const initPageState = async (options = {}, refreshOptions = {}) => {
const { keepCurrent = false } = refreshOptions;
const trainingType = resolveTrainingType(options.mode);
const fallbackConfig = createEmptyModeConfig(trainingType);
if (!keepCurrent) {
pageConfig.value = fallbackConfig;
}
try {
const result = await getTrainingDifficultyListAPI(trainingType);
applyPageState(
options,
normalizeTrainingDifficultyConfig(result, trainingType)
);
} catch (error) {
console.log("training difficulty load failed", error);
if (!keepCurrent) {
applyPageState(options, fallbackConfig);
}
uni.showToast({
title: "训练难度加载失败",
icon: "none",
});
}
};
const resolveTargetPaperType = (target) => {
return Number(target) === 1 ? "20厘米全环靶" : "40厘米全环靶";
};
const saveTrainingContext = (target) => {
const difficulty = selectedDifficulty.value;
if (!difficulty.id) {
return;
}
uni.setStorageSync(trainingDifficultyStorageKey, {
trainingType: pageConfig.value.key,
trainingTitle: pageConfig.value.title,
difficultyId: difficulty.id,
difficultyLabel: difficulty.label,
targetPaperType: target
? resolveTargetPaperType(target)
: difficulty.targetPaperType,
});
};
const handleSelectDifficulty = (node) => {
if (!node?.id) {
return;
}
if (checkDifficultyLocked(node)) {
uni.showToast({
title: "难度尚未解锁",
icon: "none",
});
return;
}
if (node.id === selectedDifficultyId.value) {
return;
}
selectedDifficultyId.value = node.id;
nextTick(() => {
scrollToDifficulty(node.id, true);
});
};
const handleStart = () => {
if (!selectedDifficulty.value.id) {
return;
}
saveTrainingContext();
uni.showToast({
title: `${selectedDifficulty.value.title} 即将开始`,
icon: "none",
});
};
const openTargetPicker = () => {
if (!selectedDifficulty.value.id) {
return;
}
showTargetPicker.value = true;
};
const handleTargetConfirm = (target) => {
showTargetPicker.value = false;
saveTrainingContext(target);
// uni.showToast({
// title: `${selectedDifficulty.value.title} 即将开始`,
// icon: "none",
// });
uni.navigateTo({
url: `/pages/training/practise-one?target=${target}`,
});
};
const markProgressRefresh = () => {
needRefreshProgress.value = true;
};
onLoad((options = {}) => {
routeOptions.value = { ...options };
uni.$on(trainingDifficultyRefreshEvent, markProgressRefresh);
initPageState(options);
});
onShow(() => {
if (!needRefreshProgress.value) {
return;
}
needRefreshProgress.value = false;
initPageState(routeOptions.value, {
keepCurrent: true,
});
});
onUnload(() => {
uni.$off(trainingDifficultyRefreshEvent, markProgressRefresh);
});
</script>
<template>
<Container
:title="pageConfig.title"
:bgType="8"
bgColor="#1c1c23"
:scroll="false"
>
<view class="difficulty-page">
<view class="difficulty-page__nodes">
<scroll-view
class="difficulty-page__nodes-scroll"
scroll-y
enhanced
:scroll-top="nodesScrollTop"
:scroll-with-animation="nodesScrollWithAnimation"
:show-scrollbar="false"
>
<view class="difficulty-page__nodes-track" :style="nodesTrackStyle">
<image
v-for="connector in difficultyConnectors"
:key="connector.id"
class="difficulty-page__connector"
src="../../static/training-difficulty-design/jiantou.png"
mode="aspectFit"
:style="connector"
/>
<TrainingDifficultyBadge
v-for="node in difficultyNodes"
:key="node.id"
:node="node"
:active="node.id === selectedDifficultyId"
:locked="checkDifficultyLocked(node)"
:completedProgress="getCompletedDifficultyProgress(node)"
@click="handleSelectDifficulty"
/>
</view>
</scroll-view>
</view>
<view class="difficulty-page__preview">
<TrainingDifficultyPreviewCard
:title="selectedDifficulty.title"
:lines="selectedDifficulty.summary"
/>
</view>
<view class="difficulty-page__start">
<TrainingDifficultyStartButton
:text="selectedDifficulty.startText"
@click="openTargetPicker"
/>
</view>
</view>
<TargetPicker
:show="showTargetPicker"
:onClose="() => (showTargetPicker = false)"
:onConfirm="handleTargetConfirm"
/>
</Container>
</template>
<style scoped>
.difficulty-page {
height: 100%;
display: flex;
flex-direction: column;
box-sizing: border-box;
padding: 18rpx 0 40rpx;
overflow: hidden;
}
.difficulty-page__nodes {
position: relative;
flex: 1;
min-height: 0;
z-index: 2;
margin-bottom: 8rpx;
}
.difficulty-page__nodes-scroll {
width: 100%;
height: 100%;
}
.difficulty-page__nodes-track {
position: relative;
width: 100%;
min-height: 100%;
}
.difficulty-page__connector {
position: absolute;
width: 18rpx;
height: 28rpx;
z-index: 1;
pointer-events: none;
}
.difficulty-page__preview {
position: relative;
flex: none;
z-index: 3;
width: 540rpx;
height: 172rpx;
margin: 0 auto;
}
.difficulty-page__start {
position: relative;
flex: none;
z-index: 4;
width: 302rpx;
height: 190rpx;
margin: 0 auto;
top: -16rpx;
}
</style>

View File

@@ -0,0 +1,862 @@
<script setup>
import { nextTick, onMounted, ref } from "vue";
import { onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import { getPersonalTrainingAPI } from "@/apis";
const checkedIcon = "../../static/training-home/done.png";
const missedIcon = "../../static/training-home/missed.png";
// 后端训练项目 id 与难度页 mode 参数的映射关系。
const trainingModeRouteMap = {
base: "basic",
endurance: "endurance",
precision: "precision",
rhythm: "rhythm",
strength: "power",
};
// 训练项目卡片右侧主图标。
const trainingModeIconMap = {
base_bow: "../../static/training-home/img_22.png",
bow: "../../static/training-home/img_3.png",
target: "../../static/training-home/img_4.png",
wave: "../../static/training-home/img_5.png",
muscle: "../../static/training-home/img_6.png",
};
// 训练项目卡片标题图,按接口 id 映射本地资源。
const trainingModeTitleImageMap = {
endurance: "../../static/training-home/nailixunlian.png",
precision: "../../static/training-home/jingzhunxunlian.png",
rhythm: "../../static/training-home/jiezouxunlian.png",
strength: "../../static/training-home/liliangxulian.png",
};
const defaultWeekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
const defaultRadarDimensions = [
{ name: "基础", score: 0 },
{ name: "精准", score: 0 },
{ name: "力量", score: 0 },
{ name: "节奏", score: 0 },
{ name: "耐力", score: 0 },
];
// 页面始终直接消费接口字段,这里只保留一份兜底结构,避免模板访问空值。
const createDefaultTrainingData = () => ({
week_days: defaultWeekDays.map((day) => ({ day, status: "cross" })),
stats: {
total_training_days: 0,
total_arrows: 0,
hit_rate: 0,
endurance_shoot_speed: 0,
total_calories: 0,
overtake_rate: 0,
},
radar: {
dimensions: defaultRadarDimensions,
},
training_items: [],
});
const trainingData = ref(createDefaultTrainingData());
const pageMounted = ref(false);
const trainingRadarCanvasId = "training-home-radar";
const radarImageWidth = 225;
const radarImageHeight = 224;
const radarFigureWidthRpx = 448;
const radarFigureHeightRpx = Math.round(
(radarFigureWidthRpx * radarImageHeight) / radarImageWidth
);
const radarCanvasWidth = Math.round(uni.upx2px(radarFigureWidthRpx));
const radarCanvasHeight = Math.round(uni.upx2px(radarFigureHeightRpx));
const radarScaleX = radarCanvasWidth / radarImageWidth;
const radarScaleY = radarCanvasHeight / radarImageHeight;
const radarScale = Math.min(radarScaleX, radarScaleY);
const radarCenterX = 112.0624 * radarScaleX;
const radarCenterY = 111.4645 * radarScaleY;
const radarStrokeWidth = Math.max(1, 2 * radarScale);
const radarPointRadius = Math.max(2.5, 3.5 * radarScale);
const radarOuterRadiusX = 110.7089 * radarScaleX;
const radarOuterRadiusY = 110.7089 * radarScaleY;
const radarMaxValue = 100;
const radarFigureStyle = {
width: `${radarFigureWidthRpx}rpx`,
height: `${radarFigureHeightRpx}rpx`,
};
const formatValue = (value, digits = 1) => {
const numberValue = Number(value);
if (!Number.isFinite(numberValue)) return "--";
return String(Number(numberValue.toFixed(digits)));
};
const getLevelText = (item) => {
if (!item) return "";
const level = Number(item.current_level) || 0;
return item.is_locked ? `Coming! LV${level}` : `当前进度 LV${level} >`;
};
// 卡路里字段按需求做 K / W 缩写展示。
const getCaloriesValue = (value) => {
const numberValue = Number(value);
if (!Number.isFinite(numberValue)) return "--";
if (numberValue >= 10000) return `${formatValue(numberValue / 10000)}W`;
if (numberValue >= 1000) return `${formatValue(numberValue / 1000)}K`;
return formatValue(numberValue, 0);
};
const getTrainingIcon = (item = {}) =>
trainingModeIconMap[item.icon] || trainingModeIconMap.bow;
const getTrainingTitleImage = (item = {}) =>
trainingModeTitleImageMap[item.id] || "";
const getTrainingMode = (item = {}) =>
trainingModeRouteMap[item.id] || item.id || "";
const getFeaturedItem = () =>
trainingData.value.training_items.find((item) => item.id === "base") ||
trainingData.value.training_items[0];
const getRadarPoint = (centerX, centerY, radiusX, radiusY, angle) => ({
x: centerX + radiusX * Math.cos(angle),
y: centerY + radiusY * Math.sin(angle),
});
// 雷达图直接使用接口的 5 维 score按 0-100 等比映射到顶点位置。
const drawRadar = () => {
const dimensions = Array.isArray(trainingData.value.radar?.dimensions)
? trainingData.value.radar.dimensions.slice(0, 5)
: [];
if (dimensions.length !== 5) return;
const ctx = uni.createCanvasContext(trainingRadarCanvasId);
const angles = dimensions.map(
(_, index) => (-90 + index * 72) * (Math.PI / 180)
);
ctx.clearRect(0, 0, radarCanvasWidth, radarCanvasHeight);
const points = dimensions.map((item, index) => {
const normalized = Math.max(
0,
Math.min(Number(item.score) || 0, radarMaxValue)
);
const progress = normalized / radarMaxValue;
return getRadarPoint(
radarCenterX,
radarCenterY,
radarOuterRadiusX * progress,
radarOuterRadiusY * progress,
angles[index]
);
});
ctx.beginPath();
points.forEach((point, index) => {
if (index === 0) ctx.moveTo(point.x, point.y);
else ctx.lineTo(point.x, point.y);
});
ctx.closePath();
ctx.setFillStyle("rgba(255, 209, 154, 0.26)");
ctx.fill();
ctx.setStrokeStyle("rgba(220, 162, 92, 0.92)");
ctx.setLineWidth(radarStrokeWidth);
ctx.stroke();
points.forEach((point) => {
ctx.beginPath();
ctx.arc(point.x, point.y, radarPointRadius, 0, 2 * Math.PI);
ctx.setFillStyle("rgba(221, 162, 90, 1)");
ctx.fill();
});
ctx.beginPath();
ctx.arc(radarCenterX, radarCenterY, radarPointRadius, 0, 2 * Math.PI);
ctx.setFillStyle("rgba(125, 107, 83, 0.65)");
ctx.fill();
ctx.draw();
};
// 小程序 canvas 首次渲染时机不稳定,延后一帧再绘制更稳。
const refreshRadar = async () => {
await nextTick();
setTimeout(() => {
drawRadar();
}, 30);
};
const loadPersonalTrainingData = async () => {
try {
const result = await getPersonalTrainingAPI();
trainingData.value = {
week_days:
Array.isArray(result?.week_days) && result.week_days.length
? result.week_days
: createDefaultTrainingData().week_days,
stats: {
total_training_days: result?.stats?.total_training_days ?? 0,
total_arrows: result?.stats?.total_arrows ?? 0,
hit_rate: result?.stats?.hit_rate ?? 0,
endurance_shoot_speed: result?.stats?.endurance_shoot_speed ?? 0,
total_calories: result?.stats?.total_calories ?? 0,
overtake_rate: result?.stats?.overtake_rate ?? 0,
},
radar: {
dimensions:
Array.isArray(result?.radar?.dimensions) &&
result.radar.dimensions.length === 5
? result.radar.dimensions
: createDefaultTrainingData().radar.dimensions,
},
training_items: Array.isArray(result?.training_items)
? result.training_items
: [],
};
} catch (error) {
console.log("personal training load failed", error);
trainingData.value = createDefaultTrainingData();
} finally {
await refreshRadar();
}
};
const openTrainingRecord = () => {
uni.navigateTo({
url: "/pages/my-growth?tab=2",
});
};
const openTrainingItem = (item = {}) => {
const mode = getTrainingMode(item);
if (!mode) return;
if (item.is_locked) {
uni.showToast({
title: `${item.name || "训练"} 暂未开放`,
icon: "none",
});
return;
}
uni.navigateTo({
url: `/pages/training/difficulty?mode=${mode}`,
});
};
const openFeaturedTraining = () => {
const item = getFeaturedItem();
if (item) openTrainingItem(item);
};
// 首次进入页面时拉取数据并完成雷达图初始化。
onMounted(async () => {
await loadPersonalTrainingData();
pageMounted.value = true;
});
// 从其他页面返回时刷新训练数据,保持进度与推荐状态最新。
onShow(async () => {
if (!pageMounted.value) return;
await loadPersonalTrainingData();
});
</script>
<template>
<Container :showBackToGame="true" :bgType="7" bgColor="#050b19">
<view class="training-home">
<view class="week-grid">
<view
v-for="item in trainingData.week_days"
:key="item.day"
class="week-item"
>
<view class="week-item-bg"></view>
<image
class="week-item-icon"
:src="item.status === 'checked' ? checkedIcon : missedIcon"
mode="widthFix"
/>
<text
class="week-item-label"
:class="{ 'week-item-label-active': item.status === 'checked' }"
>
{{ item.day }}
</text>
</view>
</view>
<view class="stats-card">
<view class="stats-card-bg"></view>
<image
class="stats-quote stats-quote-left"
src="../../static/training-home/img_17.png"
mode="widthFix"
/>
<image
class="stats-quote stats-quote-right"
src="../../static/training-home/img_16.png"
mode="widthFix"
/>
<view class="stats-grid">
<view class="stats-item">
<view class="stats-value-row">
<view class="stats-value-group">
<text class="stats-value">
{{ formatValue(trainingData.stats.total_training_days, 0) }}
</text>
<text class="stats-unit"></text>
<view class="stats-value-decoration"></view>
</view>
</view>
<text class="stats-label">共训练</text>
</view>
<view class="stats-item">
<view class="stats-value-row">
<view class="stats-value-group">
<text class="stats-value">
{{ formatValue(trainingData.stats.total_arrows, 0) }}
</text>
<text class="stats-unit"></text>
<view class="stats-value-decoration"></view>
</view>
</view>
<text class="stats-label">累计射箭</text>
</view>
<view class="stats-item">
<view class="stats-value-row">
<view class="stats-value-group">
<text class="stats-value">
{{ formatValue(trainingData.stats.hit_rate) }}
</text>
<text class="stats-unit">%</text>
<view class="stats-value-decoration"></view>
</view>
</view>
<text class="stats-label">命中率</text>
</view>
<view class="stats-item">
<view class="stats-value-row">
<view class="stats-value-group">
<text class="stats-value">
{{ formatValue(trainingData.stats.endurance_shoot_speed, 0) }}
</text>
<text class="stats-unit">/分钟</text>
<view class="stats-value-decoration"></view>
</view>
</view>
<text class="stats-label">耐力射击</text>
</view>
<view class="stats-item">
<view class="stats-value-row">
<view class="stats-value-group">
<text class="stats-value">
{{ getCaloriesValue(trainingData.stats.total_calories) }}
</text>
<text class="stats-unit">卡路里</text>
<view class="stats-value-decoration"></view>
</view>
</view>
<text class="stats-label">共消耗</text>
</view>
</view>
</view>
<view class="radar-section">
<view class="record-bubble" @click="openTrainingRecord">
<image
class="record-bubble-bg"
src="../../static/training-home/img_28.png"
mode="widthFix"
/>
<view class="record-bubble-copy">
<view class="record-main">
已超越<text class="record-main-highlight">{{ formatValue(trainingData.stats.overtake_rate) }}%</text>对手
</view>
<view class="record-sub-row">
<text class="record-sub-text">我的训练记录</text>
<image
class="record-arrow"
src="../../static/training-home/img_7.png"
mode="widthFix"
/>
</view>
</view>
</view>
<view class="radar-board">
<text class="radar-label radar-label-top">
{{ trainingData.radar.dimensions[0].name }}
</text>
<text class="radar-label radar-label-right">
{{ trainingData.radar.dimensions[1].name }}
</text>
<text class="radar-label radar-label-bottom-right">
{{ trainingData.radar.dimensions[2].name }}
</text>
<text class="radar-label radar-label-bottom-left">
{{ trainingData.radar.dimensions[3].name }}
</text>
<text class="radar-label radar-label-left">
{{ trainingData.radar.dimensions[4].name }}
</text>
<view class="radar-figure" :style="radarFigureStyle">
<image
class="radar-grid-image"
:style="radarFigureStyle"
src="../../static/training-home/img_19.png"
/>
<canvas
:canvas-id="trainingRadarCanvasId"
:id="trainingRadarCanvasId"
class="radar-canvas"
:style="radarFigureStyle"
:width="radarCanvasWidth"
:height="radarCanvasHeight"
/>
<image
class="radar-mascot"
src="../../static/training-home/img_21.png"
mode="widthFix"
/>
</view>
</view>
</view>
<view class="featured-card" @click="openFeaturedTraining">
<image
class="featured-card-bg"
src="../../static/training-home/img_22.png"
mode="widthFix"
/>
<view class="featured-card-copy">
<text class="featured-card-progress">
{{ getLevelText(getFeaturedItem()) }}
</text>
</view>
</view>
<view class="mode-grid">
<view
v-for="item in trainingData.training_items.filter((item) => item.id !== 'base')"
:key="item.id"
class="mode-card"
@click="openTrainingItem(item)"
>
<view v-if="item.is_recommended" class="mode-tag">推荐</view>
<view class="mode-card-copy">
<image
v-if="getTrainingTitleImage(item)"
class="mode-card-title-image"
:src="getTrainingTitleImage(item)"
mode="widthFix"
/>
<text v-else class="mode-card-title">{{ item.name }}</text>
<text class="mode-card-progress">{{ getLevelText(item) }}</text>
</view>
<image
class="mode-card-icon"
:src="getTrainingIcon(item)"
mode="aspectFit"
/>
</view>
</view>
</view>
</Container>
</template>
<style scoped>
.training-home {
position: relative;
overflow: hidden;
padding: 18rpx 20rpx 60rpx 20rpx;
}
.week-grid {
display: flex;
justify-content: space-between;
margin-top: 18rpx;
}
.week-item {
position: relative;
width: 92rpx;
height: 96rpx;
border-radius: 16rpx;
overflow: hidden;
}
.week-item-bg {
width: 100%;
height: 100%;
background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
opacity: 0.5;
}
.week-item-icon {
position: absolute;
left: 28rpx;
top: 14rpx;
width: 36rpx;
}
.week-item-label {
position: absolute;
left: 0;
right: 0;
bottom: 10rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 20rpx;
text-align: center;
line-height: 28rpx;
}
.week-item-label-active {
color: #e7ba80;
}
.stats-card {
position: relative;
margin-top: 32rpx;
width: 100%;
height: 124rpx;
overflow: hidden;
border-radius: 24rpx;
}
.stats-card-bg {
position: absolute;
inset: 0;
background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
opacity: 0.5;
}
.stats-quote {
position: absolute;
z-index: 1;
width: 53rpx;
height: 50rpx;
}
.stats-quote-left {
left: 4rpx;
top: 4rpx;
}
.stats-quote-right {
right: 4rpx;
bottom: 4rpx;
}
.stats-grid {
position: absolute;
z-index: 1;
left: 36rpx;
right: 36rpx;
top: 22rpx;
display: flex;
justify-content: space-between;
align-items: flex-start;
}
.stats-item {
min-width: 0;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.stats-value-row {
display: flex;
align-items: flex-end;
justify-content: center;
width: 100%;
height: 48rpx;
line-height: 48rpx;
}
.stats-value-group {
position: relative;
display: inline-flex;
align-items: flex-end;
justify-content: center;
min-width: 72rpx;
white-space: nowrap;
}
.stats-value-decoration {
position: absolute;
left: 0;
right: 0;
bottom: 6rpx;
min-width: 72rpx;
height: 12rpx;
border-radius: 6rpx;
background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
opacity: 0.5;
}
.stats-value {
position: relative;
z-index: 1;
color: #fff;
font-size: 34rpx;
font-family: Helvetica, Arial, sans-serif;
font-weight: 500;
line-height: 46rpx;
}
.stats-unit {
position: relative;
z-index: 1;
margin-left: 4rpx;
padding-bottom: 8rpx;
color: #fff;
font-size: 20rpx;
line-height: 28rpx;
opacity: 0.6;
}
.stats-label {
display: inline-block;
margin-top: 6rpx;
color: #fcce96;
font-size: 20rpx;
line-height: 28rpx;
opacity: 0.6;
}
.radar-section {
position: relative;
padding-top: 34rpx;
}
.record-bubble {
position: absolute;
right: 0;
top: 10rpx;
width: 202rpx;
height: 122rpx;
z-index: 3;
}
.record-bubble-bg {
width: 202rpx;
}
.record-bubble-copy {
position: absolute;
left: 0;
right: 0;
top: 24rpx;
text-align: center;
}
.record-main {
color: #fff;
font-size: 24rpx;
line-height: 30rpx;
}
.record-main-highlight {
color: #e7ba80;
}
.record-sub-row {
margin-top: 4rpx;
display: flex;
align-items: center;
justify-content: center;
}
.record-sub-text {
color: #ffd947;
font-size: 24rpx;
height: 30rpx;
line-height: 30rpx;
}
.record-arrow {
width: 24rpx;
}
.radar-board {
position: relative;
width: 100%;
height: 514rpx;
}
.radar-label {
position: absolute;
color: rgba(255, 255, 255, 0.78);
font-size: 28rpx;
line-height: 40rpx;
}
.radar-label-top {
left: 350rpx;
top: 14rpx;
transform: translateX(-50%);
opacity: 0.5;
}
.radar-label-right {
right: 77rpx;
top: 190rpx;
opacity: 0.5;
}
.radar-label-bottom-right {
right: 170rpx;
bottom: 18rpx;
opacity: 0.5;
}
.radar-label-bottom-left {
left: 170rpx;
bottom: 18rpx;
opacity: 0.5;
}
.radar-label-left {
left: 75rpx;
top: 180rpx;
opacity: 0.5;
}
.radar-figure {
position: absolute;
left: 50%;
top: 54rpx;
transform: translateX(-50%);
overflow: visible;
}
.radar-grid-image,
.radar-canvas {
position: absolute;
left: 0;
top: 0;
}
.radar-mascot {
position: absolute;
right: 38rpx;
top: 0;
width: 92rpx;
}
.featured-card {
position: relative;
width: 100%;
height: 150rpx;
margin-top: 70rpx;
}
.featured-card-bg {
width: 100%;
}
.featured-card-copy {
position: absolute;
left: 160rpx;
top: 68rpx;
display: flex;
align-items: center;
}
.featured-card-title {
color: #895409;
font-size: 28rpx;
font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
font-weight: 700;
line-height: 32rpx;
}
.featured-card-progress {
margin-left: 18rpx;
color: #895409;
font-size: 22rpx;
line-height: 32rpx;
}
.mode-grid {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 16rpx 18rpx;
margin-top: 16rpx;
}
.mode-card {
position: relative;
height: 150rpx;
box-shadow: inset 2rpx 2rpx 6rpx 0rpx rgba(255, 255, 255, 0.27);
border-radius: 16rpx;
border: 2rpx solid rgba(235, 184, 123, 0.5);
background: rgba(0, 0, 0, 0.5);
overflow: hidden;
}
.mode-tag {
position: absolute;
left: 0;
top: 0;
width: 72rpx;
height: 34rpx;
line-height: 34rpx;
text-align: center;
font-size: 20rpx;
color: #000;
border-bottom-right-radius: 16rpx;
background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
}
.mode-card-copy {
position: absolute;
left: 30rpx;
top: 40rpx;
}
.mode-card-title {
display: block;
background-image: linear-gradient(
133deg,
rgba(235, 184, 123, 0.8) 0%,
rgba(181, 140, 78, 0.8) 100%
);
color: #e7ba80;
font-size: 32rpx;
font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
font-weight: 700;
line-height: 38rpx;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.mode-card-title-image {
display: block;
width: 128rpx;
}
.mode-card-progress {
display: block;
margin-top: 14rpx;
color: #fcce96;
font-size: 22rpx;
line-height: 32rpx;
opacity: 0.5;
}
.mode-card-icon {
position: absolute;
right: 12rpx;
top: 14rpx;
width: 124rpx;
height: 124rpx;
}
</style>

View File

@@ -0,0 +1,293 @@
<script setup>
import { ref, onMounted, onBeforeUnmount } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.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";
import Avatar from "@/components/Avatar.vue";
import BowPower from "@/components/BowPower.vue";
import TestDistance from "./components/TestDistance.vue";
import BubbleTip from "./components/BubbleTip.vue";
import audioManager from "@/audioManager";
import {
createPractiseAPI,
startPractiseAPI,
endPractiseAPI,
getPractiseAPI,
} from "@/apis";
import { sharePractiseData } from "@/canvas";
import { wxShare, debounce } from "@/util";
import { MESSAGETYPESV2, roundsName } from "@/constants";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user } = storeToRefs(store);
const sound = ref(true);
const start = ref(false);
const scores = ref([]);
const total = 12;
const practiseResult = ref({});
const practiseId = ref("");
const showGuide = ref(false);
const tips = ref("");
const targetType = ref(1);
const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
onLoad((options) => {
if (options.target) {
targetType.value = Number(options.target);
}
});
const onReady = async () => {
await startPractiseAPI();
scores.value = [];
start.value = true;
audioManager.play("练习开始");
};
const onOver = async () => {
practiseResult.value = await getPractiseAPI(practiseId.value);
start.value = false;
};
async function onReceiveMessage(msg) {
if (msg.type === MESSAGETYPESV2.ShootResult) {
scores.value = msg.details;
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
// setTimeout(onOver, 1500);
}
}
function onComplete() {
uni.$emit(trainingDifficultyRefreshEvent);
uni.navigateBack();
}
async function onRetry() {
practiseId.value = "";
practiseResult.value = {};
start.value = false;
scores.value = [];
const result = await createPractiseAPI(total, 120, targetType.value);
if (result) practiseId.value = result.id;
}
const onClickShare = debounce(async () => {
await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
await wxShare("shareCanvas");
});
function onAudioEnded(s) {
if (s.indexOf("比赛结束") >= 0) {
onOver()
}
}
const updateSound = () => {
sound.value = !sound.value;
audioManager.setMuted(!sound.value);
};
onMounted(async () => {
// audioManager.play("第一轮");
uni.setKeepScreenOn({
keepScreenOn: true,
});
uni.$on("socket-inbox", onReceiveMessage);
uni.$on("share-image", onClickShare);
uni.$on("audioEnded", onAudioEnded);
const result = await createPractiseAPI(total, 120, targetType.value);
if (result) practiseId.value = result.id;
});
onBeforeUnmount(() => {
uni.setKeepScreenOn({
keepScreenOn: false,
});
uni.$off("socket-inbox", onReceiveMessage);
uni.$off("share-image", onClickShare);
uni.$off("audioEnded", onAudioEnded);
audioManager.stopAll();
endPractiseAPI();
});
</script>
<template>
<Container
:bgType="!start && !practiseResult.id?9:10"
:showBottom="!start && !scores.length"
>
<view>
<TestDistance v-if="!start && !practiseResult.id" />
<block v-else>
<ShootProgress
:start="start"
:onStop="onOver"
/>
<view class="user-row">
<!-- <Avatar :src="user.avatar" :size="35" /> -->
<BubbleTip v-if="showGuide" type="normal2">
<text>还有两场坚持</text>
<text>就是胜利💪</text>
</BubbleTip>
<!-- <BowPower /> -->
</view>
<BowTarget
:totalRound="start ? total / 4 : 0"
:currentRound="scores.length % 3"
:scores="scores"
/>
<view class="sound-text-box">
<button class="sound-btn" hover-class="none" @click="updateSound">
<image
class="sound-icon"
:src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="aspectFit"
/>
</button>
<view class="bat-text-big-box">
<image
class="dao-icon"
src="../../static/training-difficulty-design/dao-icon.png"
mode="widthFix"
/>
<view class="bat-text-box">
<view class="bat-text-small-box">
<view class="text-round-box">
<view class="text1">每箭命中9环之上</view>
<view class="text2">剩余<text class="text2-yellow">3</text></view>
</view>
</view>
</view>
</view>
</view>
<ScorePanel2 :arrows="scores" :total="total" />
<ScoreResult
v-if="practiseResult.details"
:rowCount="6"
:total="total"
:onClose="onComplete"
:onRetry="onRetry"
:result="practiseResult"
/>
<canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
</block>
</view>
<template #bottom>
<view class="btn-box">
<image
class="btn-box-bg"
src="../../static/training-difficulty-design/par-star.png"
mode="widthFix"
/>
<button class="btn" @click="onReady">准备好了开始练习</button>
</view>
</template>
</Container>
</template>
<style scoped>
.btn-box{
width: 488rpx;
height: 234rpx;
position: fixed;
bottom: 130rpx;
left: 50%;
transform: translateX(-50%);
}
.btn-box-bg{
width: 100%;
}
.btn{
width: 330rpx;
height: 70rpx;
line-height: 70rpx;
background: #FED847;
border-radius: 44rpx;
text-align: center;
color: #000000;
font-size: 28rpx;
font-weight: 500;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: -36rpx;
}
.sound-text-box{
height: 125rpx;
padding: 0 56rpx;
display: flex;
align-items: flex-end;
}
.sound-btn {
width: 76rpx;
height: 70rpx;
border: none;
}
.sound-btn::after {
border: none;
}
.sound-icon {
width: 76rpx;
height: 70rpx;
}
.bat-text-big-box{
flex: 1;
position: relative;
}
.dao-icon{
width: 160rpx;
height: 125rpx;
position: absolute;
left: 0;
bottom: 0;
}
.text-round-box{
width: 100%;
}
.bat-text-box{
display: flex;
}
.bat-text-small-box{
background: rgba(0, 0, 0, 0.5);
width: auto;
min-width: 100rpx;
border-radius: 16rpx 60rpx 60rpx 16rpx;
display: flex;
flex-direction: column;
justify-content: center;
padding-left: 176rpx;
height: 112rpx;
padding-right: 30rpx;
font-size: 30rpx;
color: #E7BA80;
}
.text1{
font-size: 30rpx;
font-weight: 400;
color: #E7BA80;
line-height: 42rpx;
}
.text2{
color: #FFFFFF;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
}
.text2-yellow{
font-size: 30rpx;
color: #FFD947;
font-weight: 500;
margin: 0 4rpx;
}
</style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
src/static/app-bg6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 KiB

BIN
src/static/app-bg7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

BIN
src/static/app-bg8.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 KiB

BIN
src/static/app-bg9.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5</title>
<defs>
<linearGradient x1="50%" y1="1.43983214%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#FF7EAF" offset="0%"></stop>
<stop stop-color="#C36AFF" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="排位赛" transform="translate(-251.000000, -155.000000)">
<g id="编组-9" transform="translate(3.000000, 93.000000)">
<g id="编组-5" transform="translate(248.000000, 62.000000)">
<g id="编组-4">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
<circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="52" cy="64.5" r="64"></circle>
<rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
</g>
<text id="10人大乱斗" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="16" font-weight="bold" fill="#FFFFFF">
<tspan x="15" y="32">10人大乱斗</tspan>
</text>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="111px" height="54px" viewBox="0 0 111 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5@2x</title>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#896CFF" offset="0%"></stop>
<stop stop-color="#9754FF" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="排位赛" transform="translate(-132.000000, -93.000000)">
<g id="编组-9" transform="translate(3.000000, 93.000000)">
<g id="编组-5" transform="translate(129.500000, 0.000000)">
<g id="编组-4">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
<circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="55" cy="64.5" r="64"></circle>
<rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(89.406727, 10.201587) rotate(51.000000) translate(-89.406727, -10.201587) " x="82.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
</g>
<g id="1v1备份" transform="translate(43.000000, 21.000000)" fill="#FFFFFF" fill-rule="nonzero">
<polygon id="路径" points="0 1.625 0 3.64722222 2.69090909 2.22083333 2.69090909 13 5 13 5 0 3.07272727 0"></polygon>
<polygon id="路径" points="17 3 14.4705882 3 12.0196078 10.5384615 9.60784314 3 7 3 10.5490196 13 13.2941176 13"></polygon>
<polygon id="路径" points="19 1.625 19 3.64722222 21.6909091 2.22083333 21.6909091 13 24 13 24 0 22.0727273 0"></polygon>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5@2x</title>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#4A8CFF" offset="0%"></stop>
<stop stop-color="#669DFF" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="排位赛" transform="translate(-251.000000, -93.000000)">
<g id="编组-9" transform="translate(3.000000, 93.000000)">
<g id="编组-5" transform="translate(248.000000, 0.000000)">
<g id="编组-4">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
<circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
<rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
</g>
<text id="2v2" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="18" font-weight="bold" fill="#FFFFFF">
<tspan x="40.408" y="33">2v2</tspan>
</text>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5@2x</title>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#FF8787" offset="0%"></stop>
<stop stop-color="#FF9696" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="排位赛" transform="translate(-14.000000, -155.000000)">
<g id="编组-9" transform="translate(3.000000, 93.000000)">
<g id="编组-5" transform="translate(11.000000, 62.000000)">
<g id="编组-4">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
<circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
<rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
</g>
<text id="3v3" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="18" font-weight="bold" fill="#FFFFFF">
<tspan x="40.408" y="33">3v3</tspan>
</text>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="111px" height="54px" viewBox="0 0 111 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5</title>
<defs>
<linearGradient x1="50%" y1="3.4527039%" x2="50%" y2="99.6818489%" id="linearGradient-1">
<stop stop-color="#FFA052" offset="0%"></stop>
<stop stop-color="#FFBC4E" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
<radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</radialGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="排位赛" transform="translate(-132.000000, -155.000000)">
<g id="编组-9" transform="translate(3.000000, 93.000000)">
<g id="编组-5" transform="translate(129.500000, 62.000000)">
<g id="编组-4">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
<circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
<rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
</g>
<text id="5人大乱斗" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="16" font-weight="bold" fill="#FFFFFF">
<tspan x="18.976" y="32">5人大乱斗</tspan>
</text>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/static/rank/star.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

BIN
src/static/share2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 585 B

BIN
src/static/shooter2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="55px" height="55px" viewBox="0 0 55 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 11</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="训练难度展示" transform="translate(-160.000000, -478.000000)">
<g id="编组-2备份" transform="translate(154.000000, 472.000000)">
<g id="编组-11" transform="translate(6.000000, 6.000000)">
<circle id="椭圆形" fill="#CACACA" cx="27.5" cy="27.5" r="27.5"></circle>
<circle id="椭圆形" fill="#FFFFFF" cx="27.5" cy="26" r="25"></circle>
<circle id="椭圆形" fill="#5E5E5E" cx="27.5" cy="26" r="22"></circle>
<circle id="椭圆形" fill="#17B6F2" cx="27.5" cy="26" r="19.5"></circle>
<circle id="椭圆形" fill="#FFC2C2" cx="27.5" cy="26" r="17"></circle>
<circle id="椭圆形" fill="#FF1F33" opacity="0.800000012" cx="27.5" cy="26" r="14.5"></circle>
<circle id="椭圆形" fill="#FED847" cx="27.5" cy="26" r="13"></circle>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="56px" height="55px" viewBox="0 0 56 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 9</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="训练难度展示" transform="translate(-60.000000, -313.000000)">
<g id="编组-2备份" transform="translate(54.500000, 307.000000)">
<g id="编组-9" transform="translate(5.500000, 6.000000)">
<circle id="椭圆形" fill="#CACACA" cx="28" cy="27.5" r="27.5"></circle>
<circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="25"></circle>
<circle id="椭圆形" fill="#5E5E5E" cx="28" cy="26" r="22"></circle>
<circle id="椭圆形" fill="#808080" cx="28" cy="26" r="19.5"></circle>
<circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="17"></circle>
<circle id="椭圆形" fill="#8C8C8C" cx="28" cy="26" r="14.5"></circle>
<circle id="椭圆形" fill="#DBDBDB" cx="28" cy="26" r="13"></circle>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1011 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Some files were not shown because too many files have changed in this diff Show More