powerfun-unity

Go to file

CaiYanPeng f155b2b627 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

2021-08-25 10:23:51 +08:00

Assets

Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

2021-08-25 10:23:51 +08:00

Packages

限制编辑信息里的长度

2021-05-20 20:07:45 +08:00

ProjectSettings

增加移动端界面暂存

2021-08-24 17:50:14 +08:00

.gitignore

Merge branch 'dev_lishuo' into dev