liyang c2ee818830 Merge remote-tracking branch 'origin/main' into Huang ...

# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameLocal.cs
#	ProjectSettings/ProjectSettings.asset

2026-01-20 18:01:58 +08:00

..

com.arongranberg.astar

…

Packages

…

AudioManager.asset

…

AutoStreamingSettings.asset

…

BurstAotSettings_Android.json

…

BurstAotSettings_StandaloneWindows.json

…

ClusterInputManager.asset

…

CommonBurstAotSettings.json

…

DynamicsManager.asset

…

EditorBuildSettings.asset

Merge remote-tracking branch 'origin/main' into Huang

2026-01-20 18:01:58 +08:00

EditorSettings.asset

…

GraphicsSettings.asset

…

InputManager.asset

…

MemorySettings.asset

…

NavMeshAreas.asset

…

PackageManagerSettings.asset

…

Physics2DSettings.asset

…

PresetManager.asset

…

ProjectSettings.asset

Merge remote-tracking branch 'origin/main' into Huang

2026-01-20 18:01:58 +08:00

ProjectVersion.txt

…

QualitySettings.asset

…

SceneTemplateSettings.json

…

ShaderGraphSettings.asset

…

TagManager.asset

…

TimelineSettings.asset

…

TimeManager.asset

…

UnityConnectSettings.asset

…

URPProjectSettings.asset

…

VersionControlSettings.asset

…

VFXManager.asset

…

XRPackageSettings.asset

…

XRSettings.asset

…