134 Commits

Author SHA1 Message Date
0ab425cb52 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Resources/UI/language.json
2021-12-29 14:49:07 +08:00
b8a3a30629 骑行loading&赛事计时板调整 2021-12-29 14:40:58 +08:00
bac3334a01 修改细节 2021-12-29 14:23:37 +08:00
3ca297ee96 按设计稿修改登录页登录样式;修改主页动画顺序;增加我的收藏列表可切换 2021-12-28 18:25:48 +08:00
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
a2b44262f7 合计修正版本暂存 2021-12-27 09:39:07 +08:00
2743c8d185 骑行界面优化&PCtips显示调整 2021-12-24 18:33:58 +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
de4292d55a 骑行记录实时保存,异常中断重新连接 2021-12-07 16:44:36 +08:00
fa144dbaa0 新页面框架(PC) 2021-12-07 14:37:08 +08:00
0549cdbd52 赛事提醒自动保存当前骑行 2021-11-23 16:27:35 +08:00
8e88b4adba 地球null问题,隐藏划船机 2021-11-09 16:47:21 +08:00
609e4dc367 延迟问题解决 2021-11-09 11:37:10 +08:00
9a545f00f4 修改细节 2021-11-08 13:07:08 +08:00
26e4e81402 暂存 2021-10-20 10:20:12 +08:00
f0314adb27 隐藏划船机 2021-10-12 20:26:41 +08:00
8d8fd59a80 修改细节 2021-09-28 20:35:16 +08:00
85e0a13f08 增加选择页,修改记录列表pc兼容 2021-09-28 15:25:52 +08:00
5bd1c3b1ca Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2021-09-28 11:30:08 +08:00
c73545d912 划船机暂存 2021-09-28 11:27:24 +08:00
65e7d9c4f4 优化赛事人数多卡的问题&解决蓝牙连接133错误码 2021-09-24 19:16:40 +08:00
7d4617eca6 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-15 19:30:47 +08:00
ad26419654 设备连接微调 2021-09-15 14:17:11 +08:00
6fa4504e46 替换图片,push问题,ios配置,常亮 2021-09-15 10:45:11 +08:00
dfb80658dd 登录增加loading&赛事提醒修改 2021-09-13 18:21:43 +08:00
b11c5de681 修改样式 2021-09-06 17:50:01 +08:00
467a6f3810 Merge remote-tracking branch 'origin/dev_m1' into dev_mobile_ble
# Conflicts:
#	Assets/Scripts/App.cs
2021-09-03 15:12:01 +08:00
2663068574 地球页面;反馈页面样式修改 2021-09-01 16:14:45 +08:00
3ec6fd0569 比赛;编辑页面 2021-08-31 17:11:43 +08:00
85130ce6c3 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2021-08-27 10:13:17 +08:00
428a7c5507 暫存 2021-08-27 10:12:50 +08:00
d8927ceca5 蓝牙停止扫描和一些bug修复 2021-08-26 19:33:43 +08:00
f21b83697b 暂存 2021-08-26 15:49:06 +08:00