lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
540 Commits 9 Branches 14 Tags
79849bd5374ac0ddc47f6aa70273f7637f13fc22
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Caiyanpeng 79849bd537 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-07 15:11:44 +08:00
Caiyanpeng 9fb819b6fe banner种类增加；集合详情增加作者；排行榜轮换功能 2022-01-07 15:11:40 +08:00
Caiyanpeng fa0d9e973c Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-07 11:05:43 +08:00
Caiyanpeng f5385e31d6 修改nav；增加消息弹窗 2022-01-07 11:05:32 +08:00
Caiyanpeng 2d38b63c91 暂存 2022-01-06 17:51:17 +08:00
Caiyanpeng ba36014712 微调 2022-01-05 14:02:51 +08:00
Caiyanpeng 537ae2d6ed banner手势滑动，点击效果；自动滚动 2022-01-05 09:24:06 +08:00
Caiyanpeng 7f7318fb36 消息轮播bug修改；内容滚动匀速播放；收藏图标变大 2021-12-31 11:23:16 +08:00
Caiyanpeng 333c99fb46 一波小改动 2021-12-30 16:51:04 +08:00
Caiyanpeng c5500c269f Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 20:31:34 +08:00
Caiyanpeng 914e2719c1 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 19:48:23 +08:00
Caiyanpeng 0fe5b3a953 微信分享问题解决 2021-12-29 19:48:15 +08:00
Caiyanpeng 816742898f Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 17:40:45 +08:00
Caiyanpeng eab147c263 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 17:22:51 +08:00
Caiyanpeng 0e16fec75a 图片模糊功能bug修改 2021-12-29 17:17:15 +08:00
Caiyanpeng 95d845ac0f Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 17:06:04 +08:00
Caiyanpeng 8dde7520ad 修改细节 2021-12-29 17:05:58 +08:00
Caiyanpeng be731c471b Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-29 14:51:27 +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
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
Caiyanpeng 2b390717c2 暂存 2021-12-28 11:25:09 +08:00
Caiyanpeng a2b44262f7 合计修正版本暂存 2021-12-27 09:39:07 +08:00
Caiyanpeng 769b75e2e2 FB登录功能暂存；苹果有问题 2021-12-24 13:58:14 +08:00
Caiyanpeng 6423007638 Facebook sdk接入 2021-12-23 15:36:11 +08:00
Caiyanpeng 4260cf05d3 移动端浏览器 2021-12-23 09:54:14 +08:00
Caiyanpeng 5c2c22b675 收藏问题；苹果登录无法快速登录问题 2021-12-21 17:41:17 +08:00
Caiyanpeng 4b3dad0b84 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
 2021-12-21 10:47:00 +08:00
Caiyanpeng 05d2c74efa 苹果登录暂存 2021-12-21 09:58:07 +08:00
Caiyanpeng ebcc83ed6a Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-17 13:03:27 +08:00
Caiyanpeng a9e4b1fd34 安卓分享 2021-12-17 13:03:19 +08:00
Caiyanpeng 6c0d9f5dec Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-16 18:43:34 +08:00
Caiyanpeng 32777c739d 首页动画不停止bug；中文图片绑定 2021-12-16 18:43:26 +08:00
Caiyanpeng 12e0d8d295 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 
# Conflicts:
#	Assets/Scripts/UI/Prefab/MapList/MapItem.cs
 2021-12-16 16:55:14 +08:00
Caiyanpeng 1cb555c13d 移动端消息 2021-12-16 16:54:35 +08:00
Caiyanpeng 24044ec772 跳上传线路网页；pc分两种消息弹窗 2021-12-16 16:00:14 +08:00
Caiyanpeng 603efc7508 三层消息通知，修改细节 2021-12-15 18:18:12 +08:00
Caiyanpeng 9231304269 Merge branch 'dev_nonearth' into dev_cyp 2021-12-15 13:32:38 +08:00
Caiyanpeng 98de46f8b1 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-15 13:03:32 +08:00
Caiyanpeng 6ed3895fcd 加入合集后的跳转问题 2021-12-15 11:08:25 +08:00
Caiyanpeng ec4a28cd2a 集合首页和详情页 2021-12-14 18:10:58 +08:00
Caiyanpeng 16b42a19e4 ios端本地化 2021-12-13 17:18:57 +08:00
Caiyanpeng 625e2b7934 app名称本地化自适应；分享图片接入 2021-12-10 18:10:20 +08:00
Caiyanpeng cbd1ce3313 集合功能部分 2021-12-10 09:53:49 +08:00
Caiyanpeng 542036fb45 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2021-12-07 14:37:13 +08:00
Caiyanpeng fa144dbaa0 新页面框架（PC） 2021-12-07 14:37:08 +08:00
Caiyanpeng ef3e3a8321 高版本反而弹更新的bug；部分手机自动更新由于程序退出导致安装包损坏问题 2021-12-03 18:21:17 +08:00
Caiyanpeng aa0c8d4fb6 中文绑定一波 2021-11-25 17:31:26 +08:00
Caiyanpeng 134dc76ec5 Merge branch 'dev_language' into dev_release 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
#	Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
 2021-11-25 10:04:35 +08:00
