|
|
7f56624ec7
|
设备扫描优化&我的收藏返回记忆位置
|
2022-07-19 15:47:43 +08:00 |
|
|
|
3207d7b191
|
删除用户pc
|
2022-07-15 14:27:05 +08:00 |
|
|
|
bf3b0d2642
|
Merge remote-tracking branch 'origin/dev_combine' into dev_release
# Conflicts:
# Assets/Scenes/Test.unity
# Assets/SoftMaskForUGUI-1.0.2/Samples~/Demo/Mobile.meta
|
2022-07-15 13:35:28 +08:00 |
|
|
|
eeb9a42c83
|
删除用户暂存
|
2022-07-15 13:34:43 +08:00 |
|
|
|
4d0a383a88
|
移除划船机相关内容
|
2022-07-15 13:07:23 +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 |
|
|
|
72f254af2a
|
蓝牙重复初始化问题
|
2022-06-09 14:52:45 +08:00 |
|
|
|
c333086e30
|
重置问题
|
2022-06-08 13:55:35 +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 |
|
|
|
71c9907c89
|
UImanager show方法会产生多余的HomeController
|
2022-06-01 19:49:15 +08:00 |
|
|
|
ff6d61a606
|
修改其他的
|
2022-05-31 16:51:07 +08:00 |
|
|
|
17c2a44e40
|
AR视频direction文件相关调整
|
2022-05-25 18:40:47 +08:00 |
|
|
|
509c309252
|
对战初步完成
|
2022-05-10 19:24:07 +08:00 |
|
|
|
b0c0890ca3
|
对战loading页相关逻辑
|
2022-04-29 19:03:18 +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 |
|
|
|
4a3542010f
|
tcp发送增加ar视频播放帧数&首页布局还原到初版
|
2022-04-20 17:32:27 +08:00 |
|
|
|
995aef63f8
|
AR骑行动画&换装基本交互逻辑
|
2022-04-15 18:14:55 +08:00 |
|
|
|
f383c54507
|
4.14修改,设备连接去掉ftms骑行台
|
2022-04-14 19:18:44 +08:00 |
|
|
|
30e09c9c7a
|
修改细节,修复bug
|
2022-04-01 18:07:16 +08:00 |
|
|
|
ab653b994f
|
适配c2;新版设计稿;对战切换手势;主逻辑接通;使用think的阻力值,修改影子模式船位置
|
2022-03-25 18:02:34 +08:00 |
|
|
|
c3514df331
|
请求公开线路;增加移动版
|
2022-03-03 15:06:13 +08:00 |
|
|
|
01df299251
|
邮件功能完成
|
2022-03-02 17:54:06 +08:00 |
|
|
|
1b3743a135
|
修改活动逻辑;增加一些接口;可弹多个广告
|
2022-02-17 16:56:18 +08:00 |
|
|
|
1148e29379
|
活动暂存
|
2022-02-16 18:22:27 +08:00 |
|
|
|
e231d3540e
|
活动暂存
|
2022-02-11 17:26:36 +08:00 |
|
|
|
c12df53c18
|
ios快捷登录
|
2022-01-27 16:54:20 +08:00 |
|
|
|
58a8233697
|
google 登录暂存
|
2022-01-19 13:42:12 +08:00 |
|
|
|
d89deba02c
|
修改bug
|
2022-01-13 18:50:51 +08:00 |
|
|
|
e82592722f
|
首页弹消息bug;隐藏google
|
2022-01-13 16:53:01 +08:00 |
|
|
|
f5385e31d6
|
修改nav;增加消息弹窗
|
2022-01-07 11:05:32 +08:00 |
|
|
|
0fe5b3a953
|
微信分享问题解决
|
2021-12-29 19:48:15 +08:00 |
|
|
|
bac3334a01
|
修改细节
|
2021-12-29 14:23:37 +08:00 |
|
|
|
fc55360be0
|
骑行视角手势&移除按钮音效
|
2021-12-22 14:25:57 +08:00 |
|
|
|
6c0d9f5dec
|
Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
|
2021-12-16 18:43:34 +08:00 |
|
|
|
77989384fc
|
音效微调
|
2021-12-16 18:27:50 +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 |
|
|
|
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 |
|
|
|
ec4a28cd2a
|
集合首页和详情页
|
2021-12-14 18:10:58 +08:00 |
|
|
|
fa144dbaa0
|
新页面框架(PC)
|
2021-12-07 14:37:08 +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 |
|
|
|
0549cdbd52
|
赛事提醒自动保存当前骑行
|
2021-11-23 16:27:35 +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 |
|