184 Commits

Author SHA1 Message Date
576a770c7b 登录失效问题 2022-07-14 18:10:58 +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
17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +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
affc775226 调整后提交 2022-04-20 18:22:54 +08:00
995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
f383c54507 4.14修改,设备连接去掉ftms骑行台 2022-04-14 19:18:44 +08:00
d938a0c8be 多人动画位移计算和动画帧数偏差公式调整 2022-04-06 19:27:45 +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
e3f5280d94 暂存 2022-03-09 09:11: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
6a0bd67a6e Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2022-02-23 11:31:23 +08:00
768f8261da 英文版本,pc分享功能,移动端fb分享,修改细节 2022-02-22 18:11:26 +08:00
f5294b0d39 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
# Conflicts:
#	Assets/Scripts/App.cs
2022-02-18 15:49:54 +08:00
1b3743a135 修改活动逻辑;增加一些接口;可弹多个广告 2022-02-17 16:56:18 +08:00
1148e29379 活动暂存 2022-02-16 18:22:27 +08:00
5f0efe3995 修复ios蓝牙关闭功率不变的问题 2022-02-11 17:00:28 +08:00
c12df53c18 ios快捷登录 2022-01-27 16:54:20 +08:00
58a8233697 google 登录暂存 2022-01-19 13:42:12 +08:00
5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
d811eb8514 pc暂存 2022-01-10 14:59:06 +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
14e9e8e23b Merge remote-tracking branch 'origin/dev_cyp' into dev_nonearth
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2022-01-06 18:03:12 +08:00
43dc844998 loading页面Tips调整&骑行卡顿问题解决 2022-01-06 18:01:48 +08:00
2d38b63c91 暂存 2022-01-06 17:51:17 +08:00
6055b2010b 分享问题修复 2021-12-29 17:39:55 +08:00
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
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