CaiYanPeng 190a66bb68 Merge branch 'dev_lishuo' into dev_cyp ...

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

2021-11-23 09:51:10 +08:00

..

Mobile

Merge branch 'dev_lishuo' into dev_cyp

2021-11-23 09:51:10 +08:00

ConnectDeviceModal.prefab

中文版本

2021-11-10 18:13:38 +08:00

ConnectDeviceModal.prefab.meta

实现连接设备界面

2021-04-01 11:09:53 +08:00

DeviceItem.prefab

中文版本

2021-11-10 18:13:38 +08:00

DeviceItem.prefab.meta

实现连接设备界面

2021-04-01 11:09:53 +08:00

DeviceView.prefab

中文版本

2021-11-10 18:13:38 +08:00

DeviceView.prefab.meta

完成大地图主要界面

2021-04-15 09:01:07 +08:00

Mobile.meta

设备连接页面调整

2021-08-25 16:07:26 +08:00