270 Commits

Author SHA1 Message Date
9e2240fd9b 视频编辑工具合并后字体调整 2022-06-27 13:37: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
c333086e30 重置问题 2022-06-08 13:55:35 +08:00
ff878d5d50 修改断线重连自动开始问题 2022-06-07 11:32:23 +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
9f0f42981e 视频路书编辑器完善 2022-05-30 15:17:55 +08:00
17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
b0c0890ca3 对战loading页相关逻辑 2022-04-29 19:03:18 +08:00
06582201fa 加入房间,踢人,准备等tcp命令 2022-04-28 18:01:51 +08:00
f47f5c9ff6 0426动画等修改 2022-04-27 14:48:06 +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
f383c54507 4.14修改,设备连接去掉ftms骑行台 2022-04-14 19:18:44 +08:00
874dec5ec6 新版本动画:上下滑动切换有箭头 2022-04-12 19:08:58 +08:00
7780dc5ee5 3d翻转 2022-04-11 11:40:02 +08:00
d938a0c8be 多人动画位移计算和动画帧数偏差公式调整 2022-04-06 19:27:45 +08:00
efdc95ed3d 人物动画调整&UI界面细节调整 2022-04-02 18:26:18 +08:00
cd1d67d9e8 动画调整&新版设计稿调整 2022-04-01 18:41:31 +08:00
30e09c9c7a 修改细节,修复bug 2022-04-01 18:07:16 +08:00
ec9337b446 观察者模式调整 2022-03-31 18:40:19 +08:00
69d73c26cd 新版设计稿 2022-03-30 18:41:06 +08:00
6ec4c0101b 透明小地图&列表点击切换&海拔图头像位移 2022-03-29 18:41:32 +08:00
ab653b994f 适配c2;新版设计稿;对战切换手势;主逻辑接通;使用think的阻力值,修改影子模式船位置 2022-03-25 18:02:34 +08:00
bf48989a9c ui调整 2022-03-25 09:57:30 +08:00
57940568c9 初版ui提交 2022-03-24 09:36:59 +08:00
b3b882c51e 碰撞检测,射线检测,动态位移 2022-03-11 18:11:56 +08:00
16e416332d AR多人骑行研究 2022-03-10 18:32:53 +08:00
448b6d7798 微调 2022-03-04 18:29:37 +08:00
e85d5f8613 AR初版demo 2022-03-04 16:12:15 +08:00
c3514df331 请求公开线路;增加移动版 2022-03-03 15:06:13 +08:00
01df299251 邮件功能完成 2022-03-02 17:54:06 +08:00
768f8261da 英文版本,pc分享功能,移动端fb分享,修改细节 2022-02-22 18:11:26 +08:00
2c7d02ec9a 修改细节,开始搞pc 2022-02-18 18:12:31 +08:00
1148e29379 活动暂存 2022-02-16 18:22:27 +08:00
e231d3540e 活动暂存 2022-02-11 17:26:36 +08:00
c12df53c18 ios快捷登录 2022-01-27 16:54:20 +08:00
e82592722f 首页弹消息bug;隐藏google 2022-01-13 16:53:01 +08:00
7a7c1ee55c google处理 2022-01-13 13:16:45 +08:00
02111a57b1 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Resources/UI/language.json
2022-01-12 16:56:50 +08:00
91fa3cc82d pc版首页;安卓google登录;解决fb登录ios问题 2022-01-12 16:55:57 +08:00
f7450f0067 骑行视角增加至5级&保存逻辑增加100m不可以保存 2022-01-12 16:41:52 +08:00
5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00