164 Commits
Author SHA1 Message Date
zhangyi d1c689cfda update:翻译备份 2026-11-05 18:25:03 +08:00
zhangyi 53ac4473f9 update:英文版代码备份 2026-11-05 14:49:42 +08:00
zhangyi 419cefd00e update:优化精准训练描边 2026-11-04 16:06:34 +08:00
zhangyi 14f9ccd1ef Merge branch 'feat-shebei' 2026-10-29 16:49:46 +08:00
zhangyi 899a222e3f update:优化 2026-10-29 16:49:08 +08:00
zhangyi ca727ec1f7 update:优化wifi反馈 2026-10-29 16:28:03 +08:00
zhangyi cc8f997600 Merge branch 'feat-shebei' 2026-10-29 16:12:55 +08:00
zhangyi bac84536c7 update:优化样式 2026-10-29 16:11:58 +08:00
zhangyi a81494973c Merge branch 'feat-shebei' 2026-10-29 15:08:27 +08:00
zhangyi 94c46bb7df update:隐藏新人礼 2026-10-29 15:07:47 +08:00
zhangyi f3fab17687 update:过滤图片 2026-10-29 14:54:00 +08:00
zhangyi d22d958215 Merge branch 'feat-mendian' 2026-10-29 10:05:02 +08:00
zhangyi b4ed13d2b5 Merge branch 'feat-training' 2026-10-29 09:57:48 +08:00
zhangyi b8b0ab4005 Merge branch 'feat-shebei' 2026-10-29 09:57:07 +08:00
zhangyi 05f73acf47 update:优化节奏训练计数 2026-10-23 14:50:15 +08:00
zhangyi eca15178f4 update:优化语音和训练文案 2026-10-23 11:55:02 +08:00
zhangyi 9eb6ef7cf1 update:优化图片地址 2026-10-21 15:49:43 +08:00
zhangyi 00f84fc3e4 update:新增门店vip相关 2026-10-21 15:27:31 +08:00
zhangyi 5bb9df8a03 update:优化节奏训练文案 2026-10-12 16:12:24 +08:00
zhangyi bad336c7d4 update:更新训练的说明文案 2026-10-12 14:57:11 +08:00
zhangyi cee09cd7fa update:隐藏会员入口 2026-10-08 14:34:09 +08:00
zhangyi ae3ba60191 update:优化 2026-09-24 17:10:10 +08:00
zhangyi f4b37fba00 update:优化ota 2026-09-24 15:16:14 +08:00
zhangyi f8bf9fdb63 update:新增扫码绑定失败界面 2026-09-24 14:23:42 +08:00
zhangyi 21ed8066aa update:优化稳定训练提示 2026-09-24 10:23:38 +08:00
zhangyi 78fd64c697 update:优化wifi 2026-09-23 18:33:12 +08:00
zhangyi 169e2e4a51 update:修复bug 2026-09-23 15:36:39 +08:00
zhangyi 19a4631df3 update:优化 2026-09-23 14:16:00 +08:00
zhangyi 9ad2c5e12e update:优化稳定训练 2026-09-23 10:35:11 +08:00
zhangyi 9de435a369 update:优化稳定训练 2026-09-22 17:36:06 +08:00
zhangyi 5357f131de update:优化精准稳定 2026-09-22 15:15:16 +08:00
zhangyi 7093d3e4e5 update:替换网络图片 2026-09-22 10:00:26 +08:00
zhangyi e98e5129d2 update:优化特效 2026-09-22 09:37:37 +08:00
zhangyi 01e8f6c6da update:优化ota状态共享 2026-09-21 16:22:05 +08:00
zhangyi 4bd7599cc0 update:新增ota 2026-09-21 14:56:43 +08:00
zhangyi b060d8f987 update:提交我的设备改版 2026-09-17 18:23:41 +08:00
zhangyi 46cbd37102 Merge branch 'test' into feat-shebei 2026-09-15 18:15:12 +08:00
zhangyi d4d690cb8e update:更新protocol 2026-09-15 18:12:39 +08:00
zhangyi b51813dd33 update:优化设备页 2026-09-15 17:56:36 +08:00
zhangyi a11e7f7532 Merge branch 'fix-audio' into feat-shebei 2026-09-15 15:49:26 +08:00
zhangyi 88febb92e5 update:更换语音 2026-09-15 15:44:14 +08:00
zhangyi 03fa2f4d48 update:代码备份 2026-09-15 15:39:46 +08:00
zhangyi c8533de5cf update:优化测距展示 2026-09-03 10:35:16 +08:00
zhangyi 74bfd7a327 update:优化赏金赛记录 2026-08-31 16:14:57 +08:00
zhangyi bbfa35e871 update:优化个人训练 2026-08-28 11:12:28 +08:00
zhangyi 469487ba73 update:优化新手教程 2026-08-27 17:24:25 +08:00
zhangyi b9bbaba77f update:优化新版个人训练 2026-08-26 17:23:36 +08:00
zhangyi 11eeb98b74 update:图片更新 2026-08-26 15:36:45 +08:00
zhangyi 96b64e4187 update:新增稳定训练 2026-08-26 15:23:02 +08:00
zhangyi 45bc324f70 update:优化节奏训练结算 2026-08-25 18:00:14 +08:00
zhangyi 2eba5f87d7 update:优化记录 2026-08-25 17:49:44 +08:00
zhangyi 9a06dcf942 update:对接节奏训练 2026-08-25 17:36:54 +08:00
zhangyi 35e0ee3ca0 update:优化节奏训练 2026-08-24 16:35:56 +08:00
zhangyi 59fa317c5a update: 优化个人训练 2026-08-21 15:38:01 +08:00
zhangyi 09756ae165 Merge branch 'feat-scene' into test 2026-08-20 18:09:06 +08:00
zhangyi b89c003313 update: 新增回到首页按钮 2026-08-20 18:08:49 +08:00
zhangyi 9dda58b19c Merge branch 'feat-yuyin' into test 2026-08-20 17:57:33 +08:00
zhangyi 962596e510 update:优化精准射箭语音 2026-08-20 17:57:22 +08:00
zhangyi 8a2fbb0780 Merge branch 'feat-scene' into test 2026-08-20 17:14:11 +08:00
zhangyi 0c0a00f742 update: 优化机构金币相关 2026-08-20 17:13:36 +08:00
zhangyi 66fc7fa8eb Merge branch 'feat-yuyin' into test 2026-08-20 16:56:47 +08:00
zhangyi 6363dda204 update: 语音优化 2026-08-20 16:56:34 +08:00
zhangyi 9f4fbbe4c9 Merge branch 'feat-scene' into test 2026-08-20 16:10:48 +08:00
zhangyi 45957d04b1 update:优化金币 2026-08-20 16:10:17 +08:00
zhangyi 42cfb5c3d8 update: 优化图片 2026-08-20 14:43:28 +08:00
zhangyi 844f72489e Merge branch 'feat-scene' into test 2026-08-20 14:37:47 +08:00
zhangyi d2571854bc update: 对接金币相关 2026-08-20 14:37:08 +08:00
zhangyi bb224c9f29 update:语音优化 2026-08-19 14:04:12 +08:00
zhangyi 82c360f1b1 Merge branch 'test' into feat-scene 2026-08-19 10:17:38 +08:00
zhangyi 63f3cada0f update:暂存金币相关 2026-08-19 10:14:17 +08:00
chenlimao 75cfcd66ee fix: OTA轮询次数改为15次 2026-08-18 13:57:49 +08:00
chenlimao 7955b37ec5 fix: 修复首页更新卡在更新中弹窗问题 2026-08-18 11:48:20 +08:00
chenlimao 9e6ad4cf50 feat: OTA 首页弹窗优化 2026-08-18 10:30:16 +08:00
chenlimao 6c55d32f90 chore: 依赖锁提交 2026-08-17 18:02:12 +08:00
zhangyi d60c32506f update:优化机构扫码页 2026-08-17 14:05:52 +08:00
zhangyi 63fb4ae85a update:优化性能问题 2026-08-17 10:11:28 +08:00
zhangyi 2628a17b3f update: 新增设备充电通知 2026-08-14 17:59:11 +08:00
zhangyi e7f073ed7c update:个人训练优化 2026-08-14 17:13:23 +08:00
zhangyi d662db9465 Merge branch 'test' into feat-scene 2026-08-10 11:56:37 +08:00
zhangyi 23655102d3 update:设备解绑功能 2026-08-10 10:34:54 +08:00
zhangyi fbb2076a77 Merge branch 'main' into feat-scene 2026-08-06 14:24:17 +08:00
zhangyi 8c96a4cb73 update:优化文字 2026-08-05 17:52:26 +08:00
zhangyi 6a78093d31 update: 优化 2026-08-05 17:38:34 +08:00
zhangyi 4835993639 update:大乱斗新增电量展示 2026-08-04 17:31:05 +08:00
zhangyi 3c45ef78ac update: 修复飞行特效 2026-08-04 16:18:30 +08:00
zhangyi ab70c8c78e Merge branch 'feat-miao' into test 2026-08-03 16:59:30 +08:00
zhangyi fac2576b65 update:新增调瞄通信,优化首页 2026-08-03 16:39:52 +08:00
zhangyi 360da2a1d7 update:本地域名优化 2026-08-03 14:26:00 +08:00
zhangyi e96537b21b update:优化边距 2026-07-31 16:26:08 +08:00
zhangyi 8c834d299b update:个人训练新版新增靶型标志 2026-07-31 16:07:38 +08:00
zhangyi b386990475 Merge branch 'main' into test 2026-07-31 14:55:45 +08:00
zhangyi 3ab1ad59bd update:新增语音优化 2026-07-31 14:45:17 +08:00
zhangyi cfdb169329 update:优化训练0环显示 2026-07-31 13:52:39 +08:00
zhangyi 4245a3f947 update:按钮特效优化 2026-07-31 11:16:34 +08:00
zhangyi d6f914ca7e update:新版优化练习结束语音 2026-07-31 10:56:41 +08:00
zhangyi 959244c03a update:更新新版个人训练结束播报 2026-07-31 10:32:45 +08:00
zhangyi 3a51142bd3 Merge branch 'feat-audio2' into test 2026-07-31 10:28:40 +08:00
zhangyi 07dc8a250c update:个人训练结束修改语音 2026-07-31 10:21:30 +08:00
zhangyi f34800798d update:新增机构扫码登录页 2026-07-31 09:42:59 +08:00
zhangyi 72fd8b134e update:补充新版个人训练查看靶纸vip特效 2026-07-28 15:37:13 +08:00
zhangyi 30ab1c6775 update:优化个人训练字段 2026-07-27 17:45:07 +08:00
zhangyi 02f30e88ba update:优化vip飞行特效 2026-07-27 16:55:56 +08:00
zhangyi e6f11d3684 update:优化个人训练 2026-07-27 16:38:53 +08:00
zhangyi c5618fb60b update:新增个人训练重连机制,修复海报 2026-07-24 16:00:46 +08:00
zhangyi f316d52cec update:优化图片 2026-07-23 16:47:15 +08:00
zhangyi d8d2f9e7e7 update;优化 2026-07-23 14:44:46 +08:00
zhangyi ef499e1448 update:优化新版个人训练 2026-07-23 14:38:45 +08:00
zhangyi c0d061d7d5 update:优化图片 2026-07-23 13:45:49 +08:00
zhangyi dff210462f update:优化个人训练图片 2026-07-23 11:01:55 +08:00
zhangyi 3c5754b3fd update:对接个人训练改版 2026-07-23 09:44:58 +08:00
zhangyi a78ab1daeb Merge branch 'test' into feat-prac 2026-07-20 17:58:40 +08:00
zhangyi 886faa0007 update:新增匹配跳转幂等 2026-07-20 16:46:04 +08:00
zhangyi b15c37cb4a update:优化10人乱斗测距页 2026-07-17 18:26:14 +08:00
zhangyi 970a9874b4 Merge branch 'test' 2026-07-16 16:41:16 +08:00
zhangyi f64a6b5c95 update:新增房间重连逻辑,优化tententen语音,修复mvp斩获环 2026-07-16 16:40:32 +08:00
zhangyi 621397e25d update:优化比赛流程 2026-07-16 11:38:17 +08:00
zhangyi fa7ad8f538 update:优化比赛结束 2026-07-15 16:57:48 +08:00
zhangyi b8c5f3dd91 Merge branch 'test' 2026-07-15 15:23:57 +08:00
zhangyi af7f70ba80 update:修改mvp字段 2026-07-15 15:22:31 +08:00
zhangyi 6d1a910051 Merge branch 'test' 2026-07-15 09:55:37 +08:00
zhangyi 1c7cf74eb9 update:优化段位介绍 2026-07-15 09:55:01 +08:00
zhangyi e9023ecc9f update:新增dist排除代码 2026-07-14 17:59:52 +08:00
zhangyi 080af14be8 update:语音加载优化,修复大乱斗未重连比赛服问题 2026-07-13 14:50:21 +08:00
zhangyi 1796d4aa40 update:房间新增vip特效 2026-07-10 18:13:41 +08:00
zhangyi 4b39107453 update:优化大乱斗断连 2026-07-10 17:49:42 +08:00
zhangyi 3e090e5b33 update:修复大乱斗 2026-07-10 16:45:03 +08:00
zhangyi 98ca638b63 update:新增比赛服断线重连机制 2026-07-10 15:11:45 +08:00
zhangyi b5373bee31 update:新版本websocket 2026-07-10 13:57:09 +08:00
zhangyi 58a7bb2017 update:优化个人练习 2026-07-09 18:29:04 +08:00
zhangyi 82eedc3ab8 update:分包、对接个人练习 2026-07-09 17:53:29 +08:00
zhangyi ac4d8dfb38 Merge branch 'test' into feat-websoc 2026-07-09 16:26:31 +08:00
zhangyi 725a3ddcb9 update:优化比赛 2026-07-09 16:15:27 +08:00
zhangyi 33187e0cc3 update;优化比赛服 2026-07-09 15:48:28 +08:00
zhangyi bf6b87b59c update:优化跳转 2026-07-09 14:43:25 +08:00
zhangyi 12729a1cef update:修复日志和防抖 2026-07-09 14:35:48 +08:00
zhangyi f8efe4c4a4 update:优化比赛 2026-07-09 11:43:06 +08:00
zhangyi af07d09ab6 update:优化比赛队列 2026-07-08 18:18:27 +08:00
zhangyi e0d976fcce update:更新比赛服逻辑 2026-07-08 16:03:34 +08:00
zhangyi 01ac4f9c03 update:新增比赛服链接 2026-07-08 14:51:35 +08:00
zhangyi 095884d7fc Merge branch 'fix-vip' 2026-07-06 11:16:52 +08:00
zhangyi a7897af861 Merge branch 'fix-vip' 2026-07-06 09:38:15 +08:00
zhangyi fd7c4b4bbf update:优化图片 2026-07-03 17:50:55 +08:00
zhangyi efb186d242 Merge branch 'test' 2026-07-03 17:49:40 +08:00
zhangyi 0bf4773400 Merge branch 'test' into feat-prac 2026-06-15 09:32:27 +08:00
zhangyi 4ce2e6a7c4 Merge branch 'fix-bug' 2026-06-15 09:31:27 +08:00
zhangyi 52c5b9504a update:更新靶纸 2026-06-11 18:13:46 +08:00
zhangyi 022683aff1 Merge branch 'test' into feat-prac 2026-06-02 15:54:15 +08:00
zhangyi 72518fa17e update:优化样式 2026-06-01 15:39:40 +08:00
zhangyi f5497c534d update:代码备份 2026-06-01 10:59:26 +08:00
zhangyi b3fc11f1b1 update:代码备份 2026-05-29 17:46:52 +08:00
zhangyi 8b25a10d4c Merge branch 'test' into feat-prac 2026-05-29 14:01:03 +08:00
zhangyi 0e82416800 Merge branch 'test' into feat-prac 2026-05-28 11:16:54 +08:00
zhangyi e6d00e7ea9 Merge branch 'test' into feat-prac 2026-05-28 09:46:54 +08:00
zhangyi 18afba01ec update:新增基础训练入口 2026-05-26 11:38:49 +08:00
zhangyi 2780d1a6df update:代码备份 2026-05-26 10:23:31 +08:00
zhangyi 2a53f6739e update:对接个人训练难度页 2026-05-26 09:33:28 +08:00
zhangyi bae31add22 update:对接个人训练首页 2026-05-20 16:36:07 +08:00
zhangyi 465b9c8dc7 update:代码备份 2026-05-18 16:39:36 +08:00
zhangyi 3ff11df1d7 update:代码备份 2026-05-18 11:05:13 +08:00
zhangyi 21d8d0fbdb update:代码备份 2026-05-18 09:20:07 +08:00
zhangyi fc7149121b update:优化 2026-05-15 10:23:59 +08:00
zhangyi 8061ddbed5 update:训练难度展示ui完成 2026-05-15 09:46:33 +08:00
zhangyi bb50c7ca10 update:删除个人训练首页的无用组件 2026-05-13 10:54:15 +08:00
zhangyi 1bca5977c1 个人训练改版首页存档 2026-05-13 10:49:31 +08:00
324 changed files with 31563 additions and 4906 deletions
+7 -1
View File
@@ -1,3 +1,9 @@
{ {
"i18n-ally.localesPaths": [] "i18n-ally.localesPaths": [],
"files.watcherExclude": {
"**/dist/**": true
},
"search.exclude": {
"**/dist/**": true
}
} }
+1
View File
@@ -264,6 +264,7 @@ AI 应主动:
* 少解释 * 少解释
* 优先 patch * 优先 patch
* 优先 diff * 优先 diff
* 写好中文注释
除非用户明确要求: 除非用户明确要求:
否则不要输出完整项目。 否则不要输出完整项目。
+62
View File
@@ -0,0 +1,62 @@
# 小程序英文静态文案交付记录
## 实现范围
- 固定英文,使用现有 `vue-i18n`;没有新增或升级依赖,没有增加语言切换入口或在线翻译请求。
- `src/locales/en.json` 为英文词条,`zh-CN.json` 为中文校对基线,`source-keys.json` 为原文到文案键的索引。
- 已整理 1,108 条词条,覆盖主包、会员/设备/金币/团队对战/训练分包,以及保留在源码中的历史页面和公共组件。
- 页面文本、输入提示、弹窗默认文案、前端固定错误提示、静态说明、协议、状态显示、分享标题及 Canvas 绘制文字均纳入翻译;`manifest.json` 中的小程序定位权限用途说明使用对应英文常量。
- 公共按钮支持英文换行,弹窗和教练点评支持长文案滚动;会员提示和分享 Canvas 的文字做了局部排版调整。
## 业务隔离
- API 地址、请求结构、路由、状态码、缓存键、WebSocket/Protobuf 字段、计分、射距及靶纸判断保持原样。
- `audioManager.js` 完全未修改,中文音频键、语音结束事件与播放顺序继续使用原值。
- 比赛提示继续以原值参与状态与语音判断,由 `formatBattleTip` 在明确的渲染位置显示英文。
- 新手引导步骤标题保留原值;Header 只对四个已知的静态步骤值转换显示,不对任意动态标题做翻译。
- Wi-Fi 样式判断继续使用原始状态;段位图片的 `picNames` 和名称保持中文,仅在文本节点展示英文。
- 训练雷达的兜底数据增加仅用于显示的 `staticLabel`,原始 `name` 及其映射保持原样。服务端返回的维度名称直接显示原文。
- `translateStatic` 只用于明确来自前端配置或前端计算结果的展示,不应用于接口响应、用户输入或 store 的整体数据。
## 保留内容及后续交接
| 内容 | 当前处理 | 后续负责人/事项 |
| --- | --- | --- |
| 底部导航图片 `tab-vip.png`、`tab-point-book.png`、`tab-mall.png` | 地址与资源不变 | UI 提供英文图 |
| 首页、引导、设备介绍、VIP/SVIP、训练标题及比赛结果等图片 | 地址与资源不变,图片内中文保留 | UI 按原尺寸与资源位交付英文图 |
| 分享卡片底图、二维码、徽章等 | 保留;只翻译代码绘制的文字 | UI 后续提供需要替换的英文底图 |
| 音频、视频 | 保留 | 如需英语语音,另行准备资源与实施方案 |
| 商品、门店、套餐、公告、固件说明、服务端规则与协议、接口错误消息 | 保留接口原文 | 后端/运营提供英文内容 |
| 接口段位名称及介绍 | 所有后端 HTTP 请求统一携带 `Accept-Language: en-US`,直接展示后端响应 | 后端部署并维护英文段位配置;图标仍按接口原地址展示 |
| 昵称、组织名、设备别名、Wi-Fi 名称、记分备注等用户内容 | 原样展示及提交 | 不机翻 |
| WebView 外部页面、微信授权和支付系统界面 | 保持原有行为 | 对应内容方/系统管理 |
| 调试日志、音频测试页中的原始音频标识、中文正则与判断字符串 | 保留技术原值 | 无需作为页面文案替换 |
币种、金额、距离、时区与日期计算不作转换。品牌名暂译为 **Sheling Planet**;段位和射箭术语已统一机翻用词,正式品牌译名及协议可由业务方继续校对。
## 验证记录
- 比赛界面修复:独立及公共 `BattleFooter` 的空回合循环改用明确的变量名,避免编译后的文案字段与 `wx:for-item="i"` 同名,导致文本节点输出 `[object Object]`。不修改回合数据、得分求和或回合图片。
- 独立比赛顶部进度组件接入 `formatBattleTip`,仅在渲染时转换英文,保留原始中文提示和语音队列;英文顶部文字与调试按钮做局部排版调整,调试按钮保留非正式环境才显示的原条件。
- `npm run battle:display:check`:先在旧微信编译产物复现行对象输出,再在修复后的 JS + WXML 中验证 0–3 个正常回合、加赛回合、空成绩/零分、红蓝方英文提示和中文状态不变。调试按钮改为紧凑两列,最终真机视觉效果仍需预览验收。
- 全局英文请求头:统一请求封装的所有 HTTP 请求均携带 `Accept-Language: en-US`,移除段位接口白名单;独立的 `aimRenewAPI` 同样携带英文头,保留不等待响应和忽略响应结果的行为。认证、请求参数、接口地址及响应处理不变。首页继续使用现有 `/user/myHome`,未按文档示例替换成 `/index/myHome`。
- 固定英文版缓存兼容:恢复用户缓存时仅清空 `lvlName`、`rankName`、`nextRankName` 中的旧中文显示名,等待原有接口回填;保留英文缓存、昵称、身份、设备、段位编号、成绩与图标。配置和榜单维持现有不持久化方式,不新增语言切换或整体清缓存。
- `npm run rank:i18n:check`:验证所有已覆盖 HTTP 请求的英文头(包括 GET、POST、PUT、DELETE 和独立调瞄续期),有/无登录凭证、分页/赛季参数及原始错误消息保持原行为,并通过真实 Pinia 持久化插件验证旧中文缓存恢复和英文缓存再次恢复。
- 2026-11-05 只读联调 `/index/appConfig`:测试环境 `apitest.shelingxingqiu.com` 返回 74 条段位,中文请求为 `倔强青铜I / 倔强青铜`,英文请求为 `Bronze I / Bronze`;正式环境 `api.shelingxingqiu.com` 的英文请求仍返回中文,需要后端确认正式环境的多语言支持。两边的中英文请求中,段位编号、升级积分及图标地址均一致。未使用用户凭证调用首页或个人榜单,登录态接口仍需真机联调。
- 同日只读联调积分榜、十环榜、MVP 榜(各取 1 条、携带 `en-US`):测试环境三榜均返回英文 `Bronze I`;正式环境三榜仍返回中文段位。这是后端响应差异,前端未额外机翻或覆盖这些动态字段。
- 参数占位符修复:统一 `t` 入口直接读取固定英文词条并执行一次参数替换,兼容 uni-app 小程序运行库直接返回原文的情况。31 条参数文案对照完整版翻译库及当前 uni-app 消息编译器检查,包含数字 0、空字符串、布尔值及参数中含花括号的场景。页面调用和业务数据不作修改。
- 上传限制修复:定位权限用途说明缩短为 `Find Wi-Fi for device updates`(29 个字符),并在 `i18n:check` 中检查权限说明为 1–30 个字符。上传校验与本地编译是不同步骤,本地构建通过不代表微信上传校验通过。
- `npm run i18n:check`:通过。核查中英文键、占位符与插值、翻译函数遮蔽、163 个 Vue 文件的 SFC 编译,以及未翻译的模板直接文字与展示属性。
- 专项用例通过:中文方向音效键、测距/无效射箭语音键、英文测距/无效射箭提示、499/500 cm 边界、次数上限消息、设备/新手试炼进入条件。
- 使用本次修改前的 Git 基线完成附加对照:所有受影响源码中的资源 URL 一致,音频源码未改变;脚本语法树去除文案调用和明确的显示层调整后与基线一致。
- `npm run build`:微信小程序构建通过;构建前的协议检查通过(12 个消息、164 个字段)。
- 已清理四条不存在的旧主包路由:`pages/calibration`、`pages/my-device`、`pages/device-intro`、`pages/ota-wifi`。保留 `pages/device/` 下对应分包页面及现有跳转,剩余 58 条路由均有源文件。
- 未执行真机视觉验收、实物智能弓/OTA 联调或真实支付。代码与构建检查不能替代这些验收。
建议在微信开发者工具及真机重点检查首页、首次引导、设备三态、训练规则、比赛提示、结果页、会员协议、订单、记分本与分享图的英文排版;验证登录、绑定/解绑、OTA、训练/比赛、支付/取消与分享仍按原流程工作。
## 日常维护
新增固定文案时同步维护三份词条文件,模板和脚本通过 `t(key, params)` 取值;整句使用参数,避免重新引入中文语序拼接。业务枚举、接口数据与媒体标识不要作为翻译目标。
运行 `npm run i18n:check` 做本地检查;构建后运行 `npm run i18n:check -- --built`,对真实微信产物模块执行参数插值回归。`npm run battle:display:check` 检查比赛组件真实 JS + WXML 的渲染作用域及英文提示。`node scripts/localization-inventory.cjs` 可只读输出保留中文候选。候选包含日志、语音及判断字符串,不能作为全文替换清单。
+130
View File
@@ -114,3 +114,133 @@ git push origin test
3. **体验版发布前确认代码已提交**,避免遗漏 3. **体验版发布前确认代码已提交**,避免遗漏
4. **开发分支命名建议**:`feature/姓名-功能名`,如 `feature/zhangsan-login` 4. **开发分支命名建议**:`feature/姓名-功能名`,如 `feature/zhangsan-login`
5. **删除已合并的开发分支**:`git branch -d feature/your-name-work` 5. **删除已合并的开发分支**:`git branch -d feature/your-name-work`
---
## 六、比赛服 Proto 更新流程
### 1. 新开发人员快速接手
首次拉取项目后,先安装依赖并确认当前协议与运行时解码器一致:
```bash
npm install
npm run proto:check
npm run build
```
如果 `proto:check` 提示协议不同步,先执行 `npm run proto:generate`,不要直接修改生成区块。
### 2. 相关文件职责
| 文件 | 职责 | 修改规则 |
|------|------|----------|
| `src/utils/match.min.js` | 后端比赛服协议描述,是生成字段表的输入文件 | 后端协议更新时整体替换;禁止在小程序运行时代码中导入 |
| `scripts/generate-match-schema.mjs` | 解析协议、校验字段并生成运行时字段表 | 只有新增通用协议能力时才修改 |
| `src/utils/matchProtocol.js` | 小程序实际使用的 protobuf 编解码器 | `<match-schema-generated>` 标记区间内禁止手动修改 |
| `src/matchWebsocket.js` | 服务端消息路由、ACK 和业务事件分发 | 新增消息业务行为时人工接入 |
| `src/utils/matchAdapter.js` | 将解码结果从 snake_case 统一转换为 camelCase | 页面继续使用适配后的字段名 |
`match.min.js` 不是小程序运行时解码器。运行时仍使用 `protobufjs/minimal.js` 的 `Reader/Writer`,`int64` 字段统一保留为字符串,避免大整数精度丢失。
### 3. 日常协议更新步骤
```text
替换 src/utils/match.min.js
↓
执行 npm run proto:update
↓
检查生成差异和业务接入范围
↓
执行 git diff --check
↓
微信开发者工具检查包体并上传
```
具体操作:
1. 从后端获取最新的 `match.min.js`,整体覆盖 `src/utils/match.min.js`。
2. 执行推荐命令:
```bash
npm run proto:update
```
3. 该命令会依次完成:
- 解析 `match.min.js`
- 更新 `matchProtocol.js` 内的生成区块
- 校验生成区块与协议源文件一致
- 执行微信小程序正式构建
4. 检查 Git 差异。普通字段更新通常只应涉及:
- `src/utils/match.min.js`
- `src/utils/matchProtocol.js` 的生成区块
5. 如果新增了消息业务行为,再单独检查 `src/matchWebsocket.js`、页面或组件的接入改动。
6. 执行空白和换行检查:
```bash
git diff --check
```
7. 打开微信开发者工具,导入 `dist/build/mp-weixin`,检查代码依赖分析和主包体积后再上传。
### 4. Proto 命令说明
| 命令 | 用途 | 是否修改文件 |
|------|------|--------------|
| `npm run proto:generate` | 根据 `match.min.js` 更新生成区块 | 是 |
| `npm run proto:check` | 检查生成区块是否与协议同步 | 否 |
| `npm run proto:update` | 执行生成,然后运行正式构建 | 是,日常更新推荐使用 |
| `npm run dev` | 启动开发构建,启动前自动执行 `proto:check` | 协议不同步时直接中止 |
| `npm run build` | 执行正式构建,构建前自动执行 `proto:check` | 协议不同步时直接中止 |
`npm run dev` 和 `npm run build` 只负责检查,不会自动改写协议;发现不同步时应执行 `npm run proto:generate` 或 `npm run proto:update`。
### 5. 自动生成与人工接入边界
以下内容由生成器自动处理:
- 服务端和客户端消息枚举
- 普通 scalar 字段
- 嵌套 message
- repeated message
- 当前解码器支持的 map
- snake_case 字段名和 oneof 兼容信息
以下情况仍需人工处理:
- **新增服务端消息类型**:枚举会自动生成,但 `matchWebsocket.js` 的路由、ACK、音频或页面事件仍需接入。
- **新增客户端指令**:枚举会自动生成,但发送函数、字段编码和业务调用入口仍需接入。
- **修改既有字段编号或类型**:属于协议兼容性变更,必须先与后端确认,不能只看构建是否通过。
- **新增解码器不支持的类型**:生成器会直接报错,需要同时扩展生成器和 `matchProtocol.js` 的通用解码能力。
当前生成器会拒绝不支持的 scalar、map key、字段规则以及 packed scalar repeated,避免继续构建后静默丢字段。
### 6. 常见报错处理
| 报错或现象 | 原因 | 处理方式 |
|------------|------|----------|
| 生成区块与 `match.min.js` 不同步 | 替换协议后没有重新生成 | 执行 `npm run proto:update` |
| 找不到 `Root.create(...)` | 后端提供的文件格式发生变化或文件不完整 | 停止更新,确认协议文件来源和生成格式 |
| 使用了不支持的类型、规则或 map key | 新协议超出当前通用解码器能力 | 不要手补生成区块,先扩展生成器和解码器并补充验证 |
| packed scalar repeated 不支持 | protobuf 默认可能使用 packed 编码,当前通用解码器未覆盖 | 增加 packed 解码能力后再重新生成 |
| `matchProtocol.js` 缺少生成区块标记 | 标记被误删或生成区块被手改 | 恢复 `<match-schema-generated>` 标记,重新执行生成 |
| 协议生成成功但构建失败 | 问题位于项目构建或业务代码,不是字段表同步 | 保留生成结果,按构建错误继续定位 |
### 7. 禁止事项与验收清单
禁止:
- 禁止在运行时代码中导入 `match.min.js`。
- 禁止手动修改 `<match-schema-generated>` 与 `</match-schema-generated>` 之间的内容。
- 禁止绕过 `proto:check` 后直接上传。
- 禁止把 `int64` 字段直接转换为普通 `Number`。
- 禁止把“枚举已经生成”等同于“业务消息已经完成接入”。
每次协议更新至少确认:
1. `npm run proto:check` 通过。
2. `npm run build` 通过,或直接确认 `npm run proto:update` 已完整通过。
3. `git diff --check` 通过。
4. 生成区块之外没有意外改动。
5. 新消息已完成必要的 WebSocket 路由和页面验证。
6. 微信开发者工具中的主包、分包体积符合上传限制。
+2 -1
View File
@@ -12,5 +12,6 @@
}, },
"vueCompilerOptions": { "vueCompilerOptions": {
"plugins": ["@uni-helper/uni-types/volar-plugin"] "plugins": ["@uni-helper/uni-types/volar-plugin"]
} },
"exclude": ["node_modules", "dist"]
} }
+628
View File
@@ -26,6 +26,8 @@
"@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001", "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
"@dcloudio/uni-ui": "^1.5.11", "@dcloudio/uni-ui": "^1.5.11",
"pinia": "2.0.36", "pinia": "2.0.36",
"pinia-plugin-persistedstate": "3.2.1",
"protobufjs": "^8.7.0",
"vue": "^3.4.21", "vue": "^3.4.21",
"vue-i18n": "^9.1.9" "vue-i18n": "^9.1.9"
}, },
@@ -2422,6 +2424,70 @@
"vite": "^5.2.8" "vite": "^5.2.8"
} }
}, },
"node_modules/@esbuild/aix-ppc64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
"integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"aix"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/android-arm": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
"integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/android-arm64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
"integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/android-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
"integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/darwin-arm64": { "node_modules/@esbuild/darwin-arm64": {
"version": "0.20.2", "version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
@@ -2438,6 +2504,294 @@
"node": ">=12" "node": ">=12"
} }
}, },
"node_modules/@esbuild/darwin-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
"integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/freebsd-arm64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
"integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/freebsd-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
"integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-arm": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
"integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-arm64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
"integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-ia32": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
"integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-loong64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
"integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
"cpu": [
"loong64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-mips64el": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
"integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
"cpu": [
"mips64el"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-ppc64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
"integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-riscv64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
"integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
"cpu": [
"riscv64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-s390x": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
"integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
"cpu": [
"s390x"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/linux-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
"integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/netbsd-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
"integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"netbsd"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/openbsd-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
"integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"openbsd"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/sunos-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
"integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"sunos"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/win32-arm64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
"integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/win32-ia32": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
"integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@esbuild/win32-x64": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
"integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=12"
}
},
"node_modules/@intlify/core-base": { "node_modules/@intlify/core-base": {
"version": "9.1.9", "version": "9.1.9",
"resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz", "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz",
@@ -3424,6 +3778,32 @@
} }
} }
}, },
"node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz",
"integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"android"
]
},
"node_modules/@rollup/rollup-android-arm64": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz",
"integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
]
},
"node_modules/@rollup/rollup-darwin-arm64": { "node_modules/@rollup/rollup-darwin-arm64": {
"version": "4.39.0", "version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz",
@@ -3437,6 +3817,227 @@
"darwin" "darwin"
] ]
}, },
"node_modules/@rollup/rollup-darwin-x64": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz",
"integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
]
},
"node_modules/@rollup/rollup-freebsd-arm64": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz",
"integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
]
},
"node_modules/@rollup/rollup-freebsd-x64": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz",
"integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz",
"integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz",
"integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
"integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz",
"integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz",
"integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==",
"cpu": [
"loong64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz",
"integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==",
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz",
"integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==",
"cpu": [
"riscv64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-riscv64-musl": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz",
"integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==",
"cpu": [
"riscv64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz",
"integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==",
"cpu": [
"s390x"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
"integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz",
"integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz",
"integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz",
"integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
"version": "4.39.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz",
"integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
]
},
"node_modules/@sinonjs/commons": { "node_modules/@sinonjs/commons": {
"version": "1.8.6", "version": "1.8.6",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
@@ -7535,6 +8136,12 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/long": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
"license": "Apache-2.0"
},
"node_modules/lru-cache": { "node_modules/lru-cache": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8222,6 +8829,15 @@
} }
} }
}, },
"node_modules/pinia-plugin-persistedstate": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz",
"integrity": "sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==",
"license": "MIT",
"peerDependencies": {
"pinia": "^2.0.0"
}
},
"node_modules/pirates": { "node_modules/pirates": {
"version": "4.0.7", "version": "4.0.7",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
@@ -8530,6 +9146,18 @@
"node": ">= 6" "node": ">= 6"
} }
}, },
"node_modules/protobufjs": {
"version": "8.7.0",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-8.7.0.tgz",
"integrity": "sha512-uu52JNxLh3vsL7tXU/h0gDaywufvuUCTbGSi0NKQKBZ2ZopkmrWQJSQO/EFqzu/5YhiwgVM8rq/a/iVpx4eZ0g==",
"license": "BSD-3-Clause",
"dependencies": {
"long": "^5.3.2"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/proxy-addr": { "node_modules/proxy-addr": {
"version": "2.0.7", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+9
View File
@@ -3,7 +3,15 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"i18n:check": "node scripts/check-localization.cjs",
"rank:i18n:check": "node scripts/check-rank-i18n.cjs",
"battle:display:check": "node scripts/check-battle-display.cjs",
"proto:generate": "node scripts/generate-match-schema.mjs",
"proto:check": "node scripts/generate-match-schema.mjs --check",
"proto:update": "npm run proto:generate && npm run build",
"predev": "npm run proto:check",
"dev": "uni -p mp-weixin", "dev": "uni -p mp-weixin",
"prebuild": "npm run proto:check",
"build": "uni build -p mp-weixin" "build": "uni build -p mp-weixin"
}, },
"dependencies": { "dependencies": {
@@ -26,6 +34,7 @@
"@dcloudio/uni-ui": "^1.5.11", "@dcloudio/uni-ui": "^1.5.11",
"pinia": "2.0.36", "pinia": "2.0.36",
"pinia-plugin-persistedstate": "3.2.1", "pinia-plugin-persistedstate": "3.2.1",
"protobufjs": "^8.7.0",
"vue": "^3.4.21", "vue": "^3.4.21",
"vue-i18n": "^9.1.9" "vue-i18n": "^9.1.9"
}, },
+250 -1
View File
@@ -3,7 +3,256 @@
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.7.7", "libVersion": "3.7.7",
"packOptions": { "packOptions": {
"ignore": [], "ignore": [
{
"type": "file",
"value": "static/common/dialog-light.png"
},
{
"type": "file",
"value": "static/common/dialog-bg.png"
},
{
"type": "file",
"value": "static/common/dialog-icon.png"
},
{
"type": "file",
"value": "static/prompt-bg-square.png"
},
{
"type": "file",
"value": "static/coach-comment.png"
},
{
"type": "file",
"value": "static/screen-hint-bg.png"
},
{
"type": "file",
"value": "static/red-team-win.png"
},
{
"type": "file",
"value": "static/blue-team-win.png"
},
{
"type": "file",
"value": "static/my-grow.png"
},
{
"type": "file",
"value": "static/gold-shining.png"
},
{
"type": "file",
"value": "static/bow-target.png"
},
{
"type": "file",
"value": "static/matching-bg.png"
},
{
"type": "file",
"value": "static/versus.png"
},
{
"type": "file",
"value": "static/point-champion.png"
},
{
"type": "file",
"value": "static/my-practise.png"
},
{
"type": "file",
"value": "static/shining-bg.png"
},
{
"type": "file",
"value": "static/donate.png"
},
{
"type": "file",
"value": "static/friend-battle.png"
},
{
"type": "file",
"value": "static/user-upgrade.png"
},
{
"type": "file",
"value": "static/finish-frame.png"
},
{
"type": "file",
"value": "static/vip/svip-jian.png"
},
{
"type": "file",
"value": "static/battle-header.png"
},
{
"type": "file",
"value": "static/battle-header-melee.png"
},
{
"type": "file",
"value": "static/player-bg.png"
},
{
"type": "file",
"value": "static/mvp-blue.png"
},
{
"type": "file",
"value": "static/finish-tip.png"
},
{
"type": "file",
"value": "static/2unfinish-tip.png"
},
{
"type": "file",
"value": "static/have-no-device.png"
},
{
"type": "file",
"value": "static/device-icon.png"
},
{
"type": "file",
"value": "static/unfinish-tip.png"
},
{
"type": "file",
"value": "static/test-tip.png"
},
{
"type": "file",
"value": "static/mvp-red.png"
},
{
"type": "file",
"value": "static/vip/svip-lie.png"
},
{
"type": "file",
"value": "static/mvp-tip.png"
},
{
"type": "file",
"value": "static/rank/battle-choose.png"
},
{
"type": "file",
"value": "static/back-to-game-bg.png"
},
{
"type": "file",
"value": "static/complete-light1.png"
},
{
"type": "file",
"value": "static/complete-light2.png"
},
{
"type": "file",
"value": "static/title-2v2.png"
},
{
"type": "file",
"value": "static/tab-bg.png"
},
{
"type": "file",
"value": "static/scan.png"
},
{
"type": "file",
"value": "static/choose-battle-mode.png"
},
{
"type": "file",
"value": "static/shooter.png"
},
{
"type": "file",
"value": "static/my-growth.png"
},
{
"type": "file",
"value": "static/juezhanbang.png"
},
{
"type": "file",
"value": "static/title-3v3.png"
},
{
"type": "file",
"value": "static/point-book-tip-bg.png"
},
{
"type": "file",
"value": "static/reward-us.png"
},
{
"type": "file",
"value": "static/rank/star.png"
},
{
"type": "file",
"value": "static/tab-point-book.png"
},
{
"type": "file",
"value": "static/pk-icon.png"
},
{
"type": "file",
"value": "static/first-try.png"
},
{
"type": "file",
"value": "static/row-yellow-bg.png"
},
{
"type": "file",
"value": "static/room-notfound-title.png"
},
{
"type": "file",
"value": "static/title-mvp.png"
},
{
"type": "file",
"value": "static/long-bubble-tall.png"
},
{
"type": "file",
"value": "static/battle-result.png"
},
{
"type": "file",
"value": "static/tab-mall.png"
},
{
"type": "folder",
"value": "static/training-home"
},
{
"type": "folder",
"value": "static/training-difficulty-design"
},
{
"type": "folder",
"value": "static/coin"
},
{
"type": "folder",
"value": "static/home-device"
}
],
"include": [] "include": []
}, },
"setting": { "setting": {
+96
View File
@@ -0,0 +1,96 @@
// 回归截图中的小程序循环作用域问题:执行真实 render,再按 WXML 作用域取文本。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const {baseParse} = require('@vue/compiler-dom');
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const en = JSON.parse(read('src/locales/en.json'));
const sourceKeys = JSON.parse(read('src/locales/source-keys.json'));
const localeCode = read('src/locales/index.js').replace(/^import .*;\r?\n/gm, '').replace(/export /g, '');
const locale = new Function('createI18n','en','sourceKeys',localeCode+'\nreturn {t,formatBattleTip};')(
() => ({global: {t: key => key}}), en, sourceKeys);
const computed = getter => ({get value() {return getter();}});
const vendor = {
computed, unref: value => value,
e: (...parts) => Object.assign({}, ...parts),
f: (items, render) => (typeof items === 'number' ? Array.from({length: items}, (_,i) => i+1) : items)
.map((item,index) => render(item,index,index)),
t: value => value == null ? '' : String(value),
_export_sfc: component => component,
};
function loadComponent(file, dependencies) {
let component;
vm.runInNewContext(read(file), {
exports: {}, wx: {createComponent: value => {component = value;}},
require: id => {
for (const [suffix,value] of Object.entries(dependencies)) if (id.endsWith(suffix)) return value;
throw Error('Unexpected component dependency: '+id);
},
}, {filename: file});
assert(component, 'No compiled component: '+file);
return component;
}
const prefix = 'dist/build/mp-weixin/pages/team-battle/components/';
const footer = loadComponent(prefix+'BattleFooter.js', {
'common/vendor.js': vendor,
'locales/index.js': locale,
'constants.js': {RoundImages: {round1:'round1',round2:'round2',round3:'round3',gold1:'gold1'}},
});
const wxml = baseParse(read(prefix+'BattleFooter.wxml'));
function evaluate(expression, scope) {
return new Function('scope', 'with(scope){return ('+expression+');}')(scope);
}
function renderedTexts(node,scope) {
const attr = name => (node.props || []).find(p => p.name === name)?.value?.content;
const forValue = attr('wx:for');
if (forValue) {
const rows = evaluate(forValue.slice(2,-2),scope);
return rows.flatMap((item,index) => renderedTexts({...node,props:node.props.filter(p=>p.name!=='wx:for')},
{...scope,[attr('wx:for-item') || 'item']:item,[attr('wx:for-index') || 'index']:index}));
}
const ifValue = attr('wx:if');
if (ifValue && !evaluate(ifValue.slice(2,-2),scope)) return [];
if (node.tag === 'text') {
return [(node.children || []).map(child => {
const value = child.type === 5 ? evaluate(child.content.content,scope) : child.content || '';
assert(value === null || typeof value !== 'object', 'WXML rendered a loop object in a text node');
return value == null ? '' : String(value);
}).join('')];
}
return (node.children || []).flatMap(child => renderedTexts(child,scope));
}
for (const count of [0,1,2,3,4]) {
const roundResults = Array.from({length:count},(_,index)=>({
ifGold:index===3, goldRound:index===3 ? 1 : 0,
shoots:{1:[{ring:index===0 ? 10 : 0}],2:[{ring:8}]},
}));
const props = {roundResults,bluePoints:0,redPoints:0,goldenRound:count===4 ? 1 : 0};
const data = footer.setup(props)(props,{});
const texts = renderedTexts(wxml,data);
assert.equal(texts.filter(text=>text===en.pts).length, Math.max(3,count)*2);
assert(!texts.join('').includes('[object Object]'));
if (count) assert(texts.includes('10'), 'Completed round score lost');
if (count>1) assert(texts.includes('0'), 'Zero score lost');
}
// 顶部只转换显示值,监听器仍接收原始中文提示,语音控制不增加播放调用。
for (const tip of ['请蓝队射箭','请红队射箭你重回']) {
const store = {game:{currentShot:1,totalShot:3,tips:tip}};
const header = loadComponent(prefix+'HeaderProgress.js', {
'common/vendor.js': {...vendor,
ref:value=>({value}), watch:(source,callback)=>callback(source()),
onMounted:()=>{},onBeforeUnmount:()=>{},o:handler=>handler,
},
'locales/index.js':locale,
'store.js':{useStore:()=>store},
'audioManager.js':{audioManager:{setMuted:()=>{}}},
});
const data = header.setup({})({},{});
assert.equal(data.a,locale.formatBattleTip(tip));
assert(!/[\u3400-\u9fff]/.test(data.a));
assert.equal(store.game.tips,tip);
assert.equal(data.c,'1');
assert.equal(data.d,'3');
}
console.log('Battle display checks passed: compiled JS + WXML, 0–3 rounds and golden round, blank/zero scores, English tips and original Chinese state preserved.');
+220
View File
@@ -0,0 +1,220 @@
// 英文文案与业务边界检查:不调用网络、设备或支付接口。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const parser = require('@babel/parser');
const traverse = require('@babel/traverse').default;
const { parse, compileScript } = require('@vue/compiler-sfc');
const { baseParse } = require('@vue/compiler-dom');
const { createI18n } = require('vue-i18n');
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const en = JSON.parse(read('src/locales/en.json'));
const zh = JSON.parse(read('src/locales/zh-CN.json'));
const sourceKeys = JSON.parse(read('src/locales/source-keys.json'));
const han = /[\p{Script=Han}]/u;
const manifest=JSON.parse(read('src/manifest.json'));
assert.equal(manifest['mp-weixin'].permission['scope.userLocation'].desc,en.wifi_location_permission);
// 微信上传会校验权限用途说明,英文也最多允许 30 个字符。
for (const [scope, permission] of Object.entries(manifest['mp-weixin'].permission || {})) {
assert.equal(typeof permission.desc, 'string', `${scope}: permission description must be a string`);
assert(permission.desc.length > 0 && permission.desc.length <= 30,
`${scope}: permission description must contain 1–30 characters (got ${permission.desc.length})`);
}
const params = value => [...value.matchAll(/\{(p\d+)\}/g)].map(m=>m[1]).sort();
assert.deepEqual(Object.keys(en).sort(), Object.keys(zh).sort());
const localeCode = read('src/locales/index.js').replace(/^import .*;\r?\n/gm, '').replace(/export /g, '');
const api = new Function('createI18n','en','sourceKeys', localeCode+'\nreturn {t,translateStatic,formatBattleTip};')(createI18n,en,sourceKeys);
// 使用当前 uni-app 实际打包的消息编译器复现问题,避免只测 Node 完整版。
const miniRuntimePath = path.join(path.dirname(require.resolve('@dcloudio/uni-cli-shared/package.json')),
'lib/vue-i18n/dist/vue-i18n.runtime.esm-bundler.js');
const miniRuntimeCode = fs.readFileSync(miniRuntimePath, 'utf8');
let miniCompilerCode;
traverse(parser.parse(miniRuntimeCode, {sourceType: 'module'}), {
ObjectProperty(p) {
if (p.node.key.name === 'messageCompiler' && p.node.value.type === 'FunctionExpression') {
miniCompilerCode = miniRuntimeCode.slice(p.node.value.start, p.node.value.end);
}
},
});
assert(miniCompilerCode, 'Cannot locate uni-app message compiler; review runtime compatibility test');
const miniCompiler = new Function('return (' + miniCompilerCode + ');')();
const createMiniI18n = ({locale, messages}) => ({global: {t: (key, args = {}) => {
const message = messages[locale][key];
return message === undefined ? key : miniCompiler(message)({
normalize: values => values.join(''),
interpolate: value => String(value),
named: name => args[name],
});
}}});
const miniApi = new Function('createI18n','en','sourceKeys', localeCode+'\nreturn {t,translateStatic,formatBattleTip};')(createMiniI18n,en,sourceKeys);
const referenceI18n = createI18n({legacy: false, locale: 'en', fallbackLocale: 'en', messages: {en}});
const parameterized = Object.entries(en).filter(([,value]) => params(value).length);
for (const [key,value] of parameterized) {
for (const example of [0, 7, -2, '', false, 'Bronze', '$& {p1}']) {
const args = Object.fromEntries(params(value).map(name => [name, example]));
const expected = referenceI18n.global.t(key, args);
assert.equal(api.t(key, args), expected, key + ': full runtime interpolation');
assert.equal(miniApi.t(key, args), expected, key + ': mini runtime interpolation');
}
}
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze', p1: 0}), 'Bronze, 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze', p1: 12}), 'Bronze, 12 matches');
assert.equal(miniApi.t('value_value_matches', {p0: '{p1}', p1: 12}), '{p1}, 12 matches');
assert.equal(miniApi.t('value_value_matches', {p0: '', p1: 0}), ', 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: null, p1: 0}), ', 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze'}), 'Bronze, {p1} matches');
assert.equal(miniApi.t('value_value_matches', Object.create({p0: 'Inherited', p1: 12})), en.value_value_matches);
assert.equal(miniApi.formatBattleTip('请开始射箭第三轮'), 'Start shooting round 3');
console.log(`Interpolation compatibility passed: ${parameterized.length} messages, full and uni-app mini compilers, zero/empty/boolean/literal-brace values.`);
// 构建后检查真实产物模块;只替换平台启动依赖,沿用上方实际小程序编译器。
if (process.argv.includes('--built')) {
const builtExports = {};
vm.runInNewContext(read('dist/build/mp-weixin/locales/index.js'), {
exports: builtExports,
require: id => {
assert(/common\/vendor\.js$/.test(id), 'Unexpected built locale dependency: ' + id);
return {createI18n: createMiniI18n};
},
}, {filename: 'dist/build/mp-weixin/locales/index.js'});
for (const [key,value] of parameterized) {
for (const example of [0, 12, '', false, 'Bronze', '$& {p1}']) {
const args = Object.fromEntries(params(value).map(name => [name, example]));
assert.equal(builtExports.t(key, args), referenceI18n.global.t(key, args), key + ': built module interpolation');
}
}
console.log(`Built WeChat locale module passed: ${parameterized.length} parameterized messages.`);
}
for (const [key,value] of Object.entries(en)) {
assert(!han.test(value), 'English contains Chinese: '+key);
assert.deepEqual(params(value), params(zh[key]), 'Placeholder mismatch: '+key);
const args=Object.fromEntries(params(value).map(name=>[name, name.toUpperCase()]));
const output=api.t(key,args);
for (const name of params(value)) assert(output.includes(args[name]),'Interpolation failed: '+key);
}
for (const [source,key] of Object.entries(sourceKeys)) assert.equal(zh[key],source);
assert.equal(api.formatBattleTip('请红队射箭你重回'),'Red team, shoot');
assert.equal(api.formatBattleTip('上半场:请先射6箭'),'First half: shoot 6 arrows first');
assert.equal(api.formatBattleTip('请开始射箭第三轮'),'Start shooting round 3');
assert.equal(api.translateStatic('An unknown server value'),'An unknown server value');
let vueCount=0, references=0;
const files=[];
function walk(dir) {
for (const item of fs.readdirSync(path.join(root,dir),{withFileTypes:true})) {
const file=dir+'/'+item.name;
if (item.isDirectory()) {if (!['static','locales'].includes(item.name)) walk(file);}
else if (/\.(vue|js)$/.test(file) && !/match\.min\.js/.test(file)) files.push(file);
}
}
walk('src');
function checkJs(code,file,expression=false) {
let ast;
try {ast=parser.parse(expression?'('+code+')':code,{sourceType:'module'});} catch(error) {if (expression) return;throw error;}
traverse(ast,{CallExpression(p) {
const n=p.node;
if (!['t','translate'].includes(n.callee.name) || n.arguments[0]?.type!=='StringLiteral') return;
const binding=p.scope.getBinding(n.callee.name);
if (!expression) assert(binding && binding.path.node.type==='ImportSpecifier' && /locales/.test(binding.path.parent.source.value),file+': translation function shadowed');
const key=n.arguments[0].value;
assert(Object.hasOwn(en,key),file+': missing key '+key);references++;
const supplied=n.arguments[1]?.properties?.map(prop=>prop.key.name)||[];
assert.deepEqual(supplied.sort(),params(en[key]),file+': wrong parameters for '+key);
}});
}
for (const file of files) {
const code=read(file);
if (!file.endsWith('.vue')) {checkJs(code,file);continue;}
const {descriptor,errors}=parse(code,{filename:file});
assert.equal(errors.length,0,file+': SFC parse failed');vueCount++;
if (descriptor.script || descriptor.scriptSetup) {
compileScript(descriptor,{id:file});
for (const b of [descriptor.script,descriptor.scriptSetup]) if (b) checkJs(b.content,file);
}
if (!descriptor.template) continue;
function visit(n) {
if (n.type===2) assert(!han.test(n.content),file+': untranslated template text '+n.content);
if (n.type===5) checkJs(n.content.content,file,true);
for (const prop of n.props||[]) {
if (prop.exp) checkJs(prop.exp.content,file,true);
if (prop.type===6 && prop.value && !/^(src|class|id|style|key|name|value|tips|end-audio-key|practice-end-audio-key)$/.test(prop.name)) assert(!han.test(prop.value.content),file+': untranslated attribute '+prop.name);
}
for (const c of n.children||[]) visit(c);
}
visit(baseParse(descriptor.template.content));
}
// 固件与比赛继续使用中文语音键,英文仅用于展示。
const utilCode=read('src/util.js').replace(/^import .*;\r?\n/gm,'').replace(/export /g,'');
const uni={getMenuButtonBoundingClientRect:()=>({top:20}),getAccountInfoSync:()=>({miniProgram:{envVersion:'release'}}),showToast:()=>{}};
const util=new Function('t','translateStatic','uni',utilCode+'\nreturn {getDirectionText,getShootValidation,getDistanceCheckAudioKey,getDistanceCheckText,getInvalidShotAudioKey,getInvalidShotText,isLimitError,canEenter};')(api.t,api.translateStatic,uni);
for (const [angle,expected] of [[0,'下'],[45,'左下'],[90,'左'],[135,'左上'],[180,'上'],[225,'右上'],[270,'右'],[315,'右下']]) assert.equal(util.getDirectionText(angle),expected);
for (const shot of [null,{}, {distance:0}, {distance:-1}, {distance:499,targetOk:true}, {distance:500,targetOk:true}, {distance:600,targetOk:false}]) {
assert(han.test(util.getInvalidShotAudioKey(shot)));
assert(han.test(util.getDistanceCheckAudioKey(shot)));
assert(!han.test(util.getInvalidShotText(shot)));
assert(!han.test(util.getDistanceCheckText(shot)));
}
assert.equal(util.getShootValidation({distance:499,targetOk:true}).distanceOk,false);
assert.equal(util.getShootValidation({distance:500,targetOk:true}).distanceOk,true);
assert(util.isLimitError({message:'今日次数已达上限'}));
assert(!util.isLimitError({message:'other error'}));
assert.equal(util.canEenter({}, {}, true),false);
assert.equal(util.canEenter({trio:1},{deviceId:'test'},true),true);
assert.equal(util.canEenter({trio:1},{deviceId:'test'},false),false);
assert.equal(util.canEenter({trio:0},{deviceId:'test'},true),false);
// 对照 Git 基线检查协议资源未改动,只检查当前变更涉及的源码文件。
const urls=code=>[...code.matchAll(/https?:\/\/[^\s"'`<>]+/g)].map(m=>m[0]).sort();
function scriptShapes(code,file) {
const blocks=file.endsWith('.vue') ? ((d)=>[d.script,d.scriptSetup].filter(Boolean).map(b=>b.content))(parse(code).descriptor) : [code];
return blocks.map(block=>{
const ast=parser.parse(block,{sourceType:'module'});
function clean(value) {
if (Array.isArray(value)) return value.map(clean).filter(v=>v!==undefined);
if (!value || typeof value!=='object') return value;
if (value.type==='ImportDeclaration' && /locales/.test(value.source.value)) return undefined;
if (file==='src/pages/training/index.vue' && value.type==='ObjectProperty' && value.key.name==='staticLabel') return undefined;
if (file==='src/canvas.js' && value.type==='CallExpression' && value.callee.name==='renderText') {
const key=value.arguments[1]?.arguments?.[0]?.value;
if (key==='today_s_check_in') { assert.equal(value.arguments[2].value,9); value.arguments[2].value=14; }
if (key==='total') { assert.equal(value.arguments[4].value,102); value.arguments[4].value=122; }
}
if (value.type==='ExpressionStatement' && value.expression.callee?.property?.name==='use' && value.expression.arguments?.[0]?.name==='i18n') return undefined;
if (value.type==='CallExpression') {
if (value.callee.name==='translateStatic') return clean(value.arguments[0]);
if (['t','translate'].includes(value.callee.name) && value.arguments[0]?.type==='StringLiteral') {
const source=zh[value.arguments[0].value];
assert.notEqual(source,undefined,file+': unknown source');
const matches=[...source.matchAll(/\{(p\d+)\}/g)];
if (!matches.length) return {type:'StringLiteral',value:source};
const argumentsMap=Object.fromEntries((value.arguments[1]?.properties||[]).map(p=>[p.key.name,p.value]));
let cursor=0;
const quasis=matches.map(m=>{const text=source.slice(cursor,m.index);cursor=m.index+m[0].length;return {type:'TemplateElement',value:{cooked:text},tail:false};});
quasis.push({type:'TemplateElement',value:{cooked:source.slice(cursor)},tail:true});
return clean({type:'TemplateLiteral',quasis,expressions:matches.map(m=>argumentsMap[m[1]])});
}
}
if (value.type==='TemplateLiteral' && !value.expressions.length) return {type:'StringLiteral',value:value.quasis[0].value.cooked};
const result={};
for (const [key,item] of Object.entries(value)) {
if (['start','end','loc','extra','leadingComments','innerComments','trailingComments','comments','tokens','errors','raw'].includes(key)) continue;
const next=clean(item);
if (next!==undefined) result[key]=next;
}
// 唯一调整的脚本标点位于测距展示文本,不参与判断。
if (result.type==='TemplateElement' && result.value.cooked===',') result.value.cooked='; ';
return result;
}
return clean(ast.program);
});
}
const baselinePath=process.argv.slice(2).find(arg => arg !== '--built');
if (baselinePath) {
const baseline=JSON.parse(fs.readFileSync(baselinePath,'utf8').replace(/^\uFEFF/,''));
for (const [file,original] of Object.entries(baseline)) {
assert.deepEqual(urls(read(file)),urls(original),file+': URL changed');
assert.deepEqual(scriptShapes(read(file),file),scriptShapes(original,file),file+': non-localization script change');
if (file==='src/audioManager.js') assert.equal(read(file).replace(/\r\n/g,'\n'),original.replace(/\r\n/g,'\n'),'Audio resources or keys changed');
}
console.log('Git baseline media URLs and audio resources verified.');
}
console.log(`Localization checks passed: ${Object.keys(en).length} entries, ${references} references, ${vueCount} Vue files; placeholders, static templates, audio keys, shooting validation and entry conditions verified.`);
+136
View File
@@ -0,0 +1,136 @@
// 段位多语言集成回归:请求使用本地桩,缓存通过真实 Pinia 持久化插件恢复。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const { createPinia, defineStore } = require('pinia');
const { createSSRApp } = require('vue');
const persist = require('pinia-plugin-persistedstate').default;
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const requests = [];
let hasToken = true;
let nextFailure;
const rank = {rankLvl: 1, rankName: 'Bronze I', rankIcon: 'https://example.test/青铜1.png'};
const apiUni = {
getAccountInfoSync: () => ({miniProgram: {envVersion: 'trial'}}),
getStorageSync: key => hasToken && key === 'trial_token' ? 'existing-token' : '',
request(options) {
requests.push(options);
if (options.url.endsWith('/user/device/aimRenew')) return {};
if (nextFailure) {
const error = nextFailure;
nextFailure = undefined;
options.success({statusCode: 200, data: error});
return;
}
const data = options.url.includes('/myHome')
? {...rank, user: {id: 42, scores: 150, rankLvl: 1, nickName: '原昵称'}}
: {list: [{...rank}], randInfos: [{rank_id: 1, upgrade_scores: 100, name: 'Bronze I', icoin: rank.rankIcon}]};
options.success({statusCode: 200, data: {code: 0, data}});
},
};
const apiCode = read('src/apis.js').replace(/^import .*;\r?\n/gm, '').replace(/^export /gm, '');
const api = new Function('uni', 't', 'normalizeBattleApiResult', apiCode + `
return {request, getAppConfig, getHomeData, getScoreRankList, getTenRingRankList, getMvpRankList,
getMyScoreRank, getMyTenRingRank, getMyMvpRank, getSeasonStats, getProvinceData, getDailyCountAPI, aimRenewAPI};
`)(apiUni, key => key, data => data);
const storeCode = read('src/store.js').replace(/^import .*;\r?\n/gm, '').replace('export default defineStore', 'return defineStore');
function restore(cached) {
const storage = new Map([
['store', JSON.stringify(cached)],
['trial_token', 'existing-token'],
['point-book', JSON.stringify({draft: true})],
]);
const uni = {getStorageSync: key => storage.get(key), setStorageSync: (key, value) => storage.set(key, value)};
const useStore = new Function('defineStore', 'uni', storeCode)(defineStore, uni);
const pinia = createPinia();
pinia.use(persist);
createSSRApp({}).use(pinia);
return {store: useStore(pinia), storage};
}
async function main() {
const config = await api.getAppConfig();
const home = await api.getHomeData(42);
await api.getScoreRankList(42, 2, 20);
await api.getTenRingRankList(42, 2, 20);
await api.getMvpRankList(42, 2, 20);
await api.getMyScoreRank(42);
await api.getMyTenRingRank(42);
await api.getMyMvpRank(42);
await api.getSeasonStats(0);
await api.request('GET', '/index/myHome?seasonId=42');
for (const request of requests) {
assert.equal(request.header['Accept-Language'], 'en-US');
assert.equal(request.header.Authorization, 'Bearer existing-token');
assert.equal(request.method, 'GET');
assert(request.url.startsWith('https://apitest.shelingxingqiu.com/api/shoot/'));
}
assert(requests[1].url.endsWith('/user/myHome?seasonId=42'), 'Existing home route must remain unchanged');
assert.deepEqual(requests[2].data, {seasonId: 42, page: 2, perPage: 20});
assert.deepEqual(requests[8].data, {seasonId: 0});
assert.equal(home.user.rankName, rank.rankName);
assert.equal(home.user.rankIcon, rank.rankIcon);
assert.equal(home.user.nickName, '原昵称');
await api.getProvinceData();
await api.getDailyCountAPI();
await api.request('GET', '/index/appConfig/other');
await api.request('POST', '/index/appConfig');
await api.request('PUT', '/test/update', {value: 0});
await api.request('DELETE', '/test/delete', {id: 42});
for (const request of requests.slice(10)) {
assert.equal(request.header['Accept-Language'], 'en-US', 'All HTTP requests must declare English');
assert.equal(request.header.Authorization, 'Bearer existing-token');
}
assert.deepEqual(requests.at(-2).data, {value: 0});
assert.deepEqual(requests.at(-1).data, {id: 42});
// 续期请求即使未收到响应,也必须保持同步返回且不弹失败提示。
assert.equal(api.aimRenewAPI(), undefined);
assert.equal(requests.at(-1).header['Accept-Language'], 'en-US');
assert.equal(requests.at(-1).header.Authorization, 'Bearer existing-token');
assert.equal(requests.at(-1).method, 'POST');
assert.deepEqual(requests.at(-1).data, {});
assert.equal(requests.at(-1).timeout, 10000);
assert.equal(requests.at(-1).fail({errMsg: 'timeout'}), undefined);
hasToken = false;
await api.getAppConfig();
assert.deepEqual(requests.at(-1).header, {'Accept-Language': 'en-US'});
assert.equal(api.aimRenewAPI(), undefined);
assert.deepEqual(requests.at(-1).header, {'Accept-Language': 'en-US'});
hasToken = true;
nextFailure = {code: 400, message: '设备未连接', data: {reason: 'offline'}};
await assert.rejects(api.request('POST', '/test/error', {}, undefined, undefined, {showErrorToast: false}),
error => error.code === 400 && error.message === '设备未连接' && error.data.reason === 'offline');
assert.equal(requests.at(-1).header['Accept-Language'], 'en-US');
const legacy = {
user: {id: 42, nickName: '原昵称', avatar: 'avatar.png', trio: 1, scores: 150, rankLvl: 1,
lvlName: '倔强青铜I', rankName: '倔强青铜I', nextRankName: '倔强青铜II',
rankIcon: rank.rankIcon, nextRankIcon: 'next.png', lvlImage: 'level.png', vip: true},
device: {deviceId: 'unchanged-device', deviceName: '我的弓'},
};
const {store, storage} = restore(legacy);
for (const [field, value] of Object.entries(legacy.user)) {
assert.deepEqual(store.user[field], ['lvlName','rankName','nextRankName'].includes(field) ? '' : value);
}
assert.deepEqual({...store.device}, legacy.device);
assert.equal(storage.get('trial_token'), 'existing-token');
assert.equal(storage.get('point-book'), JSON.stringify({draft: true}));
assert.deepEqual([...storage.keys()].sort(), ['store', 'trial_token', 'point-book'].sort());
await store.updateConfig(config);
await store.updateUser(home.user);
assert.equal(store.user.rankName, 'Bronze I');
assert.equal(store.user.lvlName, 'Bronze I');
assert.equal(store.user.scores, 150);
assert.equal(store.user.rankLvl, 1);
store.$persist();
const next = restore(JSON.parse(storage.get('store'))).store;
assert.equal(next.user.rankName, 'Bronze I', 'English cached labels must survive cold start');
assert.equal(next.user.lvlName, 'Bronze I');
assert.equal(next.user.nickName, '原昵称');
assert.deepEqual({...next.device}, legacy.device);
assert.equal(restore({user: {id: 7, rankName: '', lvlName: null}, device: {}}).store.user.lvlName, null);
console.log('Rank i18n checks passed: global HTTP English headers (GET/POST/PUT/DELETE + aim renewal), auth/query/pagination and original errors preserved; non-blocking renewal and real Pinia cache hydration verified.');
}
main().catch(error => {console.error(error); process.exitCode = 1;});
+436
View File
@@ -0,0 +1,436 @@
import { createHash } from "node:crypto";
import { readFileSync, writeFileSync } from "node:fs";
import { dirname, resolve } from "node:path";
import { fileURLToPath } from "node:url";
import vm from "node:vm";
const scriptDirectory = dirname(fileURLToPath(import.meta.url));
const projectRoot = resolve(scriptDirectory, "..");
const sourcePath = resolve(projectRoot, "src/utils/match.min.js");
const runtimePath = resolve(projectRoot, "src/utils/matchProtocol.js");
const generatedStartMarker = "// <match-schema-generated>";
const generatedEndMarker = "// </match-schema-generated>";
const supportedScalarKinds = new Set([
"int32",
"int64",
"float",
"double",
"bool",
"string",
"bytes",
]);
const supportedMapKeyKinds = new Set(["int32", "int64", "bool", "string"]);
// 新版描述文件未携带旧协议的 oneof 元数据,保留现有解码结果中的 payload 标识。
const compatibilityOneofs = {
ServerMessage: {
match_info: "payload",
shoot_data: "payload",
practice_info: "payload",
},
};
function isRecord(value) {
return value !== null && typeof value === "object" && !Array.isArray(value);
}
function extractRootCreateArgument(source) {
const match = /(?:\$protobuf\.)?Root\.create\s*\(/.exec(source);
if (!match) {
throw new Error("match.min.js 中未找到 Root.create(...) 协议描述");
}
const openIndex = source.indexOf("(", match.index);
let depth = 0;
let quote = "";
let escaped = false;
let lineComment = false;
let blockComment = false;
for (let index = openIndex; index < source.length; index += 1) {
const char = source[index];
const next = source[index + 1];
if (lineComment) {
if (char === "\n") lineComment = false;
continue;
}
if (blockComment) {
if (char === "*" && next === "/") {
blockComment = false;
index += 1;
}
continue;
}
if (quote) {
if (escaped) {
escaped = false;
} else if (char === "\\") {
escaped = true;
} else if (char === quote) {
quote = "";
}
continue;
}
if (char === '"' || char === "'" || char === "`") {
quote = char;
continue;
}
if (char === "/" && next === "/") {
lineComment = true;
index += 1;
continue;
}
if (char === "/" && next === "*") {
blockComment = true;
index += 1;
continue;
}
if (char === "(") {
depth += 1;
continue;
}
if (char === ")") {
depth -= 1;
if (depth === 0) {
return source.slice(openIndex + 1, index).trim();
}
}
}
throw new Error("match.min.js 中的 Root.create(...) 括号不完整");
}
function stripQuotedText(source) {
let output = "";
let quote = "";
let escaped = false;
for (const char of source) {
if (quote) {
output += " ";
if (escaped) {
escaped = false;
} else if (char === "\\") {
escaped = true;
} else if (char === quote) {
quote = "";
}
continue;
}
if (char === '"' || char === "'") {
quote = char;
output += " ";
} else {
output += char;
}
}
return output;
}
function parseDescriptor(argumentSource) {
if (!argumentSource.startsWith("{") || !argumentSource.endsWith("}")) {
throw new Error("Root.create(...) 参数不是静态对象字面量");
}
try {
return JSON.parse(argumentSource);
} catch {
// 兼容旧版 pbjs 生成的未加引号对象键;只允许静态对象语法。
const syntaxOnly = stripQuotedText(argumentSource);
if (/[();`=]/.test(syntaxOnly)) {
throw new Error("旧版协议描述包含非静态表达式,已拒绝执行");
}
const descriptor = vm.runInNewContext(
`(${argumentSource})`,
Object.create(null),
{ timeout: 1000 }
);
return JSON.parse(JSON.stringify(descriptor));
}
}
function findProtocolNamespace(node, path = []) {
if (!isRecord(node)) return null;
const entries = isRecord(node.nested) ? node.nested : node;
if (isRecord(entries.ServerMessage?.fields) && isRecord(entries.ClientMessage?.fields)) {
return { entries, path };
}
for (const [name, child] of Object.entries(entries)) {
if (!isRecord(child) || isRecord(child.fields)) continue;
const found = findProtocolNamespace(child, [...path, name]);
if (found) return found;
}
return null;
}
function getEnumValues(definition) {
if (!isRecord(definition)) return null;
const candidate = isRecord(definition.values) ? definition.values : definition;
const entries = Object.entries(candidate);
if (entries.length === 0 || entries.some(([, value]) => !Number.isInteger(value))) {
return null;
}
return Object.fromEntries(entries.sort((left, right) => left[1] - right[1]));
}
function normalizeTypeName(type) {
return String(type || "")
.replace(/^\./, "")
.split(".")
.pop();
}
function getOneofByField(definition) {
const result = new Map();
if (!isRecord(definition.oneofs)) return result;
for (const [groupName, groupDefinition] of Object.entries(definition.oneofs)) {
const fieldNames = Array.isArray(groupDefinition)
? groupDefinition
: groupDefinition?.oneof;
if (!Array.isArray(fieldNames)) continue;
for (const fieldName of fieldNames) result.set(fieldName, groupName);
}
return result;
}
function buildSchema({ messageName, definition, messages, enumNames }) {
const schema = {};
const usedIds = new Set();
const oneofByField = getOneofByField(definition);
for (const [fieldKey, fieldDefinition] of Object.entries(definition.fields)) {
const id = Number(fieldDefinition.id);
if (!Number.isInteger(id) || id <= 0) {
throw new Error(`${messageName}.${fieldKey} 的字段编号无效`);
}
if (usedIds.has(id)) {
throw new Error(`${messageName} 存在重复字段编号 ${id}`);
}
usedIds.add(id);
const rule = fieldDefinition.rule;
if (rule && !["optional", "required", "repeated", "map"].includes(rule)) {
throw new Error(`${messageName}.${fieldKey} 使用了不支持的规则 ${rule}`);
}
const fieldName = fieldDefinition.protoName || fieldKey;
const typeName = normalizeTypeName(fieldDefinition.type);
const keyTypeName = normalizeTypeName(
fieldDefinition.keyType ?? fieldDefinition.keytype
);
const isMap = rule === "map" || Boolean(keyTypeName);
if (isMap) {
if (!supportedMapKeyKinds.has(keyTypeName)) {
throw new Error(
`${messageName}.${fieldKey} 使用了不支持的 map key 类型 ${keyTypeName}`
);
}
const valueIsMessage = messages.has(typeName);
const valueKind = enumNames.has(typeName) ? "int32" : typeName;
if (!valueIsMessage && !supportedScalarKinds.has(valueKind)) {
throw new Error(
`${messageName}.${fieldKey} 使用了不支持的 map value 类型 ${typeName}`
);
}
schema[id] = valueIsMessage
? {
name: fieldName,
kind: "map",
keyKind: keyTypeName,
valueKind: "message",
valueType: typeName,
}
: {
name: fieldName,
kind: "map",
keyKind: keyTypeName,
valueKind,
};
continue;
}
const isMessage = messages.has(typeName);
const kind = enumNames.has(typeName) ? "int32" : typeName;
if (!isMessage && !supportedScalarKinds.has(kind)) {
throw new Error(`${messageName}.${fieldKey} 使用了不支持的类型 ${typeName}`);
}
const repeated = rule === "repeated";
const field = isMessage
? { name: fieldName, kind: "message", type: typeName }
: { name: fieldName, kind };
if (repeated) field.repeated = true;
const oneof =
fieldDefinition.oneof ||
oneofByField.get(fieldKey) ||
compatibilityOneofs[messageName]?.[fieldName];
if (oneof) field.oneof = oneof;
schema[id] = field;
}
return schema;
}
function formatPropertyKey(key) {
return /^(?:[A-Za-z_$][\w$]*|\d+)$/.test(key) ? key : JSON.stringify(key);
}
function formatJsValue(value, depth = 0) {
if (!isRecord(value)) return JSON.stringify(value);
const entries = Object.entries(value);
if (entries.length === 0) return "{}";
const indent = " ".repeat(depth);
const primitiveEntries = entries.every(([, child]) => !isRecord(child));
if (primitiveEntries && value.kind !== "map") {
const singleLine = `{ ${entries
.map(([key, child]) => `${formatPropertyKey(key)}: ${JSON.stringify(child)}`)
.join(", ")} }`;
if (indent.length + singleLine.length <= 100) return singleLine;
}
const childIndent = " ".repeat(depth + 1);
const lines = entries.map(
([key, child]) =>
`${childIndent}${formatPropertyKey(key)}: ${formatJsValue(child, depth + 1)},`
);
return `{\n${lines.join("\n")}\n${indent}}`;
}
function createGeneratedSource(source) {
const descriptor = parseDescriptor(extractRootCreateArgument(source));
const namespace = findProtocolNamespace(descriptor);
if (!namespace) {
throw new Error("协议描述中未找到 ServerMessage 和 ClientMessage");
}
const messages = new Map();
const enums = new Map();
for (const [name, definition] of Object.entries(namespace.entries)) {
if (isRecord(definition?.fields)) {
messages.set(name, definition);
continue;
}
const values = getEnumValues(definition);
if (values) enums.set(name, values);
}
const serverMessageType = enums.get("ServerMessageType");
const clientMessageType = enums.get("ClientMessageType");
if (!serverMessageType || !clientMessageType) {
throw new Error("协议描述缺少 ServerMessageType 或 ClientMessageType");
}
const enumNames = new Set(enums.keys());
const schemaByName = new Map();
for (const [messageName, definition] of messages) {
schemaByName.set(
messageName,
buildSchema({ messageName, definition, messages, enumNames })
);
}
const reachable = new Set();
function collectReachable(messageName) {
if (reachable.has(messageName)) return;
const schema = schemaByName.get(messageName);
if (!schema) throw new Error(`找不到消息定义 ${messageName}`);
reachable.add(messageName);
for (const field of Object.values(schema)) {
if (field.kind === "message") collectReachable(field.type);
if (field.kind === "map" && field.valueKind === "message") {
collectReachable(field.valueType);
}
}
}
collectReachable("ServerMessage");
const schemas = {};
for (const messageName of messages.keys()) {
if (reachable.has(messageName)) schemas[messageName] = schemaByName.get(messageName);
}
const sourceHash = createHash("sha256").update(source).digest("hex").slice(0, 16);
const namespaceName = namespace.path.join(".") || "root";
const fieldCount = Object.values(schemas).reduce(
(total, schema) => total + Object.keys(schema).length,
0
);
const generatedBlock = [
generatedStartMarker,
"// 此区块由 scripts/generate-match-schema.mjs 自动生成,请勿手动修改。",
`// 来源:src/utils/match.min.js(sha256: ${sourceHash})`,
`// 协议命名空间:${namespaceName};消息数:${Object.keys(schemas).length};字段数:${fieldCount}`,
"",
`export const ServerMessageType = ${formatJsValue(serverMessageType)};`,
"",
`export const ClientMessageType = ${formatJsValue(clientMessageType)};`,
"",
`const SCHEMAS = ${formatJsValue(schemas)};`,
generatedEndMarker,
].join("\n");
return {
generatedBlock,
messageCount: Object.keys(schemas).length,
fieldCount,
};
}
function main() {
const args = process.argv.slice(2);
const unknownArgs = args.filter((arg) => arg !== "--check");
if (unknownArgs.length > 0) {
throw new Error(`未知参数:${unknownArgs.join(", ")}`);
}
// 统一换行符,避免 Windows 的 CRLF 让未变更的协议产生不同哈希。
const source = readFileSync(sourcePath, "utf8").replace(/\r\n?/g, "\n");
const { generatedBlock, messageCount, fieldCount } = createGeneratedSource(source);
const runtimeSource = readFileSync(runtimePath, "utf8");
const startIndex = runtimeSource.indexOf(generatedStartMarker);
const endMarkerIndex = runtimeSource.indexOf(generatedEndMarker);
if (startIndex < 0 || endMarkerIndex < startIndex) {
throw new Error("matchProtocol.js 缺少协议生成区块标记");
}
const endIndex = endMarkerIndex + generatedEndMarker.length;
const currentBlock = runtimeSource.slice(startIndex, endIndex);
if (args.includes("--check")) {
if (currentBlock !== generatedBlock) {
throw new Error(
"matchProtocol.js 的生成区块与 match.min.js 不同步,请运行 npm run proto:generate"
);
}
console.log(`[match-schema] 同步校验通过:${messageCount} 个消息,${fieldCount} 个字段`);
return;
}
if (currentBlock === generatedBlock) {
console.log(`[match-schema] 无需更新:${messageCount} 个消息,${fieldCount} 个字段`);
return;
}
const nextRuntimeSource =
runtimeSource.slice(0, startIndex) + generatedBlock + runtimeSource.slice(endIndex);
writeFileSync(runtimePath, nextRuntimeSource, "utf8");
console.log(`[match-schema] 已生成:${messageCount} 个消息,${fieldCount} 个字段`);
}
try {
main();
} catch (error) {
console.error(`[match-schema] ${error.message}`);
process.exitCode = 1;
}
+63
View File
@@ -0,0 +1,63 @@
// 只读提取源码中的中文候选;不扫描图片、生成物或第三方依赖。
const fs = require('node:fs');
const path = require('node:path');
const parser = require('@babel/parser');
const traverse = require('@babel/traverse').default;
const sfc = require('@vue/compiler-sfc');
const dom = require('@vue/compiler-dom');
const han = /[\p{Script=Han}]/u;
const root = path.resolve(__dirname, '../src');
const entries = [];
function scripts(code, file, offset = 0, context = 'script') {
if (context === 'expression') { code = '(' + code + ')'; offset -= 1; }
const ast = parser.parse(code, {sourceType: 'module', plugins: ['typescript'], errorRecovery: true});
traverse(ast, {
StringLiteral(p) { add(p, p.node.value, 'string'); },
TemplateLiteral(p) {
if (!p.node.quasis.some(q => han.test(q.value.cooked || q.value.raw))) return;
const text = p.node.quasis.map((q, i) => (q.value.cooked ?? q.value.raw) + (i < p.node.expressions.length ? `{p${i}}` : '')).join('');
add(p, text, 'template');
},
});
function add(p, text, kind) {
if (!han.test(text) || /^https?:/.test(text)) return;
const ancestors = [];
let q = p;
for (let i = 0; q && i < 5; i++, q = q.parentPath) {
const n = q.node;
ancestors.push(n.type + (n.key?.name ? ':' + n.key.name : '') + (n.type === 'CallExpression' ? ':' + code.slice(n.callee.start, n.callee.end) : ''));
}
entries.push({file, start: offset + p.node.start, end: offset + p.node.end, kind, text, context, ancestors: ancestors.join(' > '), snippet: code.slice(Math.max(0, p.node.start - 65), Math.min(code.length, p.node.end + 65))});
}
}
function inspect(file) {
const code = fs.readFileSync(path.join(root, file), 'utf8');
if (file.endsWith('.js')) return scripts(code, file);
const {descriptor} = sfc.parse(code);
for (const block of [descriptor.script, descriptor.scriptSetup]) if (block) scripts(block.content, file, block.loc.start.offset);
const block = descriptor.template;
if (!block) return;
const ast = dom.baseParse(block.content);
function walk(n) {
if (n.type === 2 && han.test(n.content)) entries.push({file, start: block.loc.start.offset + n.loc.start.offset, end: block.loc.start.offset + n.loc.end.offset, kind:'text', text:n.content, context:'template'});
if (n.type === 5 && han.test(n.content.content)) scripts(n.content.content, file, block.loc.start.offset + n.content.loc.start.offset, 'expression');
for (const prop of n.props || []) {
if (prop.type === 6 && prop.value && han.test(prop.value.content) && !/^(src|class|id|style|key|name|value)$/.test(prop.name)) entries.push({file, start:block.loc.start.offset + prop.loc.start.offset, end:block.loc.start.offset + prop.loc.end.offset, kind:'attribute', text:prop.value.content, attribute:prop.name, context:'template'});
if (prop.type === 7 && prop.exp && han.test(prop.exp.content)) {
try { scripts(prop.exp.content, file, block.loc.start.offset + prop.exp.loc.start.offset, 'expression'); } catch (e) { /* v-for 等非独立表达式保留人工检查 */ }
}
}
for (const child of n.children || []) walk(child);
}
walk(ast);
}
function walk(dir) {
for (const item of fs.readdirSync(path.join(root, dir), {withFileTypes:true})) {
const file = path.posix.join(dir, item.name);
if (item.isDirectory()) { if (item.name !== 'static' && item.name !== 'locales') walk(file); }
else if (/\.(vue|js)$/.test(file) && !/match\.min\.js|audioManager\.js/.test(file)) inspect(file);
}
}
walk('');
if (require.main === module) process.stdout.write(JSON.stringify(entries, null, 2));
module.exports = entries;
+81 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { import {
watch watch
} from "vue"; } from "vue";
@@ -7,9 +9,10 @@
onHide onHide
} from "@dcloudio/uni-app"; } from "@dcloudio/uni-app";
import websocket from "@/websocket"; import websocket from "@/websocket";
import matchWebsocket from "@/matchWebsocket";
import { import {
getDeviceBatteryAPI MESSAGETYPES
} from "@/apis"; } from "@/constants";
import useStore from "@/store"; import useStore from "@/store";
import { import {
storeToRefs storeToRefs
@@ -17,11 +20,16 @@
import audioManager from "./audioManager"; import audioManager from "./audioManager";
const store = useStore(); const store = useStore();
const { const {
user user,
device,
online
} = storeToRefs(store); } = storeToRefs(store);
const { const {
updateUser, updateUser,
updateOnline, updateDeviceStatus,
setDeviceOnline,
clearDeviceStatus,
showDeviceChargingDialog,
clearSessionState, clearSessionState,
clearDevice clearDevice
} = store; } = store;
@@ -36,6 +44,9 @@
websocket.createWebSocket(token, onShootWsMsg); websocket.createWebSocket(token, onShootWsMsg);
} }
if (!newVal) { if (!newVal) {
matchWebsocket.closeMatchWebSocket({
reason: "logout"
});
websocket.closeWebSocket(); websocket.closeWebSocket();
} }
}, { }, {
@@ -53,15 +64,25 @@
uni.removeStorageSync(`${env}_token`); uni.removeStorageSync(`${env}_token`);
clearSessionState(); clearSessionState();
uni.showModal({ uni.showModal({
title: "提示", title: t('notice'),
content: "账号已在其他设备登录", content: t('your_account_has_been_signed_in_on_another_device'),
showCancel: false, showCancel: false,
}); });
} }
async function emitUpdateOnline() { function emitUpdateOnline(nextOnline) {
const data = await getDeviceBatteryAPI(); const wasOnline = Boolean(online.value);
updateOnline(data.online); setDeviceOnline(nextOnline === true);
if (!device.value.deviceId || wasOnline === (nextOnline === true)) return;
audioManager.play(nextOnline === true ? "设备已连接" : "设备连接已断开");
}
function onDeviceStatusPush(status) {
updateDeviceStatus(status);
}
function onShootSocketDisconnected() {
clearDeviceStatus();
} }
function onDeviceBindInvalid() { function onDeviceBindInvalid() {
@@ -69,22 +90,64 @@
uni.setStorageSync("calibration", false); uni.setStorageSync("calibration", false);
} }
function onDeviceCharging() {
showDeviceChargingDialog();
}
function onDeviceShoot() { function onDeviceShoot() {
// audioManager.play("射箭声音") // audioManager.play("射箭声音")
} }
function onNetworkStatusChange(status) {
matchWebsocket.handleMatchNetworkStatusChange(status);
}
function connectMatchServerFromMessage(content) {
const messages = Array.isArray(content) ? content : [content];
messages.forEach((message) => {
if (
message?.constructor ===
MESSAGETYPES.ShootSyncBattleCreateMatchLinkID
) {
matchWebsocket.connectMatchWebSocketFromNotice(
message,
user.value.id
);
}
});
}
function onShootWsMsg(content) { function onShootWsMsg(content) {
if (content?.event === "/addons/shoot/battery") {
onDeviceStatusPush(content.data);
return;
}
if(content.type === 'shoot-trigger'){ if(content.type === 'shoot-trigger'){
onDeviceShoot() onDeviceShoot()
} }
connectMatchServerFromMessage(content);
uni.$emit("socket-inbox", content); uni.$emit("socket-inbox", content);
} }
onShow(() => { onShow(() => {
void audioManager.warmButton();
uni.$on("update-user", emitUpdateUser); uni.$on("update-user", emitUpdateUser);
uni.$on("update-online", emitUpdateOnline); uni.$on("update-online", emitUpdateOnline);
uni.$on("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$on("session-kicked-out", onSessionKickedOut); uni.$on("session-kicked-out", onSessionKickedOut);
uni.$on("device-bind-invalid", onDeviceBindInvalid); uni.$on("device-bind-invalid", onDeviceBindInvalid);
uni.$on("device-charging", onDeviceCharging);
if (typeof uni.offNetworkStatusChange === "function") {
uni.offNetworkStatusChange(onNetworkStatusChange);
}
if (typeof uni.onNetworkStatusChange === "function") {
uni.onNetworkStatusChange(onNetworkStatusChange);
}
if (typeof uni.getNetworkType === "function") {
uni.getNetworkType({
success: onNetworkStatusChange
});
}
const token = uni.getStorageSync( const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
); );
@@ -97,8 +160,17 @@
onHide(() => { onHide(() => {
uni.$off("update-user", emitUpdateUser); uni.$off("update-user", emitUpdateUser);
uni.$off("update-online", emitUpdateOnline); uni.$off("update-online", emitUpdateOnline);
uni.$off("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$off("session-kicked-out", onSessionKickedOut); uni.$off("session-kicked-out", onSessionKickedOut);
uni.$off("device-bind-invalid", onDeviceBindInvalid); uni.$off("device-bind-invalid", onDeviceBindInvalid);
uni.$off("device-charging", onDeviceCharging);
if (typeof uni.offNetworkStatusChange === "function") {
uni.offNetworkStatusChange(onNetworkStatusChange);
}
matchWebsocket.closeMatchWebSocket({
reason: "app-hide"
});
clearDeviceStatus();
websocket.closeWebSocket(); websocket.closeWebSocket();
}); });
</script> </script>
+238 -48
View File
@@ -1,3 +1,6 @@
import { t } from "@/locales";
import { normalizeBattleApiResult } from "@/utils/matchAdapter";
let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
try { try {
@@ -24,13 +27,15 @@ try {
} }
const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot"); const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
// 统一处理业务接口请求,包含登录态、业务错误和 WiFi 连接空响应兼容。 // 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。
function request(method, url, data = {}, baseUrl = BASE_URL) { function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0], options = {}) {
const {timeout = 10000, showErrorToast = true} = options;
const token = uni.getStorageSync( const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
); );
const header = {}; // 英文版全部后端 HTTP 请求统一声明语言,保留原有认证与响应处理。
const header = {"Accept-Language": "en-US"};
if (token) header.Authorization = `Bearer ${token || ""}`; if (token) header.Authorization = `Bearer ${token || ""}`;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.request({ uni.request({
@@ -38,15 +43,27 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
method, method,
header, header,
data, data,
timeout: 10000, timeout,
success: (res) => { success: (res) => {
if (url === "/user/hardwareBox/connectWifi" && res.statusCode === 200 && res.data && Object.keys(res.data).length === 0) { if (
url === "/user/hardwareBox/connectWifi" &&
res.statusCode === 200 &&
typeof res.data?.success === "boolean"
) {
resolve(res.data);
return;
}
const acceptsEmptyResponse = [
"/user/hardwareBox/connectWifi",
"/user/device/unbindByQrcodeId",
].includes(url);
if (acceptsEmptyResponse && res.statusCode === 200 && res.data && Object.keys(res.data).length === 0) {
resolve({}); resolve({});
return; return;
} }
if (res.data) { if (res.data) {
const {code, data, message} = res.data; const {code, data, message} = res.data;
if (code === 0) resolve(data); if (successCodes.includes(code)) resolve(data);
else if (message) { else if (message) {
const error = {code, data, message}; const error = {code, data, message};
if (message.indexOf("登录身份已失效") !== -1) { if (message.indexOf("登录身份已失效") !== -1) {
@@ -85,7 +102,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
if (message === "BIND_FAILD") { if (message === "BIND_FAILD") {
uni.$emit("device-bind-invalid"); uni.$emit("device-bind-invalid");
uni.showToast({ uni.showToast({
title: "设备绑定状态已失效,请重新绑定", title: t('your_device_binding_has_expired_please_bind_it_again'),
icon: "none", icon: "none",
}); });
reject({type: "DEVICE_BIND_INVALID", message}); reject({type: "DEVICE_BIND_INVALID", message});
@@ -93,7 +110,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
if (message === "ERROR_ORDER_UNPAY") { if (message === "ERROR_ORDER_UNPAY") {
uni.showToast({ uni.showToast({
title: "当前有未支付订单", title: t('you_have_an_unpaid_order'),
icon: "none", icon: "none",
}); });
resolve({}); resolve({});
@@ -101,14 +118,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
if (message === "ROOM_EMPTY") { if (message === "ROOM_EMPTY") {
return uni.showToast({ return uni.showToast({
title: "房间已过期", title: t('this_room_has_expired'),
icon: "none",
});
}
if (showErrorToast) {
uni.showToast({
title: message,
icon: "none", icon: "none",
}); });
} }
uni.showToast({
title: message,
icon: "none",
});
reject(error); reject(error);
return; return;
} }
@@ -116,7 +135,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
}, },
fail: (err) => { fail: (err) => {
handleRequestError(err, url); if (showErrorToast) handleRequestError(err, url);
reject(err); reject(err);
}, },
}); });
@@ -130,26 +149,26 @@ function handleRequestError(err, url) {
// 根据错误类型显示不同提示 // 根据错误类型显示不同提示
if (err.errMsg) { if (err.errMsg) {
if (err.errMsg.includes("timeout")) { if (err.errMsg.includes("timeout")) {
showCustomToast("请求超时,请稍后重试", "timeout"); showCustomToast(t('request_timed_out_please_try_again'), "timeout");
} else if (err.errMsg.includes("fail")) { } else if (err.errMsg.includes("fail")) {
// 检查网络状态 // 检查网络状态
uni.getNetworkType({ uni.getNetworkType({
success: (res) => { success: (res) => {
if (res.networkType === "none") { if (res.networkType === "none") {
showCustomToast("网络连接已断开,请检查网络设置", "network"); showCustomToast(t('network_disconnected_check_your_network_settings'), "network");
} else { } else {
showCustomToast("服务器连接失败,请稍后重试", "server"); showCustomToast(t('cannot_connect_to_the_server_please_try_again'), "server");
} }
}, },
fail: () => { fail: () => {
showCustomToast("网络异常,请检查网络连接", "unknown"); showCustomToast(t('network_error_check_your_connection'), "unknown");
}, },
}); });
} else { } else {
showCustomToast("请求失败,请稍后重试", "general"); showCustomToast(t('request_failed_please_try_again'), "general");
} }
} else { } else {
showCustomToast("网络异常,请稍后重试", "unknown"); showCustomToast(t('network_error_please_try_again'), "unknown");
} }
} }
@@ -185,8 +204,19 @@ export const getDailyCountAPI = () => {
return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL); return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL);
}; };
export const getHomeData = (seasonId) => { export const getHomeData = async (seasonId) => {
return request("GET", `/user/myHome?seasonId=${seasonId}`); const data = await request("GET", `/user/myHome?seasonId=${seasonId}`);
if (!data?.user) return data;
// 段位信息由 myHome 接口直接返回,统一并入用户数据供各页面展示。
return {
...data,
user: {
...data.user,
rankIcon: data.rankIcon,
rankName: data.rankName,
},
};
}; };
export const getProvinceData = () => { export const getProvinceData = () => {
@@ -230,6 +260,12 @@ export const checkUserBindAPI = async (code) => {
}); });
}; };
export const tempBindOrgAPI = (scene) => {
return request("POST", "/user/org/device/tempBind", {
scene,
});
};
export const bindDeviceAPI = (device) => { export const bindDeviceAPI = (device) => {
return request("POST", "/user/device/bindDevice", { return request("POST", "/user/device/bindDevice", {
device, device,
@@ -248,11 +284,24 @@ export const unbindDeviceAPI = (deviceId) => {
}); });
}; };
// 测试环境根据设备二维码编号解绑设备,不校验设备归属。
export const unbindDeviceByQrcodeIdAPI = (id) => {
return request("POST", "/user/device/unbindByQrcodeId", {id});
};
export const getMyDevicesAPI = () => { export const getMyDevicesAPI = () => {
// "/user/device/getBinding?deviceId=9ZF9oVXs" // "/user/device/getBinding?deviceId=9ZF9oVXs"
return request("GET", "/user/device/getBindings"); return request("GET", "/user/device/getBindings");
}; };
export const getDeviceDetailAPI = (deviceId) => {
return request("GET", `/user/device/getDetail?deviceId=${encodeURIComponent(deviceId)}`);
};
export const updateDeviceAliasAPI = (deviceId, alias) => {
return request("POST", "/user/device/updateAlias", {deviceId, alias});
};
export const createPractiseAPI = (arrows, time, target) => { export const createPractiseAPI = (arrows, time, target) => {
return request("POST", "/user/practice/create", { return request("POST", "/user/practice/create", {
shootNumber: arrows, shootNumber: arrows,
@@ -261,18 +310,36 @@ export const createPractiseAPI = (arrows, time, target) => {
}); });
}; };
export const startPractiseAPI = () => { export const createPractiseV2API = (trainingType, difficultyLevel) => {
return request("POST", "/user/practice/begin"); return request("POST", "/user/practice/create/v2", {
trainingType,
difficultyLevel,
});
}; };
export const endPractiseAPI = () => { export const getCurrentPractiseAPI = () => {
return request("POST", "/user/practice/stop"); return request("GET", "/user/practice/current");
};
export const startPractiseAPI = (id) => {
return request("POST", "/user/practice/begin", { id });
};
export const endPractiseAPI = (id) => {
return request("POST", "/user/practice/stop", { id });
}; };
export const getPractiseAPI = async (id) => { export const getPractiseAPI = async (id) => {
return request("GET", `/user/practice/get?id=${id}`); return request("GET", `/user/practice/get?id=${id}`);
}; };
export const getPractiseDetailAPI = async (id) => {
return request(
"GET",
`/user/practice/detail?id=${encodeURIComponent(id)}`
);
};
export const createRoomAPI = (gameType, teamSize, targetType) => { export const createRoomAPI = (gameType, teamSize, targetType) => {
return request("POST", "/user/createroom", { return request("POST", "/user/createroom", {
gameType, gameType,
@@ -306,12 +373,12 @@ 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, pageSize = 15) => {
const reuslt = await request( const result = await request(
"GET", "GET",
`/user/practice/list?page=${page}&page_size=${page_size}` `/user/practice/mylist?page=${page}&pageSize=${pageSize}&status=0`
); );
return reuslt.list; return Array.isArray(result?.list) ? result.list : [];
}; };
export const matchGameAPI = (match, gameType, teamSize) => { export const matchGameAPI = (match, gameType, teamSize) => {
@@ -330,9 +397,11 @@ export const readyGameAPI = (battleId) => {
}); });
}; };
export const simulShootAPI = (device_id, x, y) => { export const simulShootAPI = (device_id, x, y, targetType = 40) => {
const data = { const data = {
device_id, device_id,
// 模拟射箭仅支持 20cm、40cm 靶纸,未传或传入无效值时默认使用 40cm。
targetType: Number(targetType) === 20 ? 20 : 40,
}; };
if (x !== undefined && y !== undefined) { if (x !== undefined && y !== undefined) {
data.x = x; data.x = x;
@@ -451,6 +520,15 @@ 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");
}; };
@@ -481,32 +559,55 @@ export const laserAimAPI = async () => {
return request("POST", "/user/device/laserAim"); return request("POST", "/user/device/laserAim");
}; };
// 调瞄续期只负责发送请求,不等待或处理响应,避免阻塞下一次续期。
export const aimRenewAPI = () => {
const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
);
const header = {"Accept-Language": "en-US"};
if (token) header.Authorization = `Bearer ${token}`;
uni.request({
url: `${BASE_URL}/user/device/aimRenew`,
method: "POST",
header,
data: {},
timeout: 10000,
success: () => {},
fail: () => {},
});
};
export const laserCloseAPI = async () => { export const laserCloseAPI = async () => {
return request("POST", "/user/device/closeAim"); return request("POST", "/user/device/closeAim");
}; };
export const getDeviceBatteryAPI = async () => {
return request("GET", "/user/device/battery");
};
// 设备连接指定 WiFi,只下发 WiFi 凭证,不触发 OTA 升级。 // 设备连接指定 WiFi,只下发 WiFi 凭证,不触发 OTA 升级。
export const connectDeviceWifiAPI = async (ssid, password) => { export const connectDeviceWifiAPI = async (ssid, password) => {
return request("POST", "/user/hardwareBox/connectWifi", {ssid, password}); return request(
"POST",
"/user/hardwareBox/connectWifi",
{ssid, password},
BASE_URL,
[0],
{timeout: 20000, showErrorToast: false}
);
}; };
// 获取硬件盒子版本信息,用于判断当前设备是否需要 OTA 升级。 // 查询设备当前联网类型及已连接的 WiFi 名称。
export const getHardwareBoxVersionAPI = async () => { export const getDeviceWifiStatusAPI = async () => {
return request("GET", "/user/hardwareBox/version"); return request("GET", "/user/device/wifiStatus", {}, BASE_URL, [0], {
showErrorToast: false,
});
}; };
// 发送硬件盒子 OTA 更新指令,服务端会返回后续轮询使用的任务 ID。 // 发送硬件盒子 OTA 更新指令,服务端会返回后续轮询使用的任务 ID。
export const sendHardwareBoxUpdateAPI = async (data) => { export const sendHardwareBoxUpdateAPI = async ({versionNumber, wifiSsid, wifiPassword}) => {
return request("POST", "/user/hardwareBox/sendUpdate", data); return request("POST", "/user/hardwareBox/sendUpdate", {
}; versionNumber,
wifiSsid,
// 根据任务 ID 获取硬件盒子 OTA 更新状态。 wifiPassword,
export const getHardwareBoxTaskStatusAPI = async (taskId) => { });
return request("GET", `/user/hardwareBox/taskStatus?taskId=${taskId}`);
}; };
export const addNoteAPI = async (id, remark) => { export const addNoteAPI = async (id, remark) => {
@@ -553,9 +654,10 @@ export const getReadyAPI = (roomId) => {
}; };
export const getBattleAPI = async (battleId) => { export const getBattleAPI = async (battleId) => {
return request("POST", "/user/match/info", { const result = await request("POST", "/user/match/info", {
id: battleId, id: battleId,
}); });
return normalizeBattleApiResult(result);
}; };
export const kickPlayerAPI = (number, userId) => { export const kickPlayerAPI = (number, userId) => {
@@ -624,3 +726,91 @@ export const getMyTenRingRank = (seasonId) => {
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId; if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myTenRingRank", data); return request("GET", "/index/myTenRingRank", data);
}; };
// 获取当前用户的金币统计,可按门店查询。
export const getMyGoldAPI = (storeId) => {
const data = {};
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/my", data);
};
// 分页获取当前用户的金币流水,type:1=获得,2=兑换。
export const getGoldLogAPI = ({page = 1, pageSize = 20, type, storeId} = {}) => {
const data = {page, pageSize};
if (type !== undefined && type !== null) data.type = type;
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/log", data);
};
// 前台礼品接口位于站点根路径,并使用 code=200 表示成功。
export const getGiftListAPI = ({
page = 1,
pageSize = 20,
sort = "coin_desc",
storeId,
} = {}) => {
const data = {page, page_size: pageSize, sort};
if (storeId !== undefined && storeId !== null && storeId !== "") {
data.store_id = storeId;
}
return request(
"GET",
"/gin/api/v1/gift/list",
data,
API_ROOT_URL,
[0, 200]
);
};
export const getGiftDetailAPI = (id) => {
return request(
"GET",
`/gin/api/v1/gift/${id}`,
{},
API_ROOT_URL,
[0, 200]
);
};
// 分页获取启用门店及当前用户在各店的会员状态。
export const getStoreVipListAPI = ({page = 1, pageSize = 20} = {}) => {
return request("GET", "/store/list", {page, pageSize});
};
// 查询当前用户在指定门店的会员状态及权益剩余次数。
export const getStoreBenefitAPI = (storeId) => {
return request("GET", "/store/benefit", {storeId});
};
// 获取体验中心 VIP 介绍纯文本,无需登录。
export const getStoreVipIntroAPI = () => {
return request("GET", "/store/vip-intro");
};
// 根据用户定位分页获取附近门店。
export const getNearbyStoresAPI = ({
longitude,
latitude,
radius = 65535,
page = 1,
pageSize = 20,
} = {}) => {
return request("GET", "/store/nearby", {
longitude,
latitude,
radius,
page,
pageSize,
});
};
// 分页获取指定门店的公开金币规则。
export const getStoreGoldRuleListAPI = ({storeId, page = 1, pageSize = 20} = {}) => {
return request(
"GET",
`/gin/api/v1/super-admin/gold-rule/store/${storeId}/list`,
{page, page_size: pageSize},
API_ROOT_URL,
[0, 200]
);
};
+547 -256
View File
File diff suppressed because it is too large Load Diff
+57 -42
View File
@@ -1,3 +1,4 @@
import { t as translate } from "@/locales";
import { formatTimestamp } from "@/util"; import { formatTimestamp } from "@/util";
const loadImage = (src) => const loadImage = (src) =>
@@ -277,7 +278,7 @@ export const generateShareImage = async (canvasId, data) => {
renderText(ctx, data.user.name, 18, "#000", 84, 36); renderText(ctx, data.user.name, 18, "#000", 84, 36);
renderText(ctx, data.recordDate, 9, "#fff", 348, 23, "center", 39); renderText(ctx, data.recordDate, 9, "#fff", 348, 23, "center", 39);
renderText(ctx, "今日打卡", 14, "#fff", 336, 38, "center", 39); renderText(ctx, translate('today_s_check_in'), 9, "#fff", 336, 38, "center", 39);
// 文本标签 // 文本标签
let cursorX = 84; let cursorX = 84;
@@ -295,7 +296,7 @@ export const generateShareImage = async (canvasId, data) => {
); );
cursorX = drawTextBoxesLine( cursorX = drawTextBoxesLine(
ctx, ctx,
String(pointBook.distance) + " 米", String(pointBook.distance) + translate('m'),
cursorX + 6, cursorX + 6,
58, 58,
9, 9,
@@ -318,9 +319,9 @@ export const generateShareImage = async (canvasId, data) => {
2 2
); );
renderText(ctx, "落点稳定性", 13, "#999", 25, 110); renderText(ctx, translate('shot_grouping'), 13, "#999", 25, 110);
renderText(ctx, "黄心率", 13, "#999", 145, 110); renderText(ctx, translate('gold_hit_rate'), 13, "#999", 145, 110);
renderText(ctx, "10环数", 13, "#999", 262, 110); renderText(ctx, translate('10s'), 13, "#999", 262, 110);
renderText( renderText(
ctx, ctx,
@@ -340,8 +341,8 @@ export const generateShareImage = async (canvasId, data) => {
); );
renderText(ctx, arrowData.tenRings, 15, "#000", 262, 133); renderText(ctx, arrowData.tenRings, 15, "#000", 262, 133);
renderText(ctx, "平均环数", 13, "#999", 25, 175); renderText(ctx, translate('average_score'), 13, "#999", 25, 175);
renderText(ctx, "总环数", 13, "#999", 145, 175); renderText(ctx, translate('total_score'), 13, "#999", 145, 175);
renderText( renderText(
ctx, ctx,
Number(arrowData.averageRing.toFixed(2)), Number(arrowData.averageRing.toFixed(2)),
@@ -361,7 +362,7 @@ export const generateShareImage = async (canvasId, data) => {
if (hasPoint) { if (hasPoint) {
drawRoundedRect(ctx, 20, 230, 5, 15, 5, "#FED847"); drawRoundedRect(ctx, 20, 230, 5, 15, 5, "#FED847");
renderText(ctx, "落点分布", 13, "#999", 32, 242); renderText(ctx, translate('shot_distribution'), 13, "#999", 32, 242);
const bowSrc = await loadImage(pointBook.bowtargetType.iconPng); const bowSrc = await loadImage(pointBook.bowtargetType.iconPng);
const bowImg = await loadCanvasImage(canvas, bowSrc); const bowImg = await loadCanvasImage(canvas, bowSrc);
@@ -421,7 +422,7 @@ export const generateShareImage = async (canvasId, data) => {
); );
}); });
renderText(ctx, "环值", 9, "#999", 15, ringBarHeight - 1); renderText(ctx, translate('score'), 9, "#999", 15, ringBarHeight - 1);
ringNames.forEach((ring, index) => { ringNames.forEach((ring, index) => {
renderText( renderText(
ctx, ctx,
@@ -441,17 +442,17 @@ export const generateShareImage = async (canvasId, data) => {
const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc); const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc);
ctx.drawImage(qrcodeImg, 40, hasPoint ? 715 : 358, 68, 68); ctx.drawImage(qrcodeImg, 40, hasPoint ? 715 : 358, 68, 68);
renderText(ctx, "射灵星球", 18, "#333", 120, hasPoint ? 734 : 380); renderText(ctx, translate('sheling_planet'), 18, "#333", 120, hasPoint ? 734 : 380);
renderText( renderText(
ctx, ctx,
"高效记录每一箭,快来一起打卡吧!", translate('track_every_arrow_join_us'),
13, 13,
"#999", "#999",
120, 120,
hasPoint ? 756 : 402 hasPoint ? 756 : 402
); );
renderText(ctx, "扫码打卡", 13, "#FFA118", 142, hasPoint ? 777 : 422); renderText(ctx, translate('scan_to_check_in'), 13, "#FFA118", 142, hasPoint ? 777 : 422);
const pointImg = await loadCanvasImage(canvas, "../static/point.png"); const pointImg = await loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/point.png");
ctx.drawImage(pointImg, 120, hasPoint ? 765 : 410, 18, 14); ctx.drawImage(pointImg, 120, hasPoint ? 765 : 410, 18, 14);
// 2D 即时绘制,无需 ctx.draw() // 2D 即时绘制,无需 ctx.draw()
} catch (e) { } catch (e) {
@@ -539,10 +540,10 @@ export const sharePointData = async (canvasId, data) => {
const bubble2Img = await loadCanvasImage(canvas, bubble2Src); const bubble2Img = await loadCanvasImage(canvas, bubble2Src);
const bubble3Img = await loadCanvasImage(canvas, bubble3Src); const bubble3Img = await loadCanvasImage(canvas, bubble3Src);
ctx.drawImage(bubble1Img, 10, 88, 143, 87); ctx.drawImage(bubble1Img, 10, 88, 143, 87);
renderText(ctx, "本周箭数", 14, "#FDA103", 84, 116, "center"); renderText(ctx, translate('arrows_this_week'), 14, "#FDA103", 84, 116, "center");
renderText(ctx, data.weekArrow, 36, "#FA2A2A", 84, 152, "center"); renderText(ctx, data.weekArrow, 36, "#FA2A2A", 84, 152, "center");
ctx.drawImage(bubble2Img, 65, 220, 143, 87); ctx.drawImage(bubble2Img, 65, 220, 143, 87);
renderText(ctx, "本周消耗", 14, "#FDA103", 139, 248, "center"); renderText(ctx, translate('calories_this_week'), 14, "#FDA103", 139, 248, "center");
renderText( renderText(
ctx, ctx,
Math.round(data.weekArrow * 1.6), Math.round(data.weekArrow * 1.6),
@@ -553,7 +554,7 @@ export const sharePointData = async (canvasId, data) => {
"center" "center"
); );
ctx.drawImage(bubble3Img, 255, 52, 114, 92); ctx.drawImage(bubble3Img, 255, 52, 114, 92);
renderText(ctx, "我的名次", 14, "#FDA103", 312, 80, "center"); renderText(ctx, translate('my_rank'), 14, "#FDA103", 312, 80, "center");
renderText(ctx, data.rank, 36, "#FA2A2A", 312, 116, "center"); renderText(ctx, data.rank, 36, "#FA2A2A", 312, 116, "center");
const qrcodeSrc = await loadImage( const qrcodeSrc = await loadImage(
@@ -562,8 +563,8 @@ export const sharePointData = async (canvasId, data) => {
const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc); const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc);
ctx.drawImage(qrcodeImg, 40, 383, 68, 68); ctx.drawImage(qrcodeImg, 40, 383, 68, 68);
renderText(ctx, "射灵星球", 18, "#333", 120, 412); renderText(ctx, translate('sheling_planet'), 18, "#333", 120, 412);
renderText(ctx, "高效记录每一箭,快来一起打卡吧!", 13, "#999", 120, 435); renderText(ctx, translate('track_every_arrow_join_us'), 13, "#999", 120, 435);
// 2D 即时绘制,无需 ctx.draw() // 2D 即时绘制,无需 ctx.draw()
} catch (e) { } catch (e) {
console.error("generateShareImage 绘制失败:", e); console.error("generateShareImage 绘制失败:", e);
@@ -635,7 +636,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
); );
} else { } else {
ctx.drawImage( ctx.drawImage(
"../static/score-bg.png", "https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
16 + (i % 9) * 30, 16 + (i % 9) * 30,
290 + Math.ceil((i + 1) / 9) * 30, 290 + Math.ceil((i + 1) / 9) * 30,
27, 27,
@@ -657,7 +658,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38); ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38);
} else { } else {
ctx.drawImage( ctx.drawImage(
"../static/score-bg.png", "https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
24 + rowIndex * 42, 24 + rowIndex * 42,
i > 5 ? 362 : 320, i > 5 ? 362 : 320,
38, 38,
@@ -706,22 +707,36 @@ export async function sharePractiseData(canvasId, type, user, data) {
); );
const bgImg = await loadCanvasImage(canvas, bgImgSrc); const bgImg = await loadCanvasImage(canvas, bgImgSrc);
const avatarImgPromise = loadImage(user.avatar).then((path) => // 头像与段位框属于装饰图片,缺失时使用兜底或跳过,避免阻断分享。
loadCanvasImage(canvas, path) const loadProfileImage = async (src, fallbackSrc = "", label = "") => {
); const normalizedSrc = typeof src === "string" ? src : "";
const lvlImgPromise = loadImage(user.lvlImage).then((path) => if (normalizedSrc) {
loadCanvasImage(canvas, path) try {
); const path = await loadImage(normalizedSrc);
return await loadCanvasImage(canvas, path);
} catch (error) {
console.warn(`share ${label} image load failed`, error);
}
}
return fallbackSrc ? loadCanvasImage(canvas, fallbackSrc) : null;
};
let titleImageSrc = "../static/first-try-title.png"; const avatarImgPromise = loadProfileImage(
user?.avatar,
"https://static.shelingxingqiu.com/shootmini/static/user-icon.png",
"avatar"
);
const lvlImgPromise = loadProfileImage(user?.lvlImage, "", "level");
let titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/first-try-title.png";
if (type == 2) { if (type == 2) {
titleImageSrc = "../static/practise-one-title.png"; titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-one-title.png";
} else if (type == 3) { } else if (type == 3) {
titleImageSrc = "../static/practise-two-title.png"; titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-two-title.png";
} }
const titleImgPromise = loadCanvasImage(canvas, titleImageSrc); const titleImgPromise = loadCanvasImage(canvas, titleImageSrc);
const scoreBgImgPromise = loadCanvasImage(canvas, "../static/score-bg.png"); const scoreBgImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
const qrCodeImgPromise = loadCanvasImage(canvas, "../static/qr-code.png"); const qrCodeImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/qr-code.png");
const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] = const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] =
await Promise.all([ await Promise.all([
@@ -738,15 +753,15 @@ export async function sharePractiseData(canvasId, type, user, data) {
ctx.drawImage(bgImg, 0, 0, width, height); ctx.drawImage(bgImg, 0, 0, width, height);
drawRoundImage(ctx, avatarImg, 17, 20, 32, 32, 20); if (avatarImg) drawRoundImage(ctx, avatarImg, 17, 20, 32, 32, 20);
ctx.drawImage(lvlImg, 12, 15, 42, 42); if (lvlImg) ctx.drawImage(lvlImg, 12, 15, 42, 42);
renderText(ctx, user.nickName, 13, "#fff", 58, 34); renderText(ctx, user.nickName, 13, "#fff", 58, 34);
renderRankTitle(ctx, user.lvlName); renderRankTitle(ctx, user.lvlName);
let subTitle = "正式开启弓箭手之路"; let subTitle = translate('your_archery_journey_starts_here');
if (type > 1) { if (type > 1) {
subTitle = `今日弓箭练习打卡 ${formatTimestamp(data.startTime)}`; subTitle = translate('archery_check_in_value', { p0: formatTimestamp(data.startTime) });
} }
ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40); ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40);
@@ -754,10 +769,10 @@ export async function sharePractiseData(canvasId, type, user, data) {
ctx.font = "18px sans-serif"; ctx.font = "18px sans-serif";
renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center"); renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center");
renderText(ctx, "共", 14, "#fff", 122, 300); renderText(ctx, translate('total'), 14, "#fff", 102, 300);
const totalRing = data.details.reduce((last, next) => last + next.ring, 0); const totalRing = data.details.reduce((last, next) => last + next.ring, 0);
renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center"); renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center");
renderText(ctx, "环", 14, "#fff", 161, 300); renderText(ctx, translate('pts'), 14, "#fff", 161, 300);
renderLine(ctx, 77); renderLine(ctx, 77);
renderLine(ctx, 185); renderLine(ctx, 185);
@@ -765,10 +780,10 @@ export async function sharePractiseData(canvasId, type, user, data) {
renderScores(ctx, data.details, scoreBgImg); renderScores(ctx, data.details, scoreBgImg);
ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52); ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52);
renderText(ctx, "射灵平台", 12, "#fff", width * 0.26, height * 0.9); renderText(ctx, translate('sheling'), 12, "#fff", width * 0.26, height * 0.9);
renderText( renderText(
ctx, ctx,
"快加入我们一起玩吧~", translate('join_us_and_play'),
9, 9,
"rgba(255, 255, 255, 0.5)", "rgba(255, 255, 255, 0.5)",
width * 0.26, width * 0.26,
@@ -776,7 +791,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
); );
renderText( renderText(
ctx, ctx,
"后羿就是这样练成的", translate('practice_makes_a_great_archer'),
9, 9,
"rgba(255, 255, 255, 0.5)", "rgba(255, 255, 255, 0.5)",
width * 0.26, width * 0.26,
@@ -888,7 +903,7 @@ export const generateShareCard = (canvasId, date, actual, total) => {
const totalWidth = ctx.measureText(`${t || ""}`).width || 0; const totalWidth = ctx.measureText(`${t || ""}`).width || 0;
renderText( renderText(
ctx, ctx,
"环", translate('pts'),
20, 20,
"#FFFFFF", "#FFFFFF",
centerX + totalWidth + 5, centerX + totalWidth + 5,
@@ -980,7 +995,7 @@ export const generateShareCard = (canvasId, date, actual, total) => {
const totalWidth = ctx.measureText(`${t || ""}`).width || 0; const totalWidth = ctx.measureText(`${t || ""}`).width || 0;
renderText( renderText(
ctx, ctx,
"环", translate('pts'),
20, 20,
"#FFFFFF", "#FFFFFF",
centerX + totalWidth + 5, centerX + totalWidth + 5,
+31
View File
@@ -57,6 +57,37 @@ const props = defineProps({
src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
mode="widthFix" mode="widthFix"
/> />
<image
class="bg-image"
v-if="type === 7"
src="https://static.shelingxingqiu.com/shootmini/static/app-bg6.png"
mode="widthFix"
/>
<image
class="bg-image"
v-if="type === 8"
src="https://static.shelingxingqiu.com/shootmini/static/app-bg7.png"
mode="widthFix"
/>
<image
class="bg-image"
v-if="type === 9"
src="https://static.shelingxingqiu.com/shootmini/static/app-bg8.png"
mode="widthFix"
/>
<image
class="bg-image"
v-if="type === 11"
src="https://static.shelingxingqiu.com/shootmini/static/app-bg9.png"
mode="widthFix"
/>
<!-- 我的设备未绑定/绑定成功页面背景 -->
<image
class="bg-image"
v-if="type === 12"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/my-device-unbound-background.png"
mode="widthFix"
/>
<image <image
class="bg-image" class="bg-image"
v-if="type === 10" v-if="type === 10"
+19 -9
View File
@@ -1,15 +1,21 @@
<script setup> <script setup>
import { t } from "@/locales";
const tabs = [ const tabs = [
{ image: "../static/tab-vip.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-vip.png" },
{ image: "../static/tab-point-book.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-point-book.png" },
{ image: "../static/tab-mall.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-mall.png" },
]; ];
function handleTabClick(index) { function handleTabClick(index) {
if (index === 0) { if (index === 0) {
uni.navigateTo({ uni.showToast({
url: "/pages/member/be-vip", title: t('coming_soon'),
icon: "none",
}); });
// uni.navigateTo({
// url: "/pages/member/be-vip",
// });
} }
if (index === 1) { if (index === 1) {
uni.navigateTo({ uni.navigateTo({
@@ -18,7 +24,7 @@ function handleTabClick(index) {
} }
if (index === 2) { if (index === 2) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/device-intro", url: "/pages/device/device-intro",
}); });
} }
} }
@@ -26,7 +32,7 @@ function handleTabClick(index) {
<template> <template>
<view class="footer"> <view class="footer">
<image class="footer-bg" src="../static/tab-bg.png" mode="widthFix" /> <image class="footer-bg" src="https://static.shelingxingqiu.com/shootmini/static/tab-bg.png" mode="widthFix" />
<view <view
v-for="(tab, index) in tabs" v-for="(tab, index) in tabs"
:key="index" :key="index"
@@ -43,9 +49,13 @@ function handleTabClick(index) {
<style scoped> <style scoped>
.footer { .footer {
height: 120px; /* height: 120px; */
height: 190rpx;
width: 100vw; width: 100vw;
position: relative; /* position: relative; */
position: fixed;
bottom: 0;
left: 0;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
+29 -16
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, onMounted, watch } from "vue"; import { computed, ref, watch } from "vue";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
@@ -26,12 +26,33 @@ const props = defineProps({
type: Number, type: Number,
default: 45, default: 45,
}, },
sizeUnit: {
type: String,
default: "px",
},
imageMode: {
type: String,
default: "widthFix",
},
borderColor: { borderColor: {
type: String, type: String,
default: "", default: "",
}, },
}); });
const avatarFrame = ref(""); const avatarFrame = ref("");
const sizeValue = computed(() => `${Number(props.size)}${props.sizeUnit}`);
const frameSizeValue = computed(() => `${Number(props.size) + 10}${props.sizeUnit}`);
const avatarImageStyle = computed(() => ({
width: sizeValue.value,
height: sizeValue.value,
minHeight: sizeValue.value,
borderColor: props.borderColor || "#fff",
}));
const avatarFrameStyle = computed(() => ({
width: frameSizeValue.value,
height: frameSizeValue.value,
}));
watch( watch(
() => [config.value, props.rankLvl], () => [config.value, props.rankLvl],
() => { () => {
@@ -51,40 +72,32 @@ watch(
v-if="avatarFrame" v-if="avatarFrame"
:src="avatarFrame" :src="avatarFrame"
mode="widthFix" mode="widthFix"
:style="{ :style="avatarFrameStyle"
width: Number(size) + 10 + 'px',
height: Number(size) + 10 + 'px',
}"
class="avatar-frame" class="avatar-frame"
/> />
<image <image
v-if="rank === 1" v-if="rank === 1"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 2" v-if="rank === 2"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 3" v-if="rank === 3"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<view v-if="rank > 3" class="rank-view">{{ rank }}</view> <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image <image
:src="src || '../static/user-icon.png'" :src="src || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix" :mode="imageMode"
:style="{ :style="avatarImageStyle"
width: size + 'px',
height: size + 'px',
minHeight: size + 'px',
borderColor: borderColor || '#fff',
}"
class="avatar-image" class="avatar-image"
/> />
</view> </view>
+9 -11
View File
@@ -1,9 +1,12 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import { getBattleAPI, getUserGameState } from "@/apis"; import { getBattleAPI, getUserGameState } from "@/apis";
import { debounce } from "@/util"; import { debounce } from "@/util";
import { returnToBattle } from "@/utils/matchReturn";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -66,12 +69,7 @@ const onClick = debounce(async () => {
loading.value = true; loading.value = true;
const result = await getBattleAPI(); const result = await getBattleAPI();
if (result && result.matchId) { if (result && result.matchId) {
await uni.$checkAudio(); await returnToBattle(result, navigateOnce);
if (result.mode <= 3) {
await navigateOnce(`/pages/team-battle/index?battleId=${result.matchId}`);
} else {
await navigateOnce(`/pages/melee-battle?battleId=${result.matchId}`);
}
return; return;
} }
if (game.value.roomID) { if (game.value.roomID) {
@@ -100,15 +98,15 @@ onBeforeUnmount(() => {
class="back-to-game" class="back-to-game"
@click="onClick" @click="onClick"
> >
<image src="../static/back-to-game-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back-to-game-bg.png" mode="widthFix" />
<block v-if="game.inBattle"> <block v-if="game.inBattle">
<image src="../static/pk-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/pk-icon.png" mode="widthFix" />
<text>返回进行中的对局</text> <text>{{ t('return_to_your_current_match') }}</text>
</block> </block>
<block v-else-if="game.roomID"> <block v-else-if="game.roomID">
<text>返回房间</text> <text>{{ t('back_to_room') }}</text>
</block> </block>
<image src="../static/back.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view> </view>
</template> </template>
+14 -12
View File
@@ -1,5 +1,7 @@
= =
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
import BowPower from "@/components/BowPower.vue"; import BowPower from "@/components/BowPower.vue";
import { RoundImages } from "@/constants"; import { RoundImages } from "@/constants";
@@ -31,7 +33,7 @@ const normalRounds = computed(() => {
<template> <template>
<view class="container"> <view class="container">
<view class="guide-row"> <view class="guide-row">
<image src="../static/shooter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
<view <view
:style="{ :style="{
marginBottom: '10px', marginBottom: '10px',
@@ -42,9 +44,9 @@ const normalRounds = computed(() => {
</view> </view>
</view> </view>
<view> <view>
<image src="../static/battle-header-melee.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png" mode="widthFix" />
<text>蓝队({{ bluePoints }})</text> <text>{{ t('blue') }}{{ bluePoints }})</text>
<text>红队({{ redPoints }})</text> <text>{{ t('red') }}{{ redPoints }})</text>
</view> </view>
<view class="players"> <view class="players">
<view> <view>
@@ -66,18 +68,18 @@ const normalRounds = computed(() => {
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
: "" : ""
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
<block v-if="roundResults.length < 3"> <block v-if="roundResults.length < 3">
<view v-for="i in 3 - roundResults.length" :key="i"> <view v-for="pendingRoundNumber in 3 - roundResults.length" :key="pendingRoundNumber">
<image <image
:src="RoundImages[`round${i + roundResults.length}`]" :src="RoundImages[`round${pendingRoundNumber + roundResults.length}`]"
mode="widthFix" mode="widthFix"
/> />
<view> <view>
<text></text> <text></text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -101,18 +103,18 @@ const normalRounds = computed(() => {
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
: "" : ""
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
<block v-if="roundResults.length < 3"> <block v-if="roundResults.length < 3">
<view v-for="i in 3 - roundResults.length" :key="i"> <view v-for="pendingRoundNumber in 3 - roundResults.length" :key="pendingRoundNumber">
<image <image
:src="RoundImages[`round${i + roundResults.length}`]" :src="RoundImages[`round${pendingRoundNumber + roundResults.length}`]"
mode="widthFix" mode="widthFix"
/> />
<view> <view>
<text></text> <text></text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
</block> </block>
+12 -12
View File
@@ -38,16 +38,16 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</script> </script>
<template> <template>
<view class="container" :style="{ paddingTop: showHeader ? '5px' : '0' }"> <view class="container">
<image <image
v-if="showHeader" v-if="showHeader"
:src="`../static/battle-header${players.length ? '-melee' : ''}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/battle-header${players.length ? '-melee' : ''}.png`"
mode="widthFix" mode="widthFix"
/> />
<view <view
v-if="!players.length && blueTeam.length && redTeam.length" v-if="!players.length && blueTeam.length && redTeam.length"
class="players" class="players"
:style="{ paddingTop: showHeader ? '15px' : '0' }" :style="{ paddingTop: showHeader ? '48rpx' : '0' }"
> >
<view> <view>
<view <view
@@ -72,7 +72,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view> </view>
<image <image
v-if="winner === 1" v-if="winner === 1"
src="../static/winner-badge.png" src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix" mode="widthFix"
class="left-winner-badge" class="left-winner-badge"
/> />
@@ -100,7 +100,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view> </view>
<image <image
v-if="winner === 2" v-if="winner === 2"
src="../static/winner-badge.png" src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix" mode="widthFix"
class="right-winner-badge" class="right-winner-badge"
/> />
@@ -113,6 +113,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
v-if="players.length" v-if="players.length"
class="players-melee" class="players-melee"
scroll-x scroll-x
:show-scrollbar="false"
@touchmove="(e) => players.length > 5 && e.stopPropagation()" @touchmove="(e) => players.length > 5 && e.stopPropagation()"
:style="{ paddingTop: showHeader ? '15px' : '0' }" :style="{ paddingTop: showHeader ? '15px' : '0' }"
> >
@@ -151,13 +152,15 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
.container { .container {
width: 100%; width: 100%;
position: relative; position: relative;
z-index: 999;
margin-bottom: 10px; margin-bottom: 10px;
} }
.container > image:first-child { .container > image:first-child {
position: absolute; position: absolute;
width: 100%; width: 100%;
top: -5px; /* top: -5px; */
z-index: 1; z-index: 1;
pointer-events: none;
} }
.players { .players {
display: flex; display: flex;
@@ -188,15 +191,12 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
.players-melee { .players-melee {
height: 80px; height: 80px;
width: 100%; width: 100%;
} white-space: nowrap;
.players-melee::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
} }
/* 小程序 scroll-view 不支持直接 flex,通过内层 wrapper 承载横向排列 */ /* 小程序 scroll-view 不支持直接 flex,通过内层 wrapper 承载横向排列 */
.players-melee-inner { .players-melee-inner {
display: flex; display: inline-flex;
min-width: 100%;
height: 100%; height: 100%;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
import AppBackground from "@/components/AppBackground.vue"; import AppBackground from "@/components/AppBackground.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -58,7 +60,7 @@ const props = defineProps({
</view> </view>
</view> </view>
<view @click="onClose"> <view @click="onClose">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</view> </view>
</view> </view>
<view :style="{ width: '100%', marginBottom: '20px' }"> <view :style="{ width: '100%', marginBottom: '20px' }">
@@ -66,9 +68,9 @@ const props = defineProps({
</view> </view>
<view class="desc"> <view class="desc">
<text>{{ arrows.length }}</text> <text>{{ arrows.length }}</text>
<text>支箭,共</text> <text>{{ t('arrows_total') }}</text>
<text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text> <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
<ScorePanel <ScorePanel
:completeEffect="false" :completeEffect="false"
+7 -18
View File
@@ -1,28 +1,17 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount } from "vue"; import { t } from "@/locales";
import { getDeviceBatteryAPI } from "@/apis";
const power = ref(0); import useStore from "@/store";
const timer = ref(null); import { storeToRefs } from "pinia";
onMounted(async () => { const store = useStore();
const data = await getDeviceBatteryAPI(); const { deviceBattery: power } = storeToRefs(store);
power.value = data.battery;
timer.value = setInterval(async () => {
const data = await getDeviceBatteryAPI();
power.value = data.battery;
}, 1000 * 10);
});
onBeforeUnmount(() => {
clearInterval(timer.value);
});
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<image src="../static/b-power.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/b-power.png" mode="widthFix" />
<view>电量{{ power || 1 }}%</view> <view>{{ power === null ? t('battery') : t('battery_value', { p0: power }) }}</view>
</view> </view>
</template> </template>
+151 -32
View File
@@ -22,10 +22,22 @@ const props = defineProps({
type: Number, type: Number,
default: 0, default: 0,
}, },
targetLeft: {
type: Number,
default: 0,
},
targetTop: {
type: Number,
default: 0,
},
hitOffsetPx: { hitOffsetPx: {
type: Number, type: Number,
default: 0, default: 0,
}, },
viewportMode: {
type: Boolean,
default: false,
},
}); });
const emit = defineEmits(["complete", "impact"]); const emit = defineEmits(["complete", "impact"]);
@@ -35,11 +47,14 @@ const activePlayKey = ref("");
const animationKey = ref(""); const animationKey = ref("");
const impactEmitted = ref(false); const impactEmitted = ref(false);
const activeShot = ref(null); const activeShot = ref(null);
const activeLayout = ref(null);
let timers = []; let timers = [];
const isActive = computed(() => phase.value !== "idle"); const isActive = computed(() => phase.value !== "idle");
const ARROW_IMPACT_MS = 340; const ARROW_IMPACT_MS = 340;
const COMPLETE_FALLBACK_MS = 980; const COMPLETE_FALLBACK_MS = 980;
// 箭头尖端统一从屏幕中下区域出发,箭身自然延伸到屏幕底部之外。
const SHOT_START_VIEWPORT_Y_RATIO = 0.82;
const safeTargetRadius = computed(() => { const safeTargetRadius = computed(() => {
const radius = Number(props.targetRadius); const radius = Number(props.targetRadius);
@@ -49,12 +64,33 @@ const safeTargetRadius = computed(() => {
const safeTargetSize = computed(() => { const safeTargetSize = computed(() => {
const width = Number(props.targetWidth); const width = Number(props.targetWidth);
const height = Number(props.targetHeight); const height = Number(props.targetHeight);
const left = Number(props.targetLeft);
const top = Number(props.targetTop);
return { return {
width: Number.isFinite(width) && width > 0 ? width : 0, width: Number.isFinite(width) && width > 0 ? width : 0,
height: Number.isFinite(height) && height > 0 ? height : 0, height: Number.isFinite(height) && height > 0 ? height : 0,
left: Number.isFinite(left) ? left : 0,
top: Number.isFinite(top) ? top : 0,
}; };
}); });
function getWindowSize() {
try {
const info =
typeof uni.getWindowInfo === "function"
? uni.getWindowInfo()
: uni.getSystemInfoSync();
const width = Number(info?.windowWidth);
const height = Number(info?.windowHeight);
return {
width: Number.isFinite(width) && width > 0 ? width : 0,
height: Number.isFinite(height) && height > 0 ? height : 0,
};
} catch {
return { width: 0, height: 0 };
}
}
function hasShotPoint(shot) { function hasShotPoint(shot) {
const x = Number(shot?.x); const x = Number(shot?.x);
const y = Number(shot?.y); const y = Number(shot?.y);
@@ -62,6 +98,17 @@ function hasShotPoint(shot) {
} }
const effectiveShot = computed(() => activeShot.value || props.shot); const effectiveShot = computed(() => activeShot.value || props.shot);
const effectiveTargetSize = computed(
() => activeLayout.value?.target || safeTargetSize.value
);
const effectiveWindowSize = computed(
() => activeLayout.value?.window || getWindowSize()
);
const isViewportMode = computed(() =>
activeLayout.value
? activeLayout.value.viewportMode
: props.viewportMode === true
);
const shotPoint = computed(() => { const shotPoint = computed(() => {
const x = Number(effectiveShot.value?.x); const x = Number(effectiveShot.value?.x);
@@ -105,23 +152,69 @@ const hitPercent = computed(() => {
}; };
}); });
const arrowAngle = computed(() => { const flightPath = computed(() => {
const size = safeTargetSize.value; const size = effectiveTargetSize.value;
if (!size.width || !size.height) { const windowSize = effectiveWindowSize.value;
const dx = hitPercent.value.left - 50;
const dy = 114 - hitPercent.value.top; if (
const fallbackAngle = Math.atan2(dx, dy || 1) * (180 / Math.PI); isViewportMode.value &&
return Math.max(-18, Math.min(18, fallbackAngle)); size.width > 0 &&
size.height > 0 &&
windowSize.width > 0 &&
windowSize.height > 0
) {
const startX = windowSize.width * 0.5;
const endX =
size.left +
size.width * (hitPercent.value.left / 100) +
hitOffset.value.x;
const endY =
size.top +
size.height * (hitPercent.value.top / 100) +
hitOffset.value.y;
// 常规情况下从视口底部进入;靶面局部超出视口时仍保证起点在命中点下方。
const startY = Math.max(windowSize.height + 16, endY + 80);
const dx = endX - startX;
const dy = endY - startY;
return {
startX,
startY,
endX,
endY,
translateX: dx,
translateY: dy,
angle: Math.atan2(dx, -dy) * (180 / Math.PI),
};
} }
const startX = size.width * 0.5; const hasScreenCoordinates =
const startY = size.height * 1.14; size.width > 0 &&
const endX = size.width * (hitPercent.value.left / 100) + hitOffset.value.x; size.height > 0 &&
const endY = size.height * (hitPercent.value.top / 100) + hitOffset.value.y; windowSize.width > 0 &&
windowSize.height > 0;
const startX = hasScreenCoordinates
? windowSize.width * 0.5 - size.left
: size.width * 0.5;
const startY = hasScreenCoordinates
? windowSize.height * SHOT_START_VIEWPORT_Y_RATIO - size.top
: size.height * 1.14;
const endX =
size.width * (hitPercent.value.left / 100) + hitOffset.value.x;
const endY =
size.height * (hitPercent.value.top / 100) + hitOffset.value.y;
const dx = endX - startX; const dx = endX - startX;
const dy = startY - endY; const dy = endY - startY;
const angle = Math.atan2(dx, dy || 1) * (180 / Math.PI);
return Math.max(-18, Math.min(18, angle)); return {
startX,
startY,
endX,
endY,
translateX: dx,
translateY: dy,
angle: Math.atan2(dx, -dy) * (180 / Math.PI),
};
}); });
function formatPxOffset(value) { function formatPxOffset(value) {
@@ -135,10 +228,19 @@ function formatTargetPosition(percent, offset) {
return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`; return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
} }
const crackStyle = computed(() => ({ const crackStyle = computed(() => {
left: formatTargetPosition(hitPercent.value.left, hitOffset.value.x), if (isViewportMode.value) {
top: formatTargetPosition(hitPercent.value.top, hitOffset.value.y), return {
})); left: `${flightPath.value.endX}px`,
top: `${flightPath.value.endY}px`,
};
}
return {
left: formatTargetPosition(hitPercent.value.left, hitOffset.value.x),
top: formatTargetPosition(hitPercent.value.top, hitOffset.value.y),
};
});
function getTargetTranslate(percent) { function getTargetTranslate(percent) {
const absPercent = Math.abs(percent); const absPercent = Math.abs(percent);
@@ -147,23 +249,24 @@ function getTargetTranslate(percent) {
} }
const arrowMoveStyle = computed(() => { const arrowMoveStyle = computed(() => {
const size = safeTargetSize.value; const size = effectiveTargetSize.value;
const path = flightPath.value;
let x = getTargetTranslate(hitPercent.value.left - 50); let x = getTargetTranslate(hitPercent.value.left - 50);
let y = getTargetTranslate(hitPercent.value.top - 114); let y = getTargetTranslate(hitPercent.value.top - 114);
if (size.width && size.height) { if (isViewportMode.value || (size.width && size.height)) {
const startX = size.width * 0.5; x = `${path.translateX}px`;
const startY = size.height * 1.14; y = `${path.translateY}px`;
const endX = size.width * (hitPercent.value.left / 100) + hitOffset.value.x;
const endY = size.height * (hitPercent.value.top / 100) + hitOffset.value.y;
x = `${endX - startX}px`;
y = `${endY - startY}px`;
} }
return { return {
"--shot-start-x":
isViewportMode.value || size.width ? `${path.startX}px` : "50%",
"--shot-start-y":
isViewportMode.value || size.height ? `${path.startY}px` : "114%",
"--shot-tx": x, "--shot-tx": x,
"--shot-ty": y, "--shot-ty": y,
"--shot-angle": `${arrowAngle.value}deg`, "--shot-angle": `${path.angle}deg`,
}; };
}); });
@@ -189,6 +292,7 @@ function finish(playKey) {
phase.value = "idle"; phase.value = "idle";
activePlayKey.value = ""; activePlayKey.value = "";
activeShot.value = null; activeShot.value = null;
activeLayout.value = null;
emit("complete", playKey); emit("complete", playKey);
} }
@@ -202,6 +306,11 @@ function play() {
animationKey.value = `${props.playKey}`; animationKey.value = `${props.playKey}`;
impactEmitted.value = false; impactEmitted.value = false;
activeShot.value = { ...props.shot }; activeShot.value = { ...props.shot };
activeLayout.value = {
target: { ...safeTargetSize.value },
window: getWindowSize(),
viewportMode: props.viewportMode === true,
};
phase.value = "playing"; phase.value = "playing";
queueTimer(() => { queueTimer(() => {
@@ -236,7 +345,11 @@ onBeforeUnmount(() => {
<template> <template>
<view <view
v-show="isActive" v-show="isActive"
:class="['shot-effect', `shot-effect--${phase}`]" :class="[
'shot-effect',
`shot-effect--${phase}`,
{ 'shot-effect--viewport': isViewportMode },
]"
:style="arrowMoveStyle" :style="arrowMoveStyle"
> >
<view <view
@@ -246,7 +359,7 @@ onBeforeUnmount(() => {
> >
<image <image
class="shot-arrow" class="shot-arrow"
src="../static/vip/svip-jian.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-jian.png"
mode="heightFix" mode="heightFix"
/> />
</view> </view>
@@ -263,7 +376,7 @@ onBeforeUnmount(() => {
<image <image
:key="`crack-${animationKey}`" :key="`crack-${animationKey}`"
class="shot-crack" class="shot-crack"
src="../static/vip/svip-lie.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-lie.png"
mode="aspectFit" mode="aspectFit"
@animationend="handleCrackAnimationEnd" @animationend="handleCrackAnimationEnd"
/> />
@@ -284,10 +397,16 @@ onBeforeUnmount(() => {
transform: translateZ(0); transform: translateZ(0);
} }
.shot-effect--viewport {
position: fixed;
width: 100vw;
height: 100vh;
}
.shot-arrow-track { .shot-arrow-track {
position: absolute; position: absolute;
left: 50%; left: var(--shot-start-x);
top: 114%; top: var(--shot-start-y);
width: 0; width: 0;
height: 0; height: 0;
opacity: 0; opacity: 0;
+173 -49
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { import {
ref, ref,
watch, watch,
@@ -12,7 +14,7 @@ import PointSwitcher from "@/components/PointSwitcher.vue";
import BowShotEffect from "@/components/BowShotEffect.vue"; import BowShotEffect from "@/components/BowShotEffect.vue";
import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
import { simulShootAPI } from "@/apis"; import { simulShootAPI, laserAimAPI, laserCloseAPI } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
@@ -43,10 +45,18 @@ const props = defineProps({
type: String, type: String,
default: "solo", // solo 单排,team 双排 default: "solo", // solo 单排,team 双排
}, },
missAsZero: {
type: Boolean,
default: false,
},
stop: { stop: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
targetType: {
type: [Number, String],
default: 40,
},
targetRadius: { targetRadius: {
type: Number, type: Number,
default: 20, default: 20,
@@ -59,6 +69,14 @@ const props = defineProps({
type: Number, type: Number,
default: 5, default: 5,
}, },
stableShotEffect: {
type: Boolean,
default: false,
},
enableShotEffect: {
type: Boolean,
default: true,
},
}); });
const pMode = ref(true); const pMode = ref(true);
@@ -69,15 +87,23 @@ const dirTimer = ref(null);
const angle = ref(null); const angle = ref(null);
const circleColor = ref(""); const circleColor = ref("");
const shotEffect = ref(null); const shotEffect = ref(null);
const pendingShotEffect = ref(null);
const hiddenRedLatestKey = ref(""); const hiddenRedLatestKey = ref("");
const hiddenBlueLatestKey = ref(""); const hiddenBlueLatestKey = ref("");
const targetShaking = ref(false); const targetShaking = ref(false);
const targetSize = ref({ width: 0, height: 0 }); const targetRect = ref({ left: 0, top: 0, width: 0, height: 0 });
const shakeTimer = ref(null); const shakeTimer = ref(null);
const instance = getCurrentInstance(); const instance = getCurrentInstance();
let shotEffectRequestGeneration = 0;
const ROUND_TIP_OFFSET_Y = -32; const ROUND_TIP_OFFSET_Y = -32;
const EXPERIENCE_TIP_OFFSET_Y = -68; const EXPERIENCE_TIP_OFFSET_Y = -68;
function getRoundText(shot) {
if (shot?.ringX) return t('x');
if (shot?.ring) return t('value_pts', { p0: shot.ring });
return props.missAsZero ? t('0_pts') : t('miss');
}
function buildShotEffectKey(team, shot, index) { function buildShotEffectKey(team, shot, index) {
return [ return [
team, team,
@@ -97,7 +123,13 @@ function hasShotPoint(shot) {
} }
function shouldPlayShotEffect(shot) { function shouldPlayShotEffect(shot) {
return props.isSvip && !!shot && Number(shot.ring) > 0 && hasShotPoint(shot); return (
props.enableShotEffect &&
props.isSvip &&
!!shot &&
Number(shot.ring) > 0 &&
hasShotPoint(shot)
);
} }
function clearTipTimer() { function clearTipTimer() {
@@ -125,7 +157,7 @@ function showShotTip(team, shot) {
}, 1000); }, 1000);
} }
function triggerShotEffect(team, shot, index) { function triggerShotEffect(team, shot, index, viewportMode = false) {
const key = buildShotEffectKey(team, shot, index); const key = buildShotEffectKey(team, shot, index);
if (shotEffect.value?.team === "red") hiddenRedLatestKey.value = ""; if (shotEffect.value?.team === "red") hiddenRedLatestKey.value = "";
@@ -139,7 +171,29 @@ function triggerShotEffect(team, shot, index) {
hiddenBlueLatestKey.value = key; hiddenBlueLatestKey.value = key;
} }
shotEffect.value = { key, team, shot }; shotEffect.value = { key, team, shot, viewportMode };
}
async function prepareShotEffect(team, shot, index) {
const requestGeneration = ++shotEffectRequestGeneration;
const key = buildShotEffectKey(team, shot, index);
pendingShotEffect.value = { generation: requestGeneration, team, key };
clearTipTimer();
if (team === "red") latestOne.value = null;
if (team === "blue") bluelatestOne.value = null;
const viewportMode = props.stableShotEffect
? await updateTargetRect()
: false;
if (requestGeneration !== shotEffectRequestGeneration) {
if (pendingShotEffect.value?.generation === requestGeneration) {
pendingShotEffect.value = null;
}
return;
}
pendingShotEffect.value = null;
triggerShotEffect(team, shot, index, viewportMode);
} }
function completeShotEffect(key) { function completeShotEffect(key) {
@@ -168,35 +222,67 @@ function shakeTarget() {
}); });
} }
function updateTargetSize() { function hasValidTargetRect(rect = targetRect.value) {
nextTick(() => { return (
const query = instance?.proxy Number.isFinite(Number(rect?.left)) &&
? uni.createSelectorQuery().in(instance.proxy) Number.isFinite(Number(rect?.top)) &&
: uni.createSelectorQuery(); Number(rect?.width) > 0 &&
Number(rect?.height) > 0
);
}
query async function updateTargetRect() {
.select(".target") await nextTick();
.boundingClientRect((rect) => {
const width = Number(rect?.width); return new Promise((resolve) => {
const height = Number(rect?.height); let settled = false;
if (!Number.isFinite(width) || !Number.isFinite(height)) return; const finish = (rect) => {
if (width <= 0 || height <= 0) return; if (settled) return;
targetSize.value = { width, height }; settled = true;
})
.exec(); const isValid = hasValidTargetRect(rect);
if (isValid) {
targetRect.value = {
left: Number(rect.left),
top: Number(rect.top),
width: Number(rect.width),
height: Number(rect.height),
};
}
resolve(isValid);
};
try {
const query = instance?.proxy
? uni.createSelectorQuery().in(instance.proxy)
: uni.createSelectorQuery();
query
.select(".target")
.boundingClientRect()
.exec((result) => finish(Array.isArray(result) ? result[0] : null));
} catch {
finish(null);
}
}); });
} }
function handleWindowResize() { function handleWindowResize() {
updateTargetSize(); void updateTargetRect();
} }
function shouldHideRedHit(index) { function shouldHideRedHit(index) {
return !!hiddenRedLatestKey.value && index === props.scores.length - 1; return (
(!!hiddenRedLatestKey.value || pendingShotEffect.value?.team === "red") &&
index === props.scores.length - 1
);
} }
function shouldHideBlueHit(index) { function shouldHideBlueHit(index) {
return !!hiddenBlueLatestKey.value && index === props.blueScores.length - 1; return (
(!!hiddenBlueLatestKey.value || pendingShotEffect.value?.team === "blue") &&
index === props.blueScores.length - 1
);
} }
watch( watch(
@@ -205,14 +291,18 @@ watch(
if (newLen === oldLen + 1) { if (newLen === oldLen + 1) {
const latestShot = props.scores[newLen - 1]; const latestShot = props.scores[newLen - 1];
if (shouldPlayShotEffect(latestShot)) { if (shouldPlayShotEffect(latestShot)) {
triggerShotEffect("red", latestShot, newLen - 1); void prepareShotEffect("red", latestShot, newLen - 1);
} else { } else if (props.enableShotEffect) {
shotEffectRequestGeneration += 1;
pendingShotEffect.value = null;
showShotTip("red", latestShot); showShotTip("red", latestShot);
} }
return; return;
} }
if (newLen < oldLen) { if (newLen < oldLen) {
shotEffectRequestGeneration += 1;
pendingShotEffect.value = null;
latestOne.value = null; latestOne.value = null;
hiddenRedLatestKey.value = ""; hiddenRedLatestKey.value = "";
if (shotEffect.value?.team === "red") shotEffect.value = null; if (shotEffect.value?.team === "red") shotEffect.value = null;
@@ -226,14 +316,18 @@ watch(
if (newLen === oldLen + 1) { if (newLen === oldLen + 1) {
const latestShot = props.blueScores[newLen - 1]; const latestShot = props.blueScores[newLen - 1];
if (shouldPlayShotEffect(latestShot)) { if (shouldPlayShotEffect(latestShot)) {
triggerShotEffect("blue", latestShot, newLen - 1); void prepareShotEffect("blue", latestShot, newLen - 1);
} else { } else if (props.enableShotEffect) {
shotEffectRequestGeneration += 1;
pendingShotEffect.value = null;
showShotTip("blue", latestShot); showShotTip("blue", latestShot);
} }
return; return;
} }
if (newLen < oldLen) { if (newLen < oldLen) {
shotEffectRequestGeneration += 1;
pendingShotEffect.value = null;
bluelatestOne.value = null; bluelatestOne.value = null;
hiddenBlueLatestKey.value = ""; hiddenBlueLatestKey.value = "";
if (shotEffect.value?.team === "blue") shotEffect.value = null; if (shotEffect.value?.team === "blue") shotEffect.value = null;
@@ -338,15 +432,30 @@ function getExperienceTipStyle(shot) {
); );
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
const simulShoot2 = async () => { const simulShoot2 = async () => {
if (device.value.deviceId) { if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02; const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1); await simulShootAPI(device.value.deviceId, r1, r1, props.targetType);
} }
}; };
const openAim = async () => {
await laserAimAPI();
};
const closeAim = async () => {
await laserCloseAPI();
};
const env = computed(() => { const env = computed(() => {
const accountInfo = uni.getAccountInfoSync(); const accountInfo = uni.getAccountInfoSync();
return accountInfo.miniProgram.envVersion; return accountInfo.miniProgram.envVersion;
@@ -384,11 +493,13 @@ async function onReceiveMessage(message) {
onMounted(() => { onMounted(() => {
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
updateTargetSize(); void updateTargetRect();
if (uni.onWindowResize) uni.onWindowResize(handleWindowResize); if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
shotEffectRequestGeneration += 1;
pendingShotEffect.value = null;
if (timer.value) { if (timer.value) {
clearTimeout(timer.value); clearTimeout(timer.value);
timer.value = null; timer.value = null;
@@ -418,23 +529,20 @@ onBeforeUnmount(() => {
<view :class="['target', { 'target--shake': targetShaking }]"> <view :class="['target', { 'target--shake': targetShaking }]">
<view v-if="angle !== null" class="arrow-dir" :style="arrowStyle"> <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
<view :style="{ background: circleColor }"> <view :style="{ background: circleColor }">
<image src="../static/dot-circle.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/dot-circle.png" mode="widthFix" />
</view> </view>
</view> </view>
<view v-if="stop" class="stop-sign">中场休息</view> <view v-if="stop" class="stop-sign">{{ t('halftime') }}</view>
<view <view
v-if="latestOne && latestOne.ring && user.id === latestOne.playerId" v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
class="e-value fade-in-out" class="e-value fade-in-out"
:style="getExperienceTipStyle(latestOne)" :style="getExperienceTipStyle(latestOne)"
> >{{ t('xp_1') }}</view>
经验 +1
</view>
<view <view
v-if="latestOne" v-if="latestOne"
class="round-tip fade-in-out" class="round-tip fade-in-out"
:style="getRoundTipStyle(latestOne)" :style="getRoundTipStyle(latestOne)"
>{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶" >{{ getRoundText(latestOne) }}
}}<text v-if="latestOne.ring">环</text>
</view> </view>
<view <view
v-if=" v-if="
@@ -444,21 +552,18 @@ onBeforeUnmount(() => {
" "
class="e-value fade-in-out" class="e-value fade-in-out"
:style="getExperienceTipStyle(bluelatestOne)" :style="getExperienceTipStyle(bluelatestOne)"
> >{{ t('xp_1') }}</view>
经验 +1
</view>
<view <view
v-if="bluelatestOne" v-if="bluelatestOne"
class="round-tip fade-in-out" class="round-tip fade-in-out"
:style="getRoundTipStyle(bluelatestOne)" :style="getRoundTipStyle(bluelatestOne)"
>{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶" >{{ getRoundText(bluelatestOne) }}</view
}}<text v-if="bluelatestOne.ring">环</text></view
> >
<block v-for="(bow, index) in scores" :key="index"> <block v-for="(bow, index) in scores" :key="index">
<image <image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideRedHit(index)" v-if="pMode && isSvip && bow.ring > 0 && !shouldHideRedHit(index)"
class="svip-hit-bg" class="svip-hit-bg"
src="../static/vip/svip-xuan.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)" :style="getSvipHitBgStyle(bow)"
mode="aspectFit" mode="aspectFit"
/> />
@@ -478,7 +583,7 @@ onBeforeUnmount(() => {
<image <image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideBlueHit(index)" v-if="pMode && isSvip && bow.ring > 0 && !shouldHideBlueHit(index)"
class="svip-hit-bg" class="svip-hit-bg"
src="../static/vip/svip-xuan.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)" :style="getSvipHitBgStyle(bow)"
mode="aspectFit" mode="aspectFit"
/> />
@@ -496,17 +601,34 @@ onBeforeUnmount(() => {
</view> </view>
</block> </block>
<BowShotEffect <BowShotEffect
v-if="!shotEffect || !shotEffect.viewportMode"
:shot="shotEffect && shotEffect.shot" :shot="shotEffect && shotEffect.shot"
:playKey="shotEffect ? shotEffect.key : ''" :playKey="shotEffect ? shotEffect.key : ''"
:targetRadius="safeTargetRadius" :targetRadius="safeTargetRadius"
:targetWidth="targetSize.width" :targetLeft="targetRect.left"
:targetHeight="targetSize.height" :targetTop="targetRect.top"
:targetWidth="targetRect.width"
:targetHeight="targetRect.height"
:hitOffsetPx="currentHitRadiusPx" :hitOffsetPx="currentHitRadiusPx"
@impact="shakeTarget" @impact="shakeTarget"
@complete="completeShotEffect" @complete="completeShotEffect"
/> />
<image src="../static/bow-target.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
</view> </view>
<BowShotEffect
v-if="shotEffect && shotEffect.viewportMode"
:shot="shotEffect.shot"
:playKey="shotEffect.key"
:targetRadius="safeTargetRadius"
:targetLeft="targetRect.left"
:targetTop="targetRect.top"
:targetWidth="targetRect.width"
:targetHeight="targetRect.height"
:hitOffsetPx="currentHitRadiusPx"
:viewportMode="true"
@impact="shakeTarget"
@complete="completeShotEffect"
/>
<view class="footer"> <view class="footer">
<PointSwitcher <PointSwitcher
:onChange="(val) => (pMode = val)" :onChange="(val) => (pMode = val)"
@@ -514,8 +636,10 @@ onBeforeUnmount(() => {
/> />
</view> </view>
<view class="simul" v-if="env !== 'release'"> <view class="simul" v-if="env !== 'release'">
<button @click="simulShoot">模拟</button> <button @click="simulShoot">{{ t('simulate') }}</button>
<button @click="simulShoot2">射箭</button> <button @click="simulShoot2">{{ t('shoot') }}</button>
<button @click="openAim">{{ t('sight_on') }}</button>
<button @click="closeAim">{{ t('sight_off') }}</button>
</view> </view>
</view> </view>
</template> </template>
+6 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import { getElementRect, calcRing, capsuleHeight } from "@/util"; import { getElementRect, calcRing, capsuleHeight } from "@/util";
@@ -258,7 +260,7 @@ onBeforeUnmount(() => {
fontSize: '16px', fontSize: '16px',
marginLeft: '2px', marginLeft: '2px',
}" }"
>环</text >{{ t('pts') }}</text
> >
</view> </view>
<view <view
@@ -266,16 +268,16 @@ onBeforeUnmount(() => {
@touchstart.stop="confirmAdd" @touchstart.stop="confirmAdd"
:style="{ ...getNewPos() }" :style="{ ...getNewPos() }"
> >
<image src="../static/arrow-edit-save.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-save.png" mode="widthFix" />
</view> </view>
<view class="edit-btn delete-btn" @touchstart.stop="deleteArrow"> <view class="edit-btn delete-btn" @touchstart.stop="deleteArrow">
<image src="../static/arrow-edit-delete.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-delete.png" mode="widthFix" />
</view> </view>
<view <view
class="edit-btn drag-btn" class="edit-btn drag-btn"
@touchstart.stop="startDrag($event)" @touchstart.stop="startDrag($event)"
> >
<image src="../static/arrow-edit-move.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-move.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
+4 -4
View File
@@ -29,14 +29,14 @@ const props = defineProps({
font-size: 24rpx; font-size: 24rpx;
} }
.normal { .normal {
background-image: url("../static/bubble-tip.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip.png");
width: 157rpx; width: 157rpx;
height: 105rpx; height: 105rpx;
padding-top: 10px; padding-top: 10px;
padding-left: 30rpx; padding-left: 30rpx;
} }
.normal2 { .normal2 {
background-image: url("../static/bubble-tip4.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip4.png");
width: 190rpx; width: 190rpx;
height: 105rpx; height: 105rpx;
padding-top: 10px; padding-top: 10px;
@@ -46,14 +46,14 @@ const props = defineProps({
z-index: 1; z-index: 1;
} }
.long { .long {
background-image: url("../static/bubble-tip2.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip2.png");
width: 370rpx; width: 370rpx;
height: 70rpx; height: 70rpx;
top: -50%; top: -50%;
left: 49%; left: 49%;
} }
.short { .short {
background-image: url("../static/bubble-tip3.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip3.png");
width: 300rpx; width: 300rpx;
height: 70rpx; height: 70rpx;
top: -50%; top: -50%;
+78 -101
View File
@@ -1,13 +1,17 @@
<script setup> <script setup>
import { ref, computed, onMounted, onBeforeUnmount } from "vue"; import { t } from "@/locales";
import { ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import AppBackground from "@/components/AppBackground.vue"; 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 DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis"; import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
import { capsuleHeight, debounce } from "@/util"; import { capsuleHeight, debounce } from "@/util";
import AudioManager from "@/audioManager"; import { returnToBattle } from "@/utils/matchReturn";
const emit = defineEmits(["scrolltolower"]);
const props = defineProps({ const props = defineProps({
title: { title: {
type: String, type: String,
@@ -25,6 +29,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
usePageScroll: {
type: Boolean,
default: false,
},
isHome: { isHome: {
type: Boolean, type: Boolean,
default: false, default: false,
@@ -41,6 +49,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
headerClass: {
type: String,
default: "",
},
titleStyle: { titleStyle: {
type: [String, Object, Array], type: [String, Object, Array],
default: () => ({}), default: () => ({}),
@@ -49,14 +61,19 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
loading: {
type: Boolean,
default: false,
},
loadingText: {
type: String,
default: "",
},
}); });
const isIOS = uni.getDeviceInfo().osName === "ios"; const isIOS = uni.getDeviceInfo().osName === "ios";
const showHint = ref(false); const showHint = ref(false);
const hintType = ref(0); const hintType = ref(0);
const isLoading = ref(false); const isLoading = ref(false);
const audioInitProgress = ref(1);
const audioProgress = ref(0);
const audioTimer = ref(null);
const showGlobalHint = (type) => { const showGlobalHint = (type) => {
hintType.value = type; hintType.value = type;
@@ -67,49 +84,21 @@ const hideGlobalHint = () => {
showHint.value = false; showHint.value = false;
}; };
const restart = () => {
uni.restartMiniProgram({
path: "/pages/index",
});
};
const checkAudioProgress = async () => {
return new Promise((resolve, reject) => {
try {
audioInitProgress.value = AudioManager.getLoadProgress();
if (audioInitProgress.value === 1) return resolve();
audioTimer.value = setInterval(() => {
audioProgress.value = AudioManager.getLoadProgress();
if (audioProgress.value === 1) {
setTimeout(() => {
audioInitProgress.value = 1;
}, 200);
clearInterval(audioTimer.value);
resolve();
}
}, 200);
} catch (err) {
reject(err);
}
});
};
const audioFinalProgress = computed(() => {
const left = 1 - audioInitProgress.value;
return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
});
onBeforeUnmount(() => {
if (audioTimer.value) clearInterval(audioTimer.value);
});
onShow(() => { onShow(() => {
uni.$showHint = showGlobalHint; uni.$showHint = showGlobalHint;
uni.$hideHint = hideGlobalHint; uni.$hideHint = hideGlobalHint;
uni.$checkAudio = checkAudioProgress;
showHint.value = false; showHint.value = false;
}); });
const navigateTo = (url) =>
new Promise((resolve, reject) => {
uni.navigateTo({
url,
success: resolve,
fail: reject,
});
});
const backToGame = debounce(async () => { const backToGame = debounce(async () => {
if (isLoading.value) return; // 防止重复点击 if (isLoading.value) return; // 防止重复点击
@@ -117,16 +106,7 @@ const backToGame = debounce(async () => {
isLoading.value = true; isLoading.value = true;
const result = await getBattleAPI(); const result = await getBattleAPI();
if (result && result.matchId) { if (result && result.matchId) {
await checkAudioProgress(); await returnToBattle(result, navigateTo);
if (result.mode <= 3) {
uni.navigateTo({
url: `/pages/team-battle/index?battleId=${result.matchId}`,
});
} else {
uni.navigateTo({
url: `/pages/melee-battle?battleId=${result.matchId}`,
});
}
} }
} catch (error) { } catch (error) {
console.error("获取当前游戏失败:", error); console.error("获取当前游戏失败:", error);
@@ -146,7 +126,7 @@ const cancelMatching = async () => {
const goCalibration = async () => { const goCalibration = async () => {
await laserAimAPI(); await laserAimAPI();
uni.navigateTo({ uni.navigateTo({
url: "/pages/calibration", url: "/pages/device/calibration",
}); });
}; };
</script> </script>
@@ -154,21 +134,38 @@ const goCalibration = async () => {
<template> <template>
<view :style="{ paddingTop: capsuleHeight + 'px' }"> <view :style="{ paddingTop: capsuleHeight + 'px' }">
<AppBackground :type="bgType" :bgColor="bgColor" /> <AppBackground :type="bgType" :bgColor="bgColor" />
<slot v-if="$slots.header" name="header"></slot>
<Header <Header
v-if="!isHome" v-else-if="!isHome"
:class="headerClass"
:title="title" :title="title"
:onBack="onBack" :onBack="onBack"
:whiteBackArrow="whiteBackArrow" :whiteBackArrow="whiteBackArrow"
:titleStyle="titleStyle" :titleStyle="titleStyle"
:style="
usePageScroll
? {
position: 'sticky',
top: capsuleHeight + 'px',
zIndex: 10,
}
: undefined
"
/> />
<BackToGame v-if="showBackToGame" /> <BackToGame v-if="showBackToGame" />
<view v-if="usePageScroll">
<slot></slot>
</view>
<scroll-view <scroll-view
v-else
:scroll-y="scroll" :scroll-y="scroll"
:enhanced="true" :enhanced="true"
:bounces="false" :bounces="false"
:show-scrollbar="false" :show-scrollbar="false"
:lower-threshold="120"
@scrolltolower="emit('scrolltolower')"
:style="{ :style="{
height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${ height: `calc(100vh - ${capsuleHeight + (($slots.header || !isHome) ? 50 : 0)}px - ${
$slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px' $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
})`, })`,
}" }"
@@ -184,64 +181,51 @@ const goCalibration = async () => {
</view> </view>
<ScreenHint :show="showHint"> <ScreenHint :show="showHint">
<view v-if="hintType === 1" class="tip-content"> <view v-if="hintType === 1" class="tip-content">
<text>完成进行中的对局才能开启新的。</text> <text>{{ t('finish_your_current_match_before_starting_a_new_one') }}</text>
<text>您有正在进行中的对局,是否进入?</text> <text>{{ t('you_have_a_match_in_progress_join_it') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('stay_out') }}</button>
不进入
</button>
<button hover-class="none" @click="backToGame" :disabled="isLoading"> <button hover-class="none" @click="backToGame" :disabled="isLoading">
{{ isLoading ? "加载中..." : "进入" }} {{ isLoading ? t('loading') : t('join') }}
</button> </button>
</view> </view>
</view> </view>
<view v-if="hintType === 2" class="tip-content"> <view v-if="hintType === 2" class="tip-content">
<text>离开比赛可能会导致比赛失败,</text> <text>{{ t('leaving_may_result_in_a_loss') }}</text>
<text>确认离开吗?</text> <text>{{ t('are_you_sure_you_want_to_leave') }}</text>
<view> <view>
<button hover-class="none" @click="goBack">离开比赛</button> <button hover-class="none" @click="goBack">{{ t('leave_match') }}</button>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('continue_match') }}</button>
继续比赛
</button>
</view> </view>
</view> </view>
<view v-if="hintType === 3" class="tip-content"> <view v-if="hintType === 3" class="tip-content">
<text>今天不玩了吗?</text> <text>{{ t('done_playing_for_today') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('cancel') }}</button>
取消 <button hover-class="none" @click="$clickSound(cancelMatching)">{{ t('confirm') }}</button>
</button>
<button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
</view> </view>
</view> </view>
<view v-if="hintType === 4" class="tip-content"> <view v-if="hintType === 4" class="tip-content">
<text>完成智能弓校准,即可解锁全部功能</text> <text>{{ t('calibrate_your_smart_bow_to_unlock_all_features') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('cancel') }}</button>
取消 <button hover-class="none" @click="goCalibration">{{ t('calibrate') }}</button>
</button>
<button hover-class="none" @click="goCalibration">去校准</button>
</view> </view>
</view> </view>
</ScreenHint> </ScreenHint>
<view v-if="audioInitProgress < 1" class="audio-progress"> <view v-if="loading" class="audio-progress">
<image <image
src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png" src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
mode="widthFix" mode="widthFix"
/> />
<view> <view>
<view :style="{ width: `${audioFinalProgress * 100}%` }"> <view :style="{ width: '100%' }"></view>
<!-- <image
src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
mode="widthFix"
/> -->
</view>
</view> </view>
<view> <view>
<text>若加载时间过长,请</text> <text>{{ loadingText || t('loading') }}</text>
<button hover-class="none" @click="restart">点击这里重启</button>
</view> </view>
</view> </view>
<DeviceChargingDialog />
</view> </view>
</template> </template>
@@ -283,6 +267,7 @@ const goCalibration = async () => {
color: #666; color: #666;
opacity: 0.6; opacity: 0.6;
} }
.audio-progress { .audio-progress {
z-index: 999; z-index: 999;
width: 100vw; width: 100vw;
@@ -296,11 +281,13 @@ const goCalibration = async () => {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.audio-progress > image:nth-child(1) { .audio-progress > image:nth-child(1) {
width: 140rpx; width: 140rpx;
height: 150rpx; height: 150rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.audio-progress > view:nth-child(2) { .audio-progress > view:nth-child(2) {
width: 380rpx; width: 380rpx;
height: 6rpx; height: 6rpx;
@@ -311,34 +298,24 @@ const goCalibration = async () => {
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;
} }
.audio-progress > view:nth-child(2) > view { .audio-progress > view:nth-child(2) > view {
background: #ffe431; width: 100%;
min-height: 6rpx; min-height: 6rpx;
background: #ffe431;
border-radius: 4rpx; border-radius: 4rpx;
display: flex;
align-items: center;
justify-content: flex-end;
transition: width 0.5s ease;
}
.audio-progress > view:nth-child(2) > view > image {
width: 46rpx;
height: 26rpx;
} }
.audio-progress > view:nth-child(3) { .audio-progress > view:nth-child(3) {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.audio-progress > view:nth-child(3) > text { .audio-progress > view:nth-child(3) > text {
font-size: 22rpx; font-size: 22rpx;
color: #a2a2a2; color: #a2a2a2;
text-align: center; text-align: center;
line-height: 32rpx; line-height: 32rpx;
} }
.audio-progress > view:nth-child(3) > button {
font-size: 22rpx;
color: #ffe431;
line-height: 32rpx;
padding: 20rpx 0;
}
</style> </style>
+18 -11
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
@@ -27,7 +29,7 @@ const roomNumber = ref("");
const createRoom = debounce(async () => { const createRoom = debounce(async () => {
// 校验必填项:对战模式与靶纸均必须选择 // 校验必填项:对战模式与靶纸均必须选择
if (!battleMode.value || !targetMode.value) { if (!battleMode.value || !targetMode.value) {
uni.showToast({ title: '请完善创建信息', icon: 'none' }); uni.showToast({ title: t('please_complete_the_room_settings'), icon: 'none' });
return; return;
} }
if (game.value.inBattle) { if (game.value.inBattle) {
@@ -36,6 +38,7 @@ const createRoom = debounce(async () => {
} }
if (loading.value === true) return; if (loading.value === true) return;
loading.value = true; loading.value = true;
let keepLoading = false;
let size = 2; let size = 2;
if (battleMode.value === 2) size = 10; if (battleMode.value === 2) size = 10;
if (battleMode.value === 3) size = 4; if (battleMode.value === 3) size = 4;
@@ -49,14 +52,18 @@ const createRoom = debounce(async () => {
if (result.number) { if (result.number) {
props.onConfirm(); props.onConfirm();
await joinRoomAPI(result.number); await joinRoomAPI(result.number);
keepLoading = true;
uni.navigateTo({ uni.navigateTo({
url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value, url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value,
fail: () => {
loading.value = false;
},
}); });
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} finally { } finally {
loading.value = false; if (!keepLoading) loading.value = false;
} }
}); });
</script> </script>
@@ -64,7 +71,7 @@ const createRoom = debounce(async () => {
<view class="container"> <view class="container">
<view class="target-options-header"> <view class="target-options-header">
<view class="target-options-header-line-left"></view> <view class="target-options-header-line-left"></view>
<image class="target-options-header-title-img" src="../static/choose-battle-mode.png" mode="widthFix" /> <image class="target-options-header-title-img" src="https://static.shelingxingqiu.com/shootmini/static/choose-battle-mode.png" mode="widthFix" />
<view class="target-options-header-line-right"></view> <view class="target-options-header-line-right"></view>
</view> </view>
<view class="create-options"> <view class="create-options">
@@ -72,30 +79,30 @@ const createRoom = debounce(async () => {
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }"
@click="() => (battleMode = 1)" @click="() => (battleMode = 1)"
> >
<text>对抗模式(1V1)</text> <text>{{ t('versus_1v1') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 3 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 3 }"
@click="() => (battleMode = 3)" @click="() => (battleMode = 3)"
> >
<text>对抗模式(2V2)</text> <text>{{ t('versus_2v2') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 4 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 4 }"
@click="() => (battleMode = 4)" @click="() => (battleMode = 4)"
> >
<text>对抗模式(3V3)</text> <text>{{ t('versus_3v3') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }"
@click="() => (battleMode = 2)" @click="() => (battleMode = 2)"
> >
<text>乱斗模式(3-10人)</text> <text>{{ t('free_for_all_3_10_players') }}</text>
</view> </view>
</view> </view>
<view class="target-options-header"> <view class="target-options-header">
<view class="target-options-header-line-left"></view> <view class="target-options-header-line-left"></view>
<view class="target-options-header-title">选择靶纸</view> <view class="target-options-header-title">{{ t('select_target_face') }}</view>
<view class="target-options-header-line-right"></view> <view class="target-options-header-line-right"></view>
</view> </view>
<view class="target-options"> <view class="target-options">
@@ -103,16 +110,16 @@ const createRoom = debounce(async () => {
:class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }" :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }"
@click="() => (targetMode = 1)" @click="() => (targetMode = 1)"
> >
<text>20厘米全环靶</text> <text>{{ t('20_cm_full_ring_target') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }" :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }"
@click="() => (targetMode = 2)" @click="() => (targetMode = 2)"
> >
<text>40厘米全环靶</text> <text>{{ t('40_cm_full_ring_target') }}</text>
</view> </view>
</view> </view>
<SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton> <SButton :disabled="loading" :onClick="() => { $clickSound(); return createRoom(); }">{{ t('create_room') }}</SButton>
</view> </view>
</template> </template>
+24
View File
@@ -0,0 +1,24 @@
<script setup>
import { t } from "@/locales";
import { storeToRefs } from "pinia";
import ModalDialog from "@/components/ModalDialog.vue";
import useStore from "@/store";
const chargingNotice =
t('your_smart_bow_is_charging_and_will_shut_down_automatically_to_p');
const store = useStore();
const { deviceChargingDialogVisible } = storeToRefs(store);
const { hideDeviceChargingDialog } = store;
</script>
<template>
<ModalDialog
:show="deviceChargingDialogVisible"
:content="chargingNotice"
:show-cancel="false"
:confirm-text="t('got_it')"
:on-confirm="hideDeviceChargingDialog"
/>
</template>
+399
View File
@@ -0,0 +1,399 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
variant: {
type: String,
default: "home",
validator: (value) => ["home", "detail"].includes(value),
},
});
// 固定粒子分布营造随机感,避免每次进入页面时因运行时随机数产生位置跳变。
const sparkSeeds = [
[1, "dot", 18, 98, -28, 5, 5, 2.3, 0.4],
[2, "streak", 23, 90, -38, 4, 18, 2, 1.1, true],
[3, "dot", 28, 112, -17, 6, 6, 2.8, 1.9, true],
[4, "dot", 32, 104, -12, 12, 12, 2.6, 0.7, true, true],
[5, "dot", 36, 88, -24, 4, 4, 1.8, 1.4],
[6, "streak", 40, 116, -8, 4, 20, 2.4, 2.2, true],
[7, "dot", 44, 96, -16, 7, 7, 2.1, 0.2],
[8, "dot", 48, 120, -4, 5, 5, 2.9, 1.3, true],
[9, "dot", 51, 110, 3, 14, 14, 3, 2.7, true, true],
[10, "streak", 54, 92, 8, 4, 22, 1.9, 0.8],
[11, "dot", 58, 105, 14, 6, 6, 2.5, 1.6, true],
[12, "dot", 62, 86, 21, 4, 4, 2, 0.5],
[13, "dot", 66, 114, 10, 7, 7, 2.7, 2.1, true],
[14, "streak", 70, 96, 28, 4, 18, 2.2, 1],
[15, "dot", 74, 108, 20, 11, 11, 2.8, 2.4, true, true],
[16, "dot", 80, 90, 35, 5, 5, 2.3, 0.3, true],
[17, "dot", 21, 118, -8, 4, 4, 2.6, 1.7],
[18, "streak", 27, 84, -31, 3, 16, 1.8, 0.6, true],
[19, "dot", 34, 122, -3, 6, 6, 2.9, 2.3, true],
[20, "dot", 42, 102, 5, 5, 5, 2.2, 0.9],
[21, "dot", 47, 88, -10, 13, 13, 2.7, 1.5, true, true],
[22, "streak", 56, 120, 16, 4, 21, 2.5, 2.6, true],
[23, "dot", 64, 100, 24, 7, 7, 2.4, 0.1],
[24, "dot", 72, 84, 38, 5, 5, 2, 1.2, true],
[25, "dot", 82, 116, 12, 4, 4, 2.8, 2],
[26, "dot", 68, 124, 7, 10, 10, 3.1, 2.9, true, true],
[27, "streak", 77, 98, 33, 4, 19, 2.1, 0.7, true],
[28, "dot", 29, 94, -20, 7, 7, 2.5, 1.4],
[29, "dot", 53, 126, 0, 5, 5, 2.3, 2.2, true],
[30, "dot", 60, 108, 18, 6, 6, 2.6, 0.4],
];
const deviceSparks = computed(() => {
const isDetail = props.variant === "detail";
const sizeScale = isDetail ? 1.25 : 1;
const bottomOffset = isDetail ? 120 : 0;
return sparkSeeds.map(([
id,
type,
left,
bottom,
angle,
width,
height,
duration,
delay,
long = false,
large = false,
]) => ({
id,
type,
long,
large,
trackStyle: {
left: `${left}%`,
bottom: `${bottom + bottomOffset}rpx`,
transform: `rotate(${angle}deg)`,
},
sparkStyle: {
width: `${width * sizeScale}rpx`,
height: `${height * sizeScale}rpx`,
marginLeft: `${-(width * sizeScale) / 2}rpx`,
animationDuration: `${duration}s`,
animationDelay: `-${delay}s`,
},
}));
});
</script>
<template>
<view
class="device-online-effects"
:class="`device-online-effects--${variant}`"
>
<view class="device-online-rays-stage">
<view class="device-online-rays-orbit">
<view class="device-online-ray device-online-ray--1" />
<view class="device-online-ray device-online-ray--2" />
<view class="device-online-ray device-online-ray--3" />
<view class="device-online-ray device-online-ray--4" />
<view class="device-online-ray device-online-ray--5" />
<view class="device-online-ray device-online-ray--6" />
<view class="device-online-ray device-online-ray--7" />
</view>
</view>
<view class="device-online-particles">
<view
v-for="spark in deviceSparks"
:key="spark.id"
class="device-online-spark-track"
:style="spark.trackStyle"
>
<view
class="device-online-spark"
:class="[
`device-online-spark--${spark.type}`,
{
'device-online-spark--long': spark.long,
'device-online-spark--large': spark.large,
}
]"
:style="spark.sparkStyle"
/>
</view>
</view>
</view>
</template>
<style scoped lang="scss">
.device-online-effects {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 3;
overflow: hidden;
pointer-events: none;
}
/* 光束沿底座椭圆轨迹扫动,用位移、明暗和横向缩放表达前后纵深。 */
.device-online-rays-stage {
position: absolute;
left: 0;
bottom: 112rpx;
width: 100%;
height: 140rpx;
overflow: hidden;
transform-origin: 50% 100%;
}
.device-online-rays-orbit {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
transform-origin: 50% 100%;
animation: device-rays-rotate 6s ease-in-out infinite;
}
.device-online-ray {
position: absolute;
bottom: 0;
left: 50%;
width: 48rpx;
height: 132rpx;
margin-left: -24rpx;
transform-origin: 50% 100%;
border-radius: 50% 50% 12% 12%;
background: linear-gradient(
180deg,
rgba(255, 255, 244, 0) 0%,
rgba(255, 254, 239, 0.1) 36%,
rgba(255, 248, 215, 0.22) 72%,
rgba(255, 232, 151, 0.36) 100%
);
}
.device-online-ray--1 {
opacity: 0.55;
transform: rotate(-55deg);
}
.device-online-ray--2 {
width: 68rpx;
margin-left: -34rpx;
opacity: 0.72;
transform: rotate(-36deg);
}
.device-online-ray--3 {
width: 42rpx;
margin-left: -21rpx;
opacity: 0.6;
transform: rotate(-18deg);
}
.device-online-ray--4 {
width: 76rpx;
margin-left: -38rpx;
opacity: 0.82;
}
.device-online-ray--5 {
width: 46rpx;
margin-left: -23rpx;
opacity: 0.64;
transform: rotate(19deg);
}
.device-online-ray--6 {
width: 64rpx;
margin-left: -32rpx;
opacity: 0.7;
transform: rotate(38deg);
}
.device-online-ray--7 {
width: 44rpx;
margin-left: -22rpx;
opacity: 0.56;
transform: rotate(56deg);
}
.device-online-particles {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.device-online-spark-track {
position: absolute;
width: 0;
height: 0;
transform-origin: center bottom;
}
.device-online-spark {
position: absolute;
bottom: 0;
left: 0;
background: #fff6bd;
box-shadow: 0 0 6rpx rgba(255, 225, 112, 0.65);
animation: device-spark-rise 2.4s linear infinite;
}
.device-online-spark--dot {
border-radius: 50%;
}
.device-online-spark--streak {
border-radius: 50%;
background: linear-gradient(
180deg,
rgba(255, 255, 235, 0) 0%,
rgba(255, 250, 205, 0.75) 45%,
#ffe379 100%
);
}
.device-online-spark--long {
animation-name: device-spark-rise-long;
}
.device-online-spark--large {
background: #fffbdc;
box-shadow:
0 0 10rpx rgba(255, 243, 174, 0.95),
0 0 20rpx rgba(255, 207, 74, 0.72);
}
.device-online-effects--detail .device-online-rays-stage {
bottom: 215rpx;
height: 190rpx;
transform: scaleX(1.35);
}
.device-online-effects--detail .device-online-ray {
height: 180rpx;
}
.device-online-effects--detail .device-online-rays-orbit {
animation-name: device-rays-rotate-detail;
}
.device-online-effects--detail .device-online-spark {
animation-name: device-spark-rise-detail;
}
.device-online-effects--detail .device-online-spark--long {
animation-name: device-spark-rise-detail-long;
}
@keyframes device-spark-rise {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-148rpx) scale(1);
}
}
@keyframes device-spark-rise-long {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-176rpx) scale(1);
}
}
@keyframes device-spark-rise-detail {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-225rpx) scale(1);
}
}
@keyframes device-spark-rise-detail-long {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-270rpx) scale(1);
}
}
@keyframes device-rays-rotate {
0%,
100% {
opacity: 0.48;
transform: translate(-42rpx, 4rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(42rpx, 4rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 10rpx) skewX(0deg) scaleX(0.68);
}
}
@keyframes device-rays-rotate-detail {
0%,
100% {
opacity: 0.48;
transform: translate(-62rpx, 6rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(62rpx, 6rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 14rpx) skewX(0deg) scaleX(0.68);
}
}
</style>
+16 -16
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, computed } from "vue"; import { ref, watch, onMounted, computed } from "vue";
import { getPointBookConfigAPI } from "@/apis"; import { getPointBookConfigAPI } from "@/apis";
const props = defineProps({ const props = defineProps({
@@ -27,7 +29,7 @@ const props = defineProps({
default: "", default: "",
}, },
}); });
const itemTexts = ["选择弓种", "选择练习距离", "选择靶纸", "选择组/箭数"]; const itemTexts = [t('select_bow_type'), t('select_shooting_distance'), t('select_target_face'), t('select_ends_arrows')];
const distances = [5, 8, 10, 18, 25, 30, 50, 60, 70]; const distances = [5, 8, 10, 18, 25, 30, 50, 60, 70];
const groupArrows = [3, 6, 12, 18]; const groupArrows = [3, 6, 12, 18];
@@ -157,11 +159,9 @@ const formatSetAndAmount = computed(() => {
return itemTexts[props.itemIndex]; return itemTexts[props.itemIndex];
if (secondSelectIndex.value === 99 && !arrowAmount.value) if (secondSelectIndex.value === 99 && !arrowAmount.value)
return itemTexts[props.itemIndex]; return itemTexts[props.itemIndex];
return `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}组/${ return t('value_ends_value_arrows', { p0: selectedIndex.value === 99 ? sets.value : selectedIndex.value, p1: secondSelectIndex.value === 99
secondSelectIndex.value === 99
? arrowAmount.value ? arrowAmount.value
: groupArrows[secondSelectIndex.value] : groupArrows[secondSelectIndex.value] });
}箭`;
}); });
onMounted(async () => { onMounted(async () => {
const config = uni.getStorageSync("point-book-config"); const config = uni.getStorageSync("point-book-config");
@@ -187,13 +187,13 @@ onMounted(async () => {
<view></view> <view></view>
<block> <block>
<text v-if="expand" :style="{ color: '#999', fontWeight: 'normal' }">{{ <text v-if="expand" :style="{ color: '#999', fontWeight: 'normal' }">{{
itemIndex !== 3 ? itemTexts[itemIndex] : "选择组" itemIndex !== 3 ? itemTexts[itemIndex] : t('select_ends')
}}</text> }}</text>
<text v-if="!expand && itemIndex === 0">{{ <text v-if="!expand && itemIndex === 0">{{
value || itemTexts[itemIndex] value || itemTexts[itemIndex]
}}</text> }}</text>
<text v-if="!expand && itemIndex === 1">{{ <text v-if="!expand && itemIndex === 1">{{
value && value > 0 ? value + "米" : itemTexts[itemIndex] value && value > 0 ? value + t('m_92') : itemTexts[itemIndex]
}}</text> }}</text>
<text v-if="!expand && itemIndex === 2">{{ <text v-if="!expand && itemIndex === 2">{{
value || itemTexts[itemIndex] value || itemTexts[itemIndex]
@@ -203,7 +203,7 @@ onMounted(async () => {
<button hover-class="none"> <button hover-class="none">
<image <image
v-if="!noArrow" v-if="!noArrow"
src="../static/arrow-grey.png" src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png"
mode="widthFix" mode="widthFix"
:style="{ transform: expand ? 'rotateX(180deg)' : 'rotateX(0deg)' }" :style="{ transform: expand ? 'rotateX(180deg)' : 'rotateX(0deg)' }"
/> />
@@ -232,7 +232,7 @@ onMounted(async () => {
@click="onSelectItem(index)" @click="onSelectItem(index)"
> >
<text>{{ item }}</text> <text>{{ item }}</text>
<text>米</text> <text>{{ t('m_92') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -242,12 +242,12 @@ onMounted(async () => {
<input <input
v-model="meter" v-model="meter"
type="number" type="number"
placeholder="自定义" :placeholder="t('custom')"
placeholder-style="color: #DDDDDD" placeholder-style="color: #DDDDDD"
@focus="() => (selectedIndex = 9)" @focus="() => (selectedIndex = 9)"
@blur="onMeterChange" @blur="onMeterChange"
/> />
<text>米</text> <text>{{ t('m_92') }}</text>
</view> </view>
</view> </view>
<view v-if="itemIndex === 2" class="bowtarget-items"> <view v-if="itemIndex === 2" class="bowtarget-items">
@@ -274,7 +274,7 @@ onMounted(async () => {
@click="onSelectItem(i)" @click="onSelectItem(i)"
> >
<text>{{ i }}</text> <text>{{ i }}</text>
<text>组</text> <text>{{ t('ends') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -289,7 +289,7 @@ onMounted(async () => {
@focus="() => (selectedIndex = 99)" @focus="() => (selectedIndex = 99)"
@blur="onSetsChange" @blur="onSetsChange"
/> />
<text>组</text> <text>{{ t('ends') }}</text>
</view> </view>
</view> </view>
<view <view
@@ -299,7 +299,7 @@ onMounted(async () => {
color: '#999999', color: '#999999',
textAlign: 'center', textAlign: 'center',
}" }"
>选择每组的箭数</view >{{ t('select_arrows_per_end') }}</view
> >
<view class="amount-items"> <view class="amount-items">
<view <view
@@ -311,7 +311,7 @@ onMounted(async () => {
@click="onSelectSecondItem(index)" @click="onSelectSecondItem(index)"
> >
<text>{{ item }}</text> <text>{{ item }}</text>
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -327,7 +327,7 @@ onMounted(async () => {
@focus="() => (secondSelectIndex = 99)" @focus="() => (secondSelectIndex = 99)"
@blur="onArrowAmountChange" @blur="onArrowAmountChange"
/> />
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
</view> </view>
</view> </view>
+4 -4
View File
@@ -10,15 +10,15 @@ defineProps({
}, },
}); });
const bubbleTypes = [ const bubbleTypes = [
"../static/long-bubble.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble.png",
"../static/long-bubble-middle.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble-middle.png",
"../static/long-bubble-tall.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
]; ];
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<image src="../static/shooter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
<view> <view>
<image <image
v-if="!noBg" v-if="!noBg"
+17 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t, translateStatic } from "@/locales";
import { ref, computed, onMounted, onBeforeUnmount } from "vue"; import { ref, computed, onMounted, onBeforeUnmount } from "vue";
import HeaderProgress from "@/components/HeaderProgress.vue"; import HeaderProgress from "@/components/HeaderProgress.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -115,16 +117,18 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container"> <view class="container">
<view class="back-btn" @click="onClick"> <view class="back-btn" @click="onClick">
<image v-if="whiteBackArrow" src="../static/back.png" mode="widthFix" /> <image v-if="whiteBackArrow" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
<image <image
v-if="!whiteBackArrow" v-if="!whiteBackArrow"
src="../static/back-black.png" src="https://static.shelingxingqiu.com/shootmini/static/back-black.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
<view <view
:style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]" :style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]"
> >
<slot v-if="$slots.title" name="title"></slot>
<template v-else>
<view <view
v-if="currentPage === 'pages/point-book'" v-if="currentPage === 'pages/point-book'"
class="user-header" class="user-header"
@@ -154,13 +158,13 @@ onBeforeUnmount(() => {
<text v-else class="truncate">{{ user.nickName }}</text> <text v-else class="truncate">{{ user.nickName }}</text>
<image <image
v-if="heat" v-if="heat"
:src="`../static/hot${heat}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/hot${heat}.png`"
mode="widthFix" mode="widthFix"
/> />
</block> </block>
<block v-else> <block v-else>
<image src="../static/user-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<text>新来的弓箭手你好呀~</text> <text>{{ t('welcome_new_archer') }}</text>
</block> </block>
</view> </view>
<block <block
@@ -169,7 +173,7 @@ onBeforeUnmount(() => {
'-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11 '-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11
" "
> >
<text>{{ title }}</text> <text>{{ ['-箭前准备', '-感知距离', '-小试牛刀', '小试牛刀'].includes(title) ? translateStatic(title) : title }}</text>
</block> </block>
<block <block
v-if=" v-if="
@@ -179,21 +183,22 @@ onBeforeUnmount(() => {
" "
> >
<view class="first-try-steps"> <view class="first-try-steps">
<text :class="title === '-箭前准备' ? 'current-step' : ''">箭前准备</text> <text :class="title === '-箭前准备' ? 'current-step' : ''">{{ t('get_ready') }}</text>
<text>-</text> <text>-</text>
<text :class="title === '-感知距离' ? 'current-step' : ''" <text :class="title === '-感知距离' ? 'current-step' : ''"
>感知距离</text >{{ t('find_your_distance') }}</text
> >
<text>-</text> <text>-</text>
<text :class="title === '-小试牛刀' ? 'current-step' : ''" <text :class="title === '-小试牛刀' ? 'current-step' : ''"
>小试牛刀</text >{{ t('first_challenge') }}</text
> >
</view> </view>
</block> </block>
</template>
</view> </view>
<view v-if="pointBook" class="point-book-info"> <view v-if="pointBook" class="point-book-info">
<text>{{ pointBook.bowType.name }}</text> <text>{{ pointBook.bowType.name }}</text>
<text>{{ pointBook.distance }} 米</text> <text>{{ pointBook.distance }}{{ t('m') }}</text>
<text <text
>{{ >{{
pointBook.bowtargetType.name.substring( pointBook.bowtargetType.name.substring(
@@ -225,8 +230,8 @@ onBeforeUnmount(() => {
class="battle-room-number" class="battle-room-number"
:style="battleRoomBtnStyle" :style="battleRoomBtnStyle"
> >
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text> <text class="battle-room-number__text">{{ t('room') }}{{ game.roomNumber }}</text>
<image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" /> <image src="https://static.shelingxingqiu.com/shootmini/static/share2.png" mode="widthFix" class="battle-room-number__icon" />
</button> </button>
</view> </view>
</template> </template>
+10 -5
View File
@@ -1,8 +1,13 @@
<script setup> <script setup>
import { formatBattleTip } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -88,10 +93,10 @@ async function onReceiveMessage(message) {
currentRoundEnded.value = true; currentRoundEnded.value = true;
} else if (type === MESSAGETYPESV2.InvalidShot) { } else if (type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(shootData),
icon: "none", icon: "none",
}); });
audioManager.play("射击无效"); audioManager.play(getInvalidShotAudioKey(shootData));
} }
} }
@@ -139,10 +144,10 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container"> <view class="container">
<text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text> <text>{{ formatBattleTip(tips) }}</text>
<text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text> <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
<button v-if="!!tips" hover-class="none" @click="updateSound"> <button v-if="!!tips" hover-class="none" @click="updateSound">
<image :src="`../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" /> <image :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
</button> </button>
</view> </view>
</template> </template>
+15 -13
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount, watch } from "vue"; import { ref, onMounted, onBeforeUnmount, watch } from "vue";
const props = defineProps({ const props = defineProps({
stopMatch: { stopMatch: {
@@ -11,17 +13,17 @@ const props = defineProps({
}, },
}); });
const playerNames = [ const playerNames = [
"乐正青山", t('yuezheng_qingshan'),
"宇文玉兰", t('yuwen_yulan'),
"岑思宇", t('cen_siyu'),
"邬梓瑜", t('wu_ziyu'),
"范子衿", t('fan_zijin'),
"旗鼓相当的对手", t('a_worthy_opponent'),
"乐子睿", t('le_zirui'),
"时春晓", t('shi_chunxiao'),
"柏孤鸿", t('bai_guhong'),
"东宫锦瑟", t('donggong_jinse'),
"段干流云", t('duangan_liuyun'),
]; ];
const textStyles = [ const textStyles = [
{ {
@@ -105,7 +107,7 @@ onBeforeUnmount(() => {
<template> <template>
<view class="matching"> <view class="matching">
<image <image
src="../static/matching-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/matching-bg.png"
mode="widthFix" mode="widthFix"
class="matching-bg" class="matching-bg"
/> />
@@ -123,7 +125,7 @@ onBeforeUnmount(() => {
</text> </text>
</view> </view>
</view> </view>
<button hover-class="none" @click="$clickSound(stopMatch)">取消匹配</button> <button hover-class="none" @click="$clickSound(stopMatch)">{{ t('cancel_matchmaking') }}</button>
</view> </view>
</template> </template>
+59 -8
View File
@@ -1,4 +1,8 @@
<script setup> <script setup>
import { t } from "@/locales";
import IconButton from "./IconButton.vue";
const props = defineProps({ const props = defineProps({
show: { show: {
type: Boolean, type: Boolean,
@@ -14,11 +18,11 @@ const props = defineProps({
}, },
cancelText: { cancelText: {
type: String, type: String,
default: "取消", default: t('cancel_133'),
}, },
confirmText: { confirmText: {
type: String, type: String,
default: "确定", default: t('confirm_134'),
}, },
showCancel: { showCancel: {
type: Boolean, type: Boolean,
@@ -28,6 +32,14 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
confirmDisabled: {
type: Boolean,
default: false,
},
showClose: {
type: Boolean,
default: false,
},
onCancel: { onCancel: {
type: Function, type: Function,
default: null, default: null,
@@ -36,6 +48,10 @@ const props = defineProps({
type: Function, type: Function,
default: null, default: null,
}, },
onClose: {
type: Function,
default: null,
},
}); });
const handleCancel = () => { const handleCancel = () => {
@@ -43,8 +59,13 @@ const handleCancel = () => {
}; };
const handleConfirm = () => { const handleConfirm = () => {
if (props.confirmDisabled) return;
props.onConfirm?.(); props.onConfirm?.();
}; };
const handleClose = () => {
props.onClose?.();
};
</script> </script>
<template> <template>
@@ -52,19 +73,19 @@ const handleConfirm = () => {
<view class="modal-wrap scale-in"> <view class="modal-wrap scale-in">
<image <image
class="dialog-light" class="dialog-light"
src="../static/common/dialog-light.png" src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-light.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
class="dialog-icon" class="dialog-icon"
src="../static/common/dialog-icon.png" src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-icon.png"
mode="widthFix" mode="widthFix"
/> />
<view class="dialog-panel"> <view class="dialog-panel">
<image <image
class="dialog-bg" class="dialog-bg"
src="../static/common/dialog-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-bg.png"
mode="scaleToFill" mode="scaleToFill"
/> />
<view class="dialog-content"> <view class="dialog-content">
@@ -89,6 +110,7 @@ const handleConfirm = () => {
<view <view
v-if="showConfirm" v-if="showConfirm"
class="dialog-button confirm" class="dialog-button confirm"
:class="{ disabled: confirmDisabled }"
@click="handleConfirm" @click="handleConfirm"
> >
<text>{{ confirmText }}</text> <text>{{ confirmText }}</text>
@@ -96,6 +118,13 @@ const handleConfirm = () => {
</view> </view>
</view> </view>
<view v-if="showClose" class="dialog-close">
<IconButton
src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30"
:onClick="handleClose"
/>
</view>
</view> </view>
</view> </view>
</template> </template>
@@ -108,6 +137,7 @@ const handleConfirm = () => {
top: 0; top: 0;
left: 0; left: 0;
background-color: rgba(0, 0, 0, 0.62); background-color: rgba(0, 0, 0, 0.62);
flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 999; z-index: 999;
@@ -116,6 +146,7 @@ const handleConfirm = () => {
.modal-wrap { .modal-wrap {
position: relative; position: relative;
display: flex; display: flex;
flex-direction: column;
width: 549rpx; width: 549rpx;
min-height: 318rpx;; min-height: 318rpx;;
padding-top: 168rpx; padding-top: 168rpx;
@@ -164,6 +195,9 @@ const handleConfirm = () => {
} }
.dialog-content { .dialog-content {
max-height: 45vh;
overflow-y: auto;
overflow-wrap: break-word;
position: relative; position: relative;
z-index: 1; z-index: 1;
display: flex; display: flex;
@@ -187,6 +221,7 @@ const handleConfirm = () => {
} }
.dialog-actions { .dialog-actions {
width: 100%;
position: relative; position: relative;
z-index: 1; z-index: 1;
display: flex; display: flex;
@@ -200,11 +235,19 @@ const handleConfirm = () => {
justify-content: center; justify-content: center;
} }
.dialog-actions.single .dialog-button {
flex: 0 1 232rpx;
}
.dialog-button { .dialog-button {
display: flex; display: flex;
width: 232rpx; flex: 1;
height: 70rpx; min-width: 0;
line-height: 70rpx; min-height: 70rpx;
padding: 12rpx 20rpx;
box-sizing: border-box;
line-height: 1.3;
text-align: center;
border-radius: 44rpx; border-radius: 44rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@@ -222,6 +265,14 @@ const handleConfirm = () => {
background-color: #ffda3f; background-color: #ffda3f;
} }
.dialog-button.confirm.disabled {
opacity: 0.62;
}
.dialog-close {
margin-top: 28rpx;
}
@keyframes rotateLight { @keyframes rotateLight {
from { from {
transform: translateX(-50%) rotate(0deg); transform: translateX(-50%) rotate(0deg);
+67 -36
View File
@@ -1,10 +1,13 @@
<script setup> <script setup>
import { computed } from "vue"; import { t } from "@/locales";
import { getDeviceBatteryAPI } from "@/apis";
const OTA_MIN_BATTERY = 50; import { computed } from "vue";
const OTA_LOW_BATTERY_TEXT = "电量不足 50%,暂不支持 OTA 升级"; import useStore from "@/store";
const OTA_OFFLINE_TEXT = "请先开启智能弓"; import { storeToRefs } from "pinia";
const OTA_OFFLINE_TEXT = t('please_turn_on_your_smart_bow_first');
const store = useStore();
const { deviceStatus } = storeToRefs(store);
const props = defineProps({ const props = defineProps({
visible: { visible: {
@@ -23,6 +26,10 @@ const props = defineProps({
type: Number, type: Number,
default: 40, default: 40,
}, },
phase: {
type: String,
default: "",
},
// 副标题:如“新版本将优化智能弓体验” // 副标题:如“新版本将优化智能弓体验”
description: { description: {
type: String, type: String,
@@ -47,28 +54,22 @@ const isSuccess = computed(() => props.state === "update_success");
const isFailure = computed(() => props.state === "update_failure"); const isFailure = computed(() => props.state === "update_failure");
// Clamp progress to keep the progress bar width within its container. // Clamp progress to keep the progress bar width within its container.
const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0))); const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0)));
const progressPhaseText = computed(() => {
const phaseText = {
started: t('preparing_firmware_update'),
downloading: t('downloading_firmware'),
installing: t('installing_firmware'),
};
return phaseText[props.phase] || t('updating_firmware');
});
// 点击立即更新前先校验设备在线状态,再校验设备电量。 // 点击立即更新前先校验设备在线状态。
const handleUpdateClick = async () => { const handleUpdateClick = () => {
try { if (deviceStatus.value?.online !== true) {
const deviceStatus = await getDeviceBatteryAPI(); uni.showToast({
if (deviceStatus?.online !== true) { title: OTA_OFFLINE_TEXT,
uni.showToast({ icon: "none",
title: OTA_OFFLINE_TEXT, });
icon: "none",
});
return;
}
if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
uni.showToast({
title: OTA_LOW_BATTERY_TEXT,
icon: "none",
});
return;
}
} catch (err) {
emit("update");
return; return;
} }
emit("update"); emit("update");
@@ -131,19 +132,19 @@ const handleUpdateClick = async () => {
<text v-if="changelog" class="changelog-text">{{ changelog }}</text> <text v-if="changelog" class="changelog-text">{{ changelog }}</text>
<view class="btn-group"> <view class="btn-group">
<view class="primary-btn" @click="handleUpdateClick"> <view class="primary-btn" @click="handleUpdateClick">
<text class="primary-btn-text">立即更新</text> <text class="primary-btn-text">{{ t('update_now') }}</text>
</view> </view>
<text v-if="!forceUpdate" class="skip-text" @click="emit('skip')">暂不更新</text> <text v-if="!forceUpdate" class="skip-text" @click="emit('skip')">{{ t('later') }}</text>
</view> </view>
</block> </block>
<!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 --> <!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 -->
<block v-else-if="isSuccess"> <block v-else-if="isSuccess">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<text class="dialog-desc">请关机并重启智能弓</text> <text class="dialog-desc">{{ t('firmware_update_complete') }}</text>
<view class="btn-group-result"> <view class="btn-group-result">
<view class="primary-btn" @click="emit('done')"> <view class="primary-btn" @click="emit('done')">
<text class="primary-btn-text">完成</text> <text class="primary-btn-text">{{ t('close') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -152,21 +153,26 @@ const handleUpdateClick = async () => {
<block v-else-if="isProgress"> <block v-else-if="isProgress">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<view class="progress-wrap"> <view class="progress-wrap">
<view class="progress-meta">
<text class="progress-phase">{{ progressPhaseText }}</text>
<text class="progress-value">{{ Math.floor(progressValue) }}%</text>
</view>
<view class="progress-track"> <view class="progress-track">
<view class="progress-fill" :style="{ width: `${progressValue}%` }"></view> <view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
</view> </view>
<text class="progress-warning">{{ t('please_stay_on_this_page') }}</text>
</view> </view>
</block> </block>
<!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 --> <!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 -->
<block v-else-if="isFailure"> <block v-else-if="isFailure">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" />
<text class="dialog-desc">请确保:</text> <text class="dialog-desc">{{ t('please_make_sure') }}</text>
<text class="dialog-desc">1、智能弓已开启</text> <text class="dialog-desc">{{ t('1_your_smart_bow_is_on') }}</text>
<text class="dialog-desc">2、网路连接稳定</text> <text class="dialog-desc">{{ t('2_your_network_connection_is_stable') }}</text>
<view class="btn-group-result"> <view class="btn-group-result">
<view class="primary-btn" @click="emit('retry')"> <view class="primary-btn" @click="emit('retry')">
<text class="primary-btn-text">重试</text> <text class="primary-btn-text">{{ t('retry') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -181,7 +187,7 @@ const handleUpdateClick = async () => {
class="ota-close-below" class="ota-close-below"
@click="emit('close')" @click="emit('close')"
> >
<image src="../static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" />
</view> </view>
</view> </view>
</template> </template>
@@ -404,9 +410,26 @@ const handleUpdateClick = async () => {
} }
.progress-wrap { .progress-wrap {
width: 394rpx; width: 394rpx;
margin-top: 40rpx; margin-top: 28rpx;
margin-left: 44rpx; margin-left: 44rpx;
} }
.progress-meta {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.progress-phase {
flex: 1;
}
.progress-value {
flex-shrink: 0;
margin-left: 16rpx;
color: #fed847;
}
.progress-track { .progress-track {
width: 100%; width: 100%;
height: 18rpx; height: 18rpx;
@@ -419,6 +442,14 @@ const handleUpdateClick = async () => {
background-color: #FED847; background-color: #FED847;
border-radius: 999rpx; border-radius: 999rpx;
} }
.progress-warning {
display: block;
margin-top: 16rpx;
color: rgba(255, 255, 255, 0.88);
font-size: 22rpx;
line-height: 32rpx;
text-align: center;
}
/* 关闭按钮(位于弹窗下方) */ /* 关闭按钮(位于弹窗下方) */
.ota-close-below { .ota-close-below {
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const { user } = storeToRefs(useStore()); const { user } = storeToRefs(useStore());
@@ -18,8 +20,8 @@ const rowCount = new Array(6).fill(0);
const getRingText = (arrow) => { const getRingText = (arrow) => {
if (!arrow) return "-"; if (!arrow) return "-";
if (arrow.ringX && arrow.ring) return "X环"; if (arrow.ringX && arrow.ring) return t('x');
return arrow.ring ? `${arrow.ring}环` : "-"; return t('value_pts', { p0: Number(arrow.ring) || 0 });
}; };
const isMember = (player = {}) => player.vip === true || player.sVip === true; const isMember = (player = {}) => player.vip === true || player.sVip === true;
@@ -40,10 +42,10 @@ const getMemberNicknameClass = (player = {}) => [
opacity: opacity:
(scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0, (scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0,
}" }"
src="../static/checked-green.png" src="https://static.shelingxingqiu.com/shootmini/static/checked-green.png"
mode="widthFix" mode="widthFix"
/> />
<image :src="player.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="player.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<view <view
v-if="isMember(player)" v-if="isMember(player)"
:class="['player-score-name', ...getMemberNicknameClass(player)]" :class="['player-score-name', ...getMemberNicknameClass(player)]"
@@ -71,7 +73,7 @@ const getMemberNicknameClass = (player = {}) => [
scores scores
.map((s) => (s || []).reduce((last, next) => last + next.ring, 0)) .map((s) => (s || []).reduce((last, next) => last + next.ring, 0))
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
}}环</text }}{{ t('pts') }}</text
> >
</view> </view>
</template> </template>
+10 -8
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { topThreeColors } from "@/constants"; import { topThreeColors } from "@/constants";
defineProps({ defineProps({
avatar: { avatar: {
@@ -30,25 +32,25 @@ const rowCount = new Array(6).fill(0);
<view> <view>
<image <image
v-if="rank === 1" v-if="rank === 1"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 2" v-if="rank === 2"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 3" v-if="rank === 3"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<view v-if="rank > 3" class="rank-view">{{ rank }}</view> <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image <image
:src="avatar || '../static/user-icon.png'" :src="avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix" mode="widthFix"
:style="{ borderColor: topThreeColors[rank - 1] || '#fff' }" :style="{ borderColor: topThreeColors[rank - 1] || '#fff' }"
/> />
@@ -56,20 +58,20 @@ const rowCount = new Array(6).fill(0);
<view> <view>
<view> <view>
<view v-for="(_, index) in rowCount" :key="index"> <view v-for="(_, index) in rowCount" :key="index">
<text>{{ arrows[index] ? `${arrows[index].ring}环` : "-" }}</text> <text>{{ arrows[index] ? t('value_pts', { p0: arrows[index].ring }) : "-" }}</text>
</view> </view>
</view> </view>
<view> <view>
<view v-for="(_, index) in rowCount" :key="index"> <view v-for="(_, index) in rowCount" :key="index">
<text>{{ <text>{{
arrows[index + 6] ? `${arrows[index + 6].ring}环` : "-" arrows[index + 6] ? t('value_pts', { p0: arrows[index + 6].ring }) : "-"
}}</text> }}</text>
</view> </view>
</view> </view>
</view> </view>
<view> <view>
<text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text> <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}{{ t('pts') }}</text>
<text>积分{{ totalScore }}</text> <text>{{ t('points') }}{{ totalScore }}</text>
</view> </view>
</view> </view>
</template> </template>
+38 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
const props = defineProps({ const props = defineProps({
@@ -20,33 +22,57 @@ const props = defineProps({
default: false, default: false,
}, },
}); });
const isMember = (player = {}) => player.vip === true || player.sVip === true;
const getMemberNicknameClass = (player = {}) => [
"member-nickname",
player.vip === true && player.sVip !== true ? "member-nickname--vip" : "",
player.sVip === true ? "member-nickname--svip" : "",
];
const seats = new Array(props.total).fill(1); const seats = new Array(props.total).fill(1);
</script> </script>
<template> <template>
<view class="players"> <view class="players">
<view v-for="(_, index) in seats" :key="index"> <view v-for="(_, index) in seats" :key="index">
<image src="../static/player-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/player-bg.png" mode="widthFix" />
<view v-if="players[index] && players[index].name" class="avatar"> <view v-if="players[index] && players[index].name" class="avatar">
<Avatar <Avatar
:src="players[index].avatar || '../static/user-icon.png'" :src="players[index].avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:size="40" :size="40"
/> />
<text <text
:style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }" :style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }"
>已准备</text >{{ t('ready') }}</text
> >
</view> </view>
<view v-else class="player-unknow"> <view v-else class="player-unknow">
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
<text v-if="players[index] && players[index].name">{{ <view
players[index].name v-if="players[index] && players[index].name && isMember(players[index])"
}}</text> :class="['player-seat-name', ...getMemberNicknameClass(players[index])]"
<text v-else :style="{ color: '#fff9' }">虚位以待</text> >
<view v-if="index === 0" class="founder">管理员</view> <text class="member-nickname__text">{{ players[index].name }}</text>
<text
v-if="players[index].sVip === true"
class="member-nickname__shine"
>
{{ players[index].name }}
</text>
</view>
<text
v-else-if="players[index] && players[index].name"
class="player-seat-name"
>
{{ players[index].name }}
</text>
<text v-else class="player-seat-name" :style="{ color: '#fff9' }">{{ t('waiting_for_a_player') }}</text>
<view v-if="index === 0" class="founder">{{ t('host') }}</view>
<!-- <image <!-- <image
:src="`../static/player-${index + 1}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/player-${index + 1}.png`"
mode="widthFix" mode="widthFix"
class="player-bg" class="player-bg"
/> --> /> -->
@@ -57,7 +83,7 @@ const seats = new Array(props.total).fill(1);
class="remove-player" class="remove-player"
@click="() => removePlayer(players[index])" @click="() => removePlayer(players[index])"
> >
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -108,7 +134,7 @@ const seats = new Array(props.total).fill(1);
height: 28rpx; height: 28rpx;
line-height: 28rpx; line-height: 28rpx;
} }
.players > view > text:nth-child(3) { .player-seat-name {
width: 20vw; width: 20vw;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
+11 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -55,12 +57,12 @@ const onClick = async () => {
<template> <template>
<view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }"> <view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }">
<image v-if="data.rank === 1" src="../static/point-no1.png" /> <image v-if="data.rank === 1" src="https://static.shelingxingqiu.com/shootmini/static/point-no1.png" />
<image v-else-if="data.rank === 2" src="../static/point-no2.png" /> <image v-else-if="data.rank === 2" src="https://static.shelingxingqiu.com/shootmini/static/point-no2.png" />
<image v-else-if="data.rank === 3" src="../static/point-no3.png" /> <image v-else-if="data.rank === 3" src="https://static.shelingxingqiu.com/shootmini/static/point-no3.png" />
<text v-else>{{ data.rank || "" }}</text> <text v-else>{{ data.rank || "" }}</text>
<view> <view>
<Avatar :src="data.avatar || '../static/user-icon.png'" :size="36" /> <Avatar :src="data.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" :size="36" />
<view> <view>
<view v-if="isMember(data)" :class="getMemberNicknameClass(data)"> <view v-if="isMember(data)" :class="getMemberNicknameClass(data)">
<text class="member-nickname__text">{{ data.name }}</text> <text class="member-nickname__text">{{ data.name }}</text>
@@ -70,24 +72,24 @@ const onClick = async () => {
</view> </view>
<text v-else class="truncate">{{ data.name }}</text> <text v-else class="truncate">{{ data.name }}</text>
<view> <view>
<text>{{ data.totalDay }}天</text> <text>{{ data.totalDay }}{{ t('days') }}</text>
<view /> <view />
<text>平均{{ Number(data.averageRing.toFixed(1)) }}环</text> <text>{{ t('average') }}{{ Number(data.averageRing.toFixed(1)) }}{{ t('pts') }}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="item-info"> <view class="item-info">
<text>{{ data.weekArrow }}</text> <text>{{ data.weekArrow }}</text>
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
<view class="item-info"> <view class="item-info">
<text>{{ Math.round(data.weekArrow * 1.6) }}</text> <text>{{ Math.round(data.weekArrow * 1.6) }}</text>
<text>千卡</text> <text>{{ t('kcal') }}</text>
</view> </view>
<button hover-class="none" @click="onClick"> <button hover-class="none" @click="onClick">
<text>{{ likeCount }}</text> <text>{{ likeCount }}</text>
<image <image
:src="`../static/like-${like ? 'on' : 'off'}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/like-${like ? 'on' : 'off'}.png`"
mode="widthFix" mode="widthFix"
/> />
</button> </button>
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed } from "vue"; import { ref, onMounted, computed } from "vue";
const props = defineProps({ const props = defineProps({
@@ -48,7 +50,7 @@ onMounted(() => {
<text>{{ <text>{{
bowOptions[data.bowType] ? bowOptions[data.bowType].name : "" bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
}}</text> }}</text>
<text>{{ data.distance }} 米</text> <text>{{ data.distance }}{{ t('m') }}</text>
<text>{{ <text>{{
targetOptions[data.targetType] targetOptions[data.targetType]
? targetOptions[data.targetType].name ? targetOptions[data.targetType].name
@@ -59,13 +61,13 @@ onMounted(() => {
<text>{{ data.createAt }}</text> <text>{{ data.createAt }}</text>
</view> </view>
<view> <view>
<text>黄心率:{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text> <text>{{ t('gold_hit_rate_156') }}{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
<text>10环数:{{ data.tenRings }}</text> <text>{{ t('10s_157') }}{{ data.tenRings }}</text>
<text>平均:{{ data.averageRing }}</text> <text>{{ t('average_158') }}{{ data.averageRing }}</text>
</view> </view>
</view> </view>
<view class="right-part"> <view class="right-part">
<image src="../static/bow-target.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
<view class="arrow-amount"> <view class="arrow-amount">
<text>{{ data.actualTotalRing }}</text> <text>{{ data.actualTotalRing }}</text>
<text>/</text> <text>/</text>
+4 -2
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
const props = defineProps({ const props = defineProps({
@@ -25,9 +27,9 @@ const onClick = () => {
@click="onClick" @click="onClick"
:style="{ transform: 'translateX(' + (mode ? '-58' : '4') + 'rpx)' }" :style="{ transform: 'translateX(' + (mode ? '-58' : '4') + 'rpx)' }"
> >
<text>放大</text> <text>{{ t('zoom') }}</text>
<view :style="{ background: mode ? '#D8D8D8' : '#53EF56' }"></view> <view :style="{ background: mode ? '#D8D8D8' : '#53EF56' }"></view>
<text>真实</text> <text>{{ t('actual_size') }}</text>
</view> </view>
</view> </view>
</template> </template>
+12 -10
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, reactive, watch, onMounted } from "vue"; import { ref, reactive, watch, onMounted } from "vue";
import { getAppConfig, donateAPI } from "@/apis"; import { getAppConfig, donateAPI } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
@@ -47,7 +49,7 @@ const onPay = async (index) => {
signType: "RSA", signType: "RSA",
async success(res) { async success(res) {
uni.showToast({ uni.showToast({
title: "感谢您的支持!", title: t('thank_you_for_your_support'),
icon: "none", icon: "none",
}); });
props.onClose(); props.onClose();
@@ -55,7 +57,7 @@ const onPay = async (index) => {
fail(res) { fail(res) {
console.log("pay error", res); console.log("pay error", res);
uni.showToast({ uni.showToast({
title: "取消支付", title: t('payment_canceled'),
icon: "none", icon: "none",
}); });
props.onClose(); props.onClose();
@@ -93,8 +95,8 @@ onMounted(async () => {
<template> <template>
<view class="container"> <view class="container">
<image src="../static/donate.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/donate.png" mode="widthFix" />
<text>感谢您对我们公益项目的支持!</text> <text>{{ t('thank_you_for_supporting_our_community_project') }}</text>
<view class="amounts"> <view class="amounts">
<button <button
v-for="(item, index) in amounts" v-for="(item, index) in amounts"
@@ -113,25 +115,25 @@ onMounted(async () => {
@click="checked = !checked" @click="checked = !checked"
:style="{ marginBottom: !checked ? '20rpx' : '0' }" :style="{ marginBottom: !checked ? '20rpx' : '0' }"
> >
<image v-if="checked" src="../static/checked.png" mode="widthFix" /> <image v-if="checked" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view v-else></view> <view v-else></view>
<text>我想给建议(选填)</text> <text>{{ t('i_have_a_suggestion_optional') }}</text>
</view> </view>
<view v-if="checked"> <view v-if="checked">
<view> <view>
<text>您的姓名</text> <text>{{ t('your_name') }}</text>
<input v-model="formData.name" /> <input v-model="formData.name" />
</view> </view>
<view> <view>
<text>手机/微信号</text> <text>{{ t('phone_wechat_id') }}</text>
<input v-model="formData.account" /> <input v-model="formData.account" />
</view> </view>
<view> <view>
<text>所在机构</text> <text>{{ t('organization') }}</text>
<input v-model="formData.organization" /> <input v-model="formData.organization" />
</view> </view>
<view> <view>
<text>建议</text> <text>{{ t('suggestion') }}</text>
<textarea v-model="formData.suggestion" /> <textarea v-model="formData.suggestion" />
</view> </view>
</view> </view>
+3 -1
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, onMounted } from "vue"; import { ref, computed, onMounted } from "vue";
const props = defineProps({ const props = defineProps({
@@ -56,7 +58,7 @@ const ringText = (ring) => {
{{ b && b.ring !== undefined ? b.ring : "" }} {{ b && b.ring !== undefined ? b.ring : "" }}
</text> </text>
</view> </view>
<text>环值</text> <text>{{ t('score') }}</text>
</view> </view>
</template> </template>
+20 -26
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
const props = defineProps({ const props = defineProps({
isFinal: { isFinal: {
@@ -47,64 +49,56 @@ onBeforeUnmount(() => {
<template> <template>
<view class="round-end-tip"> <view class="round-end-tip">
<text>第{{ round }}轮射箭结束</text> <text>{{ t('round') }}{{ round }}{{ t('shooting_complete') }}</text>
<block v-if="!isFinal"> <block v-if="!isFinal">
<view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0"> <view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0">
<text>本轮蓝队</text> <text>{{ t('blue_team_this_round') }}</text>
<text>{{ <text>{{
(roundData.shoots[1] || []).reduce( (roundData.shoots[1] || []).reduce(
(last, next) => last + next.ring, (last, next) => last + next.ring,
0 0
) )
}}</text> }}</text>
<text>环,红队</text> <text>{{ t('pts_red_team') }}</text>
<text>{{ <text>{{
(roundData.shoots[2] || []).reduce( (roundData.shoots[2] || []).reduce(
(last, next) => last + next.ring, (last, next) => last + next.ring,
0 0
) )
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
<text <text
v-if="bluePoint === 0 && redPoint === 0" v-if="bluePoint === 0 && redPoint === 0"
:style="{ marginTop: '20px' }" :style="{ marginTop: '20px' }"
> >{{ t('no_arrows_were_shot_by_either_team_for_3_consecutive_turns_match') }}</text>
连续3个来回双方均无人射箭,比赛取消。 <text v-if="bluePoint !== 0 && bluePoint === redPoint">{{ t('red_and_blue_teams_each_earn') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
</text>
<text v-if="bluePoint !== 0 && bluePoint === redPoint">
红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
redPoint redPoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text> <text v-if="bluePoint > redPoint">{{ t('blue_team_wins_and_earns') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
<text v-if="bluePoint > redPoint">
蓝队获胜,得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
bluePoint bluePoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text> <text v-if="bluePoint < redPoint">{{ t('red_team_wins_and_earns') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
<text v-if="bluePoint < redPoint">
红队获胜,得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
redPoint redPoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text>
</block> </block>
<block v-if="isFinal"> <block v-if="isFinal">
<view class="point-view2"> <view class="point-view2">
<text>蓝队</text> <text>{{ t('blue_team') }}</text>
<text>{{ bluePoint }}</text> <text>{{ bluePoint }}</text>
<text>分,红队</text> <text>{{ t('pts_red_team_179') }}</text>
<text>{{ redPoint }}</text> <text>{{ redPoint }}</text>
<text>分</text> <text>{{ t('pts_180') }}</text>
</view> </view>
<text>同分僵局!最后一箭定江山</text> <text>{{ t('a_tie_one_final_arrow_decides_the_winner') }}</text>
<view class="final-shoot"> <view class="final-shoot">
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒后蓝红双方</text> <text>{{ t('s_until_both_teams_shoot') }}</text>
<text>决金箭</text> <text>{{ t('golden_arrow') }}</text>
<text>一箭决胜负</text> <text>{{ t('one_arrow_decides_it_all') }}</text>
</view> </view>
</block> </block>
</view> </view>
+8 -3
View File
@@ -69,7 +69,7 @@ const onBtnClick = debounce(async () => {
<slot /> <slot />
</block> </block>
<block v-else> <block v-else>
<image src="../static/btn-loading.png" mode="widthFix" class="loading" /> <image src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png" mode="widthFix" class="loading" />
</block> </block>
</button> </button>
</template> </template>
@@ -77,8 +77,13 @@ const onBtnClick = debounce(async () => {
<style scoped> <style scoped>
.sbtn { .sbtn {
margin: 0 auto; margin: 0 auto;
height: 44px; min-height: 88rpx;
line-height: 44px; height: auto;
line-height: 1.3;
padding: 20rpx 24rpx;
box-sizing: border-box;
white-space: normal;
overflow-wrap: break-word;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
display: flex; display: flex;
+1 -1
View File
@@ -60,7 +60,7 @@ watch(
mode="widthFix" mode="widthFix"
/> />
<view class="close-btn" @click="onClose" v-if="!noBg"> <view class="close-btn" @click="onClose" v-if="!noBg">
<image src="../static/close-yellow.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view> </view>
<slot></slot> <slot></slot>
</view> </view>
+52 -32
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch } from "vue";
const props = defineProps({ const props = defineProps({
rowCount: { rowCount: {
type: Number, type: Number,
@@ -26,45 +26,39 @@ const items = ref(new Array(props.total).fill(9));
const width = ref(92); const width = ref(92);
const itemWidth = ref(0); const itemWidth = ref(0);
const bgImages = [ const bgImages = [
"../static/complete-light1.png", "https://static.shelingxingqiu.com/shootmini/static/complete-light1.png",
"../static/complete-light2.png", "https://static.shelingxingqiu.com/shootmini/static/complete-light2.png",
]; ];
const bgIndex = ref(0);
watch( watch(
() => props.total, () => props.total,
(newValue) => { (newValue) => {
items.value = new Array(newValue).fill(9); items.value = new Array(newValue).fill(9);
} }
); );
const timer = ref(null);
onMounted(() => {
timer.value = setInterval(() => {
bgIndex.value = bgIndex.value === 0 ? 1 : 0;
}, 200);
});
onBeforeUnmount(() => {
if (timer.value) {
clearInterval(timer.value);
}
});
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<image <template v-if="total > 0 && arrows.length === total && completeEffect">
v-if="total > 0 && arrows.length === total && completeEffect" <image
:src="bgImages[bgIndex]" v-for="(image, index) in bgImages"
class="complete-light" :key="image"
:style="{ :src="image"
width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${ :class="[
(100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24)) 'complete-light',
}px)`, index === 0 ? 'complete-light--first' : 'complete-light--second',
height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${ ]"
(100 / (total * 2)) * :style="{
((total / rowCount) * 2 + (total === 12 ? 7 : 24)) width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
}px)`, (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
top: `${total === 12 ? -2 : -3}vw`, }px)`,
}" height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${
/> (100 / (total * 2)) *
((total / rowCount) * 2 + (total === 12 ? 7 : 24))
}px)`,
top: `${total === 12 ? -2 : -3}vw`,
}"
/>
</template>
<view <view
v-for="(_, index) in items" v-for="(_, index) in items"
:key="index" :key="index"
@@ -77,7 +71,7 @@ onBeforeUnmount(() => {
margin: 100 / (total * 2) + 'px', margin: 100 / (total * 2) + 'px',
}" }"
> >
<image src="../static/score-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/score-bg.png" mode="widthFix" />
<text <text
:style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }" :style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
>{{ >{{
@@ -99,7 +93,7 @@ onBeforeUnmount(() => {
padding: 1vw 0; padding: 1vw 0;
} }
.score-item { .score-item {
/* background-image: url("../static/score-bg.png"); /* background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; */ background-position: center; */
@@ -121,4 +115,30 @@ onBeforeUnmount(() => {
.complete-light { .complete-light {
position: absolute; position: absolute;
} }
.complete-light--first {
animation: complete-light-first 400ms steps(1, end) infinite;
}
.complete-light--second {
animation: complete-light-second 400ms steps(1, end) infinite;
}
@keyframes complete-light-first {
0%,
49.9% {
opacity: 1;
}
50%,
100% {
opacity: 0;
}
}
@keyframes complete-light-second {
0%,
49.9% {
opacity: 0;
}
50%,
100% {
opacity: 1;
}
}
</style> </style>
+16 -8
View File
@@ -1,24 +1,32 @@
<script setup> <script setup>
import { t } from "@/locales";
const props = defineProps({ const props = defineProps({
arrows: { arrows: {
type: Array, type: Array,
default: () => [], default: () => [],
}, },
}); });
const getSum = (a, b, c) => { const getSum = (...arrows) => {
const sum = (Number(a) || 0) + (Number(b) || 0) + (Number(c) || 0); const recordedArrows = arrows.filter(Boolean);
return sum > 0 ? sum + "环" : "-"; if (!recordedArrows.length) return "-";
const sum = recordedArrows.reduce(
(total, arrow) => total + (Number(arrow.ring) || 0),
0
);
return t('value_pts', { p0: sum });
}; };
const roundsName = ["第一轮", "第二轮", "第三轮", "第四轮"]; const roundsName = [t('round_1'), t('round_2'), t('round_3'), t('round_4')];
const getShowText = (arrow = {}) => { const getShowText = (arrow) => {
return arrow.ring ? (arrow.ringX ? "X" : arrow.ring + "环") : "-"; if (!arrow) return "-";
return arrow.ringX ? "X" : t('value_pts', { p0: Number(arrow.ring) || 0 });
}; };
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<view> <view>
<text :style="{ transform: 'translateX(-10%)' }">总成绩</text> <text :style="{ transform: 'translateX(-10%)' }">{{ t('final_score') }}</text>
<text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text> <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}{{ t('pts') }}</text>
</view> </view>
<view <view
v-for="(_, index) in new Array( v-for="(_, index) in new Array(
+29 -27
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed } from "vue"; import { ref, onMounted, computed } from "vue";
import IconButton from "@/components/IconButton.vue"; import IconButton from "@/components/IconButton.vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
@@ -57,19 +59,22 @@ onMounted(() => {
}); });
const getRing = (arrow) => { const getRing = (arrow) => {
if (!arrow) return "-";
if (arrow.ringX) return "X"; if (arrow.ringX) return "X";
return arrow.ring ? arrow.ring : "-"; return Number(arrow.ring) || 0;
}; };
const arrows = computed(() => { const arrows = computed(() => {
const data = new Array(props.total).fill({ ring: 0 }); const data = new Array(props.total).fill(null);
(props.result.details || []).forEach((arrow, index) => { (props.result.details || []).forEach((arrow, index) => {
data[index] = arrow; data[index] = arrow;
}); });
return data; return data;
}); });
const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length); const validArrows = computed(
() => arrows.value.filter((a) => Number(a?.ring) > 0).length
);
const isMember = computed(() => user.value.vip === true || user.value.sVip === true); const isMember = computed(() => user.value.vip === true || user.value.sVip === true);
const openCoachComment = () => { const openCoachComment = () => {
if (!isMember.value) return; if (!isMember.value) return;
@@ -81,11 +86,11 @@ const openCoachComment = () => {
<view class="container"> <view class="container">
<view :class="['container-header', showPanel ? 'scale-in' : 'scale-out']"> <view :class="['container-header', showPanel ? 'scale-in' : 'scale-out']">
<image :src="tipSrc" mode="widthFix" /> <image :src="tipSrc" mode="widthFix" />
<image src="../static/finish-frame.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png" mode="widthFix" />
<text <text
>完成<text class="gold-text">{{ validArrows }}</text >{{ t('completed') }}<text class="gold-text">{{ validArrows }}</text
>箭,获得<text class="gold-text">{{ validArrows }}</text >{{ t('arrows_earned') }}<text class="gold-text">{{ validArrows }}</text
>点经验</text >{{ t('xp') }}</text
> >
</view> </view>
<view <view
@@ -93,11 +98,11 @@ const openCoachComment = () => {
:style="{ transform: `translateY(${showPanel ? '0%' : '100%'})` }" :style="{ transform: `translateY(${showPanel ? '0%' : '100%'})` }"
> >
<view> <view>
<text>本局成绩(共{{ totalRing }}环):</text> <text>{{ t('score_this_match_total') }}{{ totalRing }}{{ t('pts_194') }}</text>
<button @click="() => (showBowData = true)"> <button @click="() => (showBowData = true)">
<text>查看靶纸</text> <text>{{ t('view_target') }}</text>
<image <image
src="../static/enter-arrow-blue.png" src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png"
mode="widthFix" mode="widthFix"
:style="{ width: '20px' }" :style="{ width: '20px' }"
/> />
@@ -106,20 +111,20 @@ const openCoachComment = () => {
<view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }"> <view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }">
<view v-for="(_, index) in new Array(total).fill(0)" :key="index"> <view v-for="(_, index) in new Array(total).fill(0)" :key="index">
{{ getRing(arrows[index]) {{ getRing(arrows[index])
}}<text v-if="getRing(arrows[index]) !== '-'">环</text> }}<text v-if="getRing(arrows[index]) !== '-'">{{ t('pts') }}</text>
</view> </view>
</view> </view>
<view> <view>
<block v-if="validArrows === total"> <block v-if="validArrows === total">
<IconButton <IconButton
name="分享" :name="t('share')"
src="../static/share.png" src="https://static.shelingxingqiu.com/shootmini/static/share.png"
:onClick="onClickShare" :onClick="onClickShare"
/> />
<IconButton <IconButton
v-if="isMember" v-if="isMember"
name="教练点评" :name="t('coach_feedback')"
src="../static/review.png" src="https://static.shelingxingqiu.com/shootmini/static/review.png"
:onClick="openCoachComment" :onClick="openCoachComment"
/> />
</block> </block>
@@ -127,7 +132,7 @@ const openCoachComment = () => {
:width="validArrows === total ? '70vw' : 'calc(100vw - 20px)'" :width="validArrows === total ? '70vw' : 'calc(100vw - 20px)'"
:rounded="30" :rounded="30"
:onClick="closePanel" :onClick="closePanel"
>{{ validArrows === total ? "完成" : "返回" }}</SButton >{{ validArrows === total ? t('completed') : t('back') }}</SButton
> >
</view> </view>
</view> </view>
@@ -137,17 +142,16 @@ const openCoachComment = () => {
mode="tall" mode="tall"
> >
<view class="coach-comment"> <view class="coach-comment">
<text> <text>{{ t('your_score_for_this_session_is') }}<text :style="{ color: '#fed847' }">{{
您本次练习取得了<text :style="{ color: '#fed847' }">{{
totalRing totalRing
}}</text }}</text
>环的成绩,所有箭支上靶后的平均点间距为<text >{{ t('pts_the_average_distance_between_your_arrow_impacts_is') }}<text
:style="{ color: '#fed847' }" :style="{ color: '#fed847' }"
>{{ Number((result?.interpretation?.spreadStability || 0).toFixed(2)) }}</text >{{ Number((result?.interpretation?.spreadStability || 0).toFixed(2)) }}</text
>,{{ >,{{
result.spreadEvaluation === "Dispersed" result.spreadEvaluation === "Dispersed"
? "还需要持续改进哦~" ? t('keep_practicing')
: "成绩优秀。" : t('excellent_performance')
}} }}
</text> </text>
<view> <view>
@@ -156,14 +160,12 @@ const openCoachComment = () => {
mode="widthFix" mode="widthFix"
/> />
<text :style="{ marginTop: '12px' }" <text :style="{ marginTop: '12px' }"
>针对您本次的练习,{{ >{{ t('for_this_session') }}{{
result.spreadEvaluation === "Dispersed" result.spreadEvaluation === "Dispersed"
? "我们建议您充分练习推弓、靠位以及撒放动作一致性。" ? t('we_recommend_practicing_consistency_in_your_bow_arm_anchor_point')
: totalRing >= 100 : totalRing >= 100
? "我们建议您继续保持即可。" ? t('we_recommend_keeping_up_the_good_work')
: `我们建议您将设备的瞄准器${ : t('we_recommend_adjusting_your_sight_value', { p0: directionAdjusts[result.adjustmentHint] })
directionAdjusts[result.adjustmentHint]
}调整。`
}}</text }}</text
> >
</view> </view>
+18 -7
View File
@@ -14,8 +14,13 @@ const props = defineProps({
type: String, type: String,
default: "normal", default: "normal",
}, },
contentHeight: {
type: String,
default: "",
},
}); });
const getContentHeight = () => { const getContentHeight = () => {
if (props.contentHeight) return props.contentHeight;
if (props.mode === "tall") return "50vw"; if (props.mode === "tall") return "50vw";
if (props.mode === "square") return "74vw"; if (props.mode === "square") return "74vw";
return "36vw"; return "36vw";
@@ -27,29 +32,29 @@ const getContentHeight = () => {
<view class="scale-in" :style="{ height: getContentHeight() }"> <view class="scale-in" :style="{ height: getContentHeight() }">
<image <image
v-if="mode === 'normal'" v-if="mode === 'normal'"
src="../static/screen-hint-bg.png" src="https://static.shelingxingqiu.com/shootmini/static/screen-hint-bg.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="mode === 'tall'" v-if="mode === 'tall'"
src="../static/coach-comment.png" src="https://static.shelingxingqiu.com/shootmini/static/coach-comment.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="mode === 'square'" v-if="mode === 'square'"
src="../static/prompt-bg-square.png" src="https://static.shelingxingqiu.com/shootmini/static/prompt-bg-square.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="mode === 'small'" v-if="mode === 'small'"
src="../static/finish-frame.png" src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png"
mode="widthFix" mode="widthFix"
/> />
<slot /> <slot />
</view> </view>
<IconButton <IconButton
v-if="!!onClose" v-if="!!onClose"
src="../static/close-gold-outline.png" src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30" :width="30"
:onClick="onClose" :onClick="onClose"
/> />
@@ -82,8 +87,14 @@ const getContentHeight = () => {
position: absolute; position: absolute;
width: 80vw; width: 80vw;
left: -7%; left: -7%;
bottom: -18vw; bottom: -8rpx;
z-index: -1; z-index: -1;
transform: translateY(-75px); }
/* 英文教练点评较长,保持弹窗按钮可见。 */
.container :deep(.coach-comment) {
max-height: 100%;
overflow-y: auto;
overflow-wrap: break-word;
} }
</style> </style>
+2 -2
View File
@@ -20,12 +20,12 @@ const props = defineProps({
<template> <template>
<view class="container" :style="{ display: show ? 'flex' : 'none' }"> <view class="container" :style="{ display: show ? 'flex' : 'none' }">
<view class="scale-in"> <view class="scale-in">
<image src="../static/point-book-tip-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/point-book-tip-bg.png" mode="widthFix" />
<slot /> <slot />
</view> </view>
<IconButton <IconButton
v-if="!!onClose" v-if="!!onClose"
src="../static/close-white-outline.png" src="https://static.shelingxingqiu.com/shootmini/static/close-white-outline.png"
:width="30" :width="30"
:onClick="onClose" :onClick="onClose"
/> />
+4 -2
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
const props = defineProps({ const props = defineProps({
@@ -73,8 +75,8 @@ onShow(async () => {
> >
<slot></slot> <slot></slot>
<view class="tips"> <view class="tips">
<text v-if="loading">加载中...</text> <text v-if="loading">{{ t('loading') }}</text>
<text v-if="noMore">{{ count === 0 ? "暂无数据" : "没有更多了" }}</text> <text v-if="noMore">{{ count === 0 ? t('no_data_yet') : t('no_more_results') }}</text>
</view> </view>
</scroll-view> </scroll-view>
</template> </template>
+26 -12
View File
@@ -1,8 +1,14 @@
<script setup> <script setup>
import { t, formatBattleTip } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue"; import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -46,6 +52,10 @@ const props = defineProps({
type: Function, type: Function,
default: () => {}, default: () => {},
}, },
endAudioKey: {
type: String,
default: "比赛结束",
},
}); });
const barColor = ref("#fed847"); const barColor = ref("#fed847");
@@ -127,9 +137,9 @@ watch(
const tipContent = computed(() => { const tipContent = computed(() => {
if (halfTime.value) { if (halfTime.value) {
return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`; return props.battleId ? t('halftime') : t('halftime_values', { p0: wait.value });
} }
return props.start && remain.value === 0 ? "时间到!" : props.tips; return props.start && remain.value === 0 ? t('time_s_up') : props.tips;
}); });
const updateSound = () => { const updateSound = () => {
@@ -144,29 +154,33 @@ async function onReceiveMessage(msg) {
halfTime.value = false; halfTime.value = false;
audioManager.play(audioKey); audioManager.play(audioKey);
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
audioManager.play("比赛结束", false); audioManager.play(props.endAudioKey, 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)) {
arrow = msg.details[msg.details.length - 1]; arrow = msg.details[msg.details.length - 1];
} else { } else {
if (msg.shootData.playerId !== user.value.id) return; if (!msg.shootData || String(msg.shootData.playerId) !== String(user.value.id)) return;
if (msg.shootData) arrow = msg.shootData; if (msg.shootData) arrow = msg.shootData;
} }
let key = []; let key = [];
key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶"); key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
if (arrow.angle !== null) if (arrow.angle)
key.push(`向${getDirectionText(arrow.angle)}调整`); key.push(`向${getDirectionText(arrow.angle)}调整`);
const shouldPlayTententen =
arrow.threeConsecutive10Rings === true ||
msg.shootData?.threeConsecutive10Rings === true;
if (!props.melee && shouldPlayTententen) key.push("tententen");
audioManager.play(key, false); audioManager.play(key, false);
} else if (msg.type === MESSAGETYPESV2.HalfRest) { } else if (msg.type === MESSAGETYPESV2.HalfRest) {
halfTime.value = true; halfTime.value = true;
audioManager.play("中场休息"); audioManager.play("中场休息");
} else if (msg.type === MESSAGETYPESV2.InvalidShot) { } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(msg.shootData),
icon: "none", icon: "none",
}); });
audioManager.play("射击无效"); audioManager.play(getInvalidShotAudioKey(msg.shootData));
} }
} }
@@ -191,11 +205,11 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container" :style="{ display: show ? 'block' : 'none' }"> <view class="container" :style="{ display: show ? 'block' : 'none' }">
<view> <view>
<image src="../static/shooter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
<text>{{ tipContent }}</text> <text>{{ formatBattleTip(tipContent) }}</text>
<button hover-class="none" @click="updateSound"> <button hover-class="none" @click="updateSound">
<image <image
:src="`../static/sound${sound ? '' : '-off'}-yellow.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="widthFix" mode="widthFix"
/> />
</button> </button>
@@ -209,7 +223,7 @@ onBeforeUnmount(() => {
transition: transitionStyle, transition: transitionStyle,
}" }"
/> />
<text>剩余{{ remain }}秒</text> <text>{{ t('remaining') }}{{ remain }}{{ t('s') }}</text>
</view> </view>
</view> </view>
</template> </template>
+3 -1
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import {ref, watch, onMounted, onBeforeUnmount} from "vue"; import {ref, watch, onMounted, onBeforeUnmount} from "vue";
import {RoundGoldImages} from "@/constants"; import {RoundGoldImages} from "@/constants";
@@ -129,7 +131,7 @@ onBeforeUnmount(() => {
transition: transitionStyle, transition: transitionStyle,
}" }"
/> />
<text v-if="!loading">剩余{{ remain }}秒</text> <text v-if="!loading">{{ t('remaining') }}{{ remain }}{{ t('s') }}</text>
<text v-else>···</text> <text v-else>···</text>
</view> </view>
</view> </view>
+28 -24
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import SModal from "@/components/SModal.vue"; import SModal from "@/components/SModal.vue";
@@ -12,12 +14,11 @@ import {
getHomeData, getHomeData,
getPhoneNumberAPI, getPhoneNumberAPI,
getPhoneNumberAPIv2, getPhoneNumberAPIv2,
getDeviceBatteryAPI,
} from "@/apis"; } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
const store = useStore(); const store = useStore();
const { updateUser, updateDevice, updateOnline, clearDevice } = store; const { updateUser, updateDevice, clearDevice } = store;
const props = defineProps({ const props = defineProps({
show: { show: {
@@ -32,6 +33,10 @@ const props = defineProps({
type: Function, type: Function,
default: () => {}, default: () => {},
}, },
onSuccess: {
type: Function,
default: () => {},
},
}); });
const agree = ref(false); const agree = ref(false);
const phone = ref(""); const phone = ref("");
@@ -80,25 +85,25 @@ const handleLogin = async () => {
if (loading.value) return; if (loading.value) return;
if (!phone.value) { if (!phone.value) {
return uni.showToast({ return uni.showToast({
title: "请获取手机号", title: t('please_authorize_your_phone_number'),
icon: "none", icon: "none",
}); });
} }
if (!avatarUrl.value) { if (!avatarUrl.value) {
return uni.showToast({ return uni.showToast({
title: "请选择头像", title: t('please_select_an_avatar'),
icon: "none", icon: "none",
}); });
} }
if (!nickName.value) { if (!nickName.value) {
return uni.showToast({ return uni.showToast({
title: "请输入昵称", title: t('please_enter_a_nickname'),
icon: "none", icon: "none",
}); });
} }
if (!agree.value) { if (!agree.value) {
return uni.showToast({ return uni.showToast({
title: "请先同意协议", title: t('please_agree_to_the_agreements_first'),
icon: "none", icon: "none",
}); });
} }
@@ -121,12 +126,11 @@ async function doLogin() {
devices.bindings[0].deviceId, devices.bindings[0].deviceId,
devices.bindings[0].deviceName devices.bindings[0].deviceName
); );
const data = await getDeviceBatteryAPI();
updateOnline(data.online);
} else { } else {
clearDevice(); clearDevice();
} }
props.onClose(); props.onClose();
await props.onSuccess();
} catch (error) { } catch (error) {
console.log("login error", error); console.log("login error", error);
} finally { } finally {
@@ -163,7 +167,7 @@ onShow(() => {
<SModal :show="show" :onClose="onClose" :noBg="noBg"> <SModal :show="show" :onClose="onClose" :noBg="noBg">
<view class="container" :style="{ background: noBg ? '#fff' : 'none' }"> <view class="container" :style="{ background: noBg ? '#fff' : 'none' }">
<view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"> <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
<text :style="{ color: noBg ? '#666' : '#fff' }">手机:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('phone') }}</text>
<button <button
:open-type="!phone ? 'getPhoneNumber' : ''" :open-type="!phone ? 'getPhoneNumber' : ''"
@getphonenumber="getphonenumber" @getphonenumber="getphonenumber"
@@ -174,13 +178,13 @@ onShow(() => {
phone phone
}}</text> }}</text>
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >{{ t('authorize') }}</text
> >
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button> </button>
</view> </view>
<view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"> <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
<text :style="{ color: noBg ? '#666' : '#fff' }">头像:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('avatar') }}</text>
<button <button
open-type="chooseAvatar" open-type="chooseAvatar"
@chooseavatar="onChooseAvatar" @chooseavatar="onChooseAvatar"
@@ -189,20 +193,20 @@ onShow(() => {
> >
<Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" /> <Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" />
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >{{ t('authorize') }}</text
> >
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button> </button>
</view> </view>
<view <view
class="nickname" class="nickname"
:style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"
> >
<text :style="{ color: noBg ? '#666' : '#fff' }">昵称:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('nickname') }}</text>
<input <input
type="nickname" type="nickname"
:value="nickName" :value="nickName"
placeholder="请输入昵称" :placeholder="t('please_enter_a_nickname')"
:placeholder-style="`color: ${noBg ? '#666' : '#fff9'} `" :placeholder-style="`color: ${noBg ? '#666' : '#fff9'} `"
@input="onNicknameChange" @input="onNicknameChange"
@change="onNicknameChange" @change="onNicknameChange"
@@ -211,11 +215,11 @@ onShow(() => {
</view> </view>
<SButton :rounded="20" width="80vw" :onClick="handleLogin"> <SButton :rounded="20" width="80vw" :onClick="handleLogin">
<block v-if="!loading"> <block v-if="!loading">
<text :style="{ color: '#000' }">手机号快捷登录</text> <text :style="{ color: '#000' }">{{ t('sign_in_with_phone_number') }}</text>
</block> </block>
<block v-else> <block v-else>
<image <image
src="../static/btn-loading.png" src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png"
mode="widthFix" mode="widthFix"
class="loading" class="loading"
/> />
@@ -226,21 +230,21 @@ onShow(() => {
v-if="!agree" v-if="!agree"
:style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }"
/> />
<image v-if="agree" src="../static/checked.png" mode="widthFix" /> <image v-if="agree" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view> <view>
<text>已同意并阅读</text> <text>{{ t('i_have_read_and_agree_to_the') }}</text>
<view <view
@click.stop="openServiceLink" @click.stop="openServiceLink"
:style="{ color: noBg ? '#333' : '#ffffff99' }" :style="{ color: noBg ? '#333' : '#ffffff99' }"
>《用户协议》</view >{{ t('user_agreement') }}</view
> >
<text>及</text> <text>{{ t('and') }}</text>
<view <view
@click.stop="openPrivacyLink" @click.stop="openPrivacyLink"
:style="{ color: noBg ? '#333' : '#ffffff99' }" :style="{ color: noBg ? '#333' : '#ffffff99' }"
>《隐私协议》</view >{{ t('privacy_policy') }}</view
> >
<text>内容</text> <text>{{ t('terms') }}</text>
</view> </view>
</view> </view>
</view> </view>
+676
View File
@@ -0,0 +1,676 @@
<script setup>
import {
computed,
getCurrentInstance,
nextTick,
onBeforeUnmount,
onMounted,
ref,
watch,
} from "vue";
const defaultCanvasSize = 300;
const defaultRingCount = 10;
const highlightRevealProgressFrames = [0.08, 0.2, 0.38, 0.6, 0.82, 1];
const highlightRevealFrameInterval = 60;
const props = defineProps({
// canvas 唯一标识;不传时组件内部自动生成,避免多个靶面 canvas-id 冲突。
canvasId: {
type: String,
default: "",
},
// 业务坐标半径,例如 20 表示命中点坐标范围为 -20 到 20。
// 当前组件主要用它参与重绘判断,外层命中点定位也应使用同一半径。
coordinateRadius: {
type: Number,
default: 20,
},
// 是否显示靶心十字辅助线。
showCrosshair: {
type: Boolean,
default: false,
},
// 是否显示环数文字。
showRingLabels: {
type: Boolean,
default: true,
},
// 从正上方开始顺时针等分的区域数量。
sectorCount: {
type: Number,
default: 0,
},
// 当前高亮区域,范围为 1 到 sectorCount。
activeSector: {
type: Number,
default: 0,
},
// 指定一个或多个环数,空数组表示高亮整个区域。
activeRings: {
type: Array,
default: () => [],
},
// 每次变化时以固定低帧数重新展开当前高亮扇区;默认关闭。
highlightRefreshToken: {
type: Number,
default: 0,
},
showSectorLabels: {
type: Boolean,
default: false,
},
// 只绘制透明高亮层,不绘制完整靶纸;用于叠加在靶纸图片上。
highlightOnly: {
type: Boolean,
default: false,
},
// 外部指定 canvas 绘制尺寸;用于让高亮层跟随靶图真实显示区域。
canvasWidth: {
type: Number,
default: 0,
},
canvasHeight: {
type: Number,
default: 0,
},
// 靶纸样式覆盖配置,例如环数、环色、环线颜色、环数字体等。
targetStyleConfig: {
type: Object,
default: () => ({}),
},
// 十字辅助线样式覆盖配置。
crosshairStyle: {
type: Object,
default: () => ({}),
},
// 区域分割线样式覆盖配置。
sectorStyle: {
type: Object,
default: () => ({}),
},
// 区域数字样式覆盖配置。
sectorLabelStyle: {
type: Object,
default: () => ({}),
},
// 高亮样式覆盖配置。
highlightStyle: {
type: Object,
default: () => ({}),
},
});
const instance = getCurrentInstance();
const localCanvasId = `target-canvas-${Math.random().toString(36).slice(2, 10)}`;
const currentCanvasId = computed(() => props.canvasId || localCanvasId);
const lastDrawKey = ref("");
const canvasSize = ref({
width: defaultCanvasSize,
height: defaultCanvasSize,
});
let drawRequestGeneration = 0;
let highlightAnimationGeneration = 0;
let highlightAnimationTimer = null;
let mountDrawTimer = null;
// 完整靶纸默认样式,调用方可以通过 targetStyleConfig 局部覆盖。
const defaultTargetStyleConfig = {
ringCount: defaultRingCount,
ringColors: {
1: "#f8f8f3",
2: "#f8f8f3",
3: "#595959",
4: "#595959",
5: "#24aee0",
6: "#24aee0",
7: "#ff1f35",
8: "#ff1f35",
9: "#f7d34a",
10: "#f7d34a",
},
ringLineColor: "rgba(150, 150, 150, 0.55)",
ringLineWidthRatio: 0.0022,
centerDotColor: "#ffffff",
centerDotRadiusRatio: 0.0048,
ringLabelFontRatio: 0.032,
ringLabelDarkColor: "#111111",
ringLabelLightColor: "#ffffff",
};
// 十字辅助线默认样式。
const defaultCrosshairStyle = {
color: "rgba(20, 20, 20, 0.38)",
lineWidthRatio: 0.0025,
};
// 顺时针等分线默认样式。
const defaultSectorStyle = {
color: "rgba(255, 255, 255, 0.82)",
lineWidthRatio: 0.004,
};
// 区域数字默认样式。
const defaultSectorLabelStyle = {
color: "#ffffff",
backgroundColor: "rgba(0, 0, 0, 0.62)",
fontSizeRatio: 0.075,
radiusRatio: 0.76,
badgeRadiusRatio: 0.07,
};
// 高亮区域默认样式。
const defaultHighlightStyle = {
color: "rgba(255, 228, 0, 0.6)",
strokeColor: "rgba(254, 216, 71, 0.82)",
lineWidthRatio: 0.003,
// 在最小线宽计算后应用倍数,确保不同靶面尺寸下按比例加粗。
lineWidthScale: 1,
};
// 合并默认靶纸样式和外部传入样式,ringColors 单独深合并。
const mergeTargetStyleConfig = () => ({
...defaultTargetStyleConfig,
...props.targetStyleConfig,
ringColors: {
...defaultTargetStyleConfig.ringColors,
...(props.targetStyleConfig?.ringColors || {}),
},
});
// 统一把外部传入值转成有效数字,非法值使用 fallback。
const getNumber = (value, fallback = 0) => {
const numberValue = Number(value);
return Number.isFinite(numberValue) ? numberValue : fallback;
};
// 获取指定环数的填充色,兼容数字 key 和字符串 key。
const getRingColor = (ring, config) => {
return config.ringColors?.[ring] || config.ringColors?.[String(ring)] || "#ffffff";
};
const getPositiveInteger = (value) => {
const numberValue = Number(value);
return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
};
// 过滤、去重并合并连续环,避免 3、4 环同时高亮时绘制中间描边。
const getActiveRingRanges = (ringCount) => {
const rings = [...new Set(
(Array.isArray(props.activeRings) ? props.activeRings : [])
.map(getPositiveInteger)
.filter((ring) => ring >= 1 && ring <= ringCount)
)].sort((first, second) => first - second);
return rings.reduce((ranges, ring) => {
const lastRange = ranges[ranges.length - 1];
if (lastRange && ring === lastRange.end + 1) {
lastRange.end = ring;
} else {
ranges.push({ start: ring, end: ring });
}
return ranges;
}, []);
};
// 正上方作为第一区起始边界,Canvas 角度递增方向即为顺时针。
const getSectorAngles = (sector, sectorCount) => {
const count = getPositiveInteger(sectorCount);
const index = getPositiveInteger(sector);
if (!count || !index || index > count) return null;
const step = (Math.PI * 2) / count;
const startAngle = -Math.PI / 2 + (index - 1) * step;
return {
startAngle,
endAngle: startAngle + step,
middleAngle: startAngle + step / 2,
};
};
// 绘制实心圆,靶纸环区和中心点都会用到。
const drawCircle = (ctx, centerX, centerY, radius, fillColor) => {
ctx.beginPath();
ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
ctx.setFillStyle(fillColor);
ctx.fill();
};
// 绘制环形扇区,用于按象限高亮指定环数。
const drawAnnularSector = (
ctx,
centerX,
centerY,
innerRadius,
outerRadius,
startAngle,
endAngle,
fillColor,
strokeColor = "",
lineWidth = 0
) => {
ctx.beginPath();
ctx.arc(centerX, centerY, outerRadius, startAngle, endAngle);
if (innerRadius > 0) {
ctx.arc(centerX, centerY, innerRadius, endAngle, startAngle, true);
} else {
ctx.lineTo(centerX, centerY);
}
ctx.closePath();
ctx.setFillStyle(fillColor);
ctx.fill();
if (strokeColor && lineWidth > 0) {
ctx.setStrokeStyle(strokeColor);
ctx.setLineWidth(lineWidth);
ctx.stroke();
}
};
// 从外到内绘制完整靶纸色环。
const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
for (let ring = 1; ring <= config.ringCount; ring += 1) {
const radius = targetRadius * ((config.ringCount + 1 - ring) / config.ringCount);
drawCircle(ctx, centerX, centerY, radius, getRingColor(ring, config));
}
};
// 高亮后端指定区域;activeRings 非空时高亮该区域内的一个或多个环。
const drawSectorHighlight = (
ctx,
centerX,
centerY,
targetRadius,
config,
revealProgress = 1
) => {
const angles = getSectorAngles(props.activeSector, props.sectorCount);
if (!angles) return;
const safeRevealProgress = Math.min(
Math.max(getNumber(revealProgress, 1), 0),
1
);
if (safeRevealProgress <= 0) return;
const ringRanges = getActiveRingRanges(config.ringCount);
const highlightRanges = ringRanges.length > 0
? ringRanges
: [{ start: 1, end: config.ringCount }];
const style = {
...defaultHighlightStyle,
...props.highlightStyle,
};
highlightRanges.forEach((range) => {
const innerRadius =
targetRadius * ((config.ringCount - range.end) / config.ringCount);
const outerRadius =
targetRadius * ((config.ringCount + 1 - range.start) / config.ringCount);
drawAnnularSector(
ctx,
centerX,
centerY,
innerRadius,
outerRadius,
angles.startAngle,
angles.startAngle +
(angles.endAngle - angles.startAngle) * safeRevealProgress,
style.color,
style.strokeColor,
Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale
);
});
};
// 从正上方开始顺时针绘制所有区域边界。
const drawSectorLines = (ctx, centerX, centerY, targetRadius) => {
const count = getPositiveInteger(props.sectorCount);
if (!count) return;
const style = {
...defaultSectorStyle,
...props.sectorStyle,
};
const step = (Math.PI * 2) / count;
ctx.beginPath();
for (let index = 0; index < count; index += 1) {
const angle = -Math.PI / 2 + index * step;
ctx.moveTo(centerX, centerY);
ctx.lineTo(
centerX + Math.cos(angle) * targetRadius,
centerY + Math.sin(angle) * targetRadius
);
}
ctx.setStrokeStyle(style.color);
ctx.setLineWidth(Math.max(1, targetRadius * style.lineWidthRatio));
ctx.stroke();
};
// 绘制各环之间的分割线。
const drawRingLines = (ctx, centerX, centerY, targetRadius, config) => {
const lineWidth = Math.max(1, targetRadius * config.ringLineWidthRatio);
ctx.setStrokeStyle(config.ringLineColor);
ctx.setLineWidth(lineWidth);
for (let index = 1; index <= config.ringCount; index += 1) {
const radius = targetRadius * (index / config.ringCount);
ctx.beginPath();
ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
ctx.stroke();
}
};
// 绘制靶心十字辅助线。
const drawCrosshair = (ctx, centerX, centerY, targetRadius) => {
if (!props.showCrosshair) {
return;
}
const style = {
...defaultCrosshairStyle,
...props.crosshairStyle,
};
ctx.beginPath();
ctx.moveTo(centerX - targetRadius, centerY);
ctx.lineTo(centerX + targetRadius, centerY);
ctx.moveTo(centerX, centerY - targetRadius);
ctx.lineTo(centerX, centerY + targetRadius);
ctx.setStrokeStyle(style.color);
ctx.setLineWidth(Math.max(1, targetRadius * style.lineWidthRatio));
ctx.stroke();
};
// 绘制环数文字。
const drawRingLabels = (ctx, centerX, centerY, targetRadius, config) => {
if (!props.showRingLabels) {
return;
}
const ringWidth = targetRadius / config.ringCount;
const fontSize = Math.max(10, targetRadius * config.ringLabelFontRatio);
ctx.setFontSize(fontSize);
ctx.setTextAlign("center");
ctx.setTextBaseline("middle");
for (let ring = config.ringCount; ring >= 1; ring -= 1) {
const y = centerY + (config.ringCount - ring + 0.45) * ringWidth;
const color = ring <= 2 ? config.ringLabelDarkColor : config.ringLabelLightColor;
ctx.setFillStyle(color);
ctx.fillText(String(ring), centerX, y);
}
};
// 在每个区域中线位置绘制编号,编号层始终位于高亮和分割线之上。
const drawSectorLabels = (ctx, centerX, centerY, targetRadius) => {
const count = getPositiveInteger(props.sectorCount);
if (!props.showSectorLabels || !count) return;
const style = {
...defaultSectorLabelStyle,
...props.sectorLabelStyle,
};
const labelRadius = targetRadius * style.radiusRatio;
const badgeRadius = Math.max(10, targetRadius * style.badgeRadiusRatio);
ctx.setFontSize(Math.max(11, targetRadius * style.fontSizeRatio));
ctx.setTextAlign("center");
ctx.setTextBaseline("middle");
for (let sector = 1; sector <= count; sector += 1) {
const angles = getSectorAngles(sector, count);
const x = centerX + Math.cos(angles.middleAngle) * labelRadius;
const y = centerY + Math.sin(angles.middleAngle) * labelRadius;
drawCircle(ctx, x, y, badgeRadius, style.backgroundColor);
ctx.setFillStyle(style.color);
ctx.fillText(String(sector), x, y);
}
};
// 生成本次绘制状态的唯一 key,用于避免相同内容重复 draw。
const getDrawKey = (width, height) => {
return JSON.stringify({
width,
height,
coordinateRadius: props.coordinateRadius,
showCrosshair: props.showCrosshair,
showRingLabels: props.showRingLabels,
sectorCount: props.sectorCount,
activeSector: props.activeSector,
activeRings: props.activeRings,
showSectorLabels: props.showSectorLabels,
targetStyleConfig: props.targetStyleConfig,
crosshairStyle: props.crosshairStyle,
sectorStyle: props.sectorStyle,
sectorLabelStyle: props.sectorLabelStyle,
highlightStyle: props.highlightStyle,
highlightOnly: props.highlightOnly,
});
};
// 主绘制入口:根据 highlightOnly 决定画完整靶纸,还是只画透明高亮层。
const drawTarget = ({ force = false, highlightProgress = 1 } = {}) => {
const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1);
const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1);
const drawKey = getDrawKey(width, height);
if (!force && drawKey === lastDrawKey.value) {
return;
}
const size = Math.min(width, height);
const centerX = width / 2;
const centerY = height / 2;
const targetRadius = size / 2;
const config = mergeTargetStyleConfig();
const ctx = uni.createCanvasContext(currentCanvasId.value, instance?.proxy);
ctx.clearRect(0, 0, width, height);
if (!props.highlightOnly) {
drawTargetRings(ctx, centerX, centerY, targetRadius, config);
}
drawSectorHighlight(
ctx,
centerX,
centerY,
targetRadius,
config,
highlightProgress
);
if (!props.highlightOnly) {
drawRingLines(ctx, centerX, centerY, targetRadius, config);
drawCircle(
ctx,
centerX,
centerY,
Math.max(1, targetRadius * config.centerDotRadiusRatio),
config.centerDotColor
);
drawCrosshair(ctx, centerX, centerY, targetRadius);
drawRingLabels(ctx, centerX, centerY, targetRadius, config);
}
// 高亮先画,等分线和编号后画,避免高亮覆盖区域边界。
drawSectorLines(ctx, centerX, centerY, targetRadius);
drawSectorLabels(ctx, centerX, centerY, targetRadius);
ctx.draw();
lastDrawKey.value = highlightProgress >= 1 ? drawKey : "";
};
const cancelHighlightAnimation = () => {
highlightAnimationGeneration += 1;
if (highlightAnimationTimer) {
clearTimeout(highlightAnimationTimer);
highlightAnimationTimer = null;
}
};
// 固定 6 帧展开黄色扇区,避免对原生 canvas 节点做缩放导致低端机错位。
const runHighlightRevealAnimation = () => {
cancelHighlightAnimation();
const generation = highlightAnimationGeneration;
let frameIndex = 0;
const drawNextFrame = () => {
if (generation !== highlightAnimationGeneration) return;
drawTarget({
force: true,
highlightProgress: highlightRevealProgressFrames[frameIndex],
});
frameIndex += 1;
if (frameIndex < highlightRevealProgressFrames.length) {
highlightAnimationTimer = setTimeout(
drawNextFrame,
highlightRevealFrameInterval
);
} else {
highlightAnimationTimer = null;
}
};
drawNextFrame();
};
const setCanvasSizeAndDraw = async (
width,
height,
{ animateHighlight = false, requestGeneration } = {}
) => {
canvasSize.value = {
width: width > 0 ? width : defaultCanvasSize,
height: height > 0 ? height : width || defaultCanvasSize,
};
await nextTick();
if (requestGeneration !== drawRequestGeneration) return;
const canAnimateHighlight =
animateHighlight &&
props.highlightOnly &&
!!getSectorAngles(props.activeSector, props.sectorCount);
if (canAnimateHighlight) {
runHighlightRevealAnimation();
} else {
cancelHighlightAnimation();
drawTarget();
}
};
// 读取 canvas 实际渲染尺寸后再绘制,保证小程序真机尺寸和坐标一致。
const measureAndDraw = ({ animateHighlight = false } = {}) => {
const requestGeneration = ++drawRequestGeneration;
const propWidth = Math.round(getNumber(props.canvasWidth, 0));
const propHeight = Math.round(getNumber(props.canvasHeight, 0));
if (propWidth > 0 && propHeight > 0) {
setCanvasSizeAndDraw(propWidth, propHeight, {
animateHighlight,
requestGeneration,
});
return;
}
const query = uni.createSelectorQuery().in(instance?.proxy);
query
.select(`#${currentCanvasId.value}`)
.boundingClientRect(async (rect) => {
if (requestGeneration !== drawRequestGeneration) return;
const width = Math.round(getNumber(rect?.width, defaultCanvasSize));
const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize));
await setCanvasSizeAndDraw(width, height, {
animateHighlight,
requestGeneration,
});
})
.exec();
};
// 等待 Vue 完成 DOM 更新后重新测量和绘制。
const scheduleDraw = async ({ animateHighlight = false } = {}) => {
await nextTick();
measureAndDraw({ animateHighlight });
};
watch(
() => [
props.coordinateRadius,
props.showCrosshair,
props.showRingLabels,
props.sectorCount,
props.activeSector,
props.activeRings,
props.highlightRefreshToken,
props.showSectorLabels,
props.highlightOnly,
props.canvasWidth,
props.canvasHeight,
props.targetStyleConfig,
props.crosshairStyle,
props.sectorStyle,
props.sectorLabelStyle,
props.highlightStyle,
],
(currentValues, previousValues = []) => {
const refreshTokenIndex = 6;
const refreshToken = Number(currentValues[refreshTokenIndex]);
const previousRefreshToken = Number(previousValues[refreshTokenIndex]);
const animateHighlight =
Number.isFinite(refreshToken) &&
refreshToken > 0 &&
refreshToken !== previousRefreshToken;
return scheduleDraw({ animateHighlight });
},
{
deep: true,
}
);
onMounted(() => {
mountDrawTimer = setTimeout(measureAndDraw, 30);
});
onBeforeUnmount(() => {
drawRequestGeneration += 1;
cancelHighlightAnimation();
if (mountDrawTimer) {
clearTimeout(mountDrawTimer);
mountDrawTimer = null;
}
});
</script>
<template>
<canvas
:id="currentCanvasId"
class="target-canvas"
:canvas-id="currentCanvasId"
:width="canvasSize.width"
:height="canvasSize.height"
/>
</template>
<style scoped>
.target-canvas {
display: block;
width: 100%;
height: 100%;
}
</style>
+26 -7
View File
@@ -1,12 +1,19 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
import audioManager from "@/audioManager";
const props = defineProps({ const props = defineProps({
show: { show: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
clickSound: {
type: Boolean,
default: false,
},
onClose: { onClose: {
type: Function, type: Function,
default: () => {}, default: () => {},
@@ -39,7 +46,19 @@ watch(
{} {}
); );
const playClickSound = () => {
if (props.clickSound) {
audioManager.play("点击按钮");
}
};
const handleSelectTarget = (target) => {
playClickSound();
selectedTarget.value = target;
};
const handleConfirm = () => { const handleConfirm = () => {
playClickSound();
props.onConfirm(selectedTarget.value); props.onConfirm(selectedTarget.value);
props.onClose(); props.onClose();
}; };
@@ -60,29 +79,29 @@ const handleConfirm = () => {
<view class="header"> <view class="header">
<view class="header-title"> <view class="header-title">
<view class="header-title-line-left"></view> <view class="header-title-line-left"></view>
<text>选择靶型</text> <text>{{ t('select_target_type') }}</text>
<view class="header-title-line-right"></view> <view class="header-title-line-right"></view>
</view> </view>
<view class="close-btn" @click="onClose"> <view class="close-btn" @click="onClose">
<image src="../static/close-yellow.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view> </view>
</view> </view>
<view class="target-options"> <view class="target-options">
<view <view
:class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }" :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }"
@click="() => (selectedTarget = 1)" @click="handleSelectTarget(1)"
> >
<text>20厘米全环靶</text> <text>{{ t('20_cm_full_ring_target') }}</text>
</view> </view>
<view style="width: 30rpx"></view> <view style="width: 30rpx"></view>
<view <view
:class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }" :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }"
@click="() => (selectedTarget = 2)" @click="handleSelectTarget(2)"
> >
<text>40厘米全环靶</text> <text>{{ t('40_cm_full_ring_target') }}</text>
</view> </view>
</view> </view>
<SButton width="694rpx" :onClick="handleConfirm">确定</SButton> <SButton width="694rpx" :onClick="handleConfirm">{{ t('confirm_134') }}</SButton>
</view> </view>
</view> </view>
</template> </template>
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
const props = defineProps({ const props = defineProps({
isRed: { isRed: {
@@ -65,7 +67,7 @@ watch(
<template> <template>
<view class="container"> <view class="container">
<image <image
:src="isRed ? '../static/flag-red.png' : '../static/flag-blue.png'" :src="isRed ? 'https://static.shelingxingqiu.com/shootmini/static/flag-red.png' : 'https://static.shelingxingqiu.com/shootmini/static/flag-blue.png'"
class="flag" class="flag"
:style="{ :style="{
[isRed ? 'left' : 'right']: '10rpx', [isRed ? 'left' : 'right']: '10rpx',
@@ -86,11 +88,11 @@ watch(
[isRed ? 'left' : 'right']: getPos(item.id) + 'rpx', [isRed ? 'left' : 'right']: getPos(item.id) + 'rpx',
}" }"
> >
<image :src="item.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<text <text
v-if="isFirst(item.id)" v-if="isFirst(item.id)"
:style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }" :style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }"
>{{ isRed ? "红队" : "蓝队" }}</text >{{ isRed ? t('red_team') : t('blue_team') }}</text
> >
</view> </view>
<text <text
+75 -19
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import Guide from "@/components/Guide.vue"; import Guide from "@/components/Guide.vue";
import BowPower from "@/components/BowPower.vue"; import BowPower from "@/components/BowPower.vue";
@@ -6,10 +8,16 @@ import Avatar from "@/components/Avatar.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis"; import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import {
getDistanceCheckAudioKey,
getDistanceCheckText,
getShootValidation,
} 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 { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const emit = defineEmits(["passed"]);
const props = defineProps({ const props = defineProps({
guide: { guide: {
type: Boolean, type: Boolean,
@@ -23,18 +31,50 @@ const props = defineProps({
type: Number, type: Number,
default: 15, default: 15,
}, },
targetType: {
type: [Number, String],
default: 40,
},
autoStart: {
type: Boolean,
default: false,
},
}); });
const arrow = ref({}); const arrow = ref({});
const distance = ref(0); const distance = ref(0);
const statusText = ref("");
const showsimul = ref(false); const showsimul = ref(false);
const count = ref(props.count); const count = ref(props.count);
const timer = ref(null); const timer = ref(null);
const autoStartPending = ref(false);
const autoStartTriggered = ref(false);
let autoStartTimer = null;
const DISTANCE_PASSED_AUDIO_KEY = "站距合格,靶纸正确";
const AUTO_START_TIMEOUT_MS = 6000;
const clearAutoStartTimer = () => {
if (!autoStartTimer) return;
clearTimeout(autoStartTimer);
autoStartTimer = null;
};
const triggerAutoStart = () => {
if (!autoStartPending.value || autoStartTriggered.value) return;
clearAutoStartTimer();
autoStartPending.value = false;
autoStartTriggered.value = true;
emit("passed");
};
const onAudioEnded = (key) => {
if (key === DISTANCE_PASSED_AUDIO_KEY) triggerAutoStart();
};
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
audioManager.play("请射箭测试距离"); audioManager.play("请射箭!测试站距与靶纸");
if (props.isBattle) { if (props.isBattle) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
count.value -= 1; count.value -= 1;
@@ -42,23 +82,43 @@ onMounted(() => {
}, 1000); }, 1000);
} }
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
uni.$on("audioEnded", onAudioEnded);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
clearAutoStartTimer();
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
uni.$off("audioEnded", onAudioEnded);
}); });
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) { if (msg.type === MESSAGETYPESV2.TestDistance) {
distance.value = Number((msg.shootData.distance / 100).toFixed(2)); if (autoStartPending.value || autoStartTriggered.value) return;
if (distance.value >= 5) audioManager.play("距离合格"); const rawDistance = Number(msg.shootData?.distance ?? msg.shootData?.dst);
else audioManager.play("距离不足"); distance.value = Number.isFinite(rawDistance)
? Number((rawDistance / 100).toFixed(2))
: 0;
statusText.value = getDistanceCheckText(msg.shootData);
const audioKey = getDistanceCheckAudioKey(msg.shootData);
const validation = getShootValidation(msg.shootData);
if (props.autoStart && validation.distanceOk && validation.targetOk) {
autoStartPending.value = true;
autoStartTimer = setTimeout(triggerAutoStart, AUTO_START_TIMEOUT_MS);
}
audioManager.play(audioKey);
} }
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
onMounted(() => { onMounted(() => {
@@ -77,8 +137,8 @@ onBeforeUnmount(() => {
<view class="container"> <view class="container">
<Guide v-show="guide"> <Guide v-show="guide">
<view class="guide-tips"> <view class="guide-tips">
<text>请确保站距达到5米</text> <text>{{ t('stand_at_least_5_m_from_the_target') }}</text>
<text>低于5米的射箭无效</text> <text>{{ t('shots_from_under_5_m_do_not_count') }}</text>
</view> </view>
</Guide> </Guide>
<view class="test-area"> <view class="test-area">
@@ -92,17 +152,13 @@ onBeforeUnmount(() => {
@click="simulShoot" @click="simulShoot"
hover-class="none" hover-class="none"
v-if="showsimul" v-if="showsimul"
> >{{ t('simulate_shot') }}</button>
模拟射箭
</button>
<view class="warnning-text"> <view class="warnning-text">
<block v-if="distance > 0"> <block v-if="statusText">
<text>当前距离{{ distance }}米</text> <text>{{ statusText }}</text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭,测试站距</text> <text>{{ t('shoot_to_check_distance_and_target_face') }}</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
@@ -111,13 +167,13 @@ onBeforeUnmount(() => {
</view> </view>
</view> </view>
<view v-if="isBattle" class="ready-timer"> <view v-if="isBattle" class="ready-timer">
<image src="../static/test-tip.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
<view v-if="count >= 0"> <view v-if="count >= 0">
<text>具体正式比赛还有</text> <text>{{ t('match_starts_in') }}</text>
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒</text> <text>{{ t('s') }}</text>
</view> </view>
<view v-else> 进入中... </view> <view v-else>{{ t('joining') }}</view>
</view> </view>
</view> </view>
</template> </template>
+11 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
const props = defineProps({ const props = defineProps({
countdown: { countdown: {
@@ -9,11 +11,13 @@ const props = defineProps({
const show = ref(false); const show = ref(false);
const count = ref(props.countdown); const count = ref(props.countdown);
const timer = ref(null); const timer = ref(null);
const showTimer = ref(null);
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
setTimeout(() => { showTimer.value = setTimeout(() => {
showTimer.value = null;
show.value = true; show.value = true;
timer.value = setInterval(() => { timer.value = setInterval(() => {
if (count.value === 0) { if (count.value === 0) {
@@ -27,7 +31,10 @@ onMounted(() => {
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (showTimer.value) clearTimeout(showTimer.value);
showTimer.value = null;
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
timer.value = null;
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
}); });
</script> </script>
@@ -37,11 +44,11 @@ onBeforeUnmount(() => {
class="container" class="container"
:style="{ transform: `translateX(${show ? '0' : '100'}%)` }" :style="{ transform: `translateX(${show ? '0' : '100'}%)` }"
> >
<view>距离正式比赛</view> <view>{{ t('match') }}</view>
<view> <view>
<text>开始还有</text> <text>{{ t('starts_in') }}</text>
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒</text> <text>{{ t('s') }}</text>
</view> </view>
</view> </view>
</template> </template>
+170
View File
@@ -0,0 +1,170 @@
<script setup>
import { t } from "@/locales";
import { computed } from "vue";
const MAX_VISIBLE_SCORE_CARDS = 60;
const props = defineProps({
arrows: {
type: Array,
default: () => [],
},
total: {
type: Number,
default: 0,
},
trainingType: {
type: String,
default: "",
},
recordMode: {
type: Boolean,
default: false,
},
});
const getDisplayText = (arrow = {}) => {
if (!arrow) return "";
if (!arrow.ring) return props.trainingType === "stability" ? "-" : "0";
return arrow.ringX ? "X" : String(arrow.ring);
};
const isFailed = (arrow = {}) => {
if (!arrow) return false;
if (
props.recordMode &&
props.trainingType !== "precision" &&
props.trainingType !== "rhythm" &&
props.trainingType !== "stability"
) {
return false;
}
return arrow.ok !== true;
};
const hiddenScoreCount = computed(() =>
props.recordMode
? 0
: Math.max(props.arrows.length - MAX_VISIBLE_SCORE_CARDS, 0)
);
const displayArrows = computed(() => {
const list = props.recordMode
? [...props.arrows]
: props.arrows.slice(-MAX_VISIBLE_SCORE_CARDS);
// total 是达标箭数,不是实际射箭上限;训练中始终预留下一箭空框。
if (!props.recordMode) list.push(null);
return list;
});
</script>
<template>
<view v-if="displayArrows.length" class="score-panel">
<text v-if="hiddenScoreCount" class="score-window-tip">{{ t('earlier') }}{{ hiddenScoreCount }}{{ t('arrows_hidden_showing_the_latest') }}{{ MAX_VISIBLE_SCORE_CARDS }}{{ t('arrows_241') }}</text>
<view class="score-grid">
<view
v-for="(arrow, index) in displayArrows"
:key="index"
class="score-card"
>
<image
class="score-card-bg"
:src="
isFailed(arrow)
? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png'
: 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'
"
/>
<image
v-if="trainingType === 'precision' && arrow"
class="score-result-icon"
:src="
arrow.ok === true
? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/gou.png'
: 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/cha.png'
"
mode="aspectFit"
/>
<text
v-else
class="score-value"
:class="{ 'score-value--low': isFailed(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-window-tip {
display: block;
margin-bottom: 18rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 22rpx;
line-height: 1.4;
}
.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-result-icon {
position: relative;
z-index: 1;
width: 30rpx;
height: 30rpx;
}
.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>
+40 -15
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, watch } from "vue"; import { ref, computed, watch } from "vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import useStore from "@/store"; import useStore from "@/store";
@@ -10,6 +12,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
fullNickname: {
type: Boolean,
default: false,
},
onSignin: { onSignin: {
type: Function, type: Function,
default: () => {}, default: () => {},
@@ -61,7 +67,13 @@ watch(
</script> </script>
<template> <template>
<view class="container" :style="{ width: containerWidth }"> <view
:class="[
'container',
fullNickname ? 'container--full-nickname' : '',
]"
:style="{ width: containerWidth }"
>
<block v-if="user.id"> <block v-if="user.id">
<Avatar <Avatar
:rankLvl="user.rankLvl" :rankLvl="user.rankLvl"
@@ -83,14 +95,14 @@ watch(
user.nickName user.nickName
}}</text> }}</text>
</view> </view>
<image <!-- <image
class="user-name-image" class="user-name-image"
src="../static/vip1.png" src="https://static.shelingxingqiu.com/shootmini/static/vip1.png"
mode="widthFix" mode="widthFix"
/> /> -->
</view> </view>
<view class="user-stats"> <view class="user-stats">
<text class="level-tag level-tag-first">段位积分</text> <text class="level-tag level-tag-first">{{ t('rank_points') }}</text>
<view class="rank-tag"> <view class="rank-tag">
<view <view
class="rank-tag-progress" class="rank-tag-progress"
@@ -107,31 +119,31 @@ watch(
<view v-if="showRank === true" class="rank-info" @click="toRankListPage"> <view v-if="showRank === true" class="rank-info" @click="toRankListPage">
<image <image
class="rank-info-image" class="rank-info-image"
src="../static/global-rank.png" src="https://static.shelingxingqiu.com/shootmini/static/global-rank.png"
mode="widthFix" mode="widthFix"
/> />
<block v-if="user.ranking > 0 && rankData.rank.length"> <block v-if="user.ranking > 0 && rankData.rank.length">
<text>本赛季全国</text> <text>{{ t('national_rank_this_season') }}</text>
<text class="rank-number" <text class="rank-number"
>第<text :style="{ color: '#ffd700' }" >{{ t('round') }}<text :style="{ color: '#ffd700' }"
>{{ user.ranking }}/{{ rankData.rank.length }}</text >{{ user.ranking }}/{{ rankData.rank.length }}</text
>名</text >{{ t('empty') }}</text
> >
</block> </block>
<block v-else> <block v-else>
<text>本赛季</text> <text>{{ t('this_season') }}</text>
<text>暂未上榜</text> <text>{{ t('unranked') }}</text>
</block> </block>
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view class="signin" @click="onSignin"> <view class="signin" @click="onSignin">
<image src="../static/user-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<view> <view>
<text>新来的弓箭手你好呀~</text> <text>{{ t('welcome_new_archer') }}</text>
<view> <view>
<text>登录</text> <text>{{ t('sign_in') }}</text>
<image src="../static/enter-arrow-blue.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
@@ -165,6 +177,19 @@ watch(
max-width: 180rpx; max-width: 180rpx;
} }
.container--full-nickname .user-details {
flex: 1;
min-width: 0;
}
.container--full-nickname .user-name {
width: 100%;
}
.container--full-nickname .user-name .member-nickname {
max-width: 80%;
}
.user-name .member-nickname__text, .user-name .member-nickname__text,
.user-name .member-nickname__shine { .user-name .member-nickname__shine {
font-size: 13px; font-size: 13px;
+1 -1
View File
@@ -25,7 +25,7 @@ defineProps({
<view> <view>
<slot></slot> <slot></slot>
<view v-if="onClick !== null"> <view v-if="onClick !== null">
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
+11 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -52,32 +54,32 @@ onBeforeUnmount(() => {
<template> <template>
<view class="content" :style="{ display: show ? 'flex' : 'none' }"> <view class="content" :style="{ display: show ? 'flex' : 'none' }">
<view v-if="showRank" class="up-rank"> <view v-if="showRank" class="up-rank">
<image :src="user.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="user.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<image :src="nextRankImage" mode="widthFix" /> <image :src="nextRankImage" mode="widthFix" />
<image class="bg-effect" src="../static/shining-bg.png" mode="widthFix" /> <image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image <image
class="bg-effect" class="bg-effect"
src="../static/gold-shining.png" src="https://static.shelingxingqiu.com/shootmini/static/gold-shining.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
<view v-if="showGrade" class="up-grade"> <view v-if="showGrade" class="up-grade">
<image <image
class="scale-in" class="scale-in"
src="../static/user-upgrade.png" src="https://static.shelingxingqiu.com/shootmini/static/user-upgrade.png"
mode="widthFix" mode="widthFix"
/> />
<image class="bg-effect" src="../static/shining-bg.png" mode="widthFix" /> <image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image <image
class="bg-effect" class="bg-effect"
src="../static/gold-shining.png" src="https://static.shelingxingqiu.com/shootmini/static/gold-shining.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
<view class="text-content"> <view class="text-content">
<image src="../static/update-text-bg.png" /> <image src="https://static.shelingxingqiu.com/shootmini/static/update-text-bg.png" />
<text>恭喜你升级到</text> <text>{{ t('congratulations_you_reached') }}</text>
<text>{{ showRank ? nextRankTitle : `射灵${lvl}级` }}</text> <text>{{ showRank ? nextRankTitle : t('sheling_level_value', { p0: lvl }) }}</text>
<text>!</text> <text>!</text>
</view> </view>
<!-- <button @click="onClose" hover-class="none">关闭</button> --> <!-- <button @click="onClose" hover-class="none">关闭</button> -->
+242
View File
@@ -0,0 +1,242 @@
import { t } from "@/locales";
import { computed, ref } from "vue";
import { sendHardwareBoxUpdateAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const OTA_PROGRESS_EVENT = "/addons/shoot/otaProgress";
const OTA_RESULT_EVENT = "/addons/shoot/otaResult";
const UPDATE_TIMEOUT = 10 * 60 * 1000;
const phaseTextMap = {
started: t('preparing_firmware_update'),
downloading: t('downloading_firmware'),
installing: t('installing_firmware'),
};
// 设备详情中的 latestVersion 是升级目标,version 是当前固件版本。
export const getOtaInfoFromDetail = (detail) => ({
versionNumber: String(detail?.latestVersion ?? "").trim(),
currentVersion: String(detail?.version ?? "").trim(),
versionInfo: String(detail?.versionInfo ?? "").trim(),
needUpdate: detail?.needUpdate === true || Number(detail?.needUpdate) === 1,
forceUpdate: detail?.forceUpdate === true || Number(detail?.forceUpdate) === 1,
});
// OTA 状态由首页、WiFi 设置页和我的设备页共享,页面切换后仍可继续接收进度。
const updating = ref(false);
const progress = ref(0);
const phase = ref("started");
const resultVisible = ref(false);
const resultStatus = ref("");
const resultReason = ref("");
let deviceRef = null;
let updateRunId = 0;
let targetVersion = "";
let lastFinishedVersion = "";
let timeoutTimer = null;
let successCallback = null;
let socketListening = false;
const phaseText = computed(
() => phaseTextMap[phase.value] || t('updating_firmware')
);
const resultTitle = computed(() =>
resultStatus.value === "success" ? t('firmware_update_complete_250') : t('firmware_update_failed')
);
const resultContent = computed(() => {
if (resultStatus.value === "success") return t('firmware_update_complete');
return resultReason.value || t('update_failed_check_your_device_and_network_then_retry');
});
const clearTimers = () => {
clearTimeout(timeoutTimer);
timeoutTimer = null;
};
const resetActiveUpdate = () => {
clearTimers();
successCallback = null;
};
const finishUpdate = (status, reason = "", runId = updateRunId) => {
if (runId !== updateRunId || !updating.value) return;
const onSuccess = successCallback;
resetActiveUpdate();
updating.value = false;
resultStatus.value = status;
resultReason.value = reason;
lastFinishedVersion = targetVersion;
if (status === "success") {
progress.value = 100;
phase.value = "installing";
onSuccess?.();
}
resultVisible.value = true;
};
const isCurrentDeviceMessage = (data) => {
const messageDeviceId = String(data?.deviceId || "");
const currentDeviceId = String(deviceRef?.value?.deviceId || "");
return !messageDeviceId || !currentDeviceId || messageDeviceId === currentDeviceId;
};
const isCurrentVersionMessage = (data) => {
const messageVersion = String(data?.versionNumber || "");
return !messageVersion || !targetVersion || messageVersion === targetVersion;
};
// 页面切换导致弹窗关闭后,使用下一条进度消息恢复当前 OTA 会话。
const recoverUpdateFromMessage = (data) => {
updateRunId += 1;
const runId = updateRunId;
targetVersion = String(data?.versionNumber || "");
lastFinishedVersion = "";
successCallback = null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", t('firmware_update_timed_out_please_try_again'), runId);
}, UPDATE_TIMEOUT);
};
function handleSocketMessage(message) {
if (Number(message?.code ?? 0) !== 0) return;
if (![OTA_PROGRESS_EVENT, OTA_RESULT_EVENT].includes(message?.event)) return;
if (!isCurrentDeviceMessage(message.data)) return;
const messageVersion = String(message.data?.versionNumber || "");
if (message.event === OTA_PROGRESS_EVENT) {
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
if (!targetVersion && messageVersion) targetVersion = messageVersion;
const nextProgress = Math.min(
100,
Math.max(0, Number(message.data?.progress) || 0)
);
progress.value = Math.max(progress.value, nextProgress);
if (phaseTextMap[message.data?.phase]) {
phase.value = message.data.phase;
}
return;
}
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
if (!targetVersion && messageVersion) targetVersion = messageVersion;
if (message.data?.status === "success") {
finishUpdate("success");
} else if (message.data?.status === "failed") {
finishUpdate("failed", message.data?.reason || "");
}
}
const startSocketListening = () => {
if (socketListening) return;
uni.$on("socket-inbox", handleSocketMessage);
socketListening = true;
};
export const useOtaUpdate = () => {
const store = useStore();
const { device } = storeToRefs(store);
deviceRef = device;
startSocketListening();
const startUpdate = async ({
versionNumber,
wifiSsid = "",
wifiPassword = "",
onSuccess,
}) => {
if (updating.value) return false;
const nextVersion = String(versionNumber || "").trim();
if (!nextVersion) {
uni.showToast({ title: t('target_firmware_version_is_missing'), icon: "none" });
return false;
}
updateRunId += 1;
const runId = updateRunId;
targetVersion = nextVersion;
lastFinishedVersion = "";
successCallback = onSuccess || null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", t('firmware_update_timed_out_please_try_again'), runId);
}, UPDATE_TIMEOUT);
try {
const updateResult = await sendHardwareBoxUpdateAPI({
versionNumber: targetVersion,
wifiSsid,
wifiPassword,
});
if (runId !== updateRunId || !updating.value) return false;
if (!updateResult?.taskId) {
finishUpdate("failed", t('could_not_create_the_firmware_update_task_please_retry'), runId);
return false;
}
return true;
} catch (error) {
if (runId === updateRunId) {
finishUpdate(
"failed",
error?.message || t('firmware_update_request_failed_please_retry'),
runId
);
}
return false;
}
};
const closeResult = () => {
resultVisible.value = false;
};
return {
updating,
progress,
phase,
phaseText,
resultVisible,
resultStatus,
resultTitle,
resultContent,
startUpdate,
closeResult,
};
};
+29 -26
View File
@@ -1,6 +1,8 @@
import { t } from "@/locales";
export const MESSAGETYPES = { export const MESSAGETYPES = {
ShootSyncMeArrowID: parseInt("0x789b6b0d"), // 2023451405 ShootSyncMeArrowID: parseInt("0x789b6b0d"), // 2023451405
ShootSyncMePracticeID: parseInt("0xD88AE05E"), // 3632980062 ShootSyncMePracticeID: parseInt("0xD88AE05E"), // 3632980062
ShootSyncBattleCreateMatchLinkID: parseInt("0xF86FF466"), // 2538869862
WaitForAllReady: parseInt("0x615C13BE"), // 1633424318 WaitForAllReady: parseInt("0x615C13BE"), // 1633424318
AllReady: parseInt("0x1CCB49FD"), // 483084797 AllReady: parseInt("0x1CCB49FD"), // 483084797
MeleeAllReady: parseInt("0x37132BD5"), // 924003285 MeleeAllReady: parseInt("0x37132BD5"), // 924003285
@@ -28,6 +30,7 @@ export const MESSAGETYPES = {
DeviceOnline: 4168086626, DeviceOnline: 4168086626,
DeviceOffline: 4168086627, DeviceOffline: 4168086627,
SomeoneIsReady: 4168086628, SomeoneIsReady: 4168086628,
DeviceCharging: 4168086631, // 设备充电中
}; };
export const MESSAGETYPESV2 = { export const MESSAGETYPESV2 = {
@@ -78,15 +81,15 @@ export const meleeAvatarColors = [
]; ];
export const orderStatusNames = { export const orderStatusNames = {
1: "待付款", 1: t('awaiting_payment'),
2: "已付款", 2: t('paid'),
3: "已发货", 3: t('shipped'),
4: "已完成", 4: t('completed_260'),
5: "已关闭", 5: t('closed'),
6: "申请退款", 6: t('refund_requested'),
7: "退款中", 7: t('refund_in_progress'),
8: "已退款", 8: t('refunded'),
9: "拒绝退款", 9: t('refund_declined'),
}; };
export const getStatusColor = (status) => { export const getStatusColor = (status) => {
@@ -101,14 +104,14 @@ export const getStatusColor = (status) => {
}; };
export const directionAdjusts = { export const directionAdjusts = {
AdjustLowerRight: "向右下方调瞄", AdjustLowerRight: t('down_and_right'),
AdjustDown: "向下方调瞄", AdjustDown: t('down'),
AdjustLowerLeft: "向左下方调瞄", AdjustLowerLeft: t('down_and_left'),
AdjustLeft: "向左侧调瞄", AdjustLeft: t('left'),
AdjustUpperLeft: "向左上侧调瞄", AdjustUpperLeft: t('up_and_left'),
AdjustUp: "向上方调瞄", AdjustUp: t('up'),
AdjustUpperRight: "向右上方调瞄", AdjustUpperRight: t('up_and_right'),
AdjustRight: "向右侧调瞄", AdjustRight: t('right'),
}; };
export const getBattleResultTips = ( export const getBattleResultTips = (
@@ -143,12 +146,12 @@ export const getBattleResultTips = (
} else { } else {
if (rank <= 3) { if (rank <= 3) {
const tests = [ const tests = [
"好成绩!全国排位赛等着你!", t('great_score_the_national_ranked_matches_await'),
"持续练习,就会迎来更多高光时刻!", t('keep_practicing_for_more_moments_to_shine'),
]; ];
return tests[getRandomIndex(2)]; return tests[getRandomIndex(2)];
} else { } else {
return "每日练习打卡,争取下次脱颖而出!"; return t('practice_daily_and_stand_out_next_time');
} }
} }
} else if (gameMode === 2) { } else if (gameMode === 2) {
@@ -177,16 +180,16 @@ export const getBattleResultTips = (
} else { } else {
if (score > 0) { if (score > 0) {
const tests = [ const tests = [
"王者一定属于你!", t('the_top_rank_is_within_your_reach'),
"高光时刻!继续保持!", t('a_moment_to_shine_keep_it_up'),
"射灵世界的佼佼者!", t('one_of_the_best_in_the_sheling_world'),
]; ];
return tests[getRandomIndex(3)]; return tests[getRandomIndex(3)];
} else { } else {
const tests = [ const tests = [
"再来一次,定能脱颖而出!", t('try_again_and_make_your_mark'),
"加强练习,争取越战越勇", t('practice_more_and_come_back_stronger'),
"人生走过的每一步都算数", t('every_step_you_take_counts'),
]; ];
return tests[getRandomIndex(3)]; return tests[getRandomIndex(3)];
} }
+1110
View File
File diff suppressed because it is too large Load Diff
+40
View File
@@ -0,0 +1,40 @@
import { createI18n } from "vue-i18n";
import en from "./en.json";
import sourceKeys from "./source-keys.json";
// 英文构建固定使用英文,不读取或写入用户语言与业务缓存。
export const i18n = createI18n({
legacy: false,
locale: "en",
fallbackLocale: "en",
messages: { en },
});
// uni-app 的小程序运行库可能直接返回原始文案,参数在此统一替换一次。
// 从固定英文词条读取,避免完整版运行库先插值后再次处理参数值里的花括号。
export const t = (key, params = {}) => {
const message = Object.prototype.hasOwnProperty.call(en, key)
? en[key]
: i18n.global.t(key);
return message.replace(/\{(p\d+)\}/g, (placeholder, name) =>
params != null && Object.prototype.hasOwnProperty.call(params, name)
? String(params[name] ?? "")
: placeholder
);
};
// 仅用于明确来自前端静态配置的双用途原值;禁止用于接口响应或用户输入。
export const translateStatic = (value) => {
const key = Object.prototype.hasOwnProperty.call(sourceKeys, value) ? sourceKeys[value] : null;
return key ? t(key) : value;
};
// 比赛提示保留中文原值供语音与状态判断使用,只在渲染时转换。
export const formatBattleTip = (value) => {
const text = String(value || "").replace(/你/g, "").replace(/重回/g, "");
const half = text.match(/^(上|下)半场:请先射6箭$/);
if (half) return `${half[1] === "上" ? "First" : "Second"} half: shoot 6 arrows first`;
const round = text.match(/^请开始射箭第(.+)轮$/);
if (round) return t(sourceKeys["请开始射箭第{p0}轮"], { p0: translateStatic(round[1]) });
return translateStatic(text);
};
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2
View File
@@ -2,6 +2,7 @@ import { createSSRApp } from 'vue'
import { createPinia } from 'pinia' import { createPinia } from 'pinia'
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
import App from './App.vue' import App from './App.vue'
import { i18n } from './locales'
import audioManager from './audioManager' import audioManager from './audioManager'
export function createApp() { export function createApp() {
@@ -9,6 +10,7 @@ export function createApp() {
const pinia = createPinia() const pinia = createPinia()
pinia.use(piniaPluginPersistedstate) pinia.use(piniaPluginPersistedstate)
app.use(pinia) app.use(pinia)
app.use(i18n)
/** /**
* 全局点击音效工具函数,用于在任意按钮/元素点击时自动播放音效。 * 全局点击音效工具函数,用于在任意按钮/元素点击时自动播放音效。
+256 -1
View File
@@ -53,6 +53,261 @@
"quickapp" : {}, "quickapp" : {},
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxa8f5989dcd45cc23", "appid" : "wxa8f5989dcd45cc23",
"packOptions" : {
"ignore" : [
{
"type" : "file",
"value" : "static/common/dialog-light.png"
},
{
"type" : "file",
"value" : "static/common/dialog-bg.png"
},
{
"type" : "file",
"value" : "static/common/dialog-icon.png"
},
{
"type" : "file",
"value" : "static/prompt-bg-square.png"
},
{
"type" : "file",
"value" : "static/coach-comment.png"
},
{
"type" : "file",
"value" : "static/screen-hint-bg.png"
},
{
"type" : "file",
"value" : "static/red-team-win.png"
},
{
"type" : "file",
"value" : "static/blue-team-win.png"
},
{
"type" : "file",
"value" : "static/my-grow.png"
},
{
"type" : "file",
"value" : "static/gold-shining.png"
},
{
"type" : "file",
"value" : "static/bow-target.png"
},
{
"type" : "file",
"value" : "static/matching-bg.png"
},
{
"type" : "file",
"value" : "static/versus.png"
},
{
"type" : "file",
"value" : "static/point-champion.png"
},
{
"type" : "file",
"value" : "static/my-practise.png"
},
{
"type" : "file",
"value" : "static/shining-bg.png"
},
{
"type" : "file",
"value" : "static/donate.png"
},
{
"type" : "file",
"value" : "static/friend-battle.png"
},
{
"type" : "file",
"value" : "static/user-upgrade.png"
},
{
"type" : "file",
"value" : "static/finish-frame.png"
},
{
"type" : "file",
"value" : "static/vip/svip-jian.png"
},
{
"type" : "file",
"value" : "static/battle-header.png"
},
{
"type" : "file",
"value" : "static/battle-header-melee.png"
},
{
"type" : "file",
"value" : "static/player-bg.png"
},
{
"type" : "file",
"value" : "static/mvp-blue.png"
},
{
"type" : "file",
"value" : "static/finish-tip.png"
},
{
"type" : "file",
"value" : "static/2unfinish-tip.png"
},
{
"type" : "file",
"value" : "static/have-no-device.png"
},
{
"type" : "file",
"value" : "static/device-icon.png"
},
{
"type" : "file",
"value" : "static/unfinish-tip.png"
},
{
"type" : "file",
"value" : "static/test-tip.png"
},
{
"type" : "file",
"value" : "static/mvp-red.png"
},
{
"type" : "file",
"value" : "static/vip/svip-lie.png"
},
{
"type" : "file",
"value" : "static/mvp-tip.png"
},
{
"type" : "file",
"value" : "static/rank/battle-choose.png"
},
{
"type" : "file",
"value" : "static/back-to-game-bg.png"
},
{
"type" : "file",
"value" : "static/complete-light1.png"
},
{
"type" : "file",
"value" : "static/complete-light2.png"
},
{
"type" : "file",
"value" : "static/title-2v2.png"
},
{
"type" : "file",
"value" : "static/tab-bg.png"
},
{
"type" : "file",
"value" : "static/scan.png"
},
{
"type" : "file",
"value" : "static/choose-battle-mode.png"
},
{
"type" : "file",
"value" : "static/shooter.png"
},
{
"type" : "file",
"value" : "static/my-growth.png"
},
{
"type" : "file",
"value" : "static/juezhanbang.png"
},
{
"type" : "file",
"value" : "static/title-3v3.png"
},
{
"type" : "file",
"value" : "static/point-book-tip-bg.png"
},
{
"type" : "file",
"value" : "static/reward-us.png"
},
{
"type" : "file",
"value" : "static/rank/star.png"
},
{
"type" : "file",
"value" : "static/tab-point-book.png"
},
{
"type" : "file",
"value" : "static/pk-icon.png"
},
{
"type" : "file",
"value" : "static/first-try.png"
},
{
"type" : "file",
"value" : "static/row-yellow-bg.png"
},
{
"type" : "file",
"value" : "static/room-notfound-title.png"
},
{
"type" : "file",
"value" : "static/title-mvp.png"
},
{
"type" : "file",
"value" : "static/long-bubble-tall.png"
},
{
"type" : "file",
"value" : "static/battle-result.png"
},
{
"type" : "file",
"value" : "static/tab-mall.png"
},
{
"type" : "folder",
"value" : "static/training-home"
},
{
"type" : "folder",
"value" : "static/training-difficulty-design"
},
{
"type" : "folder",
"value" : "static/coin"
},
{
"type" : "folder",
"value" : "static/home-device"
}
]
},
"optimization" : {
"subPackages" : true
},
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : true, "minified" : true,
@@ -66,7 +321,7 @@
"themeLocation" : "theme.json", "themeLocation" : "theme.json",
"permission" : { "permission" : {
"scope.userLocation": { "scope.userLocation": {
"desc": "用于扫描附近 WiFi,完成设备 OTA 升级网络连接" "desc": "Find Wi-Fi for device updates"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ] "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
File diff suppressed because it is too large Load Diff
+111 -37
View File
@@ -3,6 +3,9 @@
{ {
"path": "pages/index" "path": "pages/index"
}, },
{
"path": "pages/org-bind"
},
{ {
"path": "pages/friend-battle" "path": "pages/friend-battle"
}, },
@@ -18,9 +21,6 @@
{ {
"path": "pages/audio-test" "path": "pages/audio-test"
}, },
{
"path": "pages/calibration"
},
{ {
"path": "pages/about-us" "path": "pages/about-us"
}, },
@@ -30,9 +30,6 @@
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
}, },
{
"path": "pages/team-battle/index"
},
{ {
"path": "pages/melee-battle" "path": "pages/melee-battle"
}, },
@@ -60,30 +57,9 @@
{ {
"path": "pages/match-page" "path": "pages/match-page"
}, },
{
"path": "pages/my-device"
},
{
"path": "pages/device-intro"
},
{ {
"path": "pages/user" "path": "pages/user"
}, },
{
"path": "pages/member/orders"
},
{
"path": "pages/member/order-detail"
},
{
"path": "pages/member/be-vip"
},
{
"path": "pages/member/vip-intro"
},
{
"path": "pages/member/agreement"
},
{ {
"path": "pages/grade-intro" "path": "pages/grade-intro"
}, },
@@ -117,20 +93,11 @@
{ {
"path": "pages/match-detail" "path": "pages/match-detail"
}, },
{
"path": "pages/team-battle/team-bow-data"
},
{ {
"path": "pages/melee-bow-data" "path": "pages/melee-bow-data"
}, },
{ {
"path": "pages/mine-bow-data" "path": "pages/mine-bow-data"
},
{
"path": "pages/ota-wifi",
"style": {
"navigationStyle": "custom"
}
} }
], ],
"globalStyle": { "globalStyle": {
@@ -150,5 +117,112 @@
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
} }
}, },
"subPackages": [] "subPackages": [
{
"root": "pages/coin",
"pages": [
{
"path": "vip-intro"
},
{
"path": "index"
},
{
"path": "rules"
},
{
"path": "earning-records"
},
{
"path": "exchange-records"
},
{
"path": "nearby-stores"
},
{
"path": "product-detail"
}
]
},
{
"root": "pages/device",
"pages": [
{
"path": "my-device"
},
{
"path": "device-qrcode"
},
{
"path": "device-bind-success"
},
{
"path": "device-bind-failure"
},
{
"path": "device-already-bound"
},
{
"path": "device-intro"
},
{
"path": "ota-wifi",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "calibration"
},
{
"path": "unbind-device"
}
]
},
{
"root": "pages/member",
"pages": [
{
"path": "orders"
},
{
"path": "order-detail"
},
{
"path": "be-vip"
},
{
"path": "vip-intro"
},
{
"path": "agreement"
}
]
},
{
"root": "pages/team-battle",
"pages": [
{
"path": "index"
},
{
"path": "team-bow-data"
}
]
},
{
"root": "pages/training",
"pages": [
{
"path": "index"
},
{
"path": "difficulty"
},
{
"path": "practise-one"
}
]
}
]
} }
+6 -8
View File
@@ -1,25 +1,23 @@
<script setup> <script setup>
import { t } from "@/locales";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
const isIOS = uni.getDeviceInfo().osName === "ios"; const isIOS = uni.getDeviceInfo().osName === "ios";
</script> </script>
<template> <template>
<Container title="关于我们"> <Container :title="t('about_us')">
<view class="container"> <view class="container">
<view class="text"> <view class="text">{{ t('sheling_planet_is_a_platform_for_professional_archers_and_archer') }}</view>
《射灵星球》是以智能和物联网技术驱动的全球射箭专业选手及射箭爱好者互动交流平台,由广州光点飞舞网络有限公司研发并提供线上服务。
</view>
<view class="text"> <view class="text">{{ t('we_explore_and_apply_smart_archery_technology_through_innovation') }}</view>
我们专注于智能射箭技术的探索和应用,通过物联网技术、激光系统、人工智能、嵌入式AI及射箭在线互娱模式的创新与研发,提供专业的智能体育设备和有趣的在线物联游戏,以此推动射箭运动及更多专业体育运动走入大众家庭。
</view>
<view <view
class="copyright" class="copyright"
:style="{ paddingBottom: isIOS ? '40rpx' : '20rpx' }" :style="{ paddingBottom: isIOS ? '40rpx' : '20rpx' }"
> >
<text>粤ICP备2025421150号-2X</text> <text>{{ t('guangdong_icp_no_2025421150_2x') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
+21 -15
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import audioManager, { audioFils } from "@/audioManager"; import audioManager, { audioFils } from "@/audioManager";
@@ -9,39 +11,43 @@ const playAudio = (key) => {
audioManager.play(key); audioManager.play(key);
}; };
const onAudioLoaded = (key) => {
loaded.value = {
...loaded.value,
[key]: true,
};
};
onMounted(() => { onMounted(() => {
const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {}; const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
loaded.value = loadedAudioKeys; loaded.value = loadedAudioKeys;
uni.$on("audioLoaded", (key) => { uni.$on("audioLoaded", onAudioLoaded);
loaded.value[key] = true; void audioManager.initAudios();
});
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
uni.$off("audioLoaded"); uni.$off("audioLoaded", onAudioLoaded);
}); });
</script> </script>
<template> <template>
<Container title="音频测试"> <Container :title="t('audio_test')">
<view class="container"> <view class="container">
<view> <view>
<text>连续播放1</text> <text>{{ t('continuous_playback_1') }}</text>
<button hover-class="none" @click="playAudio(['第一轮', '请蓝方射箭'])"> <button hover-class="none" @click="playAudio(['第一轮', '请蓝方射箭'])">{{ t('play') }}</button>
播放
</button>
</view> </view>
<view> <view>
<text>连续播放2</text> <text>{{ t('continuous_playback_2') }}</text>
<button hover-class="none" @click="playAudio(['第二轮', '请红方射箭'])"> <button hover-class="none" @click="playAudio(['第二轮', '请红方射箭'])">{{ t('play') }}</button>
播放
</button>
</view> </view>
<view v-for="key in Object.keys(audioFils)" :key="key"> <view v-for="key in Object.keys(audioFils)" :key="key">
<text>{{ key }}</text> <text>{{ key }}</text>
<text v-if="!loaded[key]">未加载</text> <text>{{ loaded[key] ? t('loaded') : t('not_loaded') }}</text>
<button v-else hover-class="none" @click="playAudio(key)">播放</button> <button hover-class="none" @click="playAudio(key)">
{{ loaded[key] ? t('play_301') : t('load_and_play') }}
</button>
</view> </view>
</view> </view>
</Container> </Container>
+30 -29
View File
@@ -1,8 +1,11 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, onMounted } from "vue"; import { ref, computed, onMounted } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import UserUpgrade from "@/components/UserUpgrade.vue"; import UserUpgrade from "@/components/UserUpgrade.vue";
import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import { getBattleAPI } from "@/apis"; import { getBattleAPI } from "@/apis";
import { topThreeColors, getBattleResultTips } from "@/constants"; import { topThreeColors, getBattleResultTips } from "@/constants";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
@@ -82,7 +85,7 @@ const checkBowData = () => {
<view class="container"> <view class="container">
<block v-if="data.mode <= 3"> <block v-if="data.mode <= 3">
<view class="header-team" :style="{ marginTop: '25%' }"> <view class="header-team" :style="{ marginTop: '25%' }">
<image src="../static/battle-result.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/battle-result.png" mode="widthFix" />
<view class="header-solo" v-if="data.mode === 1"> <view class="header-solo" v-if="data.mode === 1">
<text <text
:style="{ :style="{
@@ -91,7 +94,7 @@ const checkBowData = () => {
? 'linear-gradient(270deg, #3597ff 0%, rgba(0,0,0,0) 100%);' ? 'linear-gradient(270deg, #3597ff 0%, rgba(0,0,0,0) 100%);'
: 'linear-gradient(270deg, #fd4444 0%, rgba(0, 0, 0, 0) 100%)', : 'linear-gradient(270deg, #fd4444 0%, rgba(0, 0, 0, 0) 100%)',
}" }"
>{{ data.winTeam === 1 ? "蓝队" : "红队" }}获胜</text >{{ data.winTeam === 1 ? t('blue_team') : t('red_team') }}{{ t('win') }}</text
> >
<Avatar <Avatar
:size="32" :size="32"
@@ -107,7 +110,7 @@ const checkBowData = () => {
</view> </view>
<view class="header-mvp" v-if="data.mode === 2 || data.mode === 3"> <view class="header-mvp" v-if="data.mode === 2 || data.mode === 3">
<image <image
:src="`../static/${data.winTeam === 1 ? 'blue' : 'red'}-team-win.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/${data.winTeam === 1 ? 'blue' : 'red'}-team-win.png`"
mode="widthFix" mode="widthFix"
/> />
<view <view
@@ -117,18 +120,18 @@ const checkBowData = () => {
}deg)`, }deg)`,
}" }"
> >
<view v-if="data.mvp && data.mvp.totalRings"> <view v-if="data.mvp && data.mvp.player_match_result.total_ring">
<image src="../static/title-mvp.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/title-mvp.png" mode="widthFix" />
<text <text
>斩获<text >{{ t('scored') }}<text
:style="{ :style="{
color: '#fed847', color: '#fed847',
fontSize: '18px', fontSize: '18px',
margin: '0 3px', margin: '0 3px',
fontWeight: '600', fontWeight: '600',
}" }"
>{{ data.mvp.totalRings }}</text >{{ data.mvp.player_match_result.total_ring }}</text
>环</text >{{ t('pts') }}</text
> >
</view> </view>
<view v-if="data.mvp && data.mvp.length"> <view v-if="data.mvp && data.mvp.length">
@@ -144,7 +147,7 @@ const checkBowData = () => {
:style="{ :style="{
backgroundColor: myTeam === 1 ? '#5fadff' : '#ff6060', backgroundColor: myTeam === 1 ? '#5fadff' : '#ff6060',
}" }"
>自己</text >{{ t('me') }}</text
> >
</view> </view>
<text class="truncate">{{ player.name }}</text> <text class="truncate">{{ player.name }}</text>
@@ -153,9 +156,9 @@ const checkBowData = () => {
</view> </view>
</view> </view>
<view class="battle-winner"> <view class="battle-winner">
<image src="../static/shining-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image <image
:src="ifWin ? '../static/you-win.png' : '../static/you-lost.png'" :src="ifWin ? 'https://static.shelingxingqiu.com/shootmini/static/you-win.png' : 'https://static.shelingxingqiu.com/shootmini/static/you-lost.png'"
mode="widthFix" mode="widthFix"
class="scale-in" class="scale-in"
/> />
@@ -173,7 +176,7 @@ const checkBowData = () => {
<block v-else> <block v-else>
<view class="header-melee"> <view class="header-melee">
<view /> <view />
<image src="../static/battle-result.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/battle-result.png" mode="widthFix" />
<view /> <view />
</view> </view>
<view <view
@@ -192,37 +195,37 @@ const checkBowData = () => {
<image <image
v-if="player.rank === 1" v-if="player.rank === 1"
class="player-bg" class="player-bg"
src="../static/melee-player-bg1.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg1.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 2" v-if="player.rank === 2"
class="player-bg" class="player-bg"
src="../static/melee-player-bg2.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg2.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 3" v-if="player.rank === 3"
class="player-bg" class="player-bg"
src="../static/melee-player-bg3.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg3.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 1" v-if="player.rank === 1"
class="player-crown" class="player-crown"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="player.rank === 2" v-if="player.rank === 2"
class="player-crown" class="player-crown"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="player.rank === 3" v-if="player.rank === 3"
class="player-crown" class="player-crown"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
/> />
<view v-if="player.rank > 3" class="view-crown">{{ <view v-if="player.rank > 3" class="view-crown">{{
@@ -238,8 +241,7 @@ const checkBowData = () => {
<text>{{ getLvlName(player.rank_lvl) }}</text> <text>{{ getLvlName(player.rank_lvl) }}</text>
</view> </view>
<text <text
><text :style="{ color: '#fff' }">{{ player.totalRing }}</text> ><text :style="{ color: '#fff' }">{{ player.totalRing }}</text>{{ t('pts_308') }}</text
环</text
> >
</view> </view>
</view> </view>
@@ -248,7 +250,7 @@ const checkBowData = () => {
class="battle-e" class="battle-e"
:style="{ marginTop: data.mode > 3 ? '20px' : '20vw' }" :style="{ marginTop: data.mode > 3 ? '20px' : '20vw' }"
> >
<image src="../static/row-yellow-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/row-yellow-bg.png" mode="widthFix" />
<view class="team-avatar"> <view class="team-avatar">
<Avatar <Avatar
:src="user.avatar" :src="user.avatar"
@@ -258,19 +260,17 @@ const checkBowData = () => {
<text <text
:style="{ backgroundColor: '#5fadff' }" :style="{ backgroundColor: '#5fadff' }"
v-if="data.mode <= 3 && myTeam === 1" v-if="data.mode <= 3 && myTeam === 1"
>蓝队</text >{{ t('blue_team') }}</text
> >
<text <text
:style="{ backgroundColor: '#ff6060' }" :style="{ backgroundColor: '#ff6060' }"
v-if="data.mode <= 3 && myTeam === 2" v-if="data.mode <= 3 && myTeam === 2"
>红队</text >{{ t('red_team') }}</text
> >
</view> </view>
<text v-if="data.way === 1"> <text v-if="data.way === 1">{{ t('your_xp') }}{{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
你的经验 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
</text> </text>
<text v-if="data.way === 2"> <text v-if="data.way === 2">{{ t('your_points') }}{{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
你的积分 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
</text> </text>
</view> </view>
<text v-if="data.mode > 3" class="description"> <text v-if="data.mode > 3" class="description">
@@ -283,10 +283,11 @@ const checkBowData = () => {
}} }}
</text> </text>
<view class="op-btn"> <view class="op-btn">
<view @click="checkBowData">查看成绩</view> <view @click="checkBowData">{{ t('view_results') }}</view>
<view @click="exit">返回</view> <view @click="exit">{{ t('back') }}</view>
</view> </view>
<UserUpgrade /> <UserUpgrade />
<DeviceChargingDialog />
</view> </view>
</template> </template>
+319 -85
View File
@@ -1,6 +1,8 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed, onBeforeUnmount } from "vue"; import { ref, onMounted, computed, onBeforeUnmount } from "vue";
import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app"; import { onShow, onHide, 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 GuideTwo from "@/components/GuideTwo.vue"; import GuideTwo from "@/components/GuideTwo.vue";
@@ -14,12 +16,14 @@ import {
chooseTeamAPI, chooseTeamAPI,
getReadyAPI, getReadyAPI,
kickPlayerAPI, kickPlayerAPI,
getBattleAPI,
} from "@/apis"; } from "@/apis";
import { isLimitError } from "@/util"; import { debounce, isLimitError } from "@/util";
import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { returnToBattle } from "@/utils/matchReturn";
const store = useStore(); const store = useStore();
const { user } = storeToRefs(store); const { user } = storeToRefs(store);
@@ -31,16 +35,30 @@ const players = ref([]);
const blueTeam = ref([]); const blueTeam = ref([]);
const redTeam = ref([]); const redTeam = ref([]);
const isMember = (player = {}) => player.vip === true || player.sVip === true;
const getMemberNicknameClass = (player = {}) => [
"member-nickname",
player.vip === true && player.sVip !== true ? "member-nickname--vip" : "",
player.sVip === true ? "member-nickname--svip" : "",
];
const normalizeRoomPlayer = (member = {}) => ({
...(member.userInfo || {}),
vip: member.vip ?? member.userInfo?.vip,
sVip: member.sVip ?? member.userInfo?.sVip,
});
/** /**
* 根据对战类型和房间人数动态生成页面标题 * 根据对战类型和房间人数动态生成页面标题
* battleType=1: 组队对战;count 2/4/6 分别对应 1v1/2v2/3v3 * battleType=1: 组队对战;count 2/4/6 分别对应 1v1/2v2/3v3
* battleType=2: 多人乱斗 * battleType=2: 多人乱斗
*/ */
const battleTitle = computed(() => { const battleTitle = computed(() => {
if (!room.value.battleType) return "好友约战"; if (!room.value.battleType) return t('friend_challenge');
if (room.value.battleType === 2) return "多人乱斗"; if (room.value.battleType === 2) return t('free_for_all');
const half = room.value.count / 2; const half = room.value.count / 2;
return `${half}v${half}对抗赛`; return t('valuevvalue_versus', { p0: half, p1: half });
}); });
/** 靶纸尺寸(cm),由 URL 参数或 API 返回的 targetType 字段填充 */ /** 靶纸尺寸(cm),由 URL 参数或 API 返回的 targetType 字段填充 */
@@ -59,17 +77,152 @@ const allReady = ref(false);
const timer = ref(null); const timer = ref(null);
const goBattle = ref(false); const goBattle = ref(false);
const showLimitModal = ref(false); const showLimitModal = ref(false);
const readySubmitting = ref(false);
const navigationPending = ref(false);
let pageMounted = false;
let pageVisible = false;
let foregroundGeneration = 0;
const MATCH_INFO_RETRY_DELAY_MS = 500;
/** 从结算页返回时为 true,跳过进场靶纸语音 */ /** 从结算页返回时为 true,跳过进场靶纸语音 */
const skipTargetAudio = ref(false); const skipTargetAudio = ref(false);
const wait = (delay) =>
new Promise((resolve) => {
setTimeout(resolve, delay);
});
const isCurrentForeground = (generation) =>
pageMounted &&
pageVisible &&
generation === foregroundGeneration &&
!navigationPending.value;
const redirectOnce = (url) =>
new Promise((resolve, reject) => {
if (navigationPending.value) {
resolve(false);
return;
}
navigationPending.value = true;
uni.redirectTo({
url,
success: resolve,
fail: (error) => {
navigationPending.value = false;
goBattle.value = false;
reject(error);
},
});
});
async function queryCurrentBattle(generation) {
try {
return await getBattleAPI();
} catch (error) {
await wait(MATCH_INFO_RETRY_DELAY_MS);
if (!isCurrentForeground(generation)) throw error;
return getBattleAPI();
}
}
async function returnToCurrentBattle(battle) {
if (!battle?.matchId || navigationPending.value) return false;
goBattle.value = true;
try {
const returned = await returnToBattle(battle, redirectOnce);
if (!returned) goBattle.value = false;
return returned;
} catch (error) {
goBattle.value = false;
throw error;
}
}
async function reconcileBattleRoom(generation) {
let battle = null;
try {
battle = await queryCurrentBattle(generation);
} catch (error) {
if (!isCurrentForeground(generation)) return;
console.log("resume room match info error", error);
uni.showToast({
title: t('could_not_check_match_status_please_retry'),
icon: "none",
});
return;
}
if (!isCurrentForeground(generation)) return;
if (battle?.matchId) {
try {
await returnToCurrentBattle(battle);
} catch (error) {
console.log("return to room battle error", error);
uni.showToast({
title: t('could_not_join_the_match_please_retry'),
icon: "none",
});
}
return;
}
let roomStarted = false;
try {
roomStarted = await refreshRoomData();
} catch (error) {
if (isCurrentForeground(generation)) {
console.log("refresh room data error", error);
}
return;
}
if (!isCurrentForeground(generation) || !roomStarted) return;
await wait(MATCH_INFO_RETRY_DELAY_MS);
if (!isCurrentForeground(generation)) return;
try {
battle = await queryCurrentBattle(generation);
} catch (error) {
if (!isCurrentForeground(generation)) return;
console.log("retry room match info error", error);
uni.showToast({
title: t('could_not_check_match_status_please_retry'),
icon: "none",
});
return;
}
if (!isCurrentForeground(generation)) return;
if (battle?.matchId) {
try {
await returnToCurrentBattle(battle);
} catch (error) {
console.log("return to room battle error", error);
uni.showToast({
title: t('could_not_join_the_match_please_retry'),
icon: "none",
});
}
return;
}
uni.showToast({
title: t('creating_match_please_wait'),
icon: "none",
});
}
/** /**
* 从服务端刷新当前房间数据,更新成员列表、准备状态等信息 * 从服务端刷新当前房间数据,更新成员列表、准备状态等信息
* 仅在 roomNumber 有效且房间未开始时执行 * 仅在 roomNumber 有效且房间未开始时执行
*/ */
async function refreshRoomData() { async function refreshRoomData() {
if (!roomNumber.value) return; if (!roomNumber.value) return false;
const result = await getRoomAPI(roomNumber.value); const result = await getRoomAPI(roomNumber.value);
if (result.started) return; if (result.started) return true;
room.value = result; room.value = result;
// 加入者通过 API 返回的 targetType 字段同步靶纸尺寸,并持久化到本地缓存 // 加入者通过 API 返回的 targetType 字段同步靶纸尺寸,并持久化到本地缓存
if (result.targetType) { if (result.targetType) {
@@ -94,13 +247,16 @@ async function refreshRoomData() {
return false; return false;
}); });
members.some((m) => { members.some((m) => {
if (m.userInfo.id === result.creator) { const player = normalizeRoomPlayer(m);
if (player.id === result.creator) {
owner.value = { owner.value = {
id: m.userInfo.id, id: player.id,
name: m.userInfo.name, name: player.name,
avatar: m.userInfo.avatar, avatar: player.avatar,
rankLvl: m.userInfo.rankLvl, rankLvl: player.rankLvl,
ready: !!m.userInfo.state, vip: player.vip,
sVip: player.sVip,
ready: !!player.state,
}; };
return true; return true;
} }
@@ -108,13 +264,16 @@ async function refreshRoomData() {
}); });
if (result.battleType === 1 && result.count === 2) { if (result.battleType === 1 && result.count === 2) {
result.members.forEach((m) => { result.members.forEach((m) => {
if (m.userInfo.id !== owner.value.id) { const player = normalizeRoomPlayer(m);
if (player.id !== owner.value.id) {
opponent.value = { opponent.value = {
id: m.userInfo.id, id: player.id,
name: m.userInfo.name, name: player.name,
avatar: m.userInfo.avatar, avatar: player.avatar,
rankLvl: m.userInfo.rankLvl, rankLvl: player.rankLvl,
ready: !!m.userInfo.state, vip: player.vip,
sVip: player.sVip,
ready: !!player.state,
}; };
} }
}); });
@@ -124,12 +283,12 @@ async function refreshRoomData() {
(m) => m.userInfo.id === result.creator (m) => m.userInfo.id === result.creator
); );
if (ownerIndex !== -1) { if (ownerIndex !== -1) {
players.value.push(result.members[ownerIndex].userInfo); players.value.push(normalizeRoomPlayer(result.members[ownerIndex]));
} else { } else {
players.value.push({}); players.value.push({});
} }
result.members.forEach((m, index) => { result.members.forEach((m, index) => {
if (ownerIndex !== index) players.value.push(m.userInfo); if (ownerIndex !== index) players.value.push(normalizeRoomPlayer(m));
}); });
} else { } else {
players.value = new Array(result.count).fill({}); players.value = new Array(result.count).fill({});
@@ -137,19 +296,25 @@ async function refreshRoomData() {
} }
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
// timer.value = setTimeout(refreshRoomData, 2000); // timer.value = setTimeout(refreshRoomData, 2000);
return false;
} }
const getReady = async () => { const getReady = debounce(async () => {
if (readySubmitting.value) return;
readySubmitting.value = true;
try { try {
await getReadyAPI(roomNumber.value); await getReadyAPI(roomNumber.value);
ready.value = true;
} catch (error) { } catch (error) {
if (isLimitError(error)) { if (isLimitError(error)) {
showLimitModal.value = true; showLimitModal.value = true;
return; return;
} }
console.log("room ready error", error); console.log("room ready error", error);
} finally {
readySubmitting.value = false;
} }
}; });
const closeLimitModal = () => { const closeLimitModal = () => {
showLimitModal.value = false; showLimitModal.value = false;
@@ -166,11 +331,12 @@ const refreshMembers = (members = []) => {
blueTeam.value = []; blueTeam.value = [];
redTeam.value = []; redTeam.value = [];
members.forEach((m, index) => { members.forEach((m, index) => {
players.value[index] = { ...m.userInfo, groupType: m.groupType }; const player = { ...normalizeRoomPlayer(m), groupType: m.groupType };
players.value[index] = player;
if (m.groupType === 1) { if (m.groupType === 1) {
blueTeam.value.push({ ...m.userInfo, groupType: 1 }); blueTeam.value.push({ ...player, groupType: 1 });
} else if (m.groupType === 2) { } else if (m.groupType === 2) {
redTeam.value.push({ ...m.userInfo, groupType: 2 }); redTeam.value.push({ ...player, groupType: 2 });
} }
}); });
for (let i = 0; i < room.value.count / 2; i++) { for (let i = 0; i < room.value.count / 2; i++) {
@@ -188,7 +354,7 @@ async function onReceiveMessage(message) {
} else if (msg.constructor === MESSAGETYPES.UserExitRoom) { } else if (msg.constructor === MESSAGETYPES.UserExitRoom) {
if (msg.userId === user.value.id) { if (msg.userId === user.value.id) {
uni.showToast({ uni.showToast({
title: "你被踢出房间", title: t('you_have_been_removed_from_the_room'),
icon: "none", icon: "none",
}); });
setTimeout(() => { setTimeout(() => {
@@ -203,7 +369,7 @@ async function onReceiveMessage(message) {
refreshRoomData(); refreshRoomData();
} else if (msg.constructor === MESSAGETYPES.RoomDestroy) { } else if (msg.constructor === MESSAGETYPES.RoomDestroy) {
uni.showToast({ uni.showToast({
title: "房间已解散", title: t('this_room_has_been_closed'),
icon: "none", icon: "none",
}); });
setTimeout(() => { setTimeout(() => {
@@ -212,17 +378,22 @@ async function onReceiveMessage(message) {
} }
}); });
} else if (message.type === MESSAGETYPESV2.AboutToStart) { } else if (message.type === MESSAGETYPESV2.AboutToStart) {
if (navigationPending.value) return;
const matchId = message.matchId || message.id;
if (!matchId) return;
goBattle.value = true; goBattle.value = true;
let url = "";
if (message.mode <= 3) { if (message.mode <= 3) {
uni.setStorageSync("blue-team", message.teams[1].players || []); uni.setStorageSync("blue-team", message.teams[1].players || []);
uni.setStorageSync("red-team", message.teams[2].players || []); uni.setStorageSync("red-team", message.teams[2].players || []);
uni.redirectTo({ url = "/pages/team-battle/index?battleId=" + matchId;
url: "/pages/team-battle/index?battleId=" + message.matchId,
});
} else { } else {
uni.redirectTo({ url = "/pages/melee-battle?battleId=" + matchId;
url: "/pages/melee-battle?battleId=" + message.matchId, }
}); try {
await redirectOnce(url);
} catch (error) {
console.log("redirect to room battle error", error);
} }
} }
} }
@@ -281,10 +452,10 @@ const canClick = computed(() => {
*/ */
const shareTitle = computed(() => { const shareTitle = computed(() => {
const { battleType, count } = room.value; const { battleType, count } = room.value;
if (battleType === 2) return '热血乱斗赛,敢来争锋?'; if (battleType === 2) return t('ready_for_a_thrilling_free_for_all');
if (battleType === 1 && count === 4) return '2v2对抗赛,是兄弟来助我一把!'; if (battleType === 1 && count === 4) return t('join_my_team_for_a_2v2_match');
if (battleType === 1 && count === 6) return '3v3对抗赛,来了马上发车!'; if (battleType === 1 && count === 6) return t('join_our_3v3_match_we_re_ready_to_go');
return '星球论箭,来一决高下敢否?'; return t('ready_to_see_who_is_the_better_archer');
}); });
/** /**
@@ -317,7 +488,15 @@ onShareAppMessage(() => {
*/ */
onShow(() => { onShow(() => {
goBattle.value = false; goBattle.value = false;
refreshRoomData(); navigationPending.value = false;
pageVisible = true;
const generation = ++foregroundGeneration;
if (pageMounted) void reconcileBattleRoom(generation);
});
onHide(() => {
pageVisible = false;
foregroundGeneration += 1;
}); });
/** /**
@@ -341,6 +520,10 @@ onLoad(async (options) => {
const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`); const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
if (stored) targetSize.value = stored; if (stored) targetSize.value = stored;
} }
if (pageMounted && pageVisible) {
const generation = ++foregroundGeneration;
void reconcileBattleRoom(generation);
}
}); });
/** /**
@@ -352,6 +535,8 @@ onMounted(() => {
keepScreenOn: true, keepScreenOn: true,
}); });
uni.$on("socket-inbox", onReceiveMessage); uni.$on("socket-inbox", onReceiveMessage);
pageMounted = true;
if (pageVisible) void reconcileBattleRoom(foregroundGeneration);
// 页面加载完成 1 秒后根据靶纸尺寸播报对应语音;从结算页返回时跳过 // 页面加载完成 1 秒后根据靶纸尺寸播报对应语音;从结算页返回时跳过
setTimeout(() => { setTimeout(() => {
if (!skipTargetAudio.value) { if (!skipTargetAudio.value) {
@@ -362,6 +547,9 @@ onMounted(() => {
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
pageMounted = false;
pageVisible = false;
foregroundGeneration += 1;
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: false, keepScreenOn: false,
}); });
@@ -378,8 +566,8 @@ onBeforeUnmount(() => {
<GuideTwo> <GuideTwo>
<view class="battle-guide"> <view class="battle-guide">
<view class="guide-tips"> <view class="guide-tips">
<text class="guide-tips__target">请使用{{ targetSizeLabel }}全环靶</text> <text class="guide-tips__target">{{ t('please_use_a') }}{{ targetSizeLabel }}{{ t('full_ring_target') }}</text>
<text class="guide-tips__warn">如果实际靶纸与选择靶纸不同,将导致射箭无效</text> <text class="guide-tips__warn">{{ t('shots_will_not_count_if_the_target_face_differs_from_your_select') }}</text>
</view> </view>
</view> </view>
</GuideTwo> </GuideTwo>
@@ -388,42 +576,58 @@ onBeforeUnmount(() => {
<view> <view>
<view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }"> <view 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>{{ t('host') }}</text>
<text>{{ owner.name }}</text> <view
v-if="isMember(owner)"
:class="['room-player-name', ...getMemberNicknameClass(owner)]"
>
<text class="member-nickname__text">{{ owner.name }}</text>
<text v-if="owner.sVip === true" class="member-nickname__shine">
{{ owner.name }}
</text>
</view>
<text v-else class="room-player-name">{{ owner.name }}</text>
</view> </view>
<view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }"> <view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
<image src="../static/versus.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
<view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }"> <view 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 }">{{ t('ready_329') }}</text>
已准备 <view
</text> v-if="isMember(opponent)"
<text>{{ opponent.name }}</text> :class="['room-player-name', ...getMemberNicknameClass(opponent)]"
>
<text class="member-nickname__text">{{ opponent.name }}</text>
<text v-if="opponent.sVip === true" class="member-nickname__shine">
{{ opponent.name }}
</text>
</view>
<text v-else class="room-player-name">{{ opponent.name }}</text>
<button v-if="owner.id === user.id" hover-class="none" class="remove-player" <button v-if="owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(opponent)"> @click="() => removePlayer(opponent)">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
<view class="no-player" v-else> <view class="no-player" v-else>
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
</view> </view>
</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 src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" mode="widthFix" />
<image v-if="room.count === 4" src="../static/title-2v2.png" mode="widthFix" /> <image v-if="room.count === 4" src="https://static.shelingxingqiu.com/shootmini/static/title-2v2.png" mode="widthFix" />
<image v-if="room.count === 6" src="../static/title-3v3.png" mode="widthFix" /> <image v-if="room.count === 6" src="https://static.shelingxingqiu.com/shootmini/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">{{ t('host') }}</text>
<!-- 仅房主可见踢人按钮,且不能踢自己 --> <!-- 仅房主可见踢人按钮,且不能踢自己 -->
<button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player" <button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }"> @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -432,30 +636,48 @@ onBeforeUnmount(() => {
<view> <view>
<view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item"> <view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item">
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)"> <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button> </button>
<text class="truncate">{{ item.name || "我要加入" }}</text> <view
<view v-if="item.id"> v-if="item.id && isMember(item)"
:class="['team-player-name', 'truncate', ...getMemberNicknameClass(item)]"
>
<text class="member-nickname__text">{{ item.name }}</text>
<text v-if="item.sVip === true" class="member-nickname__shine">
{{ item.name }}
</text>
</view>
<text v-else class="truncate">{{ item.name || t('join_330') }}</text>
<view v-if="item.id" class="team-player-avatar">
<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 }">{{ t('ready') }}</text>
</view> </view>
<button v-else hover-class="none" @click="chooseTeam(2)"> <button v-else hover-class="none" @click="chooseTeam(2)">
<image src="../static/add-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
<view> <view>
<view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item"> <view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item">
<view v-if="item.id"> <view v-if="item.id" class="team-player-avatar">
<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 }">{{ t('ready') }}</text>
</view> </view>
<button v-else hover-class="none" @click="chooseTeam(1)"> <button v-else hover-class="none" @click="chooseTeam(1)">
<image src="../static/add-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button> </button>
<text class="truncate">{{ item.name || "我要加入" }}</text> <view
v-if="item.id && isMember(item)"
:class="['team-player-name', 'truncate', ...getMemberNicknameClass(item)]"
>
<text class="member-nickname__text">{{ item.name }}</text>
<text v-if="item.sVip === true" class="member-nickname__shine">
{{ item.name }}
</text>
</view>
<text v-else class="truncate">{{ item.name || t('join_330') }}</text>
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)"> <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -465,24 +687,27 @@ onBeforeUnmount(() => {
<PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players" <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
:removePlayer="removePlayer" :isOwner="owner.id === user.id" /> :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
<view> <view>
<SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)"> <SButton
:disabled="!canClick || readySubmitting"
:onClick="() => { $clickSound(); return getReady(); }"
>
{{ {{
allReady.value allReady.value
? "即将进入对局..." ? t('joining_match')
: owner.id === user.id : owner.id === user.id
? "开始对局" ? t('start_match')
: "我准备好了" : t('i_m_ready')
}} }}
</SButton> </SButton>
<text class="tips">所有人准备好后由房主点击开始</text> <text class="tips">{{ t('once_everyone_is_ready_the_host_can_start_the_match') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
<ModalDialog <ModalDialog
:show="showLimitModal" :show="showLimitModal"
:content="'今日约战次数已经用完\n开通会员可增加次数'" :content="t('you_have_used_all_your_challenges_for_today_activate_membership_')"
cancelText="知道了" :cancelText="t('got_it_335')"
confirmText="去开通" :confirmText="t('activate')"
:onCancel="closeLimitModal" :onCancel="closeLimitModal"
:onConfirm="goVipPage" :onConfirm="goVipPage"
/> />
@@ -490,13 +715,11 @@ onBeforeUnmount(() => {
<ScreenHint :show="showKickConfirm"> <ScreenHint :show="showKickConfirm">
<view class="kick-confirm"> <view class="kick-confirm">
<!-- 弹窗标题,玩家名字高亮显示 --> <!-- 弹窗标题,玩家名字高亮显示 -->
<text class="kick-confirm__title"> <text class="kick-confirm__title">{{ t('remove') }}<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>{{ t('from_the_room') }}</text>
是否把「<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>」移出房间?
</text>
<!-- 按钮区:确认在左,取消在右 --> <!-- 按钮区:确认在左,取消在右 -->
<view class="kick-confirm__btns"> <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--confirm" @click="confirmKick">{{ t('confirm_134') }}</button>
<button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">取消</button> <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">{{ t('cancel_133') }}</button>
</view> </view>
</view> </view>
</ScreenHint> </ScreenHint>
@@ -584,11 +807,12 @@ onBeforeUnmount(() => {
position: relative; position: relative;
} }
.player>text:nth-child(3) { .room-player-name {
margin-top: 6rpx; margin-top: 6rpx;
} }
.player>text { .player>text,
.room-player-name {
max-width: 100px; max-width: 100px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@@ -596,6 +820,12 @@ onBeforeUnmount(() => {
text-align: center; text-align: center;
} }
.room-player-name .member-nickname__text,
.room-player-name .member-nickname__shine {
font-size: 14px;
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;
@@ -843,12 +1073,18 @@ onBeforeUnmount(() => {
} }
.choose-side-left-item>text, .choose-side-left-item>text,
.choose-side-right-item>text { .choose-side-right-item>text,
.team-player-name {
margin: 10px; margin: 10px;
max-width: 100px; max-width: 100px;
font-size: 14px; font-size: 14px;
} }
.team-player-name .member-nickname__text,
.team-player-name .member-nickname__shine {
font-size: 14px;
}
.choose-side-left-item>button:first-child, .choose-side-left-item>button:first-child,
.choose-side-right-item>button:last-child { .choose-side-right-item>button:last-child {
position: absolute; position: absolute;
@@ -885,15 +1121,13 @@ onBeforeUnmount(() => {
width: 18px; width: 18px;
} }
.choose-side-left-item>view, .team-player-avatar {
.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, .team-player-avatar>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;
@@ -0,0 +1,77 @@
<script setup>
import { t } from "@/locales";
defineProps({
cumulative: {
type: [Number, String],
default: 0,
},
available: {
type: [Number, String],
default: 0,
},
});
</script>
<template>
<view class="balance-panel">
<view class="balance-list">
<view class="balance-item">
<text class="balance-item__label">{{ t('total_coins') }}</text>
<text class="balance-item__value">{{ cumulative }}</text>
</view>
<view class="balance-list__line" />
<view class="balance-item">
<text class="balance-item__label">{{ t('redeemable_coins') }}</text>
<text class="balance-item__value">{{ available }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.balance-panel {
width: 100%;
padding: 8rpx 28rpx 0;
box-sizing: border-box;
}
.balance-list {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 60rpx;
margin-top: 0;
border-radius: 12rpx;
box-sizing: border-box;
background: linear-gradient(90deg, transparent, rgba(4, 4, 4, 0.7), transparent);
}
.balance-item {
width: auto;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.balance-item__label {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.balance-item__value {
color: #ffd947;
font-size: 30rpx;
line-height: 42rpx;
}
.balance-list__line {
width: 2rpx;
height: 16rpx;
background-color: rgba(255, 255, 255, 0.5);
margin: 0 22rpx;
}
</style>
@@ -0,0 +1,39 @@
<script setup>
import { t } from "@/locales";
defineProps({
text: {
type: String,
default: t('no_coin_earnings_yet'),
},
});
</script>
<template>
<view class="empty-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/empty-coin-record.png"
mode="aspectFit"
/>
<text>{{ text }}</text>
</view>
</template>
<style scoped>
.empty-state {
width: 100%;
padding-top: 280rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 26rpx;
line-height: 36rpx;
}
.empty-state > image {
width: 162rpx;
height: 190rpx;
margin-bottom: 26rpx;
}
</style>
+92
View File
@@ -0,0 +1,92 @@
<script setup>
import Header from "@/components/Header.vue";
const props = defineProps({
title: {
type: String,
default: "",
},
subtitle: {
type: String,
default: "",
},
switchable: { type: Boolean, default: false },
onBack: {
type: Function,
default: null,
},
});
const emit = defineEmits(["select-store"]);
</script>
<template>
<view class="coin-header">
<Header title="" :onBack="onBack">
<template #title>
<view class="coin-header__title-group">
<text
:class="[
'coin-header__title',
subtitle ? 'coin-header__title--with-subtitle' : '',
]"
>
{{ title }}
</text>
<view v-if="subtitle" class="coin-header__store" @click="switchable && emit('select-store')">
<text class="coin-header__subtitle">{{ subtitle }}</text>
<image v-if="switchable" class="coin-header__switch" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-switch.png" mode="aspectFit" />
</view>
</view>
</template>
</Header>
</view>
</template>
<style scoped lang="scss">
.coin-header__store { display: flex; align-items: center; max-width: 430rpx; }
.coin-header__store .coin-header__subtitle { overflow: hidden; text-overflow: ellipsis; }
.coin-header__switch { flex-shrink: 0; width: 28rpx; height: 28rpx; margin-left: 10rpx; }
.coin-header {
position: sticky;
top: 0;
z-index: 20;
width: 100%;
height: 50px;
display: flex;
align-items: center;
flex-shrink: 0;
}
.coin-header__title-group {
position: absolute;
top: 50%;
left: 50%;
width: 430rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transform: translate(-50%, -50%);
text-align: center;
}
.coin-header__title {
color: #e7ba80;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 500;
white-space: nowrap;
}
.coin-header__title--with-subtitle {
font-size: 28rpx;
}
.coin-header__subtitle {
color: #ffffff;
font-size: 20rpx;
line-height: 28rpx;
font-weight: 400;
white-space: nowrap;
}
</style>
@@ -0,0 +1,50 @@
<script setup>
defineProps({
menus: {
type: Array,
default: () => [],
},
});
const emit = defineEmits(["select"]);
</script>
<template>
<view class="quick-menu">
<view
v-for="item in menus"
:key="item.key"
class="quick-menu__item"
@click="emit('select', item)"
>
<image class="quick-menu__icon" :src="item.icon" mode="aspectFit" />
<text>{{ item.label }}</text>
</view>
</view>
</template>
<style scoped>
.quick-menu {
display: flex;
align-items: flex-start;
justify-content: space-between;
width: 100%;
padding: 26rpx 46rpx 30rpx;
box-sizing: border-box;
}
.quick-menu__item {
width: 142rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #fae6bc;
font-size: 24rpx;
line-height: 34rpx;
}
.quick-menu__icon {
width: 116rpx;
height: 116rpx;
}
</style>
@@ -0,0 +1,190 @@
<script setup>
import { t } from "@/locales";
defineProps({
records: {
type: Array,
default: () => [],
},
mode: {
type: String,
default: "earning",
},
});
</script>
<template>
<view
class="record-table"
:class="{ 'record-table--exchange': mode === 'exchange' }"
>
<view class="record-table__header">
<template v-if="mode === 'exchange'">
<text>{{ t('redeemed_item') }}</text>
<text>{{ t('redemption_type') }}</text>
<text>{{ t('time') }}</text>
<text>{{ t('coins_used') }}</text>
</template>
<template v-else>
<text>{{ t('time') }}</text>
<text>{{ t('type') }}</text>
<text>{{ t('coins_earned') }}</text>
</template>
</view>
<view
v-for="item in records"
:key="item.id"
class="record-table__row"
>
<template v-if="mode === 'exchange'">
<text class="record-table__exchange-content">{{ item.content }}</text>
<text class="record-table__exchange-type">{{ item.type }}</text>
<view class="record-table__time record-table__exchange-time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__amount record-table__exchange-amount">
{{ item.amount }}
</text>
</template>
<template v-else>
<view class="record-table__time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__type">{{ item.type }}</text>
<text class="record-table__amount">{{ item.amount }}</text>
</template>
</view>
</view>
</template>
<style scoped>
.record-table {
width: 670rpx;
margin: 20rpx auto 0;
box-sizing: border-box;
border: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header,
.record-table__row {
display: flex;
align-items: center;
}
.record-table__header {
height: 66rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__header > text {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header > text:nth-child(1),
.record-table__time {
width: 182rpx;
flex: 0 0 182rpx;
}
.record-table__header > text:nth-child(2),
.record-table__type {
width: 304rpx;
flex: 0 0 304rpx;
}
.record-table__header > text:nth-child(3),
.record-table__amount {
width: 180rpx;
flex: 0 0 180rpx;
border-right: none;
}
.record-table__row {
height: 86rpx;
border-top: 2rpx solid rgba(255, 255, 255, 0.35);
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__row > view,
.record-table__row > text {
height: 100%;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__time {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.record-table__time > text:last-child {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__type {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
}
.record-table__row > .record-table__amount {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
text-align: center;
font-size: 24rpx;
border-right: none;
}
.record-table__exchange-content,
.record-table__exchange-type {
display: flex;
align-items: center;
justify-content: center;
padding: 0 8rpx;
color: #ffffff;
text-align: center;
}
.record-table--exchange .record-table__header > text:nth-child(1),
.record-table__exchange-content {
width: 286rpx;
flex: 0 0 286rpx;
}
.record-table--exchange .record-table__header > text:nth-child(2),
.record-table__exchange-type {
width: 110rpx;
flex: 0 0 110rpx;
}
.record-table--exchange .record-table__header > text:nth-child(3),
.record-table__exchange-time {
width: 160rpx;
flex: 0 0 160rpx;
}
.record-table--exchange .record-table__header > text:nth-child(4),
.record-table__exchange-amount {
width: 110rpx;
flex: 0 0 110rpx;
border-right: none;
}
</style>
@@ -0,0 +1,56 @@
<script setup>
import { t } from "@/locales";
const emit = defineEmits(["authorize"]);
</script>
<template>
<view class="location-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/location-permission.png"
mode="aspectFit"
/>
<text>{{ t('allow_location_access_to_find_nearby_stores') }}</text>
<button hover-class="none" @click="emit('authorize')">{{ t('allow_access') }}</button>
</view>
</template>
<style scoped>
.location-state {
width: 100%;
padding-top: 190rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 600;
}
.location-state > image {
width: 168rpx;
height: 190rpx;
margin-bottom: 52rpx;
}
.location-state > button {
width: 360rpx;
height: 72rpx;
margin-top: 44rpx;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
border-radius: 36rpx;
background-color: #ffd947;
color: #22222e;
font-size: 26rpx;
line-height: 72rpx;
font-weight: 500;
}
.location-state > button::after {
border: none;
}
</style>
@@ -0,0 +1,58 @@
<script setup>
import { t } from "@/locales";
defineProps({
variant: {
type: String,
default: "gold",
},
});
</script>
<template>
<view class="exchange-notice" :class="`exchange-notice--${variant}`">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/icon-notice.png"
mode="aspectFit"
/>
<text>{{ t('online_redemption_is_not_available_please_redeem_at_a_store') }}</text>
</view>
</template>
<style scoped>
.exchange-notice {
display: flex;
align-items: center;
justify-content: center;
width: 504rpx;
height: 40rpx;
margin: 0 auto;
padding: 0 16rpx;
box-sizing: border-box;
color: rgba(255, 255, 255, 0.65);
font-size: 20rpx;
line-height: 28rpx;
border-radius: 24rpx;
}
.exchange-notice--gold {
border: 2rpx solid rgba(255, 217, 71, 0.28);
background-color: rgba(255, 217, 71, 0.05);
}
.exchange-notice--red {
width: 492rpx;
height: 44rpx;
margin: 0 0 0 40rpx;
border: none;
background-color: rgba(255, 96, 96, 0.3);
color: #ffffff;
}
.exchange-notice > image {
width: 24rpx;
height: 24rpx;
margin-right: 8rpx;
flex-shrink: 0;
}
</style>
@@ -0,0 +1,90 @@
<script setup>
import { computed, ref } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({
images: {
type: Array,
default: () => [],
},
});
const current = ref(0);
const slideImages = computed(() => {
const images = props.images.filter(
(image) => typeof image === "string" && image.trim()
);
return images.length ? images : [DEFAULT_PRODUCT_IMAGE];
});
const onChange = (event) => {
current.value = event.detail.current;
};
</script>
<template>
<view class="hero-swiper">
<swiper class="hero-swiper__body" :duration="260" @change="onChange">
<swiper-item v-for="(image, index) in slideImages" :key="index">
<view class="hero-swiper__item">
<image
class="hero-swiper__background"
src="https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png"
mode="scaleToFill"
/>
<image class="hero-swiper__product" :src="image" mode="aspectFit" />
</view>
</swiper-item>
</swiper>
<view class="hero-swiper__dots">
<view
v-for="(_, index) in slideImages"
:key="index"
class="hero-swiper__dot"
:class="{ 'hero-swiper__dot--active': current === index }"
/>
</view>
</view>
</template>
<style scoped>
.hero-swiper,
.hero-swiper__body,
.hero-swiper__item {
position: relative;
width: 750rpx;
height: 750rpx;
}
.hero-swiper__background,
.hero-swiper__product {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.hero-swiper__dots {
position: absolute;
left: 0;
bottom: 20rpx;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.hero-swiper__dot {
width: 12rpx;
height: 12rpx;
margin: 0 6rpx;
border-radius: 50%;
background-color: rgba(34, 34, 46, 0.55);
}
.hero-swiper__dot--active {
background-color: #ffd947;
}
</style>
@@ -0,0 +1,102 @@
<script setup>
import { t } from "@/locales";
import { computed } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({
product: {
type: Object,
required: true,
},
});
const productImage = computed(() => {
const image = props.product?.image;
return typeof image === "string" && image.trim()
? image
: DEFAULT_PRODUCT_IMAGE;
});
</script>
<template>
<view class="product-card">
<view class="product-card__image-wrap">
<image class="product-card__image" :src="productImage" mode="aspectFit" />
</view>
<text class="product-card__name">{{ product.name }}</text>
<view class="product-card__footer">
<text>{{ product.cost }}{{ t('coins') }}</text>
<text class="product-card__divider">|</text>
<text>{{ t('remaining') }}{{ product.stock }}{{ t('empty_352') }}</text>
</view>
</view>
</template>
<style scoped>
.product-card {
width: 336rpx;
height: 418rpx;
padding: 10rpx 10rpx 14rpx;
box-sizing: border-box;
border: 2rpx solid rgba(255, 217, 71, 0.1);
border-radius: 12rpx;
background-color: rgba(84, 67, 29, 0.2);
overflow: hidden;
}
.product-card__image-wrap {
position: relative;
width: 312rpx;
height: 312rpx;
overflow: hidden;
border-radius: 12rpx;
background-image: url("https://static.shelingxingqiu.com/shootmini/static/coin/product-card-bg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.product-card__image {
display: block;
width: 100%;
height: 100%;
}
.product-card__name {
display: block;
margin-top: 12rpx;
color: #fff0c9;
font-size: 26rpx;
line-height: 36rpx;
font-weight: 600;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.product-card__footer {
display: flex;
align-items: center;
justify-content: center;
margin-top: 4rpx;
color: rgba(255, 255, 255, 0.85);
font-size: 22rpx;
line-height: 32rpx;
}
.product-card__footer > text:first-child {
color: #ffffff;
}
.product-card__footer > text:last-child {
color: rgba(255, 255, 255, 0.78);
}
.product-card__divider {
margin: 0 10rpx;
color: rgba(255, 255, 255, 0.45);
}
</style>
@@ -0,0 +1,82 @@
<script setup>
import { t } from "@/locales";
defineProps({
benefit: {
type: Object,
required: true,
},
});
</script>
<template>
<!-- 与会员卡共用剩余次数,接口缺失时显示占位。 -->
<view class="benefit-card">
<text class="benefit-card__badge">{{ benefit.remaining }}{{ t('times') }}</text>
<image class="benefit-card__icon" :src="benefit.icon" mode="aspectFit" />
<view class="benefit-card__content">
<text class="benefit-card__title">{{ benefit.title }}</text>
<text class="benefit-card__description">{{ benefit.description }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.benefit-card {
position: relative;
display: flex;
align-items: center;
min-height: 176rpx;
margin-bottom: 24rpx;
padding: 28rpx 28rpx 28rpx 56rpx;
box-sizing: border-box;
border-radius: 20rpx;
background: linear-gradient(180deg, #080808, rgba(152, 124, 84, 0.4));
}
// .benefit-card:last-child {
// margin-bottom: 0;
// }
.benefit-card__badge {
position: absolute;
top: 0;
left: 0;
width: 64rpx;
height: 32rpx;
border-radius: 16rpx 0 16rpx 0;
background: linear-gradient(135deg, #ffd19a, #a17636);
color: #ffffff;
font-size: 22rpx;
line-height: 30rpx;
text-align: center;
}
.benefit-card__icon {
flex-shrink: 0;
width: 120rpx;
height: 120rpx;
margin-right: 38rpx;
}
.benefit-card__content {
flex: 1;
min-width: 0;
}
.benefit-card__title {
display: block;
color: #fae6bc;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 500;
}
.benefit-card__description {
display: block;
margin-top: 10rpx;
color: #ffffff;
font-size: 22rpx;
line-height: 30rpx;
}
</style>
+71
View File
@@ -0,0 +1,71 @@
<script setup>
import { t } from "@/locales";
const props = defineProps({
store: {
type: Object,
required: true,
},
});
const emit = defineEmits(["select"]);
const selectStore = () => {
emit("select", props.store);
};
</script>
<template>
<view class="store-card" hover-class="none" @click="selectStore">
<image class="store-card__photo" :src="store.image" mode="aspectFill" />
<text class="store-card__name">{{ store.name }}</text>
<view class="store-card__info">
<view class="store-card__row">
<text>{{ t('address') }}{{ store.address }}</text>
</view>
<view class="store-card__row">
<text>{{ t('phone_355') }}{{ store.phone }}</text>
</view>
<view class="store-card__row">
<text>{{ t('hours') }}{{ store.hours }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.store-card {
width: 650rpx;
margin: 22rpx auto 0;
box-sizing: border-box;
}
.store-card__photo {
width: 650rpx;
height: 324rpx;
border-radius: 20rpx;
}
.store-card__name {
display: block;
margin-top: 24rpx;
margin-left: 10rpx;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 500;
}
.store-card__info {
width: 584rpx;
margin-top: 12rpx;
margin-left: 10rpx;
}
.store-card__row {
margin-top: 0;
color: #ffffff;
font-size: 24rpx;
line-height: 40rpx;
}
</style>
@@ -0,0 +1,61 @@
<script setup>
defineProps({
tabs: {
type: Array,
default: () => [],
},
active: {
type: String,
default: "vip",
},
});
const emit = defineEmits(["select"]);
</script>
<template>
<!-- 业务 Tab 只切换内容,不接管系统导航。 -->
<view class="section-tabs">
<view
v-for="tab in tabs"
:key="tab.key"
class="section-tabs__item"
:class="{ 'section-tabs__item--active': active === tab.key }"
hover-class="section-tabs__item--pressed"
@click="emit('select', tab.key)"
>
<text>{{ tab.label }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.section-tabs {
display: flex;
justify-content: space-between;
padding: 20rpx 40rpx 0;
box-sizing: border-box;
}
.section-tabs__item {
display: flex;
align-items: center;
justify-content: center;
width: 326rpx;
height: 68rpx;
border-radius: 34rpx;
color: #999999;
background: #000000;
font-size: 28rpx;
line-height: 40rpx;
}
.section-tabs__item--active {
color: #ffffff;
background: linear-gradient(135deg, #ffd19a, #a17636);
}
.section-tabs__item--pressed {
opacity: 0.8;
}
</style>
+137
View File
@@ -0,0 +1,137 @@
<script setup>
import { t } from "@/locales";
defineProps({
membership: {
type: Object,
required: true,
},
benefits: {
type: Array,
default: () => [],
},
});
const emit = defineEmits(["introduction"]);
</script>
<template>
<view class="vip-card" :class="{ 'vip-card--active': membership.active }">
<!-- 切图仅含静态字效与徽章,次数、有效期和状态独立渲染。 -->
<image class="vip-card__background" :src="membership.cardImage" mode="aspectFit" />
<view class="vip-card__benefits">
<view v-for="benefit in benefits" :key="benefit.key" class="vip-card__benefit">
<text class="vip-card__label">{{ benefit.title }}</text>
<view class="vip-card__count">
<text class="vip-card__number">{{ membership.remaining[benefit.key] }}</text>
<text class="vip-card__unit">{{ t('times') }}</text>
</view>
</view>
</view>
<text class="vip-card__status">
{{ membership.active ? t('valid_until_value', { p0: membership.expiresAt }) : t('not_activated') }}
</text>
<view class="vip-card__introduction" @click="emit('introduction')">
<text>{{ t('learn_more_about_experience_center_vip') }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.vip-card {
position: relative;
width: 750rpx;
height: 288rpx;
color: #333333;
}
.vip-card__background {
position: absolute;
top: 0;
left: 0;
width: 750rpx;
height: 288rpx;
}
.vip-card__benefits {
position: absolute;
top: 124rpx;
left: 70rpx;
display: flex;
justify-content: space-between;
width: 400rpx;
}
.vip-card__benefit {
width: 120rpx;
text-align: center;
}
.vip-card__label {
display: block;
font-size: 20rpx;
line-height: 28rpx;
white-space: nowrap;
opacity: 0.8;
}
.vip-card__count {
display: flex;
align-items: baseline;
justify-content: center;
position: relative;
height: 44rpx;
}
.vip-card__count::before {
content: "";
position: absolute;
left: 16rpx;
bottom: 4rpx;
width: 88rpx;
height: 12rpx;
border-radius: 8rpx;
background: #ffd947;
}
.vip-card__number {
position: relative;
font-size: 40rpx;
line-height: 48rpx;
font-weight: 500;
}
.vip-card__unit {
position: relative;
margin-left: 2rpx;
font-size: 22rpx;
line-height: 30rpx;
opacity: 0.8;
}
.vip-card__status {
position: absolute;
top: 212rpx;
left: 496rpx;
width: 232rpx;
color: #888888;
font-size: 22rpx;
line-height: 30rpx;
text-align: center;
white-space: nowrap;
}
.vip-card--active .vip-card__status {
color: #b47d42;
}
.vip-card__introduction {
position: absolute;
left: 74rpx;
bottom: 16rpx;
padding: 6rpx 0;
font-size: 22rpx;
line-height: 30rpx;
opacity: 0.8;
}
</style>
@@ -0,0 +1,64 @@
<script setup>
import { t } from "@/locales";
const props = defineProps({
active: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["open"]);
const handleOpen = () => {
if (!props.active) emit("open");
};
</script>
<template>
<!-- 当前门店已开通时仅展示状态,未开通时提供线下开通提醒。 -->
<view class="vip-footer">
<text class="vip-footer__price">{{ t('special_offer_cny_9_9_90_days') }}</text>
<view class="vip-footer__status" @click="handleOpen">
<image class="vip-footer__badge" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-badge.png" mode="aspectFit" />
<text>{{ active ? t('your_vip_is_active') : t('to_activate_please_contact_staff_at_a_store') }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.vip-footer {
margin-top: 84rpx;
padding: 0 24rpx 22rpx;
box-sizing: border-box;
}
.vip-footer__price {
display: block;
color: #fae6bc;
font-size: 40rpx;
line-height: 56rpx;
font-weight: 500;
text-align: center;
}
.vip-footer__status {
display: flex;
align-items: center;
justify-content: center;
min-height: 90rpx;
margin-top: 12rpx;
padding: 8rpx 28rpx;
box-sizing: border-box;
border-radius: 46rpx;
color: #333333;
background: #ffd947;
font-size: 26rpx;
line-height: 36rpx;
}
.vip-footer__badge {
flex-shrink: 0;
width: 80rpx;
height: 74rpx;
margin-right: 4rpx;
}
</style>
+51
View File
@@ -0,0 +1,51 @@
import { t } from "@/locales";
// 金币快捷入口保持原有路由与图标配置。
export const quickMenus = [
{
key: "rules",
label: t('coin_rules'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-rules.png",
},
{
key: "earningRecords",
label: t('earnings'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-earning-records.png",
},
{
key: "exchangeRecords",
label: t('redemptions'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-exchange-records.png",
},
{
key: "nearbyStores",
label: t('nearby_stores'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
},
];
// 体验中心业务 Tab。
export const storeSections = [
{ key: "vip", label: t('experience_center_vip') },
{ key: "coin", label: t('my_coins') },
];
export const storeVipBenefits = [
{
key: "trial",
title: t('free_trial'),
description: t('enjoy_one_free_30_minute_smart_archery_session_join_the_official'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-trial.png",
},
{
key: "discount",
title: t('special_offer'),
description: t('buy_one_30_minute_experience_session_at_the_special_price_of_cny'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-discount.png",
},
{
key: "drink",
title: t('complimentary_drink'),
description: t('receive_one_complimentary_designated_drink_each_time_you_visit'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-drink.png",
},
];
+132
View File
@@ -0,0 +1,132 @@
<script setup>
import { t } from "@/locales";
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const earningRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !earningRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
const amount = Number(item.amount) || 0;
return {
id: item.id,
date,
time,
type: item.remark || item.typeDesc || "-",
amount: amount > 0 ? `+${amount}` : String(amount),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = earningRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 1,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
earningRecords.value = reset
? mappedList
: earningRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
earningRecords.value = [];
page.value = 0;
}
console.error("加载金币获取明细失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader :title="t('coin_earnings')" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" />
<CoinRecordList v-else :records="earningRecords" />
<view
v-if="loading || (noMore && earningRecords.length)"
class="records-page__status"
>
<text>{{ loading ? t('loading') : t('no_more_results') }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+132
View File
@@ -0,0 +1,132 @@
<script setup>
import { t } from "@/locales";
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const exchangeRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !exchangeRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
return {
id: item.id,
content: item.remark || "-",
type: item.typeDesc || "-",
date,
time,
amount: String(Number(item.amount) || 0),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = exchangeRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 2,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
exchangeRecords.value = reset
? mappedList
: exchangeRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
exchangeRecords.value = [];
page.value = 0;
}
console.error("加载金币兑换记录失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader :title="t('coin_redemptions')" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" :text="t('no_redemptions_yet')" />
<CoinRecordList v-else mode="exchange" :records="exchangeRecords" />
<view
v-if="loading || (noMore && exchangeRecords.length)"
class="records-page__status"
>
<text>{{ loading ? t('loading') : t('no_more_results') }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>

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