121 Commits

Author SHA1 Message Date
60bf5bd59d 增加confirm类型;国家省份城市json;增加列表缓存 2021-05-08 10:52:37 +08:00
9bc3864790 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2021-05-01 01:03:24 +08:00
39d84e2e8a 海拔头像移动bug修复 2021-05-01 01:02:54 +08:00
6b380b3442 Merge remote-tracking branch 'origin/dev' into dev_cyp
# Conflicts:
#	Assets/Scenes/1-Login.unity
2021-05-01 00:14:22 +08:00
3ec804f1b0 小调整 2021-05-01 00:11:27 +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
392eca5dc2 人物抖动的问题解决,界面调整,3d视觉调整 2021-04-30 23:45:50 +08:00
af34243c28 修改细节 2021-04-30 21:09:21 +08:00
9f4e446850 修改设备图标。连接设备加缓存功能。 2021-04-30 18:03:34 +08:00
6399c26f7e Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2021-04-30 17:50:37 +08:00
f6a4ebda8c Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2021-04-30 17:46:06 +08:00
333542a63a 第一次进地球,登录页bug修改,主页面交互修改,其它细节 2021-04-30 17:46:00 +08:00
2b6be4711c 3d地图优先 2021-04-30 17:45:21 +08:00
48c5b161b1 ant+和http组件bug修复 2021-04-30 17:25:28 +08:00
f7b33bf491 Merge remote-tracking branch 'origin/dev_lishuo' into dev_lishuo 2021-04-29 23:50:17 +08:00
cb93e31143 设备问题修复 2021-04-29 23:49:51 +08:00
52fd841486 修改细节 2021-04-29 23:45:29 +08:00
aaef57c0b0 阻力灵敏度bug 2021-04-29 23:44:47 +08:00
b030294bd6 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Scenes/Ride/Ride.unity
2021-04-29 22:17:24 +08:00
82997480fe 按钮&设置&退出界面调整 2021-04-29 22:16:32 +08:00
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