Caiyanpeng 9ff3de1d10 Merge branch 'dev_cyp' into dev_release 2021-11-25 10:03:35 +08:00
Caiyanpeng 350103d5a9 Merge remote-tracking branch 'origin/dev_release' into dev_release 2021-11-24 10:16:14 +08:00
Caiyanpeng 2cf77e94ed 搜索按钮变大 2021-11-24 10:16:09 +08:00
Caiyanpeng eeffccd4e6 taskrun 2021-11-24 09:10:23 +08:00
Caiyanpeng 732e5ac6c6 测试包；退出骑行场景释放tcp资源 2021-11-23 16:10:25 +08:00
Caiyanpeng c0ebe80a1f 网络异常处理 2021-11-23 15:58:02 +08:00
Caiyanpeng 23e5ae6ebd 中文调整 2021-11-23 15:48:22 +08:00
Caiyanpeng 190a66bb68 Merge branch 'dev_lishuo' into dev_cyp 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
 2021-11-23 09:51:10 +08:00
Caiyanpeng 8c5ad08475 比赛列表搜索逻辑统一 2021-11-23 09:47:04 +08:00
Caiyanpeng 6cc2486ebf Merge remote-tracking branch 'origin/ios_nearby' into dev_cyp 2021-11-23 09:34:20 +08:00
Caiyanpeng 37e4c54c20 修改观察者模式提示连接设备bug；新版本设备连接bug；单开限定 2021-11-22 16:10:11 +08:00
Caiyanpeng 9570334e25 压缩图片bug解决 2021-11-22 09:51:17 +08:00
Caiyanpeng 3083224ee6 保存图片压缩；记录列表清缓存；ms延迟3s；比赛列表样式问题 2021-11-19 10:54:14 +08:00
Caiyanpeng 5ba176725f 单点登录不在进程内运行问题；gps取定位服务的；点击图标显示毫秒 2021-11-18 14:45:31 +08:00
Caiyanpeng 42e23e2f84 使用astc优化网络图片；workouts链接修改 2021-11-18 09:15:19 +08:00
Caiyanpeng 5480de5c6d 测试 2021-11-16 20:19:32 +08:00
Caiyanpeng e3e2f5200b Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 2021-11-16 18:41:22 +08:00
Caiyanpeng 6a4390f1b9 两个列表进骑行释放内存 2021-11-16 18:41:18 +08:00
Caiyanpeng 3295314b7e Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 2021-11-15 15:21:46 +08:00
Caiyanpeng b79584f745 删除appcenter；删除打包后的debug 2021-11-15 11:38:13 +08:00
Caiyanpeng 402f19b8a5 Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
 2021-11-15 11:34:49 +08:00
Caiyanpeng 9acde45f4a 一些设置调整；进入骑行时请texture 2021-11-15 11:33:57 +08:00
Caiyanpeng d754ff3b15 app center；增加發送ping的秒 2021-11-12 16:21:13 +08:00
Caiyanpeng 8e88b4adba 地球null问题，隐藏划船机 2021-11-09 16:47:21 +08:00
Caiyanpeng 609e4dc367 延迟问题解决 2021-11-09 11:37:10 +08:00
Caiyanpeng 9a545f00f4 修改细节 2021-11-08 13:07:08 +08:00
Caiyanpeng baab5a9fb0 修改细节 2021-11-03 13:48:53 +08:00
Caiyanpeng e8a12452ca Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-11-03 09:52:51 +08:00
Caiyanpeng f92b623349 暂存 2021-11-03 09:52:03 +08:00
Caiyanpeng 558fb16160 增加编号，loading页提示，延迟毫秒 2021-11-01 11:04:22 +08:00
Caiyanpeng b9aa0131cc 划船机保存前读秒 2021-10-25 16:13:04 +08:00
Caiyanpeng eb21914fb7 划船机其他细节 2021-10-22 18:18:26 +08:00
Caiyanpeng a4e17a56d0 划船机停止逻辑，切换图标 2021-10-21 18:04:33 +08:00
Caiyanpeng e503443f22 Merge branch 'dev_rower' into dev_release 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
 2021-10-20 15:12:05 +08:00
Caiyanpeng 3a834fca08 ios审核先屏蔽第三方登录 2021-10-20 14:58:37 +08:00
Caiyanpeng 8f8ee0b833 android11跳转 2021-10-20 13:32:43 +08:00
Caiyanpeng 26e4e81402 暂存 2021-10-20 10:20:12 +08:00
Caiyanpeng b075279a14 增加搜索框，ios图片名重复问题 2021-10-18 14:03:26 +08:00
Caiyanpeng f731494396 pc兼容 2021-10-15 09:54:23 +08:00
Caiyanpeng dd4157cbc2 一些设置 2021-10-15 09:29:05 +08:00
Caiyanpeng 05f6c8a08b 微信注册样式问题 2021-10-14 14:04:44 +08:00
Caiyanpeng 3c540dece4 修改细节 2021-10-13 19:03:22 +08:00
Caiyanpeng d8adb8a5b8 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-13 11:29:14 +08:00
Caiyanpeng 9be2e77ae5 设备连接页面检测定位服务 2021-10-13 11:29:09 +08:00
Caiyanpeng efd1795e63 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-12 20:51:07 +08:00
Caiyanpeng f0314adb27 隐藏划船机 2021-10-12 20:26:41 +08:00
Caiyanpeng 2f0291836e ios以及bug处理 2021-10-12 20:26:25 +08:00
Caiyanpeng d4326ffb42 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-12 20:11:18 +08:00
Caiyanpeng 44ff898f8d 更新弹窗 2021-10-12 20:07:13 +08:00