122 Commits

Author SHA1 Message Date
99081519bb 骑行界面&赛事界面调整&设备断开功能 2021-09-07 16:11:15 +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
7af935118e 赛事界面&骑行界面调整 2021-09-03 13:06:26 +08:00
3fb8aee922 骑行界面细节调整 2021-09-02 11:04:50 +08:00
c280408192 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/Mobile/WeChatController.cs
2021-09-02 10:10:06 +08:00
c5586b3eb1 单人骑行界面 2021-09-02 10:08:46 +08:00
2663068574 地球页面;反馈页面样式修改 2021-09-01 16:14:45 +08:00
3ec6fd0569 比赛;编辑页面 2021-08-31 17:11:43 +08:00
3a360d3437 附近的人逻辑优化&Android进入骑行提示开启定位服务问题修复 2021-08-31 14:24:08 +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
723c881790 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-08-26 09:29:42 +08:00
0139cbc173 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-08-25 16:09:18 +08:00
eb87fe07aa 设备连接页面调整 2021-08-25 16:07:26 +08:00
89e3a04fe9 暂存 2021-08-25 15:35:41 +08:00
92c8f246b8 Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble 2021-08-25 11:22:23 +08:00
bb08b6b762 tcp库更新&附近人下拉调整 2021-08-25 11:20:59 +08:00
88beff5b89 条件编译报错问题 2021-08-25 10:31:20 +08:00
f155b2b627 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
2021-08-25 10:23:51 +08:00
3de8b1d555 移动端蓝牙设备正常骑行 2021-08-24 18:34:41 +08:00
3c9d489c76 增加移动端界面暂存 2021-08-24 17:50:14 +08:00
31e8e3bebb 移动端微信接入 2021-08-24 09:28:46 +08:00
f6740d31bb Merge branch 'dev_lishuo' into dev_mobile 2021-08-19 18:11:12 +08:00
ca91f45ef3 切换移动端暂存 2021-08-19 16:28:57 +08:00
f39500c560 附近的人删除逻辑 2021-08-19 14:09:42 +08:00
49da1493d5 nearby重合问题&线路排序修改&显示赛事编号 2021-08-17 18:43:41 +08:00
35b5ab59d3 切换移动端暂存 2021-08-13 17:19:02 +08:00
11e9acdb14 修复单人骑行ridingtime差一秒 2021-08-12 18:57:30 +08:00
906dc7dec8 闪动问题 2021-08-12 16:29:00 +08:00
32b6e28736 修复右边排名问题 2021-08-12 13:24:00 +08:00
a9530096e4 tcp逻辑微调 2021-08-12 10:04:01 +08:00
570bd1554f 微调 2021-08-11 16:56:17 +08:00
3fcc6c0489 人物动画调整&网页url移除#号&riding time 差一秒的问题 2021-08-11 10:30:23 +08:00
5642d3f1c9 赛事微调&mapbox sqlite dll 更新 2021-08-10 16:36:13 +08:00
9f19e951cc Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-07-30 20:45:51 +08:00
317f7c6d8c cookie bug 2021-07-30 20:44:45 +08:00
b8a5982bc5 微调 2021-07-30 19:39:01 +08:00
ea70e04ec0 提高骑行时间精准度和一些细节调整 2021-07-30 18:08:31 +08:00
07a7a95aa8 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-07-30 15:39:59 +08:00
074200cb4f 倒计时的算法及界面调整 2021-07-30 15:38:40 +08:00
b4e97d5514 Race按钮恢复原样,增加是否创建比赛 2021-07-30 15:38:14 +08:00
12838266ba 骑行结束时间误差问题解决 2021-07-30 09:53:49 +08:00
9ab8165630 消息通知bug&赛事界面调整 2021-07-29 20:01:38 +08:00
7884e7ac7e 修改细节 2021-07-29 19:55:29 +08:00
33df128750 修复小人移动动画显示异常和一些界面调整 2021-07-29 16:13:23 +08:00
b9db3325a8 微调 2021-07-29 09:26:19 +08:00
09f72d10bd 英文文案调整 2021-07-28 21:11:46 +08:00
c96cdbb163 英文文案调整 2021-07-28 18:56:23 +08:00