lishuo e513eeac5c Merge branch 'dev_cyp' into dev_ar_cyp ...

# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs

2022-06-02 11:30:37 +08:00

..

AndroidResolverDependencies.xml

暂存

2022-03-09 09:11:53 +08:00

AudioManager.asset

骑行视角等优化

2021-12-09 18:17:39 +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

Merge branch 'dev_cyp' into dev_ar_cyp

2022-06-02 11:30:37 +08:00

EditorSettings.asset

init

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

GraphicsSettings.asset

暂存

2022-03-09 09:11:53 +08:00

GvhProjectSettings.xml

Facebook sdk接入

2021-12-23 15:36:11 +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

暂存

2022-03-09 09:11:53 +08:00

ProjectVersion.txt

init

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

QualitySettings.asset

对战AR

2022-05-13 09:28:58 +08:00

TagManager.asset

对战AR

2022-05-13 09:28:58 +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