新增梅陇镇广场模型文件

2026-06-01 15:53:49 +08:00
parent 28d2d2479b
commit 350fb9b525
10 changed files with 28 additions and 12 deletions
@@ -74,17 +74,6 @@ Plugins/**/Intermediate/*
 DerivedDataCache/*

 <<<<<<< HEAD
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md006.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md007.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md011.uasset
-SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset
+
 =======
 >>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df