100 Commits

Author SHA1 Message Date
44abc5ded1 调整大地图的光 2021-04-29 22:14:17 +08:00
7b4fbc513e 修改细节 2021-04-29 22:05:19 +08:00
8eb201d0ee 伴侣骑行bug修复 2021-04-29 19:01:49 +08:00
a49acaab1e Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-29 18:13:05 +08:00
540bbc9a7c 功体比bug修复 2021-04-29 18:12:40 +08:00
de61fbd291 调整连接设备样式。调整地球样式。去掉灯光。 2021-04-29 18:10:09 +08:00
ae55258b9b 骑行界面按钮替换,界面&逻辑调整 2021-04-29 18:07:30 +08:00
4cb40f2c8e 修改细节,增加图标和splash image,最后需要用破解版打包 2021-04-29 18:05:00 +08:00
b15a4fe2c1 修改细节 2021-04-28 18:41:54 +08:00
9993752ff5 上传记录增加本地保存逻辑 2021-04-28 17:23:29 +08:00
614d067d25 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Scripts/App.cs
2021-04-28 15:49:24 +08:00
6d45d052a0 移除xcharts和细节调整 2021-04-28 15:37:18 +08:00
3b63dec2e1 修正地球自适应问题。修正地图搜索卡死问题。 2021-04-28 15:30:38 +08:00
c8111d7db3 修改细节 2021-04-28 15:22:04 +08:00
b71a15e2ba Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-27 20:28:24 +08:00
00b9c7e796 骑行数据逻辑调整 2021-04-27 20:28:03 +08:00
5080503ebd 添加地球 2021-04-27 19:47:02 +08:00
86a5b68317 修改细节 2021-04-27 19:29:22 +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
2b275d6dc5 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
# Conflicts:
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
2021-04-25 19:43:07 +08:00
02b8f97d83 细节调整 2021-04-25 19:41:35 +08:00
8de7e94c8d 键盘bug,细节调整 2021-04-25 19:35:41 +08:00
bbc3deeef2 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
# Conflicts:
#	Assets/Scripts/Utils/Utils.cs
2021-04-25 13:51:21 +08:00
0f8af223fc 微调 2021-04-25 13:49:13 +08:00
048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
9ac7c86ca6 移动动效和界面调整 2021-04-25 13:33:43 +08:00
11fdcff7c3 动画文件 2021-04-23 19:30:04 +08:00
922f66bb75 界面调整 2021-04-23 19:28:35 +08:00
a96d538dc1 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-23 09:37:55 +08:00
d35c9daa82 合并前备份 2021-04-23 09:37:41 +08:00
4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
dd08f916eb 意见反馈 修改细节 2021-04-23 09:12:32 +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
1c712ff7d5 加确认框。按钮加tooltips。调整大地图tips的位置。 2021-04-21 11:25:52 +08:00
bb4fabc833 设置页面,调些细节 2021-04-21 11:19:31 +08:00
4896fab824 loading图片遗留bug修复 2021-04-19 18:38:28 +08:00
f10eeac073 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-19 18:17:27 +08:00
2d20edf57a 加淡入淡出效果。重设字体。加退出导航。 2021-04-19 18:16:56 +08:00
82923fe4f8 骑行界面字体 2021-04-19 18:03:04 +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
19766db051 Merge branch 'dev_cyp' into dev
# Conflicts:
#	Assets/Resources/Loading.meta
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/UI/Prefab/Panel/MapListController.cs
2021-04-19 14:15:34 +08:00
0346b650aa 暂存 2021-04-19 14:11:53 +08:00
018699c944 Loading页面渐隐 2021-04-16 11:23:18 +08:00