Browse Source

修复一些场景问题

胡佳骏 1 year ago
parent
commit
3d274d70de

+ 6 - 0
.gitignore

@@ -35,6 +35,12 @@
 /libopenxr_loader.so
 /libopenxr_loader.so.meta
 /GHZMRSpace.sln
+/Assets/Samples/*
+/Assets/TriLibXR/*
+/Assets/GHZSDK/*
+/Assets/AVProPlayer/*
+/Assets/Immersal/*
+/Assets/NRSDK
 /QCAR
 UnityRenderStreaming-main/UnityRenderStreaming-main/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta
 UnityRenderStreaming-main/UnityRenderStreaming-main/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/9/4 10:52:47
+Build from YUNYUNGEGE at 2023/9/4 11:50:07

+ 1 - 1
Assets/Studio/Scenes/Logo/Logo.unity

@@ -1022,7 +1022,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1772911445010504, guid: 6a01384ef9baaf146a1714c9819c18f9, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1804532980215356, guid: 6a01384ef9baaf146a1714c9819c18f9, type: 3}
       propertyPath: m_Name

+ 0 - 18
GHZMRSpaceXR.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{615ACB60-7481-2B11-05CA-D1D7ECE4D507}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Runtime", "AVProVideo.Runtime.csproj", "{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{39D8A39D-551A-7EE4-DF2B-683F2184A386}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Demos", "AVProVideo.Demos.csproj", "{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}"
@@ -17,14 +15,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.Visua
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Editor", "AVProVideo.Editor.csproj", "{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{0B921971-FAAE-A324-DFD6-5664460350D6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI.Editor", "AVProVideo.Extensions.UnityUI.Editor.csproj", "{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +29,6 @@ Global
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -63,10 +53,6 @@ Global
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B921971-FAAE-A324-DFD6-5664460350D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0B921971-FAAE-A324-DFD6-5664460350D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B921971-FAAE-A324-DFD6-5664460350D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,10 +61,6 @@ Global
 		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 1
Packages/manifest.json

@@ -3,7 +3,7 @@
     "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
     "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
     "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
-    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
+    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_A01",
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.13.3.tgz",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",

+ 2 - 2
Packages/packages-lock.json

@@ -200,7 +200,7 @@
       "hash": "474231f32c66e7b039e2f96aaf39165650f30cb0"
     },
     "jh.xr.engine": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_A01",
       "depth": 0,
       "source": "git",
       "dependencies": {
@@ -208,7 +208,7 @@
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
       },
-      "hash": "efa0c78ed35576de1a036b4e68afd5e724a9951a"
+      "hash": "c54eaf05e8a8a5ae4de15d9b7b85e25a7b5fcbec"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",