441 Commits

Author SHA1 Message Date
3e80edf0dc 注销用户两步+删除用户线路 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
c5fb7b93a3 移动端删除账号 2022-07-15 14:33:59 +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
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
bd9696cd81 android端发布前微调 2022-07-06 17:48:55 +08:00
4d4f8feb8b c2课程同步 2022-06-30 14:39:13 +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
573b96d86c 拉力曲线性能优化&解决划船时间误差问题 2022-06-21 17:49:43 +08:00
6e091bd99c anroid ble jar包调整 2022-06-15 16:58:22 +08:00
f25d0b7b8c 蓝牙断开重连相关逻辑优化 2022-06-13 18:59:02 +08:00
46b6c7fa01 设备连接稳定性 2022-06-08 16:22:07 +08:00
c333086e30 重置问题 2022-06-08 13:55:35 +08:00
bfc56dded5 0606修改 2022-06-06 18:54:28 +08:00
6effadc1e9 增加长时间保存,解决取影子以后后续请求失效问题(使用unity的请求库) 2022-06-06 09:09:20 +08:00
c6d0f7ac13 合并后错误修改 2022-06-02 18:05:41 +08:00
e513eeac5c Merge branch 'dev_cyp' into dev_ar_cyp
# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs
2022-06-02 11:30:37 +08:00
475250e795 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-06-01 16:10:35 +08:00
d9848e4e9d 设备连接界面微调&划船机本地记录过滤 2022-06-01 10:24:23 +08:00
e7af21b126 pc设备连接界面微调 2022-05-31 19:43:50 +08:00
bfa9f5f998 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-05-31 18:42:13 +08:00
a1010091f8 设备连接界面文案与交互调整 2022-05-31 18:25:53 +08:00
ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
9f0f42981e 视频路书编辑器完善 2022-05-30 15:17:55 +08:00
17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
d876c20def 对战房间下载逻辑完善 2022-05-13 11:10:37 +08:00
11b131b24a 对战AR 2022-05-13 09:28:58 +08:00
509c309252 对战初步完成 2022-05-10 19:24:07 +08:00
edc629ed75 5.9修改暂存 2022-05-10 18:43:41 +08:00
b0c0890ca3 对战loading页相关逻辑 2022-04-29 19:03:18 +08:00
cfa1cc4f7b 4.29计算逻辑修改 2022-04-29 18:39:41 +08:00
3c4ecf3e83 曲线调整 2022-04-29 08:58:42 +08:00
06582201fa 加入房间,踢人,准备等tcp命令 2022-04-28 18:01:51 +08:00
f47f5c9ff6 0426动画等修改 2022-04-27 14:48:06 +08:00
de8dd933e8 创建房间 2022-04-24 18:53:29 +08:00
597929cd32 对战界面&3d模型 2022-04-22 18:24:56 +08:00
affc775226 调整后提交 2022-04-20 18:22:54 +08:00
4665feab7c 新版首页 2022-04-20 18:19:42 +08:00
4a3542010f tcp发送增加ar视频播放帧数&首页布局还原到初版 2022-04-20 17:32:27 +08:00
3532978762 AR骑行loading页面&附近的人距离延迟问题 2022-04-19 18:47:26 +08:00
8150b99411 调整多人开始骑行状态&动画控制&AR loading页面 2022-04-18 19:13:16 +08:00
995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
2f9dd43e07 1s 2022-04-15 17:13:34 +08:00
41240b1398 动画修改一波 2022-04-15 11:14:22 +08:00