Pārlūkot izejas kodu

更换手机版本

jiajun.hu.x 1 gadu atpakaļ
vecāks
revīzija
0ba30ab509
45 mainītis faili ar 10770 papildinājumiem un 570 dzēšanām
  1. BIN
      .vs/GHZMRSpace/v16/.suo
  2. 36 0
      Assets/MRSpace.inputsettings.asset
  3. 8 0
      Assets/MRSpace.inputsettings.asset.meta
  4. 8349 0
      Assets/NavigatorProPhone.unity
  5. 7 0
      Assets/NavigatorProPhone.unity.meta
  6. 5 8
      Assets/Plugins/Android/AndroidManifest.xml
  7. BIN
      Assets/Plugins/Android/app-debug.aar
  8. 0 32
      Assets/Plugins/Android/app-debug.aar.meta
  9. 1 1
      Assets/Resources/VuforiaConfiguration.asset
  10. 1 1
      Assets/SDK/Modules/Module_InputSystem/Module_InputSystem.cs
  11. 8 0
      Assets/Samples.meta
  12. 688 0
      Assets/Scenes/Test.unity
  13. 7 0
      Assets/Scenes/Test.unity.meta
  14. 28 0
      Assets/SignalingSettings.asset
  15. 8 0
      Assets/SignalingSettings.asset.meta
  16. 1 1
      Assets/StreamingAssets/build_info
  17. 2 2
      Assets/Studio/MediaSoup/WebSocket/WSRtcHandler.cs
  18. 12 34
      Assets/Studio/Resources/_1LoginSencePrefab/LoginDlg.prefab
  19. 136 3
      Assets/Studio/Resources/_2HomeSencePrefab/CreateRoomDlg.prefab
  20. 170 70
      Assets/Studio/Resources/_2HomeSencePrefab/CreateSearchRoomDlg.prefab
  21. 137 82
      Assets/Studio/Resources/_2HomeSencePrefab/SearchRoomDlg.prefab
  22. 0 18
      Assets/Studio/Scenes/Hjj/Scripts/dontClear.cs
  23. 0 11
      Assets/Studio/Scenes/Hjj/Scripts/dontClear.cs.meta
  24. 133 3
      Assets/Studio/Scenes/Home/Home.unity
  25. 64 0
      Assets/Studio/Scenes/Home/HomeSettings.lighting
  26. 8 0
      Assets/Studio/Scenes/Home/HomeSettings.lighting.meta
  27. 493 283
      Assets/Studio/Scenes/Logo/Logo.unity
  28. 132 4
      Assets/Studio/Scenes/Show/Show.unity
  29. 64 0
      Assets/Studio/Scenes/Show/ShowSettings.lighting
  30. 8 0
      Assets/Studio/Scenes/Show/ShowSettings.lighting.meta
  31. 1 0
      Assets/Studio/XRLib/Codes/PublicTools/Common/GameSession.cs
  32. 4 4
      Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs
  33. 2 2
      Assets/Studio/_3HomeScene/HomeSceneScripts_new/CreateSearchRoomDlg.cs
  34. 1 1
      Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs
  35. 14 0
      Assets/XR/Loaders/AR Core Loader.asset
  36. 8 0
      Assets/XR/Loaders/AR Core Loader.asset.meta
  37. 17 0
      Assets/XR/Settings/AR Core Settings.asset
  38. 8 0
      Assets/XR/Settings/AR Core Settings.asset.meta
  39. 33 1
      Assets/XR/XRGeneralSettings.asset
  40. 62 0
      GHZMRSpace.sln
  41. 4 0
      Packages/manifest.json
  42. 72 1
      Packages/packages-lock.json
  43. 9 0
      ProjectSettings/EditorBuildSettings.asset
  44. 13 8
      ProjectSettings/ProjectSettings.asset
  45. 16 0
      ProjectSettings/RenderStreamingProjectSettings.asset

BIN
.vs/GHZMRSpace/v16/.suo


