lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
735 Commits 9 Branches 14 Tags
576a770c7b453965e67c2d63f2a1316266f3ac45
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lishuo 576a770c7b 登录失效问题 2022-07-14 18:10:58 +08:00
lishuo f92818885e 关闭测试功率 2022-07-14 14:39:06 +08:00
lishuo dc4868bfee 忽略packages改动 2022-07-14 14:25:54 +08:00
lishuo e80b7ab1f1 Revert "微调" 
This reverts commit 15f458d507f8bf26a5f3ab66149ab794a517e3d7.

# Conflicts:
#	.gitignore
 2022-07-14 14:20:39 +08:00
lishuo a588716b30 解决io设备连接&android卡顿问题 2022-07-14 13:37:33 +08:00
lishuo 342740b740 Merge branch 'dev_cyp1' into dev_combine 
# Conflicts:
#	.gitignore
#	Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs
#	Assets/Scripts/Scenes/MainController.cs
 2022-07-11 14:52:54 +08:00
lishuo fccc830f71 发布前微调 2022-07-08 18:55:27 +08:00
lishuo bd9696cd81 android端发布前微调 2022-07-06 17:48:55 +08:00
lishuo 38a736a259 gitignore更新 2022-07-04 10:36:40 +08:00
lishuo 11693c40af 忽略video插件 2022-06-30 14:43:01 +08:00
lishuo 4d4f8feb8b c2课程同步 2022-06-30 14:39:13 +08:00
lishuo 46f7c2d4b1 解决阻力设置点击无效的bug 2022-06-28 11:03:10 +08:00
lishuo d38330d969 人物动画控制器调整&视频编辑器字体调整 2022-06-28 10:02:50 +08:00
lishuo 9e2240fd9b 视频编辑工具合并后字体调整 2022-06-27 13:37:13 +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 06b9051b3c c2同步课程命令 2022-06-24 18:03:36 +08:00
lishuo 701ec3069b C2课程同步问题 2022-06-23 18:55:08 +08:00
lishuo 84b3e1e7a4 移除测试代码 2022-06-21 18:55:13 +08:00
lishuo 573b96d86c 拉力曲线性能优化&解决划船时间误差问题 2022-06-21 17:49:43 +08:00
lishuo 6c9b3f825a 解决没有设备号的问题 2022-06-15 18:07:06 +08:00
lishuo 6e091bd99c anroid ble jar包调整 2022-06-15 16:58:22 +08:00
lishuo 610c98f9b8 解决c2表头设定课程后抖动问题，设备断开失败问题 2022-06-15 16:42:07 +08:00
lishuo 0202814f67 心率，阻力逻辑调整 2022-06-14 18:37:58 +08:00
lishuo f25d0b7b8c 蓝牙断开重连相关逻辑优化 2022-06-13 18:59:02 +08:00
lishuo 87a0e7fb6d 划船机优化 2022-06-10 19:31:07 +08:00
lishuo 2f64aa494f 移动端蓝牙优化 2022-06-09 14:52:50 +08:00
lishuo 72f254af2a 蓝牙重复初始化问题 2022-06-09 14:52:45 +08:00
lishuo 6542dd9882 移动端蓝牙优化 2022-06-09 14:51:03 +08:00
lishuo 5b54255777 蓝牙重复初始化问题 2022-06-08 18:27:16 +08:00
lishuo 6b3dd70c61 设备连接界面断开逻辑调整 2022-06-08 17:25:02 +08:00
lishuo 1c9102fbdc 设备连接界面断开逻辑调整 2022-06-08 17:24:35 +08:00
lishuo 46b6c7fa01 设备连接稳定性 2022-06-08 16:22:07 +08:00
lishuo 02d2dcdbf7 设备连接稳定性 2022-06-08 13:05:56 +08:00
lishuo b236e939f4 graph优化 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
 2022-06-06 19:55:08 +08:00
