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

..

Ride

人物移动调整

2021-04-15 17:29:32 +08:00

1-Login.unity

暂存

2021-04-19 14:11:53 +08:00

1-Login.unity.meta

前两个页面迁移完成

2021-03-26 09:50:04 +08:00

2-Main.unity

暂存

2021-03-29 09:19:48 +08:00

2-Main.unity.meta

主场景迁移

2021-03-25 17:18:51 +08:00

3-MapList.unity

暂存

2021-04-19 14:11:53 +08:00

3-MapList.unity.meta

登录页一些效果，接路线列表页

2021-03-30 14:14:24 +08:00

Image.prefab

暂存

2021-03-29 09:19:48 +08:00

Image.prefab.meta

暂存

2021-03-29 09:19:48 +08:00

MainScene.unity

Merge branch 'dev_cyp' into dev

2021-04-19 14:15:34 +08:00

MainScene.unity.meta

添加uimanager和主场景

2021-03-25 16:53:39 +08:00

Ride.meta

单人骑行

2021-03-30 17:27:50 +08:00