+ 36 - 0
Assets/MRSpace.inputsettings.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
+  m_Name: MRSpace.inputsettings
+  m_EditorClassIdentifier: 
+  m_SupportedDevices: []
+  m_UpdateMode: 1
+  m_MaxEventBytesPerUpdate: 5242880
+  m_MaxQueuedEventsPerUpdate: 1000
+  m_CompensateForScreenOrientation: 1
+  m_BackgroundBehavior: 2
+  m_EditorInputBehaviorInPlayMode: 2
+  m_DefaultDeadzoneMin: 0.125
+  m_DefaultDeadzoneMax: 0.925
+  m_DefaultButtonPressPoint: 0.5
+  m_ButtonReleaseThreshold: 0.75
+  m_DefaultTapTime: 0.2
+  m_DefaultSlowTapTime: 0.5
+  m_DefaultHoldTime: 0.4
+  m_TapRadius: 5
+  m_MultiTapDelayTime: 0.75
+  m_DisableRedundantEventsMerging: 0
+  m_ShortcutKeysConsumeInputs: 0
+  m_iOSSettings:
+    m_MotionUsage:
+      m_Enabled: 0
+      m_Description: 

+ 8 - 0
Assets/MRSpace.inputsettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8092425ada3dfcb40846a0d4df9b50e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 8349 - 0
Assets/NavigatorProPhone.unity


+ 7 - 0
Assets/NavigatorProPhone.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b8da3f3ecd5ee4a43bed7807f1295b43
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 8
Assets/Plugins/Android/AndroidManifest.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mediasoup.droid.demo">
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <application android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true" android:hardwareAccelerated="true" android:label="@string/app_name" android:icon="@drawable/app_icon">
-    <activity android:name="org.mediasoup.droid.demo.UnityActivity">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
+  <uses-sdk tools:overrideLibrary="com.nreal.glasses_sdk" />
+  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
+  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-      <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
     </activity>
     <meta-data android:name="nreal_sdk" android:value="true" />
     <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />

BIN
Assets/Plugins/Android/app-debug.aar


+ 0 - 32
Assets/Plugins/Android/app-debug.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: c47b7a505dbe7d34da00156d4d207d67
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -49,4 +49,4 @@ MonoBehaviour:
   webcam:
     renderTextureLayer: 30
   packageInformation:
-    ARFoundationVersion: 
+    ARFoundationVersion: 4.2.8

+ 1 - 1
Assets/SDK/Modules/Module_InputSystem/Module_InputSystem.cs

@@ -122,7 +122,7 @@ namespace SC.XR.Unity.Module_InputSystem
             {
                 activeGGT26Dof = API_Module_SDKConfiguration.GetBool("Module_InputSystem", "ActiveGGT26Dof", 0);
             }
-            activeKS = true;
+            activeKS = false;
             activeHead = true;
 
         }

+ 8 - 0
Assets/Samples.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cdcbab9f59c8e34439cfea3731fd4421
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 688 - 0
Assets/Scenes/Test.unity

@@ -0,0 +1,688 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &28262428
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 28262432}
+  - component: {fileID: 28262431}
+  - component: {fileID: 28262430}
+  - component: {fileID: 28262429}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &28262429
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28262428}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &28262430
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28262428}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &28262431
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28262428}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &28262432
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28262428}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.614005, y: -0.062162314, z: 8.234594}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &591928646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 591928648}
+  - component: {fileID: 591928647}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &591928647
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 591928646}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &591928648
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 591928646}
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &640448676
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 640448680}
+  - component: {fileID: 640448679}
+  - component: {fileID: 640448678}
+  - component: {fileID: 640448677}
+  m_Layer: 0
+  m_Name: Cube (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &640448677
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 640448676}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &640448678
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 640448676}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &640448679
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 640448676}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &640448680
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 640448676}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.614005, y: -0.062162314, z: 15.85}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1101202922
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1101202926}
+  - component: {fileID: 1101202925}
+  - component: {fileID: 1101202924}
+  - component: {fileID: 1101202923}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &1101202923
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1101202922}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1101202924
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1101202922}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1101202925
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1101202922}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1101202926
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1101202922}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.614005, y: -0.062162314, z: 4.165}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1348422139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1348422142}
+  - component: {fileID: 1348422141}
+  - component: {fileID: 1348422140}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1348422140
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348422139}
+  m_Enabled: 1
+--- !u!20 &1348422141
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348422139}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1348422142
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348422139}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1929124934
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1934619120850925630, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_BackGroundColor.b
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619120850925630, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_BackGroundColor.g
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619120850925630, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_BackGroundColor.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619121951918029, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122386473148, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: managedReferences[7306397139844726786].m_url
+      value: ws://192.168.3.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556342, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1934619122417556343, guid: 7a04e4ed5b3d7124db7889acb47b1dce,
+        type: 3}
+      propertyPath: m_Name
+      value: RTC
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7a04e4ed5b3d7124db7889acb47b1dce, type: 3}

