Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio

Assets/Scenes/pre-0.24.0.unity

@@ -2932,7 +2932,6 @@ RectTransform:
   - {fileID: 1439596647}
   - {fileID: 1085911555}
   - {fileID: 1712022043}
-  - {fileID: 1195713950}
   - {fileID: 1833658609}
   - {fileID: 917198748}
   - {fileID: 110380560}
@@ -2990,7 +2989,6 @@ MonoBehaviour:
   panel_objectalign: {fileID: 0}
   panel_tooltip: {fileID: 0}
   panel_propertyviewer: {fileID: 0}
-  panel_objectdistance: {fileID: 0}
   panel_apiconnectmodal: {fileID: 0}
   panel_datafiltersetting: {fileID: 0}
   panel_multilingualsettingmodal: {fileID: 0}
@@ -3524,6 +3522,14 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -50.399902
+      objectReference: {fileID: 0}
+    - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 20.800049
+      objectReference: {fileID: 0}
     - target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -5241,112 +5247,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 2
   m_TargetDisplay: 0
---- !u!1001 &1195713949
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 545811781}
-    m_Modifications:
-    - target: {fileID: 1037199441371851518, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_Name
-      value: Panel_ObjectDistance
-      objectReference: {fileID: 0}
-    - target: {fileID: 1037199441371851518, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
---- !u!224 &1195713950 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6791165779322739231, guid: e34354bad51342e4ca9569fd37c9b8dd, type: 3}
-  m_PrefabInstance: {fileID: 1195713949}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1214186914
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs

@@ -20,7 +20,7 @@ namespace Studio.AssetTool
         public AssetLibraryPooledScrollView assetScrollView;
         public AssetLibraryScrollRect assetScrollRect;
         public HierarchyPooledScrollView componentScrollView;
-        public Panel_ObjectDistance panel_ObjectDistance;
+        //public Panel_ObjectDistance panel_ObjectDistance;
         public GameObject renderObjectPrefab;
         public float objectShowDistance = 1000.0f;
 
@@ -44,7 +44,7 @@ namespace Studio.AssetTool
             assetScrollRect = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollRect;
             assetScrollView = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollView;
             componentScrollView = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_hierarchy.scrollView;
-            panel_ObjectDistance = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_objectdistance;
+            //panel_ObjectDistance = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_objectdistance;
             //InterworkingDataScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_interworkingdatalist.scrollView;
 
             assetScrollRect.onDragBegin.AddListener(OnAssetSelected);
@@ -147,7 +147,7 @@ namespace Studio.AssetTool
             }
             selectedItem = UnityEngine.GameObject.Instantiate(renderObjectPrefab);
             selectRenderObject = selectedItem.GetComponent<CustomAssetRenderObject>();
-            selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
+            //selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
             selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
             selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
             selectRenderObject.CreateRenderObject();
@@ -180,7 +180,7 @@ namespace Studio.AssetTool
             selectRenderObject = selectedItem.GetComponent<CustomAssetRenderObject>();
             //selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair;
             //selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair;
-            selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
+            //selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate;
             selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject;
             selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary;
             selectRenderObject.CreateRenderObject();
@@ -252,7 +252,7 @@ namespace Studio.AssetTool
             canvas_Popup.panel_objectdetails.gameObject.SetActive(false);
             canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false);
             componentScrollView.DeselectAll();
-            canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
+            //canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
         }
 
         public void OrderByHierarchy(List<CustomAssetRenderObject> objectsToOrder)
@@ -296,7 +296,7 @@ namespace Studio.AssetTool
                 canvas_Popup.panel_dynamicobjectinfo.SetActive(true);
                 canvas_Popup.panel_objectdetails.gameObject.SetActive(false);
             }
-            canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects);
+            //canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects);
         }
     }
     public class ConnectedAsset

Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs

@@ -37,7 +37,7 @@ namespace Studio
         public Panel_ObjectAlign panel_objectalign;
         public Panel_Tooltip panel_tooltip;
         public Panel_PropertyViewer panel_propertyviewer;
-        public Panel_ObjectDistance panel_objectdistance;
+        //public Panel_ObjectDistance panel_objectdistance;
         public Panel_APIConnectModal panel_apiconnectmodal;
         public Panel_DataFilterSetting panel_datafiltersetting;
         public Panel_MultilingualSettingModal panel_multilingualsettingmodal;