lishuo 383fed4966 graph优化 2022-06-06 18:54:04 +08:00
lishuo c6d0f7ac13 合并后错误修改 2022-06-02 18:05:41 +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
lishuo 71c9907c89 UImanager show方法会产生多余的HomeController 2022-06-01 19:49:15 +08:00
lishuo cda569afd5 性能优化 2022-06-01 16:10:42 +08:00
lishuo c579c1b130 Merge remote-tracking branch 'origin/dev_cyp' into dev_ani3 2022-06-01 10:50:16 +08:00
lishuo d9848e4e9d 设备连接界面微调&划船机本地记录过滤 2022-06-01 10:24:23 +08:00
lishuo e7af21b126 pc设备连接界面微调 2022-05-31 19:43:50 +08:00
lishuo a1010091f8 设备连接界面文案与交互调整 2022-05-31 18:25:53 +08:00
lishuo 2524e3a004 划船机实时保存 2022-05-31 16:47:21 +08:00
lishuo 95df03e540 chart内存性能优化 2022-05-31 14:43:05 +08:00
lishuo 9f0f42981e 视频路书编辑器完善 2022-05-30 15:17:55 +08:00
lishuo 17c2a44e40 AR视频direction文件相关调整 2022-05-25 18:40:47 +08:00
lishuo d876c20def 对战房间下载逻辑完善 2022-05-13 11:10:37 +08:00
lishuo 11b131b24a 对战AR 2022-05-13 09:28:58 +08:00
lishuo 509c309252 对战初步完成 2022-05-10 19:24:07 +08:00
lishuo b0c0890ca3 对战loading页相关逻辑 2022-04-29 19:03:18 +08:00
lishuo 06582201fa 加入房间，踢人，准备等tcp命令 2022-04-28 18:01:51 +08:00
lishuo de8dd933e8 创建房间 2022-04-24 18:53:29 +08:00
lishuo 597929cd32 对战界面&3d模型 2022-04-22 18:24:56 +08:00
lishuo 4665feab7c 新版首页 2022-04-20 18:19:42 +08:00
lishuo 4a3542010f tcp发送增加ar视频播放帧数&首页布局还原到初版 2022-04-20 17:32:27 +08:00
lishuo 3532978762 AR骑行loading页面&附近的人距离延迟问题 2022-04-19 18:47:26 +08:00
lishuo 8150b99411 调整多人开始骑行状态&动画控制&AR loading页面 2022-04-18 19:13:16 +08:00
lishuo 995aef63f8 AR骑行动画&换装基本交互逻辑 2022-04-15 18:14:55 +08:00
lishuo d938a0c8be 多人动画位移计算和动画帧数偏差公式调整 2022-04-06 19:27:45 +08:00
lishuo efdc95ed3d 人物动画调整&UI界面细节调整 2022-04-02 18:26:18 +08:00
lishuo cd1d67d9e8 动画调整&新版设计稿调整 2022-04-01 18:41:31 +08:00
lishuo ec9337b446 观察者模式调整 2022-03-31 18:40:19 +08:00
lishuo 69d73c26cd 新版设计稿 2022-03-30 18:41:06 +08:00
lishuo 6ec4c0101b 透明小地图&列表点击切换&海拔图头像位移 2022-03-29 18:41:32 +08:00
lishuo bf48989a9c ui调整 2022-03-25 09:57:30 +08:00
lishuo 57940568c9 初版ui提交 2022-03-24 09:36:59 +08:00
lishuo b3b882c51e 碰撞检测，射线检测，动态位移 2022-03-11 18:11:56 +08:00
lishuo 16e416332d AR多人骑行研究 2022-03-10 18:32:53 +08:00
lishuo 448b6d7798 微调 2022-03-04 18:29:37 +08:00
lishuo e85d5f8613 AR初版demo 2022-03-04 16:12:15 +08:00
lishuo c1c93c2a60 loading页面优化 2022-02-24 11:33:24 +08:00
lishuo ed9dc53093 loading60%问题，只要加载到第一个瓦片的高度就可以直接骑行 2022-02-23 18:14:31 +08:00
lishuo 6a0bd67a6e Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2022-02-23 11:31:23 +08:00
lishuo 0c1c2ed382 保存优化&本地记录自动上传 2022-02-21 16:16:35 +08:00
lishuo f5294b0d39 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/App.cs
 2022-02-18 15:49:54 +08:00
lishuo 5f0efe3995 修复ios蓝牙关闭功率不变的问题 2022-02-11 17:00:28 +08:00
lishuo 0644421279 loading页国旗默认白色图片 2022-01-26 10:24:47 +08:00
lishuo f16883465f 观察者切换人物大小问题 2022-01-25 18:25:40 +08:00
lishuo d4fbeeefc2 赛事默认3d地图&观察者人物动画bug修复&重新连接根据用户id筛选 2022-01-25 17:14:19 +08:00
lishuo 37873427e3 PC点击区域&PFbutton微调 2022-01-25 11:17:42 +08:00
lishuo 5340d3d58b Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2022-01-25 09:28:20 +08:00
lishuo 9d48c05ef0 赛事默认3d视角&loading页面国旗问题 2022-01-24 11:39:48 +08:00
lishuo 8f022e83a6 赛事人物微调 2022-01-13 19:57:49 +08:00
lishuo 5bc1bec425 赛事loading和退出弹窗调整 2022-01-13 18:57:30 +08:00
lishuo 8a2d4f7b85 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2022-01-13 17:13:08 +08:00
lishuo d33e130eca 退出窗口层级微调 2022-01-13 17:11:04 +08:00
lishuo e70a84db98 骑行退出面板层级调整至modalpanel 2022-01-13 16:48:37 +08:00
lishuo 79ad622026 赛事loading页面条调整 2022-01-13 14:50:23 +08:00
lishuo dd1d26e9c8 pc赛事loading隐藏 2022-01-13 13:43:09 +08:00
lishuo 77414ad387 骑行结果移动端增加dnf和新记录的标识 2022-01-13 10:46:59 +08:00
lishuo dc4cf87bc4 在线人海拔图位置超出边界隐藏 2022-01-12 18:27:00 +08:00
lishuo 61fefda590 微调 2022-01-12 16:45:13 +08:00
lishuo f7450f0067 骑行视角增加至5级&保存逻辑增加100m不可以保存 2022-01-12 16:41:52 +08:00
lishuo f949c531a6 我的排名微调 2022-01-11 19:08:34 +08:00
lishuo 9aecb4ce2a 移动端兼容问题 2022-01-11 16:30:36 +08:00
lishuo 90be662db1 loading页&骑行页面记忆跳转 2022-01-11 16:19:18 +08:00
lishuo bdfe1f6ee7 结果页调整 2022-01-11 13:48:06 +08:00
lishuo dbabaae032 结果页&loading页修改 2022-01-10 18:26:30 +08:00
lishuo 082b45c43c 实时保存微调 2022-01-07 14:33:31 +08:00