+ 7 - 0
Assets/Scenes/Test.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad54bf1fb7cf86f4c9f6ce085d2c6596
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 28 - 0
Assets/SignalingSettings.asset

@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 22c294fb286b37446a86664f4fb41023, type: 3}
+  m_Name: SignalingSettings
+  m_EditorClassIdentifier: 
+  settings:
+    id: 0
+  references:
+    version: 1
+    00000000:
+      type: {class: WebSocketSignalingSettings, ns: Unity.RenderStreaming, asm: Unity.RenderStreaming}
+      data:
+        m_url: ws://127.0.0.1
+        m_iceServers:
+        - m_urls:
+          - stun:stun.l.google.com:19302
+          m_username: 
+          m_credentialType: 0
+          m_credential: 

+ 8 - 0
Assets/SignalingSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa9e054fba5f01747b205806f70b9123
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/5/23 18:10:43
+Build from HJJ at 2023/6/9 13:57:45

+ 2 - 2
Assets/Studio/MediaSoup/WebSocket/WSRtcHandler.cs

@@ -356,9 +356,9 @@ public class WSRtcHandler  {
                             Debug.Log("changeDisplayName=========>");
                             SCRtcFactory.Instance.mSCRtcHandle.getDevice();
 
-                    #if UNITY_EDITOR || !UNITY_ANDROID
+                   // #if UNITY_EDITOR || !UNITY_ANDROID
                                             joinRoom("{}");
-                    #endif
+                   // #endif
                         break;
                         default:
                             break;

+ 12 - 34
Assets/Studio/Resources/_1LoginSencePrefab/LoginDlg.prefab

@@ -5443,7 +5443,7 @@ GameObject:
   - component: {fileID: 8663634092783487456}
   - component: {fileID: 415691814}
   - component: {fileID: 415691813}
-  - component: {fileID: 1495157068510197381}
+  - component: {fileID: 6727574240926750467}
   m_Layer: 5
   m_Name: UserInputField
   m_TagString: Untagged
@@ -5563,7 +5563,7 @@ MonoBehaviour:
   VisualMove: {fileID: 0}
   VisualScale: {fileID: 1834266650}
   minCompressPercentage: 0.25
---- !u!114 &1495157068510197381
+--- !u!114 &6727574240926750467
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -5572,7 +5572,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8663634092783487453}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a46608ad6e721a8439545e876d6d4a79, type: 3}
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -5617,10 +5617,10 @@ MonoBehaviour:
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnValueChanged:
+  m_OnDidEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
+  m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
@@ -5630,18 +5630,7 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
-  m_SCKeyboardEnum: 0
-  m_UseCustomTransform: 0
-  m_CustomPosition: {x: 0, y: 0, z: 0}
-  m_CustomRotation: {x: 0, y: 0, z: 0}
-  m_CustomLocalScale: {x: 0, y: 0, z: 0}
-  m_ShouldActivateOnSelect: 0
-  m_SCKeyboardType: 1
-  m_SCKeyboardSpaceEnum: 1
-  m_CustomDistance: 1
-  m_CustomOffset: {x: 0, y: -0.2}
-  m_UseCustomOrderInLayer: 0
-  m_OrderInLayer: 10
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &8663634092788089618
 GameObject:
   m_ObjectHideFlags: 0
@@ -9081,7 +9070,7 @@ GameObject:
   - component: {fileID: 8663634093892348390}
   - component: {fileID: 1006719811}
   - component: {fileID: 1006719810}
-  - component: {fileID: 3249203755615038542}
+  - component: {fileID: 4606466436643212610}
   m_Layer: 5
   m_Name: PasswordInputField
   m_TagString: Untagged
@@ -9202,7 +9191,7 @@ MonoBehaviour:
   VisualMove: {fileID: 0}
   VisualScale: {fileID: 1291039127}
   minCompressPercentage: 0.25
