liyang 70005a1dbd Merge remote-tracking branch 'origin/main_ZYT' into Huang ...

# Conflicts:
#	ProjectSettings/ProjectSettings.asset

2026-02-04 17:46:23 +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_ZYT' into Huang

2026-02-04 17:46:23 +08:00

EditorSettings.asset

…

GraphicsSettings.asset

打包

2026-01-19 15:15:17 +08:00

InputManager.asset

打包

2026-01-19 15:15:17 +08:00

MemorySettings.asset

…

NavMeshAreas.asset

…

PackageManagerSettings.asset

…

Physics2DSettings.asset

…

PresetManager.asset

…

ProjectSettings.asset

添加北京通州向日葵广场场景、河南开封室内、室外场景，北京密云场景，辽宁水游城场景，江西南昌西湖南昌动物园场景，陕西榆林场景，四川凉山场景；修改河南商丘场景、江苏徐州鼓楼欧乐堡场景

2026-02-04 17:45:21 +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

…