117 Commits

Author SHA1 Message Date
7729332f41 接入基本设备 2021-06-04 13:22:59 +08:00
0517382612 修改bug 2021-05-20 20:00:33 +08:00
09514e2a8a 下载界面增加开始按钮,登陆注册bug修改 2021-05-20 14:12:43 +08:00
87d581291b 在线用户和影子选手信息面板,小地图已经骑行路线 2021-05-12 18:51:03 +08:00
53ec9c60ac 小调整 2021-05-12 10:42:26 +08:00
a7ea02f70a Merge branch 'dev_lishuo' into dev
# Conflicts:
#	.gitignore
#	Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
2021-05-12 10:30:08 +08:00
8f0598580d 骑行页面消息通知
在线用户和影子选手用图片显示,缩放等功能按钮微调
2021-05-11 18:21:32 +08:00
2c5501a096 更新页面,目前是强制更新 2021-05-11 10:47:04 +08:00
92676d7cf8 Merge branch 'dev_cyp' into dev
# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/UIManager.cs
2021-05-08 11:15:28 +08:00
9a4e646a8f 修复台湾问题;加服务器时间; 2021-05-08 11:09:03 +08:00
584cba79ae 小地图分辨率微调,影子选手包含自己 2021-05-08 11:02:11 +08:00
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
392eca5dc2 人物抖动的问题解决,界面调整,3d视觉调整 2021-04-30 23:45:50 +08:00
af34243c28 修改细节 2021-04-30 21:09:21 +08:00
48c5b161b1 ant+和http组件bug修复 2021-04-30 17:25:28 +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
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
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
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
02b8f97d83 细节调整 2021-04-25 19:41:35 +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
048538a0c8 修改细节 2021-04-25 13:35:07 +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
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
1c712ff7d5 加确认框。按钮加tooltips。调整大地图tips的位置。 2021-04-21 11:25:52 +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
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
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