lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
81 Commits 9 Branches 14 Tags
Commit Graph

68 Commits

Author SHA1 Message Date
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
CaiYanPeng
8de7e94c8d 键盘bug，细节调整 2021-04-25 19:35:41 +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
CaiYanPeng
048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
lishuo
9ac7c86ca6 移动动效和界面调整 2021-04-25 13:33:43 +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
suntao
4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
CaiYanPeng
dd08f916eb 意见反馈 修改细节 2021-04-23 09:12:32 +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
suntao
1c712ff7d5 加确认框。按钮加tooltips。调整大地图tips的位置。 2021-04-21 11:25:52 +08:00
CaiYanPeng
bb4fabc833 设置页面，调些细节 2021-04-21 11:19:31 +08:00
lishuo
f10eeac073 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-19 18:17:27 +08:00
suntao
2d20edf57a 加淡入淡出效果。重设字体。加退出导航。 2021-04-19 18:16:56 +08:00
lishuo
82923fe4f8 骑行界面字体 2021-04-19 18:03:04 +08:00
CaiYanPeng
51c6fd7236 细节调整 2021-04-19 17:59:45 +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
suntao
f065bf4bbb 调整样式 2021-04-19 14:36:08 +08:00
suntao
19766db051 Merge branch 'dev_cyp' into dev 
# Conflicts:
#	Assets/Resources/Loading.meta
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/UI/Prefab/Panel/MapListController.cs
 2021-04-19 14:15:34 +08:00
CaiYanPeng
0346b650aa 暂存 2021-04-19 14:11:53 +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
CaiYanPeng
f4cbad819b Merge remote-tracking branch 'origin/dev' into dev_cyp 
# Conflicts:
#	Assets/Resources/Images/back.png.meta
#	Assets/Resources/Images/change account.png.meta
#	Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
 2021-04-15 15:59:57 +08:00
CaiYanPeng
c97bd50f3f 暂存 2021-04-15 15:58:37 +08:00
suntao
e04ae0b085 细节调整 2021-04-15 15:57:29 +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
suntao
038720e7bd Merge branch 'modify-ui' into dev 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs
#	Assets/Scripts/Utils/Utils.cs
 2021-04-15 09:24:15 +08:00
suntao
d22eecd133 完成大地图主要界面 2021-04-15 09:01:07 +08:00
CaiYanPeng
10e738f958 登录页调整 增加半圆角组件 基本完成路线列表功能 基本完成骑行列表 开始做编辑页 2021-04-14 17:57:52 +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
suntao
5156473bb2 加弹框。修改连接设备样式。 2021-04-09 09:44:06 +08:00
CaiYanPeng
07feba912c 浏览器嵌入，国旗文件 2021-04-09 09:19:04 +08:00
lishuo
725b510748 动态海拔图，全路线小地图，骑行记录上传增加截图 2021-04-07 17:22:45 +08:00
lishuo
65fc5b5c50 场景加载处理一些卡顿的情况 2021-04-02 19:17:23 +08:00
suntao
e7a3214cb5 设备连接页加返回按钮 2021-04-01 14:29:58 +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
suntao
ec7589096f 实现连接设备界面 2021-04-01 11:09:53 +08:00
CaiYanPeng
996f924719 登录页一些特效，路书列表详情框架 2021-04-01 11:01:05 +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