修复一些问题

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/7/20 15:48:34
+Build from YUNYUNGEGE at 2023/8/24 13:03:02

Assets/Studio/Resources/Container/Component/VideoComponent.prefab

@@ -131,7 +131,7 @@ GameObject:
   - component: {fileID: 7614218661709076758}
   - component: {fileID: 7966748271530940476}
   - component: {fileID: 6019246518395097823}
-  - component: {fileID: 5724618819271878684}
+  - component: {fileID: 2164748603067606598}
   m_Layer: 0
   m_Name: Body
   m_TagString: Untagged
@@ -267,7 +267,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 0.99999994, z: 6.123233e-17}
   m_Center: {x: 0, y: 0, z: 0.0000047683716}
---- !u!114 &5724618819271878684
+--- !u!114 &2164748603067606598
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -276,10 +276,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 368496387985083170}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 333f01b783fb00643bbcb436f52e695c, type: 3}
+  m_Script: {fileID: 11500000, guid: f6d1977a52888584496b1acc7e998011, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _media: {fileID: 7882804780517578926}
+  _media: {fileID: 2891801243900849909}
   _automaticStereoPacking: 1
   _overrideStereoPacking: 0
   _stereoRedGreenTint: 0
@@ -585,7 +585,7 @@ Transform:
   m_GameObject: {fileID: 1033587740297260375}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 877, y: 418, z: 0.2}
+  m_LocalScale: {x: 1168.5, y: 539, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7978262185963979644}
@@ -617,7 +617,7 @@ Transform:
   m_GameObject: {fileID: 1245004364644508219}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 877, y: 10, z: 3}
+  m_LocalScale: {x: 1168.5, y: 10, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2496940228942047849}
@@ -1126,7 +1126,7 @@ Transform:
   m_GameObject: {fileID: 4715707693506345322}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 877, y: 418, z: 0.2}
+  m_LocalScale: {x: 1168.5, y: 539, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1955062532557922067}
@@ -1170,7 +1170,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 877, y: 20}
+  m_SizeDelta: {x: 1168.5, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2292419451571498287
 CanvasRenderer:
@@ -1400,7 +1400,7 @@ Transform:
   m_GameObject: {fileID: 6270581408262058542}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -6}
-  m_LocalScale: {x: 877, y: 418, z: 0.2}
+  m_LocalScale: {x: 1168.5, y: 539, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7969984161838370134}
@@ -1421,7 +1421,7 @@ GameObject:
   - component: {fileID: 4851140643290839617}
   - component: {fileID: 8229623678368615576}
   - component: {fileID: 2315890818010587767}
-  - component: {fileID: 7882804780517578926}
+  - component: {fileID: 2891801243900849909}
   m_Layer: 5
   m_Name: VideoComponent
   m_TagString: Untagged
@@ -1503,7 +1503,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c7d817848393db44c8e1668eb60b40d8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7882804780517578926
+--- !u!114 &2891801243900849909
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1512,13 +1512,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 6663474496000480464}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9852aa907acc24a4abaea753e43efceb, type: 3}
+  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   _mediaSource: 1
   _mediaReference: {fileID: 0}
   _mediaPath:
-    _pathType: 2
+    _pathType: 0
     _path: 
   _fallbackMediaHints:
     transparency: 0
@@ -2072,7 +2072,7 @@ Transform:
   m_GameObject: {fileID: 8090243259629448787}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 877, y: 20, z: 3}
+  m_LocalScale: {x: 1168.5, y: 20, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5114077707844685687}

Assets/Studio/Resources/Container/WorldDlgContainer.prefab

@@ -10,11 +10,11 @@ GameObject:
   m_Component:
   - component: {fileID: 2428927608654121612}
   - component: {fileID: 2428927608654121613}
-  - component: {fileID: 4185990696850608176}
   - component: {fileID: -840740882841024364}
   - component: {fileID: 6058706112313037571}
   - component: {fileID: 2428927608654121614}
   - component: {fileID: 4147240638112552382}
+  - component: {fileID: 2307947730547315624}
   m_Layer: 5
   m_Name: WorldDlgContainer
   m_TagString: Untagged
@@ -93,46 +93,6 @@ MonoBehaviour:
   Scaling:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &4185990696850608176
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2428927608654121611}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5320dc7c6a20f3448875d16b459c7149, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  PointerEnter:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerDown:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerClick:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerUp:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerExit:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerDrag:
-    m_PersistentCalls:
-      m_Calls: []
-  Target: {fileID: 0}
-  StartAudio: 6
-  EndAudio: 5
-  headRotate: 0
-  oneGameControllerRotate: 0
-  canOneHandRotate: 1
-  canTwoHandRotate: 1
-  canTwoHandScale: 1
-  minScaleRatio: 0.8
-  maxScaleRatio: 3
 --- !u!114 &-840740882841024364
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -198,6 +158,46 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   artType: 64
   smoothTween: 3
+--- !u!114 &2307947730547315624
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2428927608654121611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbccc4d71ae5b447bab3997600fbdce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PointerEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDown:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerClick:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerUp:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerExit:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDrag:
+    m_PersistentCalls:
+      m_Calls: []
+  Target: {fileID: 0}
+  StartAudio: 6
+  EndAudio: 5
+  headRotate: 0
+  oneGameControllerRotate: 0
+  canOneHandRotate: 0
+  canTwoHandRotate: 0
+  canTwoHandScale: 0
+  minScaleRatio: 0.8
+  maxScaleRatio: 3
 --- !u!1 &2428927608671432456
 GameObject:
   m_ObjectHideFlags: 0

Assets/Studio/Scripts/Room/StudioRtc.cs

@@ -167,8 +167,8 @@ public class StudioRtc : SCRtcManager
     // Update is called once per frame
     void Update()
     {
-        cam.transform.position = GSXRManager.Instance.head.position;
-        cam.transform.rotation = GSXRManager.Instance.head.rotation;
+        cam.transform.position = OpenXRCamera.Instance.head.position;
+        cam.transform.rotation = OpenXRCamera.Instance.head.rotation;
         SCRtcFactory.Instance.Update();
 
         if(CommonMethod.NetLoading&&CommonMethod.NetLoading.activeSelf)

Assets/Studio/_4ShowScene/BoardFunctionModule/Scripts/TransferCell.cs

@@ -48,7 +48,7 @@ namespace ShadowStudio.Tool
 
     }
     [RequireComponent(typeof(XBoundingBox))]
-    [RequireComponent(typeof(XDragComponent))]
+    [RequireComponent(typeof(ManipulationHandler))]
     /// <summary>
     /// 物体姿态控制器
     /// 选中状态，非选中状态
@@ -89,7 +89,7 @@ namespace ShadowStudio.Tool
         //public event Action<TransferCell, bool> TransferSelect;
 
         public static TransferCell curActiveCell;
-        private XDragComponent dragCell;
+        private ManipulationHandler dragCell;
         private XBoundingBox boundBox;
         private Coroutine editCoroutine;
         private bool isLock;
@@ -177,13 +177,13 @@ namespace ShadowStudio.Tool
         /// <summary>
         /// 拖拽组件
         /// </summary>
-        public XDragComponent DragCell
+        public ManipulationHandler DragCell
         {
             get
             {
                 if (!dragCell)
                 {
-                    dragCell = GetComponent<XDragComponent>();
+                    dragCell = GetComponent<ManipulationHandler>();
                     dragCell.PointerDrag.AddListener(OnPointerDrag);
                     //dragCell.PointerDown.AddListener(OnPointerDown);
                     dragCell.PointerUp.AddListener(OnPointerUp);