51 Commits

Author SHA1 Message Date
1020632757 Merge remote-tracking branch 'origin/dev_lishuo' into dev 2021-06-08 13:07:48 +08:00
b6d70e6856 解决金额区域差异问题 2021-06-07 17:05:49 +08:00
432e02e3de 调整微信登录 2021-06-07 14:48:09 +08:00
2f84f70a5f 接入蓝牙基本结构 2021-06-04 13:22:59 +08:00
8e1b4bbbca 解决区域标点符号问题 2021-06-04 13:19:37 +08:00
0517382612 修改bug 2021-05-20 20:00:33 +08:00
2d36d5df39 配置连接串为线上 2021-05-20 18:05:55 +08:00
5db375bcf5 解决台湾无法点击的问题 2021-05-20 16:15:53 +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
2c5501a096 更新页面,目前是强制更新 2021-05-11 10:47:04 +08:00
6645310601 更新拉取图片的缓存代码 2021-05-08 14:38:23 +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
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
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
6d45d052a0 移除xcharts和细节调整 2021-04-28 15:37:18 +08:00
c8111d7db3 修改细节 2021-04-28 15:22:04 +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
048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
e7ad9473a5 新版骑行页面前备份 2021-04-21 14:08:45 +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
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
7744eec847 伴侣骑行 2021-04-15 10:13:01 +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
2fcd9b23fa 附近的人 2021-04-12 17:35: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
e7044b3cde 前两个页面迁移完成 2021-03-26 09:50:04 +08:00