485 Commits

Author SHA1 Message Date
65fc5b5c50 场景加载处理一些卡顿的情况 2021-04-02 19:17:23 +08:00
e7a3214cb5 设备连接页加返回按钮 2021-04-01 14:29:58 +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
ec7589096f 实现连接设备界面 2021-04-01 11:09:53 +08:00
2e6338bcf3 新增人物控制器抽象类 2021-04-01 11:01:29 +08:00
996f924719 登录页一些特效,路书列表详情框架 2021-04-01 11:01:05 +08:00
eb93577d68 修改坡度计算逻辑,骑行界面大部分完成 2021-03-31 20:46:57 +08:00
b0f6c39118 处理合并冲突 2021-03-30 20:00:11 +08:00
8638cd97de Merge branch 'dev_lishuo' of https://gitlab.com/rhino4biz/powerfun/powerfun-unity into dev_lishuo
# Conflicts:
#	Assets/DOTween.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
#	Assets/Plugins/Newtonsoft.Json.dll
#	Assets/Prefabs.meta
#	Assets/Resources.meta
#	Assets/Scenes/Ride/Minimap Render Texture.renderTexture
#	Assets/Scenes/Ride/Ride.unity
#	Assets/Scenes/Ride/Scripts/Helper.cs
#	Assets/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scenes/Ride/Scripts/RouteController.cs
#	Assets/Scenes/Ride/Scripts/UIManager.cs
#	Packages/manifest.json
#	Packages/packages-lock.json
2021-03-30 19:35:32 +08:00
dad88828d2 合并后处理冲突 2021-03-30 19:32:11 +08:00
9a7830f46a 骑行界面调整,底层逻辑细化 2021-03-30 17:30:29 +08:00
d5133ee7b0 骑行界面UI 2021-03-30 17:29:40 +08:00
8ad36c965d 海拔图和小地图 2021-03-30 17:29:40 +08:00
42fa59d103 解决相机抖动和人物移动动画不流畅的问题 2021-03-30 17:29:39 +08:00
0ab0e99597 骑行计算逻辑调整 2021-03-30 17:29:39 +08:00
971a6f7e0e 单人骑行 2021-03-30 17:27:50 +08:00
326b74bd03 注释模态窗口 2021-03-30 14:27:09 +08:00
3c2bb10f07 加ant+相关代码。 2021-03-30 14:23:41 +08:00
f45711f39f 登录页一些效果,接路线列表页 2021-03-30 14:14:24 +08:00
db3fc6ee83 骑行界面UI 2021-03-29 20:32:30 +08:00
d1d9c92f1c Merge remote-tracking branch 'origin/dev' into dev_cyp 2021-03-29 10:00:31 +08:00
cbc79df8a2 暂存 2021-03-29 09:19:48 +08:00
38d1c387c3 加场景切换和事件绑定功能 2021-03-29 09:10:59 +08:00
c5bd9daba2 海拔图和小地图 2021-03-28 18:17:15 +08:00
e7044b3cde 前两个页面迁移完成 2021-03-26 09:50:04 +08:00
ba324aa68d 主场景迁移 2021-03-25 17:18:51 +08:00
ba994e715c Merge branch 'dev_cyp' into dev
# Conflicts:
#	Assets/Resources.meta
2021-03-25 16:58:03 +08:00
b7cc1653f4 ignore 2021-03-25 16:57:30 +08:00
6f7c4e78bd 暂存 2021-03-25 16:55:36 +08:00
4ecf26ec80 添加uimanager和主场景 2021-03-25 16:53:39 +08:00
45801dff22 解决相机抖动和人物移动动画不流畅的问题 2021-03-25 16:22:09 +08:00
60d12fcab2 骑行计算逻辑调整 2021-03-23 16:07:31 +08:00
398628017c 单人骑行 2021-03-22 19:20:51 +08:00
f557e2f5df 添加nuget和网络请求api 2021-03-22 16:06:28 +08:00
f8bcfd977f init 2021-03-22 10:53:05 +08:00