80 Commits

Author SHA1 Message Date
fe65b83c89 ios选择图片功能,结果列表扩大 2021-09-07 15:26:43 +08:00
510cd11049 意见反馈增加图片 2021-09-07 11:14:42 +08:00
c280408192 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/Mobile/WeChatController.cs
2021-09-02 10:10:06 +08:00
3ec6fd0569 比赛;编辑页面 2021-08-31 17:11:43 +08:00
99540eb1fd ios蓝牙适配 2021-08-30 18:28:26 +08:00
85130ce6c3 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2021-08-27 10:13:17 +08:00
d8927ceca5 蓝牙停止扫描和一些bug修复 2021-08-26 19:33:43 +08:00
f21b83697b 暂存 2021-08-26 15:49:06 +08:00
eb87fe07aa 设备连接页面调整 2021-08-25 16:07:26 +08:00
92c8f246b8 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-08-25 11:22:23 +08:00
bb08b6b762 tcp库更新&附近人下拉调整 2021-08-25 11:20:59 +08:00
f155b2b627 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
2021-08-25 10:23:51 +08:00
3de8b1d555 移动端蓝牙设备正常骑行 2021-08-24 18:34:41 +08:00
31e8e3bebb 移动端微信接入 2021-08-24 09:28:46 +08:00
d6c3ea2007 插件文件上传 2021-08-20 19:01:24 +08:00
6fab61f97d 移动端蓝牙框架初步导入 2021-08-20 18:45:16 +08:00
ca91f45ef3 切换移动端暂存 2021-08-19 16:28:57 +08:00
35b5ab59d3 切换移动端暂存 2021-08-13 17:19:02 +08:00
2f84f70a5f 接入蓝牙基本结构 2021-06-04 13:22:59 +08:00
07feba912c 浏览器嵌入,国旗文件 2021-04-09 09:19:04 +08:00
ae9cefc645 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Cyp/Prefab.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Core/Plugins/Mapbox.meta
#	Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
#	Assets/Plugins/Circle/ImageWithRoundedCorners.cs
#	Assets/Resources/Images/Devices.meta
#	Assets/Resources/UI/Prefab/Item.meta
#	Assets/Scripts/Devices/Ant/LegacyPages.meta
#	Assets/Scripts/UI/Prefab/Item.meta
#	Assets/StreamingAssets.meta
#	ProjectSettings/EditorBuildSettings.asset
2021-04-01 14:09:23 +08:00
996f924719 登录页一些特效,路书列表详情框架 2021-04-01 11:01:05 +08:00
eb93577d68 修改坡度计算逻辑,骑行界面大部分完成 2021-03-31 20:46:57 +08:00
dad88828d2 合并后处理冲突 2021-03-30 19:32:11 +08:00
9a7830f46a 骑行界面调整,底层逻辑细化 2021-03-30 17:30:29 +08:00
42fa59d103 解决相机抖动和人物移动动画不流畅的问题 2021-03-30 17:29:39 +08:00
971a6f7e0e 单人骑行 2021-03-30 17:27:50 +08:00
3c2bb10f07 加ant+相关代码。 2021-03-30 14:23:41 +08:00
f45711f39f 登录页一些效果,接路线列表页 2021-03-30 14:14:24 +08:00
f8bcfd977f init 2021-03-22 10:53:05 +08:00