---- !u!114 &3249203755615038542
+--- !u!114 &4606466436643212610
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9211,7 +9200,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8663634093892348387}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a46608ad6e721a8439545e876d6d4a79, type: 3}
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -9256,10 +9245,10 @@ MonoBehaviour:
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnValueChanged:
+  m_OnDidEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
+  m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
@@ -9269,18 +9258,7 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
-  m_SCKeyboardEnum: 0
-  m_UseCustomTransform: 0
-  m_CustomPosition: {x: 0, y: 0, z: 0}
-  m_CustomRotation: {x: 0, y: 0, z: 0}
-  m_CustomLocalScale: {x: 0, y: 0, z: 0}
-  m_ShouldActivateOnSelect: 0
-  m_SCKeyboardType: 1
-  m_SCKeyboardSpaceEnum: 1
-  m_CustomDistance: 1
-  m_CustomOffset: {x: 0, y: -0.2}
-  m_UseCustomOrderInLayer: 0
-  m_OrderInLayer: 10
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &8663634093931108080
 GameObject:
   m_ObjectHideFlags: 0

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 136 - 3
Assets/Studio/Resources/_2HomeSencePrefab/CreateRoomDlg.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 170 - 70
Assets/Studio/Resources/_2HomeSencePrefab/CreateSearchRoomDlg.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 137 - 82
Assets/Studio/Resources/_2HomeSencePrefab/SearchRoomDlg.prefab


+ 0 - 18
Assets/Studio/Scenes/Hjj/Scripts/dontClear.cs

@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class dontClear : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        DontDestroyOnLoad(this.gameObject);
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

+ 0 - 11
Assets/Studio/Scenes/Hjj/Scripts/dontClear.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6ca24e4baf65ab84eaeb56dff2a21f32
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 133 - 3
Assets/Studio/Scenes/Home/Home.unity


+ 64 - 0
Assets/Studio/Scenes/Home/HomeSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HomeSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

+ 8 - 0
Assets/Studio/Scenes/Home/HomeSettings.lighting.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dbc8fc20731838044ad69f532f4de820
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 493 - 283
Assets/Studio/Scenes/Logo/Logo.unity


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 132 - 4
Assets/Studio/Scenes/Show/Show.unity


+ 64 - 0
Assets/Studio/Scenes/Show/ShowSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShowSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

+ 8 - 0
Assets/Studio/Scenes/Show/ShowSettings.lighting.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5af6d15faaac62245ae9bbd946e19b3d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Studio/XRLib/Codes/PublicTools/Common/GameSession.cs

@@ -122,6 +122,7 @@ namespace XRTool.Util
             }
 #endif
 
+            //gameHead = OpenXRCamera.Instance.head;
             InitSuccess = false;
             DontDestroyOnLoad(gameObject);
             StartCoroutine(CheckBaseInit());

