lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
667 Commits 9 Branches 14 Tags
d498dd914879df9887bc73bcc5385f20ce3d8c66
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Caiyanpeng d498dd9148 日志包 2022-06-02 15:52:10 +08:00
Caiyanpeng 154252e3c3 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-06-01 16:24:36 +08:00
Caiyanpeng 475250e795 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-06-01 16:10:35 +08:00
Caiyanpeng 622aaa3b6d 重连后续修改 2022-06-01 09:54:20 +08:00
Caiyanpeng bfa9f5f998 Merge remote-tracking branch 'origin/dev_ani3' into dev_cyp 2022-05-31 18:42:13 +08:00
Caiyanpeng 3f8c189ad4 断线重连取数据逻辑 2022-05-31 18:40:32 +08:00
Caiyanpeng 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
Caiyanpeng ff6d61a606 修改其他的 2022-05-31 16:51:07 +08:00
Caiyanpeng be687d6b77 适配v1表头，性能优化一波 2022-05-11 17:11:48 +08:00
Caiyanpeng edc629ed75 5.9修改暂存 2022-05-10 18:43:41 +08:00
Caiyanpeng cfa1cc4f7b 4.29计算逻辑修改 2022-04-29 18:39:41 +08:00
Caiyanpeng 3c4ecf3e83 曲线调整 2022-04-29 08:58:42 +08:00
Caiyanpeng f47f5c9ff6 0426动画等修改 2022-04-27 14:48:06 +08:00
Caiyanpeng affc775226 调整后提交 2022-04-20 18:22:54 +08:00
Caiyanpeng a2de06fede Merge branch 'dev_ani2' into dev_ani3 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Rower/RowerMultiModeScript.cs
 2022-04-15 17:13:55 +08:00
Caiyanpeng 2f9dd43e07 1s 2022-04-15 17:13:34 +08:00
Caiyanpeng c8076494fb 3s 2022-04-15 11:14:27 +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 29e7219c21 位移动画 2022-04-13 18:08:55 +08:00
Caiyanpeng d44638354d 4.13修改细节，位移动画前暂存 2022-04-13 15:44:02 +08:00
Caiyanpeng 874dec5ec6 新版本动画：上下滑动切换有箭头 2022-04-12 19:08:58 +08:00
Caiyanpeng 7780dc5ee5 3d翻转 2022-04-11 11:40:02 +08:00
Caiyanpeng 95ab695632 之前动画加上排名变化 2022-04-07 14:19:58 +08:00
Caiyanpeng 92d0579060 中文版 2022-04-07 09:23:44 +08:00
Caiyanpeng 0a4925bb39 修改bug 2022-04-02 18:15:09 +08:00
Caiyanpeng 30e09c9c7a 修改细节，修复bug 2022-04-01 18:07:16 +08:00
Caiyanpeng 06aefb93c4 适配C2划船机课程和menu 2022-03-30 18:25:51 +08:00
Caiyanpeng e0649f7ea1 修改新设计稿，保存每次划船的影子id；修改细节，增加c2适配前暂存 2022-03-29 18:12:21 +08:00
Caiyanpeng ab653b994f 适配c2；新版设计稿；对战切换手势；主逻辑接通；使用think的阻力值，修改影子模式船位置 2022-03-25 18:02:34 +08:00
Caiyanpeng e6f3e2ecfa Merge branch 'dev_rower' into dev_cyp 
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
 2022-03-09 09:12:42 +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 b039388a59 改为线上 2022-02-25 09:31:17 +08:00
