XR_dev/UE_SpaceStudio
6
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_test' of https://gitea-web.iepose.cn/yang/SpaceStudio into dev_test

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
admini
2026-06-01 10:35:19 +08:00
parent 0899083708 42d003ea27
commit 3e17bd6950
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -73,6 +73,7 @@ Plugins/**/Intermediate/*
# Cache files for the editor to use # Cache files for the editor to use
DerivedDataCache/* DerivedDataCache/*
<<<<<<< HEAD
SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset 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_Md001.uasset
SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset
@@ -102,3 +103,5 @@ SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medi
SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_B.uasset SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_B.uasset
SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_N.uasset SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_N.uasset
SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_ORM.uasset SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_ORM.uasset
=======
>>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df