lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
808 Commits 9 Branches 14 Tags
16cd2fd26beaa4991c4f02c86788d1eba6ece97f
Commit Graph
166 Commits
Author SHA1 Message Date
lishuo 431d128ad8 AR第二个视频发布 2023-04-28 20:23:37 +08:00
Caiyanpeng 99e916905d 注销用户两步+删除用户线路 2022-07-18 17:14:29 +08:00
Caiyanpeng bf3b0d2642 Merge remote-tracking branch 'origin/dev_combine' into dev_release 
# Conflicts:
#	Assets/Scenes/Test.unity
#	Assets/SoftMaskForUGUI-1.0.2/Samples~/Demo/Mobile.meta
 2022-07-15 13:35:28 +08:00
Caiyanpeng eeb9a42c83 删除用户暂存 2022-07-15 13:34:43 +08:00
lishuo 4d0a383a88 移除划船机相关内容 2022-07-15 13:07:23 +08:00
lishuo 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
lishuo f25d0b7b8c 蓝牙断开重连相关逻辑优化 2022-06-13 18:59:02 +08:00
lishuo 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
Caiyanpeng ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
lishuo 17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
lishuo 11b131b24a 对战AR 2022-05-13 09:28:58 +08:00
lishuo b0c0890ca3 对战loading页相关逻辑 2022-04-29 19:03:18 +08:00
lishuo 06582201fa 加入房间，踢人，准备等tcp命令 2022-04-28 18:01:51 +08:00
Caiyanpeng f47f5c9ff6 0426动画等修改 2022-04-27 14:48:06 +08:00
lishuo 597929cd32 对战界面&3d模型 2022-04-22 18:24:56 +08:00
Caiyanpeng affc775226 调整后提交 2022-04-20 18:22:54 +08:00
lishuo 995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
Caiyanpeng 2f9dd43e07 1s 2022-04-15 17:13:34 +08:00
Caiyanpeng 41240b1398 动画修改一波 2022-04-15 11:14:22 +08:00
Caiyanpeng f383c54507 4.14修改，设备连接去掉ftms骑行台 2022-04-14 19:18:44 +08:00
Caiyanpeng 92d0579060 中文版 2022-04-07 09:23:44 +08:00
lishuo cd1d67d9e8 动画调整&新版设计稿调整 2022-04-01 18:41:31 +08:00
lishuo 69d73c26cd 新版设计稿 2022-03-30 18:41:06 +08:00
lishuo 6ec4c0101b 透明小地图&列表点击切换&海拔图头像位移 2022-03-29 18:41:32 +08:00
Caiyanpeng ab653b994f 适配c2；新版设计稿；对战切换手势；主逻辑接通；使用think的阻力值，修改影子模式船位置 2022-03-25 18:02:34 +08:00
Caiyanpeng e3f5280d94 暂存 2022-03-09 09:11:53 +08:00
Caiyanpeng c3514df331 请求公开线路；增加移动版 2022-03-03 15:06:13 +08:00
Caiyanpeng 01df299251 邮件功能完成 2022-03-02 17:54:06 +08:00
Caiyanpeng 1148e29379 活动暂存 2022-02-16 18:22:27 +08:00
Caiyanpeng 0a9adb19e6 修改动画；漏掉的汉化；上传图标 2022-01-25 17:15:05 +08:00
Caiyanpeng cd162f3325 长通知和切换场景保留消息 2022-01-24 15:41:04 +08:00
Caiyanpeng d89deba02c 修改bug 2022-01-13 18:50:51 +08:00
Caiyanpeng 05e3d2f887 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-11 13:51:13 +08:00
lishuo bdfe1f6ee7 结果页调整 2022-01-11 13:48:06 +08:00
Caiyanpeng 5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
Caiyanpeng 7431228d2f 0107修改 2022-01-07 22:46:35 +08:00
Caiyanpeng 9fb819b6fe banner种类增加；集合详情增加作者；排行榜轮换功能 2022-01-07 15:11:40 +08:00
Caiyanpeng 2d38b63c91 暂存 2022-01-06 17:51:17 +08:00
Caiyanpeng 7f7318fb36 消息轮播bug修改；内容滚动匀速播放；收藏图标变大 2021-12-31 11:23:16 +08:00
Caiyanpeng 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
lishuo b8a3a30629 骑行loading&赛事计时板调整 2021-12-29 14:40:58 +08:00
Caiyanpeng bac3334a01 修改细节 2021-12-29 14:23:37 +08:00
Caiyanpeng b3f6bb6861 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 
# Conflicts:
#	Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs
 2021-12-28 18:26:56 +08:00
Caiyanpeng 3ca297ee96 按设计稿修改登录页登录样式；修改主页动画顺序；增加我的收藏列表可切换 2021-12-28 18:25:48 +08:00
Caiyanpeng 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
lishuo 8e0ce907d0 分享调整 2021-12-28 11:25:35 +08:00
Caiyanpeng 2b390717c2 暂存 2021-12-28 11:25:09 +08:00
lishuo ffc98f1a58 骑行和赛事分享&集合正在骑行的人数 2021-12-27 18:29:23 +08:00
Caiyanpeng a2b44262f7 合计修正版本暂存 2021-12-27 09:39:07 +08:00
lishuo 2743c8d185 骑行界面优化&PCtips显示调整 2021-12-24 18:33:58 +08:00