172 Commits

Author SHA1 Message Date
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
ff878d5d50 修改断线重连自动开始问题 2022-06-07 11:32:23 +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
ff6d61a606 修改其他的 2022-05-31 16:51:07 +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
cfa1cc4f7b 4.29计算逻辑修改 2022-04-29 18:39:41 +08:00
06582201fa 加入房间,踢人,准备等tcp命令 2022-04-28 18:01:51 +08:00
f47f5c9ff6 0426动画等修改 2022-04-27 14:48:06 +08:00
92d0579060 中文版 2022-04-07 09:23:44 +08:00
0a4925bb39 修改bug 2022-04-02 18:15:09 +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
16e416332d AR多人骑行研究 2022-03-10 18:32:53 +08:00
e85d5f8613 AR初版demo 2022-03-04 16:12:15 +08:00
c3514df331 请求公开线路;增加移动版 2022-03-03 15:06:13 +08:00
01df299251 邮件功能完成 2022-03-02 17:54:06 +08:00
b039388a59 改为线上 2022-02-25 09:31:17 +08:00
6a0bd67a6e Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2022-02-23 11:31:23 +08:00
1e350fbb4d 更改为测试服务器,广告队列判空 2022-02-23 11:29:41 +08:00
f5294b0d39 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
# Conflicts:
#	Assets/Scripts/App.cs
2022-02-18 15:49:54 +08:00
365fab22d4 修改细节 2022-02-18 15:48:23 +08:00
1b3743a135 修改活动逻辑;增加一些接口;可弹多个广告 2022-02-17 16:56:18 +08:00
1148e29379 活动暂存 2022-02-16 18:22:27 +08:00
5f0efe3995 修复ios蓝牙关闭功率不变的问题 2022-02-11 17:00:28 +08:00
5edd784080 消息通知逻辑 2022-01-26 10:53:11 +08:00
cd162f3325 长通知和切换场景保留消息 2022-01-24 15:41:04 +08:00
7bb5bafbd2 ios端google;修改ios打包时pod数据源为清华 2022-01-20 16:30:58 +08:00
45b3ee5bbc 工具栏问题修改,中文 2022-01-13 22:56:47 +08:00
4d5523e2ff fb分享;比赛页面箭头去了 2022-01-13 15:35:57 +08:00
c53fbffe55 增加第三方信息绑定,修改细节 2022-01-12 18:16:17 +08:00
91fa3cc82d pc版首页;安卓google登录;解决fb登录ios问题 2022-01-12 16:55:57 +08:00
e20ddb9bc1 修改细节 2022-01-11 13:51:05 +08:00
5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
e5067228b2 发布版本 2022-01-07 20:43:14 +08:00
e87429d528 修改细节 2022-01-07 18:22:22 +08:00
9fb819b6fe banner种类增加;集合详情增加作者;排行榜轮换功能 2022-01-07 15:11:40 +08:00
f5385e31d6 修改nav;增加消息弹窗 2022-01-07 11:05:32 +08:00
333c99fb46 一波小改动 2021-12-30 16:51:04 +08:00
0fe5b3a953 微信分享问题解决 2021-12-29 19:48:15 +08:00
be731c471b Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 14:51:27 +08:00
7661a4e61d 全局缓存线路列表 2021-12-29 14:50:57 +08:00
bac3334a01 修改细节 2021-12-29 14:23:37 +08:00
a2b44262f7 合计修正版本暂存 2021-12-27 09:39:07 +08:00
769b75e2e2 FB登录功能暂存;苹果有问题 2021-12-24 13:58:14 +08:00
6423007638 Facebook sdk接入 2021-12-23 15:36:11 +08:00
4260cf05d3 移动端浏览器 2021-12-23 09:54:14 +08:00