58 Commits

Author SHA1 Message Date
60bf5bd59d 增加confirm类型;国家省份城市json;增加列表缓存 2021-05-08 10:52:37 +08:00
d96721e826 Merge remote-tracking branch 'origin/dev' into dev 2021-04-30 23:58:46 +08:00
071a0e1170 调整大地图样式和地球样式 2021-04-30 23:58:11 +08:00
af34243c28 修改细节 2021-04-30 21:09:21 +08:00
9f4e446850 修改设备图标。连接设备加缓存功能。 2021-04-30 18:03:34 +08:00
333542a63a 第一次进地球,登录页bug修改,主页面交互修改,其它细节 2021-04-30 17:46:00 +08:00
52fd841486 修改细节 2021-04-29 23:45:29 +08:00
44abc5ded1 调整大地图的光 2021-04-29 22:14:17 +08:00
7b4fbc513e 修改细节 2021-04-29 22:05:19 +08:00
a49acaab1e Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-29 18:13:05 +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
614d067d25 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Scripts/App.cs
2021-04-28 15:49:24 +08:00
3b63dec2e1 修正地球自适应问题。修正地图搜索卡死问题。 2021-04-28 15:30:38 +08:00
c8111d7db3 修改细节 2021-04-28 15:22:04 +08:00
5080503ebd 添加地球 2021-04-27 19:47:02 +08:00
86a5b68317 修改细节 2021-04-27 19:29:22 +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
048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
dd08f916eb 意见反馈 修改细节 2021-04-23 09:12:32 +08:00
1c712ff7d5 加确认框。按钮加tooltips。调整大地图tips的位置。 2021-04-21 11:25:52 +08:00
bb4fabc833 设置页面,调些细节 2021-04-21 11:19:31 +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
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
92e43c2cd8 路线产生逻辑微调 2021-04-15 17:09:35 +08:00
f4cbad819b Merge remote-tracking branch 'origin/dev' into dev_cyp
# Conflicts:
#	Assets/Resources/Images/back.png.meta
#	Assets/Resources/Images/change account.png.meta
#	Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
2021-04-15 15:59:57 +08:00
c97bd50f3f 暂存 2021-04-15 15:58:37 +08:00
e04ae0b085 细节调整 2021-04-15 15:57:29 +08:00
038720e7bd Merge branch 'modify-ui' into dev
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs
#	Assets/Scripts/Utils/Utils.cs
2021-04-15 09:24:15 +08:00
d22eecd133 完成大地图主要界面 2021-04-15 09:01:07 +08:00
10e738f958 登录页调整 增加半圆角组件 基本完成路线列表功能 基本完成骑行列表 开始做编辑页 2021-04-14 17:57:52 +08:00
5156473bb2 加弹框。修改连接设备样式。 2021-04-09 09:44:06 +08:00
07feba912c 浏览器嵌入,国旗文件 2021-04-09 09:19:04 +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