|
|
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 |
|
|
|
46f7c2d4b1
|
解决阻力设置点击无效的bug
|
2022-06-28 11:03:10 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
475250e795
|
Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp
|
2022-06-01 16:10:35 +08:00 |
|
|
|
d9848e4e9d
|
设备连接界面微调&划船机本地记录过滤
|
2022-06-01 10:24:23 +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 |
|
|
|
d938a0c8be
|
多人动画位移计算和动画帧数偏差公式调整
|
2022-04-06 19:27:45 +08:00 |
|
|
|
cd1d67d9e8
|
动画调整&新版设计稿调整
|
2022-04-01 18:41:31 +08:00 |
|
|
|
ec9337b446
|
观察者模式调整
|
2022-03-31 18:40:19 +08:00 |
|
|
|
ab653b994f
|
适配c2；新版设计稿；对战切换手势；主逻辑接通；使用think的阻力值，修改影子模式船位置
|
2022-03-25 18:02:34 +08:00 |
|
|
|
e6f3e2ecfa
|
Merge branch 'dev_rower' into dev_cyp
# Conflicts:
# ProjectSettings/ProjectSettings.asset
|
2022-03-09 09:12:42 +08:00 |
|
|
|
ed9dc53093
|
loading60%问题，只要加载到第一个瓦片的高度就可以直接骑行
|
2022-02-23 18:14:31 +08:00 |
|
|
|
7c1d1e797c
|
开放划船机，增加阻力设置
|
2022-02-11 17:38:23 +08:00 |
|
|
|
37873427e3
|
PC点击区域&PFbutton微调
|
2022-01-25 11:17:42 +08:00 |
|
|
|
45b3ee5bbc
|
工具栏问题修改，中文
|
2022-01-13 22:56:47 +08:00 |
|
|
|
2bf534775f
|
dotween允许回调
|
2022-01-13 20:00:04 +08:00 |
|
|
|
5bc1bec425
|
赛事loading和退出弹窗调整
|
2022-01-13 18:57:30 +08:00 |
|
|
|
5672898ce4
|
工具栏修改
|
2022-01-11 16:21:13 +08:00 |
|
|
|
f23fc4b4c0
|
Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
# Assets/Scenes/Login-Mobile.unity
# Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
|
2021-12-28 11:26:34 +08:00 |
|
|
|
2b390717c2
|
暂存
|
2021-12-28 11:25:09 +08:00 |
|
|
|
2743c8d185
|
骑行界面优化&PCtips显示调整
|
2021-12-24 18:33:58 +08:00 |
|
|
|
aa0c8d4fb6
|
中文绑定一波
|
2021-11-25 17:31:26 +08:00 |
|
|
|
23e5ae6ebd
|
中文调整
|
2021-11-23 15:48:22 +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 |
|
|
|
3083224ee6
|
保存图片压缩；记录列表清缓存；ms延迟3s；比赛列表样式问题
|
2021-11-19 10:54:14 +08:00 |
|
|
|
5ba176725f
|
单点登录不在进程内运行问题；gps取定位服务的；点击图标显示毫秒
|
2021-11-18 14:45:31 +08:00 |
|
|
|
eb9338390c
|
多语言微调
|
2021-11-11 14:20:08 +08:00 |
|
|
|
51834b709c
|
中文版本
|
2021-11-10 18:13:38 +08:00 |
|
|
|
558fb16160
|
增加编号，loading页提示，延迟毫秒
|
2021-11-01 11:04:22 +08:00 |
|
|
|
3ec6fd0569
|
比赛；编辑页面
|
2021-08-31 17:11:43 +08:00 |
|
|
|
f21b83697b
|
暂存
|
2021-08-26 15:49:06 +08:00 |
|
|
|
952e5038ed
|
修改细节
|
2021-07-28 14:59:21 +08:00 |
|
|
|
ca938ab6f5
|
修改细节
|
2021-07-27 18:36:49 +08:00 |
|
|
|
4cb40f2c8e
|
修改细节，增加图标和splash image，最后需要用破解版打包
|
2021-04-29 18:05:00 +08:00 |
|
|
|
c8111d7db3
|
修改细节
|
2021-04-28 15:22:04 +08:00 |
|
|
|
86a5b68317
|
修改细节
|
2021-04-27 19:29:22 +08:00 |
|
|
|
1002b0433a
|
接动态地图，忘记密码，文件弹窗置顶
|
2021-04-27 14:58:49 +08:00 |
|
|
|
8de7e94c8d
|
键盘bug，细节调整
|
2021-04-25 19:35:41 +08:00 |
|
|
|
048538a0c8
|
修改细节
|
2021-04-25 13:35:07 +08:00 |
|
|
|
dd08f916eb
|
意见反馈 修改细节
|
2021-04-23 09:12:32 +08:00 |
|
|
|
1c712ff7d5
|
加确认框。按钮加tooltips。调整大地图tips的位置。
|
2021-04-21 11:25:52 +08:00 |
|
|
|
bb4fabc833
|
设置页面，调些细节
|
2021-04-21 11:19:31 +08:00 |
|
|
|
f065bf4bbb
|
调整样式
|
2021-04-19 14:36:08 +08:00 |
|
