lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
810 Commits 9 Branches 14 Tags
dev
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lishuo c95f6b7c70 fix:AR相关修改 2023-06-28 15:59:34 +08:00
lishuo 74ba5790f9 AR文件更新流程&AR网络延时问题 2023-05-18 19:06:40 +08:00
lishuo 16cd2fd26b Ant+代码混淆 2023-05-15 19:02:41 +08:00
lishuo 191efae2dd 部分代码重构 2023-05-15 15:11:50 +08:00
lishuo 431d128ad8 AR第二个视频发布 2023-04-28 20:23:37 +08:00
lishuo 573aa2ff4c AR变量命名 2023-04-18 17:10:48 +08:00
lishuo 94637d5980 人物材质光滑度调整 2023-04-17 11:23:15 +08:00
lishuo fa5a9961a8 骑行部分代码重构 2023-04-17 11:20:22 +08:00
lishuo 21d54a8a1a 模型修改 2023-04-14 18:52:18 +08:00
lishuo 1f340ced78 Revert "il2cpp 打包Ant+连接问题" 
This reverts commit 0c69470972bbe5f937ff3af7a1337cc70932db86.

# Conflicts:
#	Assets/Plugins/ANT_WrappedLib.dll.meta
 2023-04-14 16:16:24 +08:00
lishuo 99c16f44e6 Revert "remove unuse comments" 
This reverts commit e32b41ed5fd09b60129f9650597b2d55e7b0811f.
 2023-04-14 16:16:08 +08:00
lishuo ce213460f9 代码混淆 2023-04-14 16:15:29 +08:00
lishuo fb75ff5318 代码混淆 2023-04-14 15:51:28 +08:00
lishuo a149a7c08e AR以及对战房间部分代码重构 2023-03-10 14:22:41 +08:00
lishuo fb4da81ce2 部分代码重构，AR起步冲的问题和停车动画调整 2023-03-08 18:33:33 +08:00
lishuo 71b6155946 方法重命名 2023-02-20 18:31:59 +08:00
lishuo 46821d34a2 自主拍摄视频测试 2023-02-20 17:32:24 +08:00
lishuo 08b92e7e9b ar骑行bug fix 2023-02-07 18:35:16 +08:00
lishuo 2c9440f656 AR骑行人物控制代码重构&build混淆代码 2023-02-02 18:41:55 +08:00
lishuo 7822584cdd ar观察者模式 2023-01-31 18:22:15 +08:00
lishuo df936c4e04 AR演示版本调优 2023-01-17 18:07:49 +08:00
lishuo 27d18d7d01 AR初版可用阶段提交 2023-01-13 10:45:42 +08:00
lishuo dc8f8ceb80 多人暂存 2022-12-09 16:45:54 +08:00
lishuo 9e2e778e12 AR继续骑和断线重连继续骑 2022-12-08 19:17:34 +08:00
lishuo ae58f4d461 新版loading逻辑 2022-12-05 18:29:49 +08:00
lishuo 3c64109090 阴影强度以及视频播放速度最大值 2022-11-29 18:42:29 +08:00
lishuo 158fab27ab ar Demo完善 2022-11-29 16:29:59 +08:00
lishuo 9552fed2e0 ar帧数匹配精准度问题 2022-11-25 19:18:21 +08:00
lishuo e3059fc1c2 暂存 2022-11-24 17:20:19 +08:00
lishuo d1c84d0a8a AR轨迹逻辑 2022-10-08 13:26:38 +08:00
lishuo 195893a1b0 轨迹插件引入 2022-09-06 13:47:45 +08:00
lishuo 89b5275efd 对战与AR骑行相关逻辑修改 2022-08-24 18:43:43 +08:00
lishuo 3bcb3ee83e AR骑行和对战 2022-08-17 18:28:28 +08:00
lishuo 341d386196 线路集合详情分辨率问题 2022-08-08 17:49:42 +08:00
lishuo 96c48d3cb3 对战结束显示自己是否DNF 2022-08-08 17:34:47 +08:00
lishuo 889ec8244e AR骑行16:10屏幕问题，首页3d小人动态显示逻辑 2022-08-08 17:10:34 +08:00
lishuo fc7ef017d0 AR加对战整体处理 2022-08-08 13:33:32 +08:00
lishuo 9b1bb3d9ba AR骑行beta 2022-08-05 15:10:09 +08:00
lishuo 4d5bc8f080 Merge branch 'dev_release' into feature_AR 
# Conflicts:
#	Assets/Resources/UI/language.json
 2022-07-22 17:35:35 +08:00
lishuo 0bd5f325de 修复我的上传bug 2022-07-22 13:29:01 +08:00
lishuo 6154504fee 首页3d小人 2022-07-21 18:09:16 +08:00
lishuo 7356f21ab2 新首页微调 2022-07-21 18:09:16 +08:00
lishuo 0b5904f7cc 附近的人与线路查询优化&登出取消设备资源释放 2022-07-21 18:09:16 +08:00
lishuo af5a4f2aa8 连接功率计无法开始问题&附近的人优化 2022-07-21 18:09:16 +08:00
lishuo ccdf2c63f2 解决我的收藏选择集合后其他分类也显示收藏列表 2022-07-21 18:09:16 +08:00
lishuo 8e9d49c921 附近的人与线路查询优化&登出取消设备资源释放 2022-07-21 17:45:26 +08:00
lishuo 200566163a 连接功率计无法开始问题&附近的人优化 2022-07-21 14:51:26 +08:00
lishuo 9d3de1e97c 解决我的收藏选择集合后其他分类也显示收藏列表 2022-07-20 17:02:10 +08:00
lishuo adc9613592 新首页 2022-07-20 16:42:15 +08:00
lishuo ad8c4c8674 修复登出设备连接释放资源bug 2022-07-20 15:04:52 +08:00
lishuo 9b656e9852 解决第二次断开设备失败问题 2022-07-20 13:27:47 +08:00
lishuo 2274a13619 设备断开优化 2022-07-20 10:44:47 +08:00
lishuo 63987511e7 解决设备连接问题 2022-07-19 18:46:01 +08:00
lishuo 7f56624ec7 设备扫描优化&我的收藏返回记忆位置 2022-07-19 15:47:43 +08:00
lishuo c209811f9f 删除账号优化 2022-07-18 18:37:42 +08:00
lishuo e6fbad7021 Merge remote-tracking branch 'origin/dev_cyp' into dev_release 2022-07-18 17:14:43 +08:00
lishuo 71ae54aabe ios连接错误回调信息微调 2022-07-18 17:14:30 +08:00
lishuo 5b39dd985b 结果页面移除划船记录&设备断开扔保留之前的厂商序列号 2022-07-18 14:31:14 +08:00
lishuo 2697103479 Merge branch 'dev_lishuo' into dev_release 2022-07-18 11:06:52 +08:00
lishuo 867b61fc00 被登出时主动释放资源 2022-07-15 14:39:24 +08:00
lishuo 46b4c01730 移动端划船机移除 2022-07-15 14:28:37 +08:00
lishuo 4d0a383a88 移除划船机相关内容 2022-07-15 13:07:23 +08:00
lishuo 29625182c3 新增softMaskForUGUI插件 2022-07-15 10:40:25 +08:00
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