提交修改RTC

Assets/LangChaoRTC/MediaSoup/RTCTexture.renderTexture

@@ -12,12 +12,13 @@ RenderTexture:
     Hash: 00000000000000000000000000000000
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
-  serializedVersion: 3
-  m_Width: 1280
-  m_Height: 720
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 1920
+  m_Height: 1080
   m_AntiAliasing: 1
   m_MipCount: -1
-  m_DepthFormat: 2
+  m_DepthStencilFormat: 92
   m_ColorFormat: 8
   m_MipMap: 0
   m_GenerateMips: 1
@@ -35,3 +36,4 @@ RenderTexture:
     m_WrapW: 1
   m_Dimension: 2
   m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2

Assets/LangChaoRTC/Remote/Chouli/LangChaoRTC.cs

@@ -103,6 +103,8 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
                     CustomInfo.mHight = 360;
                     break;
             }
+            CustomInfo.mWidth = 1920;
+            CustomInfo.mHight = 1080;
             NetWorkHeaders.GetUserAvater((JsonData aData) =>
             {
                 NetWorkHeaders.Instance.getNetTexture(aData["data"]["user"][0].ToString(), null, (Texture tex) => {

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/PngJpgItem.prefab

@@ -76,6 +76,112 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1066399678409243681
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2421801786628429755}
+  - component: {fileID: 2460267391268818233}
+  - component: {fileID: 4275313164161329013}
+  - component: {fileID: 5963320135251087541}
+  m_Layer: 3
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2421801786628429755
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066399678409243681}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.2865124}
+  m_LocalScale: {x: 0.3581405, y: 0.3581405, z: 0.3581405}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7501303589197907794}
+  - {fileID: 2283116017620325674}
+  - {fileID: 2847491637754489257}
+  - {fileID: 2283116017366872121}
+  - {fileID: 7378549253663381117}
+  - {fileID: 3042023657231314766}
+  m_Father: {fileID: 2283116017620586623}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 213.93521, y: 94.011894}
+  m_SizeDelta: {x: 1195.5, y: 525.00006}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &2460267391268818233
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066399678409243681}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &4275313164161329013
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066399678409243681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &5963320135251087541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1066399678409243681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &2283116017366872120
 GameObject:
   m_ObjectHideFlags: 0
@@ -102,16 +208,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2283116017366872120}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
-  m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_LocalPosition: {x: 0, y: 0, z: 0.79039997}
+  m_LocalScale: {x: 0.33501992, y: 0.33501992, z: 0.33501992}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00012887653, y: 0.00080652116}
+  m_AnchoredPosition: {x: -597.34955, y: -262.49774}
   m_SizeDelta: {x: 0.53475, y: 0.37301}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2283116017366872135
@@ -178,16 +284,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2283116017620325677}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
-  m_LocalScale: {x: 0.000035724504, y: 0.000035724504, z: 0.000035724504}
+  m_LocalPosition: {x: 0, y: 0, z: 0.79039997}
+  m_LocalScale: {x: 0.00009974998, y: 0.00009974998, z: 0.00009974998}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.00032236925, y: 0.017287444}
+  m_AnchoredPosition: {x: -597.3507, y: -262.45172}
   m_SizeDelta: {x: 710, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2283116017620325672
@@ -265,12 +371,7 @@ Transform:
   m_LocalScale: {x: 2.7922, y: 2.7922, z: 2.7922}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7501303589197907794}
-  - {fileID: 2283116017620325674}
-  - {fileID: 2847491637754489257}
-  - {fileID: 2283116017366872121}
-  - {fileID: 7378549253663381117}
-  - {fileID: 3042023657231314766}
+  - {fileID: 2421801786628429755}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -307,13 +408,10 @@ MonoBehaviour:
   scaleMinimum: 0.2
   activeScaleMaxRestrict: 0
   scaleMaximum: 2
-  scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
-  rotationHandleSize: 0.016
   showRotationHandleForX: 0
   showRotationHandleForY: 1
   showRotationHandleForZ: 0
-  axisScaleHandleSize: 0.016
   activeAxis: 36
   RotateStartAudio: 4
   RotateStopAudio: 3
@@ -390,6 +488,7 @@ MonoBehaviour:
   canTwoHandScale: 0
   minScaleRatio: 0.8
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!114 &-4693312241201425186
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -510,16 +609,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4243057379313034182}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
-  m_LocalScale: {x: 0.00035814047, y: 0.00035814047, z: 0.00035814047}
+  m_LocalPosition: {x: 0, y: 0, z: 0.79039997}
+  m_LocalScale: {x: 0.0009999999, y: 0.0009999999, z: 0.0009999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00042972737, y: -0.00003582472}
+  m_AnchoredPosition: {x: -597.3487, y: -262.50006}
   m_SizeDelta: {x: 150, y: 84}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4772399195672543194
@@ -584,18 +683,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5548528980826865798}
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: -0.005}
-  m_LocalScale: {x: 0.12, y: 0.12, z: 0.1}
+  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0.786039}
+  m_LocalScale: {x: 0.33506405, y: 0.33506405, z: 0.27922004}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3249712615032965929}
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.003, y: -0.022}
+  m_AnchoredPosition: {x: -597.3583, y: -262.56143}
   m_SizeDelta: {x: 0.05, y: 0.05}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &83601608496294690
@@ -710,18 +809,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6055046907787352134}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.005}
-  m_LocalScale: {x: 0.12, y: 0.12, z: 0.1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.786039}
+  m_LocalScale: {x: 0.33506402, y: 0.33506402, z: 0.27922004}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2907454102406049617}
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0037, y: -0.022}
+  m_AnchoredPosition: {x: -597.33954, y: -262.56143}
   m_SizeDelta: {x: 0.05, y: 0.05}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &957007009005889885
@@ -835,16 +934,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8225010984554638041}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
-  m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_LocalPosition: {x: 0, y: 0, z: 0.79039997}
+  m_LocalScale: {x: 0.33501992, y: 0.33501992, z: 0.33501992}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2283116017620586623}
+  m_Father: {fileID: 2421801786628429755}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0006446091, y: 0.0018981344}
+  m_AnchoredPosition: {x: -597.348, y: -262.4947}
   m_SizeDelta: {x: 0.524, y: 0.342}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &819895079492386796

Assets/LangChaoRTC/Remote/ShowRoom/SysSizeView.cs

@@ -37,6 +37,8 @@ public class SysSizeView : BaseView
                 CustomInfo.mHight = 360;
                 break;
         }
+        CustomInfo.mWidth = 1920;
+        CustomInfo.mHight = 1080;
         CustomInfo.camIndex = viewIndex + 1;
         baselist.updateConfig(CustomInfo.sscList);
     }

Packages/manifest.json

@@ -15,7 +15,7 @@
     "com.unity.xr.arfoundation": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
     "com.ximmerse.xr": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
-    "con.ghz.login": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
+    "con.ghz.login": "file:D:/JiHe/LoginXR",
     "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
     "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -220,11 +220,10 @@
       "hash": "1be760e1a372b13db307dbe0e09b719455bd53bd"
     },
     "con.ghz.login": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
+      "version": "file:D:/JiHe/LoginXR",
       "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "f457e80af8b08208ebf5ce27edf1899a8706fc89"
+      "source": "local",
+      "dependencies": {}
     },
     "jh.baseeditor.engine": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",

ProjectSettings/ProjectSettings.asset

@@ -146,7 +146,9 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: -3507145773158424512, guid: 3df6047a2585e9a4b87f07c19a70fec7, type: 2}
+  - {fileID: -6724271008176559649, guid: aba1d4d6205d4914784889e2d8ed78c4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1