suntao 92676d7cf8 Merge branch 'dev_cyp' into dev ...

# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/UIManager.cs

2021-05-08 11:15:28 +08:00

..

AudioManager.asset

init

2021-03-22 10:53:05 +08:00

ClusterInputManager.asset

init

2021-03-22 10:53:05 +08:00

DynamicsManager.asset

init

2021-03-22 10:53:05 +08:00

EditorBuildSettings.asset

浏览器嵌入，国旗文件

2021-04-09 09:19:04 +08:00

EditorSettings.asset

init

2021-03-22 10:53:05 +08:00

GraphicsSettings.asset

暂存

2021-04-15 15:58:37 +08:00

InputManager.asset

init

2021-03-22 10:53:05 +08:00

NavMeshAreas.asset

init

2021-03-22 10:53:05 +08:00

PackageManagerSettings.asset

init

2021-03-22 10:53:05 +08:00

Physics2DSettings.asset

init

2021-03-22 10:53:05 +08:00

PresetManager.asset

init

2021-03-22 10:53:05 +08:00

ProjectSettings.asset

Merge branch 'dev_cyp' into dev

2021-05-08 11:15:28 +08:00

ProjectVersion.txt

init

2021-03-22 10:53:05 +08:00

QualitySettings.asset

init

2021-03-22 10:53:05 +08:00

TagManager.asset

海拔图和小地图

2021-03-30 17:29:40 +08:00

TimeManager.asset

init

2021-03-22 10:53:05 +08:00

UnityConnectSettings.asset

init

2021-03-22 10:53:05 +08:00

VFXManager.asset

init

2021-03-22 10:53:05 +08:00

XRSettings.asset

init

2021-03-22 10:53:05 +08:00