lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83 Commits 9 Branches 14 Tags
8226b8a7c26398d564fcef66dec50b4d6c9d3c44
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lishuo 8226b8a7c2 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-04-27 15:15:59 +08:00
lishuo 4353a38c96 本地合并备份 2021-04-27 15:15:51 +08:00
lishuo 2b275d6dc5 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
 2021-04-25 19:43:07 +08:00
lishuo 02b8f97d83 细节调整 2021-04-25 19:41:35 +08:00
lishuo bbc3deeef2 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Utils/Utils.cs
 2021-04-25 13:51:21 +08:00
lishuo 0f8af223fc 微调 2021-04-25 13:49:13 +08:00
lishuo 9ac7c86ca6 移动动效和界面调整 2021-04-25 13:33:43 +08:00
lishuo 11fdcff7c3 动画文件 2021-04-23 19:30:04 +08:00
lishuo 922f66bb75 界面调整 2021-04-23 19:28:35 +08:00
lishuo a96d538dc1 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-23 09:37:55 +08:00
lishuo d35c9daa82 合并前备份 2021-04-23 09:37:41 +08:00
lishuo 96f3644b5b graph chart引入&骑行结果弹窗 2021-04-22 19:29:59 +08:00
lishuo 40d118cea3 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Mapbox/User/Modifiers.meta
#	Assets/Resources/UI/Control/PFUISlider.prefab.meta
#	Assets/StreamingAssets.meta
 2021-04-21 14:09:34 +08:00
lishuo e7ad9473a5 新版骑行页面前备份 2021-04-21 14:08:45 +08:00
lishuo 4896fab824 loading图片遗留bug修复 2021-04-19 18:38:28 +08:00
lishuo f10eeac073 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-19 18:17:27 +08:00
lishuo 82923fe4f8 骑行界面字体 2021-04-19 18:03:04 +08:00
lishuo af63072f29 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Resources/Apis/Models.meta
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
 2021-04-19 14:40:43 +08:00
lishuo afba150d91 继骑&重骑骑行结果页细节调整 2021-04-19 14:38:31 +08:00
lishuo 018699c944 Loading页面渐隐 2021-04-16 11:23:18 +08:00
lishuo 10c82703f4 人物移动调整 2021-04-15 17:29:32 +08:00
lishuo 70626ae741 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/NuGet.meta
#	Assets/Resources/Images/Ride.meta
#	Assets/Resources/Sound.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/UI/Prefab/BigMap/Tips.cs
#	Assets/StreamingAssets.meta
 2021-04-15 17:14:00 +08:00
lishuo 92e43c2cd8 路线产生逻辑微调 2021-04-15 17:09:35 +08:00
lishuo 62938ec6ae Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/App.cs
 2021-04-15 10:22:55 +08:00
lishuo 7744eec847 伴侣骑行 2021-04-15 10:13:01 +08:00
lishuo 34cde86a28 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Apis/UserApi.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs
 2021-04-12 17:42:56 +08:00
lishuo 2fcd9b23fa 附近的人 2021-04-12 17:35:56 +08:00
lishuo 725b510748 动态海拔图，全路线小地图，骑行记录上传增加截图 2021-04-07 17:22:45 +08:00
lishuo 65fc5b5c50 场景加载处理一些卡顿的情况 2021-04-02 19:17:23 +08:00
lishuo ae9cefc645 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Cyp/Prefab.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Core/Plugins/Mapbox.meta
#	Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
#	Assets/Plugins/Circle/ImageWithRoundedCorners.cs
#	Assets/Resources/Images/Devices.meta
#	Assets/Resources/UI/Prefab/Item.meta
#	Assets/Scripts/Devices/Ant/LegacyPages.meta
#	Assets/Scripts/UI/Prefab/Item.meta
#	Assets/StreamingAssets.meta
#	ProjectSettings/EditorBuildSettings.asset
 2021-04-01 14:09:23 +08:00
lishuo 2e6338bcf3 新增人物控制器抽象类 2021-04-01 11:01:29 +08:00
lishuo eb93577d68 修改坡度计算逻辑，骑行界面大部分完成 2021-03-31 20:46:57 +08:00
lishuo b0f6c39118 处理合并冲突 2021-03-30 20:00:11 +08:00
lishuo 8638cd97de Merge branch 'dev_lishuo' of https://gitlab.com/rhino4biz/powerfun/powerfun-unity into dev_lishuo 
# Conflicts:
#	Assets/DOTween.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
#	Assets/Plugins/Newtonsoft.Json.dll
#	Assets/Prefabs.meta
#	Assets/Resources.meta
#	Assets/Scenes/Ride/Minimap Render Texture.renderTexture
#	Assets/Scenes/Ride/Ride.unity
#	Assets/Scenes/Ride/Scripts/Helper.cs
#	Assets/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scenes/Ride/Scripts/RouteController.cs
#	Assets/Scenes/Ride/Scripts/UIManager.cs
#	Packages/manifest.json
#	Packages/packages-lock.json
 2021-03-30 19:35:32 +08:00
lishuo dad88828d2 合并后处理冲突 2021-03-30 19:32:11 +08:00
lishuo 9a7830f46a 骑行界面调整，底层逻辑细化 2021-03-30 17:30:29 +08:00
lishuo d5133ee7b0 骑行界面UI 2021-03-30 17:29:40 +08:00
lishuo 8ad36c965d 海拔图和小地图 2021-03-30 17:29:40 +08:00
lishuo 42fa59d103 解决相机抖动和人物移动动画不流畅的问题 2021-03-30 17:29:39 +08:00
lishuo 0ab0e99597 骑行计算逻辑调整 2021-03-30 17:29:39 +08:00
lishuo 971a6f7e0e 单人骑行 2021-03-30 17:27:50 +08:00
lishuo db3fc6ee83 骑行界面UI 2021-03-29 20:32:30 +08:00
lishuo c5bd9daba2 海拔图和小地图 2021-03-28 18:17:15 +08:00
lishuo 45801dff22 解决相机抖动和人物移动动画不流畅的问题 2021-03-25 16:22:09 +08:00
lishuo 60d12fcab2 骑行计算逻辑调整 2021-03-23 16:07:31 +08:00
lishuo 398628017c 单人骑行 2021-03-22 19:20:51 +08:00