|
|
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 |
|
|
|
46b6c7fa01
|
设备连接稳定性
|
2022-06-08 16:22:07 +08:00 |
|
|
|
c333086e30
|
重置问题
|
2022-06-08 13:55:35 +08:00 |
|
|
|
bfc56dded5
|
0606修改
|
2022-06-06 18:54:28 +08:00 |
|
|
|
c6d0f7ac13
|
合并后错误修改
|
2022-06-02 18:05:41 +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 |
|
|
|
d9848e4e9d
|
设备连接界面微调&划船机本地记录过滤
|
2022-06-01 10:24:23 +08:00 |
|
|
|
a1010091f8
|
设备连接界面文案与交互调整
|
2022-05-31 18:25:53 +08:00 |
|
|
|
17c2a44e40
|
AR视频direction文件相关调整
|
2022-05-25 18:40:47 +08:00 |
|
|
|
d876c20def
|
对战房间下载逻辑完善
|
2022-05-13 11:10:37 +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 |
|
|
|
b0c0890ca3
|
对战loading页相关逻辑
|
2022-04-29 19:03:18 +08:00 |
|
|
|
3c4ecf3e83
|
曲线调整
|
2022-04-29 08:58:42 +08:00 |
|
|
|
06582201fa
|
加入房间，踢人，准备等tcp命令
|
2022-04-28 18:01:51 +08:00 |
|
|
|
f47f5c9ff6
|
0426动画等修改
|
2022-04-27 14:48:06 +08:00 |
|
|
|
de8dd933e8
|
创建房间
|
2022-04-24 18:53:29 +08:00 |
|
|
|
597929cd32
|
对战界面&3d模型
|
2022-04-22 18:24:56 +08:00 |
|
|
|
affc775226
|
调整后提交
|
2022-04-20 18:22:54 +08:00 |
|
|
|
4665feab7c
|
新版首页
|
2022-04-20 18:19:42 +08:00 |
|
|
|
4a3542010f
|
tcp发送增加ar视频播放帧数&首页布局还原到初版
|
2022-04-20 17:32:27 +08:00 |
|
|
|
995aef63f8
|
AR骑行动画&换装基本交互逻辑
|
2022-04-15 18:14:55 +08:00 |
|
|
|
2f9dd43e07
|
1s
|
2022-04-15 17:13:34 +08:00 |
|
|
|
41240b1398
|
动画修改一波
|
2022-04-15 11:14:22 +08:00 |
|
|
|
f383c54507
|
4.14修改，设备连接去掉ftms骑行台
|
2022-04-14 19:18:44 +08:00 |
|
|
|
29e7219c21
|
位移动画
|
2022-04-13 18:08:55 +08:00 |
|
|
|
d44638354d
|
4.13修改细节，位移动画前暂存
|
2022-04-13 15:44:02 +08:00 |
|
|
|
874dec5ec6
|
新版本动画：上下滑动切换有箭头
|
2022-04-12 19:08:58 +08:00 |
|
|
|
7780dc5ee5
|
3d翻转
|
2022-04-11 11:40:02 +08:00 |
|
|
|
95ab695632
|
之前动画加上排名变化
|
2022-04-07 14:19:58 +08:00 |
|
|
|
92d0579060
|
中文版
|
2022-04-07 09:23:44 +08:00 |
|
|
|
30e09c9c7a
|
修改细节，修复bug
|
2022-04-01 18:07:16 +08:00 |
|
|
|
e0649f7ea1
|
修改新设计稿，保存每次划船的影子id；修改细节，增加c2适配前暂存
|
2022-03-29 18:12:21 +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 |
|
|
|
e3f5280d94
|
暂存
|
2022-03-09 09:11:53 +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 |
|
|
|
2c7d02ec9a
|
修改细节，开始搞pc
|
2022-02-18 18:12:31 +08:00 |
|
|
|
1b3743a135
|
修改活动逻辑；增加一些接口；可弹多个广告
|
2022-02-17 16:56:18 +08:00 |
|
|
|
1148e29379
|
活动暂存
|
2022-02-16 18:22:27 +08:00 |
|
|
|
7c1d1e797c
|
开放划船机，增加阻力设置
|
2022-02-11 17:38:23 +08:00 |
|
|
|
e231d3540e
|
活动暂存
|
2022-02-11 17:26:36 +08:00 |
|
|
|
c12df53c18
|
ios快捷登录
|
2022-01-27 16:54:20 +08:00 |
|
|
|
1271e8e5d9
|
设置通知默认不显示
|
2022-01-25 18:29:22 +08:00 |
|
|
|
cd162f3325
|
长通知和切换场景保留消息
|
2022-01-24 15:41:04 +08:00 |
|
|
|
58a8233697
|
google 登录暂存
|
2022-01-19 13:42:12 +08:00 |
|
|
|
45b3ee5bbc
|
工具栏问题修改，中文
|
2022-01-13 22:56:47 +08:00 |
|
