33 Commits

Author SHA1 Message Date
b6d70e6856 解决金额区域差异问题 2021-06-07 17:05:49 +08:00
e4d4333357 视角切换&小地图模糊问题解决 2021-05-07 18:41:37 +08:00
392eca5dc2 人物抖动的问题解决,界面调整,3d视觉调整 2021-04-30 23:45:50 +08:00
8226b8a7c2 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-04-27 15:15:59 +08:00
4353a38c96 本地合并备份 2021-04-27 15:15:51 +08:00
1002b0433a 接动态地图,忘记密码,文件弹窗置顶 2021-04-27 14:58:49 +08:00
048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
a96d538dc1 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-23 09:37:55 +08:00
4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
96f3644b5b graph chart引入&骑行结果弹窗 2021-04-22 19:29:59 +08:00
40d118cea3 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Mapbox/User/Modifiers.meta
#	Assets/Resources/UI/Control/PFUISlider.prefab.meta
#	Assets/StreamingAssets.meta
2021-04-21 14:09:34 +08:00
e7ad9473a5 新版骑行页面前备份 2021-04-21 14:08:45 +08:00
bb4fabc833 设置页面,调些细节 2021-04-21 11:19:31 +08:00
2d20edf57a 加淡入淡出效果。重设字体。加退出导航。 2021-04-19 18:16:56 +08:00
51c6fd7236 细节调整 2021-04-19 17:59:45 +08:00
af63072f29 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Resources/Apis/Models.meta
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
2021-04-19 14:40:43 +08:00
afba150d91 继骑&重骑骑行结果页细节调整 2021-04-19 14:38:31 +08:00
f065bf4bbb 调整样式 2021-04-19 14:36:08 +08:00
70626ae741 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/NuGet.meta
#	Assets/Resources/Images/Ride.meta
#	Assets/Resources/Sound.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/UI/Prefab/BigMap/Tips.cs
#	Assets/StreamingAssets.meta
2021-04-15 17:14:00 +08:00
c97bd50f3f 暂存 2021-04-15 15:58:37 +08:00
62938ec6ae Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/App.cs
2021-04-15 10:22:55 +08:00
d22eecd133 完成大地图主要界面 2021-04-15 09:01:07 +08:00
34cde86a28 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Scripts/Apis/UserApi.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs
2021-04-12 17:42:56 +08:00
5156473bb2 加弹框。修改连接设备样式。 2021-04-09 09:44:06 +08:00
07feba912c 浏览器嵌入,国旗文件 2021-04-09 09:19:04 +08:00
65fc5b5c50 场景加载处理一些卡顿的情况 2021-04-02 19:17:23 +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
dad88828d2 合并后处理冲突 2021-03-30 19:32:11 +08:00
9a7830f46a 骑行界面调整,底层逻辑细化 2021-03-30 17:30:29 +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