102 Commits

Author SHA1 Message Date
9b1bb3d9ba AR骑行beta 2022-08-05 15:10:09 +08:00
5b39dd985b 结果页面移除划船记录&设备断开扔保留之前的厂商序列号 2022-07-18 14:31:14 +08:00
46b4c01730 移动端划船机移除 2022-07-15 14:28:37 +08:00
342740b740 Merge branch 'dev_cyp1' into dev_combine
# Conflicts:
#	.gitignore
#	Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs
#	Assets/Scripts/Scenes/MainController.cs
2022-07-11 14:52:54 +08:00
4d4f8feb8b c2课程同步 2022-06-30 14:39:13 +08:00
1d015706db Merge branch 'dev_cyp1' into dev_ar_cyp
# Conflicts:
#	Assets/Plugins/Android/unityandroidbluetoothlelib.jar
#	Assets/Resources/UI/language.json
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs
#	Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs
#	Assets/Scripts/Scenes/MainController.cs
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerGraphChartFeed.cs
#	Assets/Scripts/UIManager.cs
2022-06-27 10:36:20 +08:00
bfc56dded5 0606修改 2022-06-06 18:54:28 +08:00
e513eeac5c Merge branch 'dev_cyp' into dev_ar_cyp
# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs
2022-06-02 11:30:37 +08:00
ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
11b131b24a 对战AR 2022-05-13 09:28:58 +08:00
509c309252 对战初步完成 2022-05-10 19:24:07 +08:00
edc629ed75 5.9修改暂存 2022-05-10 18:43:41 +08:00
cfa1cc4f7b 4.29计算逻辑修改 2022-04-29 18:39:41 +08:00
06582201fa 加入房间,踢人,准备等tcp命令 2022-04-28 18:01:51 +08:00
597929cd32 对战界面&3d模型 2022-04-22 18:24:56 +08:00
995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
e0649f7ea1 修改新设计稿,保存每次划船的影子id;修改细节,增加c2适配前暂存 2022-03-29 18:12:21 +08:00
ab653b994f 适配c2;新版设计稿;对战切换手势;主逻辑接通;使用think的阻力值,修改影子模式船位置 2022-03-25 18:02:34 +08:00
bf48989a9c ui调整 2022-03-25 09:57:30 +08:00
57940568c9 初版ui提交 2022-03-24 09:36:59 +08:00
16e416332d AR多人骑行研究 2022-03-10 18:32:53 +08:00
e85d5f8613 AR初版demo 2022-03-04 16:12:15 +08:00
c3514df331 请求公开线路;增加移动版 2022-03-03 15:06:13 +08:00
01df299251 邮件功能完成 2022-03-02 17:54:06 +08:00
768f8261da 英文版本,pc分享功能,移动端fb分享,修改细节 2022-02-22 18:11:26 +08:00
1b3743a135 修改活动逻辑;增加一些接口;可弹多个广告 2022-02-17 16:56:18 +08:00
58a8233697 google 登录暂存 2022-01-19 13:42:12 +08:00
5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
9fb819b6fe banner种类增加;集合详情增加作者;排行榜轮换功能 2022-01-07 15:11:40 +08:00
300c61a883 推荐banner增加赛事 2022-01-07 11:03:49 +08:00
16a89b07b8 推荐api&骑行结果日期格式已经跳转到记录 2022-01-07 10:34:16 +08:00
2d38b63c91 暂存 2022-01-06 17:51:17 +08:00
6055b2010b 分享问题修复 2021-12-29 17:39:55 +08:00
bac3334a01 修改细节 2021-12-29 14:23:37 +08:00
b3f6bb6861 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs
2021-12-28 18:26:56 +08:00
3ca297ee96 按设计稿修改登录页登录样式;修改主页动画顺序;增加我的收藏列表可切换 2021-12-28 18:25:48 +08:00
0500736fff 最近骑行继续骑数据源 2021-12-28 14:13:38 +08:00
ffc98f1a58 骑行和赛事分享&集合正在骑行的人数 2021-12-27 18:29:23 +08:00
603efc7508 三层消息通知,修改细节 2021-12-15 18:18:12 +08:00
6ed3895fcd 加入合集后的跳转问题 2021-12-15 11:08:25 +08:00
ec4a28cd2a 集合首页和详情页 2021-12-14 18:10:58 +08:00
50b46c5b76 伴侣骑行继续骑 2021-11-11 15:55:58 +08:00
609e4dc367 延迟问题解决 2021-11-09 11:37:10 +08:00
c73545d912 划船机暂存 2021-09-28 11:27:24 +08:00
ee1114e2cf 解决累计爬升不准问题&本地文件记录样式 2021-09-09 16:29:22 +08:00
99081519bb 骑行界面&赛事界面调整&设备断开功能 2021-09-07 16:11:15 +08:00
5642d3f1c9 赛事微调&mapbox sqlite dll 更新 2021-08-10 16:36:13 +08:00
07a7a95aa8 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-07-30 15:39:59 +08:00
b4e97d5514 Race按钮恢复原样,增加是否创建比赛 2021-07-30 15:38:14 +08:00
9ab8165630 消息通知bug&赛事界面调整 2021-07-29 20:01:38 +08:00