+ 4 - 4
Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -23,8 +23,8 @@ namespace ShadowStudio.UI
     public class LoginDlg : UnitySingleton<LoginDlg>
     {
         private string session;
-        private SCInputField userInputField;
-        private SCInputField passwordInputField;
+        private InputField userInputField;
+        private InputField passwordInputField;
         private Button loginBtn;
         private Button setBtn;
         private Toggle remberToggle;
@@ -45,9 +45,9 @@ namespace ShadowStudio.UI
         {
             CommonMethod.IsReceive = false;
             dlg = GetComponent<WorldDlg>();
-            userInputField = dlg.GetChild<SCInputField>("UIRoot/UserInputField");
+            userInputField = dlg.GetChild<InputField>("UIRoot/UserInputField");
             //dlg.GetBreadthChild<SCInputField>("UserInputField")
-            passwordInputField = dlg.GetChild<SCInputField>("UIRoot/PasswordInputField");
+            passwordInputField = dlg.GetChild<InputField>("UIRoot/PasswordInputField");
             loginBtn = dlg.GetChild<Button>("FullUIRoot/LoginBtn");
             setBtn = dlg.GetChild<Button>("UIRoot/SetBtn");
             remberToggle = dlg.GetChild<Toggle>("UIRoot/RemberToggle_CheckBox");

+ 2 - 2
Assets/Studio/_3HomeScene/HomeSceneScripts_new/CreateSearchRoomDlg.cs

@@ -20,7 +20,7 @@ namespace ShadowStudio.UI
         private Button createRoomBtn;
         private Button deleteBtn;
         private Button aboutmeBtn;
-        private SCInputField searchRoomInputFiled;
+        private InputField searchRoomInputFiled;
         public WorldDlg dlg;
         private XRImage3D image3D;
         private void Start()
@@ -35,7 +35,7 @@ namespace ShadowStudio.UI
             deleteBtn.onClick.AddListener(OnClickDelete);
             aboutmeBtn = dlg.GetBreadthChild<Button>("AboutmeBtn");
             aboutmeBtn.onClick.AddListener(OnClickAboutmeBtn);
-            searchRoomInputFiled = dlg.GetBreadthChild<SCInputField>("SearchRoomInputFiled");
+            searchRoomInputFiled = dlg.GetBreadthChild<InputField>("SearchRoomInputFiled");
             searchRoomInputFiled.onEndEdit.AddListener(InputSearchRoomEnd);
             searchRoomInputFiled.onValueChanged.AddListener(SearchRoomChanged);
             if (UserInfoMgr.Instance.userConfig.Login_type == "3")

+ 1 - 1
Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -175,7 +175,7 @@ namespace ShadowStudio.UI
 
         public void CloseScan()
         {
-            if (vufora_camera.enabled == true)
+            if (vufora_camera!=null&&vufora_camera.enabled == true)
             {
                 CommonMethod.ShowScanEffect(false);
                 vufora_camera.enabled = false;

+ 14 - 0
Assets/XR/Loaders/AR Core Loader.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
+  m_Name: AR Core Loader
+  m_EditorClassIdentifier: 

+ 8 - 0
Assets/XR/Loaders/AR Core Loader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9fccdabffc9d3804f8df794769058ed9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 17 - 0
Assets/XR/Settings/AR Core Settings.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9dae4501572e1418791be3e3bf1f7faa, type: 3}
+  m_Name: AR Core Settings
+  m_EditorClassIdentifier: 
+  m_Requirement: 0
+  m_Depth: 0
+  m_IgnoreGradleVersion: 0

+ 8 - 0
Assets/XR/Settings/AR Core Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85b68ef9883be5f479ea230877fd83a1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 33 - 1
Assets/XR/XRGeneralSettings.asset

@@ -56,10 +56,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
   m_Name: XRGeneralSettings
   m_EditorClassIdentifier: 
-  Keys: 0100000007000000
+  Keys: 01000000070000000d000000
   Values:
   - {fileID: -7061507647067013983}
   - {fileID: -6682207197718421661}
+  - {fileID: 7564021778193297842}
 --- !u!114 &2112244585808358372
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -75,4 +76,35 @@ MonoBehaviour:
   m_RequiresSettingsUpdate: 0
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
+  m_Loaders:
+  - {fileID: 11400000, guid: 9fccdabffc9d3804f8df794769058ed9, type: 2}
+--- !u!114 &6776991485157659913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: WebGL Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
   m_Loaders: []
+--- !u!114 &7564021778193297842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: WebGL Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: 6776991485157659913}
+  m_InitManagerOnStart: 1

+ 62 - 0
GHZMRSpace.sln

@@ -0,0 +1,62 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDK", "NRSDK.csproj", "{07651C06-551B-4104-834F-04A3173CF73A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{5809EC30-BEC9-B1AD-1FAA-189FC8166933}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{B1CB0FB7-B23C-B57F-BB07-6EC2A7413903}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDK.Experimental", "NRSDK.Experimental.csproj", "{D79F2922-9A06-157E-BFD3-0A49CD32F719}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{6E590DEB-A88F-A43E-43B5-5F71DB63395E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRSDKEditor", "NRSDKEditor.csproj", "{9928867B-EC05-524B-88D6-9E30F6717DCC}"
+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}") = "NRSDKEditor.Experimental", "NRSDKEditor.Experimental.csproj", "{22ECECA4-BB70-8321-E7F6-15EAAB29C5CD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{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
+		{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
+		{D79F2922-9A06-157E-BFD3-0A49CD32F719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D79F2922-9A06-157E-BFD3-0A49CD32F719}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D79F2922-9A06-157E-BFD3-0A49CD32F719}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D79F2922-9A06-157E-BFD3-0A49CD32F719}.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
+		{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
+		{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
+		{22ECECA4-BB70-8321-E7F6-15EAAB29C5CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22ECECA4-BB70-8321-E7F6-15EAAB29C5CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22ECECA4-BB70-8321-E7F6-15EAAB29C5CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22ECECA4-BB70-8321-E7F6-15EAAB29C5CD}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

+ 4 - 0
Packages/manifest.json

@@ -8,11 +8,15 @@
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.purchasing": "4.5.2",
+    "com.unity.renderstreaming": "file:../com.unity.renderstreaming",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.7.8",
+    "com.unity.xr.arcore": "4.2.8",
+    "com.unity.xr.arfoundation": "4.2.8",
+    "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

+ 72 - 1
Packages/packages-lock.json

@@ -35,6 +35,13 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.editorcoroutines": {
+      "version": "1.0.0",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -98,6 +105,17 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.renderstreaming": {
+      "version": "file:../com.unity.renderstreaming",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {
+        "com.unity.webrtc": "3.0.0-pre.4",
+        "com.unity.inputsystem": "1.4.4",
+        "com.unity.ugui": "1.0.0",
+        "com.unity.modules.screencapture": "1.0.0"
+      }
+    },
     "com.unity.services.analytics": {
       "version": "4.2.0",
       "depth": 1,
@@ -121,7 +139,7 @@
     },
     "com.unity.subsystemregistration": {
       "version": "1.1.0",
-      "depth": 2,
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.modules.subsystems": "1.0.0"
@@ -179,6 +197,59 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.webrtc": {
+      "version": "3.0.0-pre.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.editorcoroutines": "1.0.0",
+        "com.unity.modules.audio": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.arcore": {
+      "version": "4.2.8",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.modules.androidjni": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.arfoundation": {
+      "version": "4.2.8",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.arsubsystems": {
+      "version": "4.2.8",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.subsystemregistration": "1.1.0",
+        "com.unity.xr.management": "4.0.1"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.interactionsubsystems": {
+      "version": "1.0.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.subsystemregistration": "1.0.5"
+      },
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.xr.legacyinputhelpers": {
       "version": "2.1.10",
       "depth": 1,

+ 9 - 0
ProjectSettings/EditorBuildSettings.asset

@@ -20,7 +20,16 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/GHZAlter/LANScene.unity
     guid: 0b4e6f654a95ee64d9e2b4c8a349108b
+  - enabled: 0
+    path: Assets/Scenes/Test.unity
+    guid: ad54bf1fb7cf86f4c9f6ce085d2c6596
   m_configObjects:
+    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 85b68ef9883be5f479ea230877fd83a1,
+      type: 2}
+    com.unity.input.settings: {fileID: 11400000, guid: 8092425ada3dfcb40846a0d4df9b50e6,
+      type: 2}
+    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,

+ 13 - 8
ProjectSettings/ProjectSettings.asset

@@ -147,7 +147,12 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 10.13.3
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 8092425ada3dfcb40846a0d4df9b50e6, type: 2}
+  - {fileID: 11400000, guid: eaaad242393318e4f85c45e69c8837f0, type: 2}
+  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
+  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
+  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -184,12 +189,12 @@ PlayerSettings:
   stripEngineCode: 1
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  ForceInternetPermission: 0
-  ForceSDCardPermission: 0
+  ForceInternetPermission: 1
+  ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0
-  StripUnusedMeshComponents: 0
+  StripUnusedMeshComponents: 1
   VertexChannelCompressionMask: 214
   iPhoneSdkVersion: 988
   iOSTargetOSVersionString: 14.0
@@ -574,7 +579,7 @@ PlayerSettings:
   openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
-    Android: 1
+    Android: 0
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality:
@@ -595,7 +600,7 @@ PlayerSettings:
   enableCrashReportAPI: 0
   cameraUsageDescription: Camera access required for target detection and tracking
   locationUsageDescription: 
-  microphoneUsageDescription: 
+  microphoneUsageDescription: For Microphone
   bluetoothUsageDescription: 
   switchNMETAOverride: 
   switchNetLibKey: 
@@ -857,7 +862,7 @@ PlayerSettings:
   incrementalIl2cppBuild:
     iPhone: 1
   suppressCommonWarnings: 1
-  allowUnsafeCode: 0
+  allowUnsafeCode: 1
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
   selectedPlatform: 2
@@ -1025,7 +1030,7 @@ PlayerSettings:
   projectName: 
   organizationId: 
   cloudEnabled: 0
-  legacyClampBlendShapeWeights: 1
+  legacyClampBlendShapeWeights: 0
   playerDataPath: 
   forceSRGBBlit: 1
   virtualTexturingSupportEnabled: 0

+ 16 - 0
ProjectSettings/RenderStreamingProjectSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b4f5b5e9819c4eafb84bd87d1c2f266f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WizardPopupAtStart: 1
+  m_WizardPopupAlreadyShownOnce: 1

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels