0626 修改 同步

.gitignore

@@ -27,6 +27,7 @@
 /Unity.XR.PICO.Editor.csproj
 /.vsconfig
 /.vs
+/.vscode
 /*.apk
 /libc++_shared.so
 /libc++_shared.so.meta

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from HJJ at 2023/4/20 14:52:19
+Build from DESKTOP-LM86I61 at 2023/6/25 15:54:20

Assets/Studio/Scenes/Logo/Logo.unity

@@ -2046,7 +2046,7 @@ PrefabInstance:
     - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: isHand
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}

Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -180,10 +180,10 @@ namespace ShadowStudio.UI
         {
             // userInputField.text = "HBKC217147";
             //passwordInputField.text = "HBKC217147";
-
+#if UNITY_EDITOR
             userInputField.text = "ycst0008";
             passwordInputField.text = "yc123456";
-
+#endif
             if (userInputField.text == "" || passwordInputField.text == "")
             {
                 if (userInputField.text == "")

GHZMRSpace.sln

@@ -1,84 +1,51 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{5809EC30-BEC9-B1AD-1FAA-189FC8166933}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDK", "NRSDK.csproj", "{061c6507-1b55-0441-834f-04a3173cf73a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{30ec0958-c9be-adb1-1faa-189fc8166933}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming", "Unity.RenderStreaming.csproj", "{FBE3676D-1C1C-A0C3-A838-4A44D56286C0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{b70fcbb1-3cb2-7fb5-bb07-6ec2a7413903}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample", "Unity.RenderStreaming.Sample.csproj", "{E719F101-5363-7677-D79E-8BF509C171F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample", "Unity.RenderStreaming.Sample.csproj", "{01f119e7-6353-7776-d79e-8bf509c171f5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.Stats", "Unity.RenderStreaming.Sample.Stats.csproj", "{07EA15CD-ED49-1FE9-B712-C4EC2CBB20DD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.Stats", "Unity.RenderStreaming.Sample.Stats.csproj", "{cd15ea07-49ed-e91f-b712-c4ec2cbb20dd}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.WebBrowserInput", "Unity.RenderStreaming.Sample.WebBrowserInput.csproj", "{B7151302-F874-7EB8-7911-9CAC74B37D9E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.WebBrowserInput", "Unity.RenderStreaming.Sample.WebBrowserInput.csproj", "{021315b7-74f8-b87e-7911-9cac74b37d9e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDK", "NRSDK.csproj", "{07651C06-551B-4104-834F-04A3173CF73A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{eb0d596e-8fa8-3ea4-43b5-5f71db63395e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{6E590DEB-A88F-A43E-43B5-5F71DB63395E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDKEditor", "NRSDKEditor.csproj", "{7b862899-05ec-4b52-88d6-9e30f6717dcc}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Editor", "Unity.RenderStreaming.Editor.csproj", "{D7E30EC4-B265-8D5E-60B8-D5F6AAC5F0FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{0af871eb-a2e4-172d-fcfa-1fba93c60a91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{EB71F80A-E4A2-2D17-FCFA-1FBA93C60A91}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.Editor", "Unity.RenderStreaming.Sample.Editor.csproj", "{359A2D90-3CDD-9A15-8AE7-9E9E34E3FFDE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDKEditor", "NRSDKEditor.csproj", "{9928867B-EC05-524B-88D6-9E30F6717DCC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderStreaming.Sample.Editor", "Unity.RenderStreaming.Sample.Editor.csproj", "{902d9a35-dd3c-159a-8ae7-9e9e34e3ffde}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5809EC30-BEC9-B1AD-1FAA-189FC8166933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5809EC30-BEC9-B1AD-1FAA-189FC8166933}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5809EC30-BEC9-B1AD-1FAA-189FC8166933}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5809EC30-BEC9-B1AD-1FAA-189FC8166933}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBE3676D-1C1C-A0C3-A838-4A44D56286C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBE3676D-1C1C-A0C3-A838-4A44D56286C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBE3676D-1C1C-A0C3-A838-4A44D56286C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBE3676D-1C1C-A0C3-A838-4A44D56286C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E719F101-5363-7677-D79E-8BF509C171F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E719F101-5363-7677-D79E-8BF509C171F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E719F101-5363-7677-D79E-8BF509C171F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E719F101-5363-7677-D79E-8BF509C171F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07EA15CD-ED49-1FE9-B712-C4EC2CBB20DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07EA15CD-ED49-1FE9-B712-C4EC2CBB20DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07EA15CD-ED49-1FE9-B712-C4EC2CBB20DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07EA15CD-ED49-1FE9-B712-C4EC2CBB20DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7151302-F874-7EB8-7911-9CAC74B37D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7151302-F874-7EB8-7911-9CAC74B37D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7151302-F874-7EB8-7911-9CAC74B37D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7151302-F874-7EB8-7911-9CAC74B37D9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07651C06-551B-4104-834F-04A3173CF73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07651C06-551B-4104-834F-04A3173CF73A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07651C06-551B-4104-834F-04A3173CF73A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07651C06-551B-4104-834F-04A3173CF73A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E590DEB-A88F-A43E-43B5-5F71DB63395E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E590DEB-A88F-A43E-43B5-5F71DB63395E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E590DEB-A88F-A43E-43B5-5F71DB63395E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E590DEB-A88F-A43E-43B5-5F71DB63395E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7E30EC4-B265-8D5E-60B8-D5F6AAC5F0FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7E30EC4-B265-8D5E-60B8-D5F6AAC5F0FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7E30EC4-B265-8D5E-60B8-D5F6AAC5F0FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7E30EC4-B265-8D5E-60B8-D5F6AAC5F0FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB71F80A-E4A2-2D17-FCFA-1FBA93C60A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB71F80A-E4A2-2D17-FCFA-1FBA93C60A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB71F80A-E4A2-2D17-FCFA-1FBA93C60A91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB71F80A-E4A2-2D17-FCFA-1FBA93C60A91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{359A2D90-3CDD-9A15-8AE7-9E9E34E3FFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{359A2D90-3CDD-9A15-8AE7-9E9E34E3FFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{359A2D90-3CDD-9A15-8AE7-9E9E34E3FFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{359A2D90-3CDD-9A15-8AE7-9E9E34E3FFDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9928867B-EC05-524B-88D6-9E30F6717DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9928867B-EC05-524B-88D6-9E30F6717DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9928867B-EC05-524B-88D6-9E30F6717DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9928867B-EC05-524B-88D6-9E30F6717DCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{061c6507-1b55-0441-834f-04a3173cf73a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{061c6507-1b55-0441-834f-04a3173cf73a}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30ec0958-c9be-adb1-1faa-189fc8166933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30ec0958-c9be-adb1-1faa-189fc8166933}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{b70fcbb1-3cb2-7fb5-bb07-6ec2a7413903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{b70fcbb1-3cb2-7fb5-bb07-6ec2a7413903}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01f119e7-6353-7776-d79e-8bf509c171f5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01f119e7-6353-7776-d79e-8bf509c171f5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{cd15ea07-49ed-e91f-b712-c4ec2cbb20dd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{cd15ea07-49ed-e91f-b712-c4ec2cbb20dd}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{021315b7-74f8-b87e-7911-9cac74b37d9e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{021315b7-74f8-b87e-7911-9cac74b37d9e}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{eb0d596e-8fa8-3ea4-43b5-5f71db63395e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{eb0d596e-8fa8-3ea4-43b5-5f71db63395e}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7b862899-05ec-4b52-88d6-9e30f6717dcc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7b862899-05ec-4b52-88d6-9e30f6717dcc}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0af871eb-a2e4-172d-fcfa-1fba93c60a91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0af871eb-a2e4-172d-fcfa-1fba93c60a91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{902d9a35-dd3c-159a-8ae7-9e9e34e3ffde}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{902d9a35-dd3c-159a-8ae7-9e9e34e3ffde}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ProjectSettings/EditorBuildSettings.asset

@@ -18,6 +18,8 @@ EditorBuildSettings:
     path: Assets/Studio/Scenes/Show/Show.unity
     guid: ae34a02a0fc4f6e41a4bdf3e80ea1c56
   m_configObjects:
+    com.unity.renderstreaming.settings: {fileID: 11400000, guid: eaaad242393318e4f85c45e69c8837f0,
+      type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 8f422df2931cba0478c1fe8ab232b9a3,
       type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 2d049ae1db0e2b74c8251022ae6dcb95,

ProjectSettings/ProjectSettings.asset

@@ -934,8 +934,8 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
+      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -956,9 +956,9 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: True
       Proximity: False
       CodeGeneration: False
+      BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False

ProjectSettings/RenderStreamingProjectSettings.asset

@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_WizardPopupAtStart: 1
-  m_WizardPopupAlreadyShownOnce: 1
+  m_WizardPopupAlreadyShownOnce: 0