Caiyanpeng 0c42fbe2cd Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-02-24 14:48:50 +08:00
Caiyanpeng 7e67184248 不给功率；修改比赛卡片有海拔图的异常问题 2022-02-24 11:35:26 +08:00
Caiyanpeng 353c19662c Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-02-24 08:58:14 +08:00
Caiyanpeng 3b0ffd78e7 分享文案 2022-02-24 08:58:03 +08:00
Caiyanpeng 1e350fbb4d 更改为测试服务器，广告队列判空 2022-02-23 11:29:41 +08:00
Caiyanpeng 768f8261da 英文版本，pc分享功能，移动端fb分享，修改细节 2022-02-22 18:11:26 +08:00
Caiyanpeng 2c7d02ec9a 修改细节，开始搞pc 2022-02-18 18:12:31 +08:00
Caiyanpeng 365fab22d4 修改细节 2022-02-18 15:48:23 +08:00
Caiyanpeng 1b3743a135 修改活动逻辑；增加一些接口；可弹多个广告 2022-02-17 16:56:18 +08:00
Caiyanpeng 1148e29379 活动暂存 2022-02-16 18:22:27 +08:00
Caiyanpeng 7c1d1e797c 开放划船机，增加阻力设置 2022-02-11 17:38:23 +08:00
Caiyanpeng e231d3540e 活动暂存 2022-02-11 17:26:36 +08:00
Caiyanpeng 17aee7a740 修改bug 2022-02-11 13:46:38 +08:00
Caiyanpeng c12df53c18 ios快捷登录 2022-01-27 16:54:20 +08:00
Caiyanpeng a625db3ebe 短通知bug;安卓更新中文补全 2022-01-26 17:25:07 +08:00
Caiyanpeng 7476af7701 手机端直接隐藏通知；安卓64位 2022-01-26 13:48:11 +08:00
Caiyanpeng c4bcb36356 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-26 10:53:46 +08:00
Caiyanpeng 5edd784080 消息通知逻辑 2022-01-26 10:53:11 +08:00
Caiyanpeng 28487b295b 进入比赛默认3d 2022-01-25 18:48:37 +08:00
Caiyanpeng 2abb2d81a2 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-25 18:29:27 +08:00
Caiyanpeng 1271e8e5d9 设置通知默认不显示 2022-01-25 18:29:22 +08:00
Caiyanpeng 3da12c3054 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-25 17:17:17 +08:00
Caiyanpeng 0a9adb19e6 修改动画；漏掉的汉化；上传图标 2022-01-25 17:15:05 +08:00
Caiyanpeng cd162f3325 长通知和切换场景保留消息 2022-01-24 15:41:04 +08:00
Caiyanpeng 7bb5bafbd2 ios端google；修改ios打包时pod数据源为清华 2022-01-20 16:30:58 +08:00
Caiyanpeng 58a8233697 google 登录暂存 2022-01-19 13:42:12 +08:00
Caiyanpeng 45b3ee5bbc 工具栏问题修改，中文 2022-01-13 22:56:47 +08:00
Caiyanpeng 0458a23c20 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 20:00:09 +08:00
Caiyanpeng 2bf534775f dotween允许回调 2022-01-13 20:00:04 +08:00
Caiyanpeng fed54ad85b Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 18:58:01 +08:00
Caiyanpeng 5489fa2a24 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 18:50:55 +08:00
Caiyanpeng d89deba02c 修改bug 2022-01-13 18:50:51 +08:00
Caiyanpeng 0a1ba5fbde Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 16:53:05 +08:00
Caiyanpeng e82592722f 首页弹消息bug；隐藏google 2022-01-13 16:53:01 +08:00
Caiyanpeng 697818bae4 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 15:36:20 +08:00
Caiyanpeng 4d5523e2ff fb分享；比赛页面箭头去了 2022-01-13 15:35:57 +08:00
Caiyanpeng 7a7c1ee55c google处理 2022-01-13 13:16:45 +08:00
Caiyanpeng bc5e4d14e4 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2022-01-13 13:13:28 +08:00
Caiyanpeng 2fec28e7cd 打包改为移动端 2022-01-13 13:13:24 +08:00
Caiyanpeng 10ffd8160a Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-13 08:57:48 +08:00
Caiyanpeng c53fbffe55 增加第三方信息绑定，修改细节 2022-01-12 18:16:17 +08:00
Caiyanpeng 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
Caiyanpeng 91fa3cc82d pc版首页；安卓google登录；解决fb登录ios问题 2022-01-12 16:55:57 +08:00
Caiyanpeng f0df68bbda banner bug；maxranking修改 2022-01-12 10:29:10 +08:00
Caiyanpeng 939774bd42 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-11 18:00:53 +08:00
Caiyanpeng 623cad18b2 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-11 16:21:45 +08:00
Caiyanpeng 5672898ce4 工具栏修改 2022-01-11 16:21:13 +08:00
Caiyanpeng 05e3d2f887 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-11 13:51:13 +08:00
Caiyanpeng e20ddb9bc1 修改细节 2022-01-11 13:51:05 +08:00
Caiyanpeng 27ea20b1c8 Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp 2022-01-11 11:18:18 +08:00
Caiyanpeng 5bf7635f1e pc修改 2022-01-11 11:18:09 +08:00
Caiyanpeng d811eb8514 pc暂存 2022-01-10 14:59:06 +08:00
Caiyanpeng f070f5a36c 修改maplist；苹果处理 2022-01-10 10:28:03 +08:00
Caiyanpeng 7431228d2f 0107修改 2022-01-07 22:46:35 +08:00
Caiyanpeng e5067228b2 发布版本 2022-01-07 20:43:14 +08:00
Caiyanpeng e87429d528 修改细节 2022-01-07 18:22:22 +08:00
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