|
|
ae753e51cb
|
Merge remote-tracking branch 'origin/dev_combine' into dev_release
# Conflicts:
# Assets/Scripts/App.cs
|
2022-07-15 14:28:37 +08:00 |
|
|
|
46b4c01730
|
移动端划船机移除
|
2022-07-15 14:28:37 +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 |
|
|
|
29625182c3
|
新增softMaskForUGUI插件
|
2022-07-15 10:40:25 +08:00 |
|
|
|
576a770c7b
|
登录失效问题
|
2022-07-14 18:10:58 +08:00 |
|
|
|
f92818885e
|
关闭测试功率
|
2022-07-14 14:39:06 +08:00 |
|
|
|
dc4868bfee
|
忽略packages改动
|
2022-07-14 14:25:54 +08:00 |
|
|
|
e80b7ab1f1
|
Revert "微调"
This reverts commit 15f458d507f8bf26a5f3ab66149ab794a517e3d7.
# Conflicts:
# .gitignore
|
2022-07-14 14:20:39 +08:00 |
|
|
|
a588716b30
|
解决io设备连接&android卡顿问题
|
2022-07-14 13:37:33 +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 |
|
|
|
fccc830f71
|
发布前微调
|
2022-07-08 18:55:27 +08:00 |
|
|
|
bd9696cd81
|
android端发布前微调
|
2022-07-06 17:48:55 +08:00 |
|
|
|
38a736a259
|
gitignore更新
|
2022-07-04 10:36:40 +08:00 |
|
|
|
11693c40af
|
忽略video插件
|
2022-06-30 14:43:01 +08:00 |
|
|
|
4d4f8feb8b
|
c2课程同步
|
2022-06-30 14:39:13 +08:00 |
|
|
|
46f7c2d4b1
|
解决阻力设置点击无效的bug
|
2022-06-28 11:03:10 +08:00 |
|
|
|
d38330d969
|
人物动画控制器调整&视频编辑器字体调整
|
2022-06-28 10:02:50 +08:00 |
|
|
|
9e2240fd9b
|
视频编辑工具合并后字体调整
|
2022-06-27 13:37: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 |
|
|
|
06b9051b3c
|
c2同步课程命令
|
2022-06-24 18:03:36 +08:00 |
|
|
|
701ec3069b
|
C2课程同步问题
|
2022-06-23 18:55:08 +08:00 |
|
|
|
84b3e1e7a4
|
移除测试代码
|
2022-06-21 18:55:13 +08:00 |
|
|
|
573b96d86c
|
拉力曲线性能优化&解决划船时间误差问题
|
2022-06-21 17:49:43 +08:00 |
|
|
|
6c9b3f825a
|
解决没有设备号的问题
|
2022-06-15 18:07:06 +08:00 |
|
|
|
6e091bd99c
|
anroid ble jar包调整
|
2022-06-15 16:58:22 +08:00 |
|
|
|
610c98f9b8
|
解决c2表头设定课程后抖动问题，设备断开失败问题
|
2022-06-15 16:42:07 +08:00 |
|
|
|
0202814f67
|
心率，阻力逻辑调整
|
2022-06-14 18:37:58 +08:00 |
|
|
|
f25d0b7b8c
|
蓝牙断开重连相关逻辑优化
|
2022-06-13 18:59:02 +08:00 |
|
|
|
87a0e7fb6d
|
划船机优化
|
2022-06-10 19:31:07 +08:00 |
|
|
|
2f64aa494f
|
移动端蓝牙优化
|
2022-06-09 14:52:50 +08:00 |
|
|
|
72f254af2a
|
蓝牙重复初始化问题
|
2022-06-09 14:52:45 +08:00 |
|
|
|
6542dd9882
|
移动端蓝牙优化
|
2022-06-09 14:51:03 +08:00 |
|
|
|
5b54255777
|
蓝牙重复初始化问题
|
2022-06-08 18:27:16 +08:00 |
|
|
|
6b3dd70c61
|
设备连接界面断开逻辑调整
|
2022-06-08 17:25:02 +08:00 |
|
|
|
1c9102fbdc
|
设备连接界面断开逻辑调整
|
2022-06-08 17:24:35 +08:00 |
|
|
|
46b6c7fa01
|
设备连接稳定性
|
2022-06-08 16:22:07 +08:00 |
|
|
|
c333086e30
|
重置问题
|
2022-06-08 13:55:35 +08:00 |
|
|
|
02d2dcdbf7
|
设备连接稳定性
|
2022-06-08 13:05:56 +08:00 |
|
|
|
c7afcbb01f
|
Merge branch 'dev_cyp' into dev_cyp1
# Conflicts:
# Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
|
2022-06-07 11:32:46 +08:00 |
|
|
|
ff878d5d50
|
修改断线重连自动开始问题
|
2022-06-07 11:32:23 +08:00 |
|
|
|
b236e939f4
|
graph优化
# Conflicts:
# Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
|
2022-06-06 19:55:08 +08:00 |
|
|
|
bfc56dded5
|
0606修改
|
2022-06-06 18:54:28 +08:00 |
|
|
|
383fed4966
|
graph优化
|
2022-06-06 18:54:04 +08:00 |
|
|
|
6effadc1e9
|
增加长时间保存，解决取影子以后后续请求失效问题（使用unity的请求库）
|
2022-06-06 09:09:20 +08:00 |
|
|
|
c6d0f7ac13
|
合并后错误修改
|
2022-06-02 18:05:41 +08:00 |
|
|
|
d498dd9148
|
日志包
|
2022-06-02 15:52:10 +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 |
|
