129 Commits

Author SHA1 Message Date
46b4c01730 移动端划船机移除 2022-07-15 14:28:37 +08:00
bd9696cd81 android端发布前微调 2022-07-06 17:48:55 +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
17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
509c309252 对战初步完成 2022-05-10 19:24:07 +08:00
edc629ed75 5.9修改暂存 2022-05-10 18:43:41 +08:00
06582201fa 加入房间,踢人,准备等tcp命令 2022-04-28 18:01:51 +08:00
4a3542010f tcp发送增加ar视频播放帧数&首页布局还原到初版 2022-04-20 17:32:27 +08:00
995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +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
01df299251 邮件功能完成 2022-03-02 17:54:06 +08:00
1e350fbb4d 更改为测试服务器,广告队列判空 2022-02-23 11:29:41 +08:00
768f8261da 英文版本,pc分享功能,移动端fb分享,修改细节 2022-02-22 18:11:26 +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
7c1d1e797c 开放划船机,增加阻力设置 2022-02-11 17:38:23 +08:00
0644421279 loading页国旗默认白色图片 2022-01-26 10:24:47 +08:00
d4fbeeefc2 赛事默认3d地图&观察者人物动画bug修复&重新连接根据用户id筛选 2022-01-25 17:14:19 +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
02111a57b1 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Resources/UI/language.json
2022-01-12 16:56:50 +08:00
91fa3cc82d pc版首页;安卓google登录;解决fb登录ios问题 2022-01-12 16:55:57 +08:00
f7450f0067 骑行视角增加至5级&保存逻辑增加100m不可以保存 2022-01-12 16:41:52 +08:00
f0df68bbda banner bug;maxranking修改 2022-01-12 10:29:10 +08:00
9aecb4ce2a 移动端兼容问题 2022-01-11 16:30:36 +08:00
90be662db1 loading页&骑行页面记忆跳转 2022-01-11 16:19:18 +08:00
5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
d811eb8514 pc暂存 2022-01-10 14:59:06 +08:00
7431228d2f 0107修改 2022-01-07 22:46:35 +08:00
e87429d528 修改细节 2022-01-07 18:22:22 +08:00
9fb819b6fe banner种类增加;集合详情增加作者;排行榜轮换功能 2022-01-07 15:11:40 +08:00
fa0d9e973c Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-07 11:05:43 +08:00
f5385e31d6 修改nav;增加消息弹窗 2022-01-07 11:05:32 +08:00
16a89b07b8 推荐api&骑行结果日期格式已经跳转到记录 2022-01-07 10:34:16 +08:00
14e9e8e23b Merge remote-tracking branch 'origin/dev_cyp' into dev_nonearth
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
2022-01-06 18:03:12 +08:00
2d38b63c91 暂存 2022-01-06 17:51:17 +08:00
0628bd3716 loading调整&骑行动画&角度手势方向调整 2022-01-06 10:58:52 +08:00
7f7318fb36 消息轮播bug修改;内容滚动匀速播放;收藏图标变大 2021-12-31 11:23:16 +08:00
333c99fb46 一波小改动 2021-12-30 16:51:04 +08:00
eece0cffa5 Merge remote-tracking branch 'origin/dev_cyp' into dev_nonearth
# Conflicts:
#	Assets/Resources/UI/language.json
2021-12-29 17:07:34 +08:00
d4fa2bbb69 骑行保存数据改成同步 2021-12-29 17:05:07 +08:00
0ab425cb52 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
# Conflicts:
#	Assets/Resources/UI/language.json
2021-12-29 14:49:07 +08:00
b8a3a30629 骑行loading&赛事计时板调整 2021-12-29 14:40:58 +08:00
bac3334a01 修改细节 2021-12-29 14:23:37 +08:00
3ca297ee96 按设计稿修改登录页登录样式;修改主页动画顺序;增加我的收藏列表可切换 2021-12-28 18:25:48 +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