235 Commits

Author SHA1 Message Date
f23fc4b4c0 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
2021-12-28 11:26:34 +08:00
2b390717c2 暂存 2021-12-28 11:25:09 +08:00
ffc98f1a58 骑行和赛事分享&集合正在骑行的人数 2021-12-27 18:29:23 +08:00
a2b44262f7 合计修正版本暂存 2021-12-27 09:39:07 +08:00
2743c8d185 骑行界面优化&PCtips显示调整 2021-12-24 18:33:58 +08:00
769b75e2e2 FB登录功能暂存;苹果有问题 2021-12-24 13:58:14 +08:00
d91dc17ea7 单击手势进入极简模式 2021-12-22 16:20:27 +08:00
67abc1ef63 loading页面不显示loading序列帧 2021-12-22 16:06:35 +08:00
fc55360be0 骑行视角手势&移除按钮音效 2021-12-22 14:25:57 +08:00
c8c27bd021 3d骑行视角旋转 2021-12-21 18:43:22 +08:00
5c2c22b675 收藏问题;苹果登录无法快速登录问题 2021-12-21 17:41:17 +08:00
4b3dad0b84 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2021-12-21 10:47:00 +08:00
939084b074 解决消息处理bug 2021-12-21 10:10:05 +08:00
05d2c74efa 苹果登录暂存 2021-12-21 09:58:07 +08:00
348552b0bc 消息通知增加上线了 2021-12-20 14:44:48 +08:00
2c8457c75e 中断骑行弹窗bug修复 2021-12-17 11:24:24 +08:00
7616e09a40 骑行loading页面bug修复&线路集合图片异步加载 2021-12-17 11:10:17 +08:00
32777c739d 首页动画不停止bug;中文图片绑定 2021-12-16 18:43:26 +08:00
12e0d8d295 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Scripts/UI/Prefab/MapList/MapItem.cs
2021-12-16 16:55:14 +08:00
1cb555c13d 移动端消息 2021-12-16 16:54:35 +08:00
b9d14a590c 音效&骑行loading优化 2021-12-16 16:53:38 +08:00
24044ec772 跳上传线路网页;pc分两种消息弹窗 2021-12-16 16:00:14 +08:00
603efc7508 三层消息通知,修改细节 2021-12-15 18:18:12 +08:00
9231304269 Merge branch 'dev_nonearth' into dev_cyp 2021-12-15 13:32:38 +08:00
40ac7e1397 消息通知 2021-12-15 13:24:26 +08:00
98de46f8b1 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-15 13:03:32 +08:00
6ed3895fcd 加入合集后的跳转问题 2021-12-15 11:08:25 +08:00
ec4a28cd2a 集合首页和详情页 2021-12-14 18:10:58 +08:00
3da24b200d Merge remote-tracking branch 'origin/dev_cyp' into dev_nonearth
# Conflicts:
#	Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab
2021-12-14 16:24:09 +08:00
625e2b7934 app名称本地化自适应;分享图片接入 2021-12-10 18:10:20 +08:00
7d2af849f4 骑行视角等优化 2021-12-09 18:17:39 +08:00
b1fedd4831 骑行细节优化(视角缩放,海拔图拉伸) 2021-12-08 18:10:38 +08:00
083b414be0 点击附近的人不隐藏面板 2021-12-07 17:43:32 +08:00
de4292d55a 骑行记录实时保存,异常中断重新连接 2021-12-07 16:44:36 +08:00
542036fb45 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-07 14:37:13 +08:00
fa144dbaa0 新页面框架(PC) 2021-12-07 14:37:08 +08:00
cc6730cbc4 汉化微调&赛事相关中文版本样式调整 2021-12-06 17:02:30 +08:00
aa0c8d4fb6 中文绑定一波 2021-11-25 17:31:26 +08:00
134dc76ec5 Merge branch 'dev_language' into dev_release
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
#	Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
2021-11-25 10:04:35 +08:00
a2ff7604cc 解决海图索引超过2000头像不显示问题 2021-11-24 16:40:53 +08:00
06b102f0eb 比赛海拔图位置&赛事无法开始问题 2021-11-24 13:08:42 +08:00
917cbbfb90 赛事开始逻辑调整 2021-11-24 10:15:28 +08:00
eeffccd4e6 taskrun 2021-11-24 09:10:23 +08:00
0549cdbd52 赛事提醒自动保存当前骑行 2021-11-23 16:27:35 +08:00
732e5ac6c6 测试包;退出骑行场景释放tcp资源 2021-11-23 16:10:25 +08:00
23e5ae6ebd 中文调整 2021-11-23 15:48:22 +08:00
190a66bb68 Merge branch 'dev_lishuo' into dev_cyp
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
2021-11-23 09:51:10 +08:00
6cc2486ebf Merge remote-tracking branch 'origin/ios_nearby' into dev_cyp 2021-11-23 09:34:20 +08:00
68688c9daf 超时重连增加条件编译 2021-11-23 09:33:05 +08:00
d5ea26f15c ios附近的人掉线问题 2021-11-22 18:04:16 +08:00