 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
|
8ad36c965d
|
海拔图和小地图
|
2021-03-30 17:29:40 +08:00 |
|
|
lishuo
|
42fa59d103
|
解决相机抖动和人物移动动画不流畅的问题
|
2021-03-30 17:29:39 +08:00 |
|
|
lishuo
|
971a6f7e0e
|
单人骑行
|
2021-03-30 17:27:50 +08:00 |
|
 suntao
|
326b74bd03
|
注释模态窗口
|
2021-03-30 14:27:09 +08:00 |
|
|
suntao
|
3c2bb10f07
|
加ant+相关代码。
|
2021-03-30 14:23:41 +08:00 |
|
 Caiyanpeng
|
f45711f39f
|
登录页一些效果，接路线列表页
|
2021-03-30 14:14:24 +08:00 |
|
|
Caiyanpeng
|
d1d9c92f1c
|
Merge remote-tracking branch 'origin/dev' into dev_cyp
|
2021-03-29 10:00:31 +08:00 |
|
|
Caiyanpeng
|
cbc79df8a2
|
暂存
|
2021-03-29 09:19:48 +08:00 |
|
|
suntao
|
38d1c387c3
|
加场景切换和事件绑定功能
|
2021-03-29 09:10:59 +08:00 |
|
|
lishuo
|
c5bd9daba2
|
海拔图和小地图
|
2021-03-28 18:17:15 +08:00 |
|
|
Caiyanpeng
|
e7044b3cde
|
前两个页面迁移完成
|
2021-03-26 09:50:04 +08:00 |
|
|
Caiyanpeng
|
ba324aa68d
|
主场景迁移
|
2021-03-25 17:18:51 +08:00 |
|
|
suntao
|
4ecf26ec80
|
添加uimanager和主场景
|
2021-03-25 16:53:39 +08:00 |
|
|
lishuo
|
45801dff22
|
解决相机抖动和人物移动动画不流畅的问题
|
2021-03-25 16:22:09 +08:00 |
|
|
lishuo
|
398628017c
|
单人骑行
|
2021-03-22 19:20:51 +08:00 |
|
|
suntao
|
f557e2f5df
|
添加nuget和网络请求api
|
2021-03-22 16:06:28 +08:00 |
|
|
suntao
|
f8bcfd977f
|
init
|
2021-03-22 10:53:05 +08:00 |
|