224 Commits

Author SHA1 Message Date
383fed4966 graph优化 2022-06-06 18:54:04 +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
cda569afd5 性能优化 2022-06-01 16:10:42 +08:00
c579c1b130 Merge remote-tracking branch 'origin/dev_cyp' into dev_ani3 2022-06-01 10:50:16 +08:00
d9848e4e9d 设备连接界面微调&划船机本地记录过滤 2022-06-01 10:24:23 +08:00
622aaa3b6d 重连后续修改 2022-06-01 09:54:20 +08:00
bfa9f5f998 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-05-31 18:42:13 +08:00
3f8c189ad4 断线重连取数据逻辑 2022-05-31 18:40:32 +08:00
a1010091f8 设备连接界面文案与交互调整 2022-05-31 18:25:53 +08:00
167a424505 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
2022-05-31 16:51:37 +08:00
ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
2524e3a004 划船机实时保存 2022-05-31 16:47:21 +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
be687d6b77 适配v1表头,性能优化一波 2022-05-11 17:11:48 +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
cfa1cc4f7b 4.29计算逻辑修改 2022-04-29 18:39:41 +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
995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
f383c54507 4.14修改,设备连接去掉ftms骑行台 2022-04-14 19:18:44 +08:00
d44638354d 4.13修改细节,位移动画前暂存 2022-04-13 15:44:02 +08:00
92d0579060 中文版 2022-04-07 09:23:44 +08:00
30e09c9c7a 修改细节,修复bug 2022-04-01 18:07:16 +08:00
06aefb93c4 适配C2划船机课程和menu 2022-03-30 18:25:51 +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
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
17aee7a740 修改bug 2022-02-11 13:46:38 +08:00
c12df53c18 ios快捷登录 2022-01-27 16:54:20 +08:00
7476af7701 手机端直接隐藏通知;安卓64位 2022-01-26 13:48:11 +08:00
5edd784080 消息通知逻辑 2022-01-26 10:53:11 +08:00
cd162f3325 长通知和切换场景保留消息 2022-01-24 15:41:04 +08:00
58a8233697 google 登录暂存 2022-01-19 13:42:12 +08:00
d89deba02c 修改bug 2022-01-13 18:50:51 +08:00
c53fbffe55 增加第三方信息绑定,修改细节 2022-01-12 18:16:17 +08:00
91fa3cc82d pc版首页;安卓google登录;解决fb登录ios问题 2022-01-12 16:55:57 +08:00
f0df68bbda banner bug;maxranking修改 2022-01-12 10:29:10 +08:00
9aecb4ce2a 移动端兼容问题 2022-01-11 16:30:36 +08:00