674 Commits

Author SHA1 Message Date
89b5275efd 对战与AR骑行相关逻辑修改 2022-08-24 18:43:43 +08:00
3bcb3ee83e AR骑行和对战 2022-08-17 18:28:28 +08:00
96c48d3cb3 对战结束显示自己是否DNF 2022-08-08 17:34:47 +08:00
889ec8244e AR骑行16:10屏幕问题,首页3d小人动态显示逻辑 2022-08-08 17:10:34 +08:00
fc7ef017d0 AR加对战整体处理 2022-08-08 13:33:32 +08:00
9b1bb3d9ba AR骑行beta 2022-08-05 15:10:09 +08:00
4d5bc8f080 Merge branch 'dev_release' into feature_AR
# Conflicts:
#	Assets/Resources/UI/language.json
2022-07-22 17:35:35 +08:00
0bd5f325de 修复我的上传bug 2022-07-22 13:29:01 +08:00
0b5904f7cc 附近的人与线路查询优化&登出取消设备资源释放 2022-07-21 18:09:16 +08:00
af5a4f2aa8 连接功率计无法开始问题&附近的人优化 2022-07-21 18:09:16 +08:00
ccdf2c63f2 解决我的收藏选择集合后其他分类也显示收藏列表 2022-07-21 18:09:16 +08:00
8e9d49c921 附近的人与线路查询优化&登出取消设备资源释放 2022-07-21 17:45:26 +08:00
200566163a 连接功率计无法开始问题&附近的人优化 2022-07-21 14:51:26 +08:00
9d3de1e97c 解决我的收藏选择集合后其他分类也显示收藏列表 2022-07-20 17:02:10 +08:00
adc9613592 新首页 2022-07-20 16:42:15 +08:00
ad8c4c8674 修复登出设备连接释放资源bug 2022-07-20 15:04:52 +08:00
d3f1af9b8b Merge remote-tracking branch 'origin/dev_release' into dev_release 2022-07-20 13:47:16 +08:00
32c644fde8 用户下线出现提示bug 2022-07-20 13:47:10 +08:00
9b656e9852 解决第二次断开设备失败问题 2022-07-20 13:27:47 +08:00
2274a13619 设备断开优化 2022-07-20 10:44:47 +08:00
63987511e7 解决设备连接问题 2022-07-19 18:46:01 +08:00
629e27f5cd 分享闪退 2022-07-19 17:55:06 +08:00
7f56624ec7 设备扫描优化&我的收藏返回记忆位置 2022-07-19 15:47:43 +08:00
c209811f9f 删除账号优化 2022-07-18 18:37:42 +08:00
71ae54aabe ios连接错误回调信息微调 2022-07-18 17:14:30 +08:00
99e916905d 注销用户两步+删除用户线路 2022-07-18 17:14:29 +08:00
5b39dd985b 结果页面移除划船记录&设备断开扔保留之前的厂商序列号 2022-07-18 14:31:14 +08:00
2697103479 Merge branch 'dev_lishuo' into dev_release 2022-07-18 11:06:52 +08:00
68071a95f6 消息点问题 2022-07-18 10:10:40 +08:00
867b61fc00 被登出时主动释放资源 2022-07-15 14:39:24 +08:00
ae753e51cb Merge remote-tracking branch 'origin/dev_combine' into dev_release
# Conflicts:
#	Assets/Scripts/App.cs
2022-07-15 14:28:37 +08:00
46b4c01730 移动端划船机移除 2022-07-15 14:28:37 +08:00
3207d7b191 删除用户pc 2022-07-15 14:27:05 +08:00
bf3b0d2642 Merge remote-tracking branch 'origin/dev_combine' into dev_release
# Conflicts:
#	Assets/Scenes/Test.unity
#	Assets/SoftMaskForUGUI-1.0.2/Samples~/Demo/Mobile.meta
2022-07-15 13:35:28 +08:00
eeb9a42c83 删除用户暂存 2022-07-15 13:34:43 +08:00
4d0a383a88 移除划船机相关内容 2022-07-15 13:07:23 +08:00
576a770c7b 登录失效问题 2022-07-14 18:10:58 +08:00
f92818885e 关闭测试功率 2022-07-14 14:39:06 +08:00
a588716b30 解决io设备连接&android卡顿问题 2022-07-14 13:37:33 +08:00
342740b740 Merge branch 'dev_cyp1' into dev_combine
# Conflicts:
#	.gitignore
#	Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs
#	Assets/Scripts/Scenes/MainController.cs
2022-07-11 14:52:54 +08:00
fccc830f71 发布前微调 2022-07-08 18:55:27 +08:00
bd9696cd81 android端发布前微调 2022-07-06 17:48:55 +08:00
4d4f8feb8b c2课程同步 2022-06-30 14:39:13 +08:00
46f7c2d4b1 解决阻力设置点击无效的bug 2022-06-28 11:03:10 +08:00
1d015706db Merge branch 'dev_cyp1' into dev_ar_cyp
# Conflicts:
#	Assets/Plugins/Android/unityandroidbluetoothlelib.jar
#	Assets/Resources/UI/language.json
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs
#	Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs
#	Assets/Scripts/Scenes/MainController.cs
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerGraphChartFeed.cs
#	Assets/Scripts/UIManager.cs
2022-06-27 10:36:20 +08:00
06b9051b3c c2同步课程命令 2022-06-24 18:03:36 +08:00
701ec3069b C2课程同步问题 2022-06-23 18:55:08 +08:00
84b3e1e7a4 移除测试代码 2022-06-21 18:55:13 +08:00
573b96d86c 拉力曲线性能优化&解决划船时间误差问题 2022-06-21 17:49:43 +08:00
6c9b3f825a 解决没有设备号的问题 2022-06-15 18:07:06 +08:00