powerfun-unity

Go to file

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

Assets

Merge remote-tracking branch 'origin/dev' into dev_lishuo

2021-04-01 14:09:23 +08:00

Packages

修改坡度计算逻辑，骑行界面大部分完成

2021-03-31 20:46:57 +08:00

ProjectSettings

Merge remote-tracking branch 'origin/dev' into dev_lishuo

2021-04-01 14:09:23 +08:00

.gitignore

暂存