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

Assets/Prefabs/AAA/Panel_AssetLibrary.prefab

@@ -1018,7 +1018,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 5808496954263173159}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999706
+  m_Size: 0.9999879
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1062,8 +1062,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 210, y: -398.78}
+  m_AnchoredPosition: {x: 210, y: -383.64026}
-  m_SizeDelta: {x: 420, y: 797.56}
+  m_SizeDelta: {x: 420, y: 767.2806}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7966294254755768478
 CanvasRenderer:
@@ -1741,7 +1741,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.00034048597, y: 0.00006742932}
+  m_AnchoredPosition: {x: -0.00034048597, y: 0.001809986}
   m_SizeDelta: {x: 282.99957, y: 2}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2780744526690132257
@@ -1909,7 +1909,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2790108437195061205}
   - component: {fileID: 4816600667775265712}
-  - component: {fileID: 7155725060116008310}
   - component: {fileID: 6824587133790205693}
   - component: {fileID: 633200204918678257}
   m_Layer: 5
@@ -1926,7 +1925,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7484356029459005624}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1936,11 +1935,11 @@ RectTransform:
   - {fileID: 1516075325225382354}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -95}
-  m_SizeDelta: {x: 420, y: 860}
+  m_SizeDelta: {x: 420, y: 890}
-  m_Pivot: {x: 1, y: 0}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &4816600667775265712
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1956,23 +1955,6 @@ MonoBehaviour:
   scrollRect: {fileID: 0}
   scrollView: {fileID: 0}
   Button_Close: {fileID: 4146936943515036526}
---- !u!114 &7155725060116008310
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7484356029459005624}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  state: 0
-  resizeDirection: 0
-  handleThickness: 5
-  minWidth: 100
-  minHeight: 100
 --- !u!222 &6824587133790205693
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2220,8 +2202,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 210, y: -485}
+  m_AnchoredPosition: {x: 210, y: -473.35403}
-  m_SizeDelta: {x: 420, y: 785.56}
+  m_SizeDelta: {x: 420, y: 762.2681}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5930958411786542109
 MonoBehaviour:

Assets/Scenes/pre-0.24.0.unity

@@ -278,10 +278,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 545811781}
     m_Modifications:
-    - target: {fileID: 689613192064771489, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
-      propertyPath: m_Size
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 1129385609974625576, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -308,7 +304,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_Pivot.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMax.x
@@ -316,7 +312,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMin.x
@@ -324,7 +320,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_SizeDelta.x
@@ -332,7 +328,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 860
+      value: 890
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_LocalPosition.x
@@ -352,15 +348,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -368,7 +364,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -95
       objectReference: {fileID: 0}
     - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -400,7 +396,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5808496954263173159, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.9999975
+      value: 0.9999967
       objectReference: {fileID: 0}
     - target: {fileID: 7247557757669176915, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -420,7 +416,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7269315550475766926, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.00022777471
+      value: 0.0000016448514
       objectReference: {fileID: 0}
     - target: {fileID: 7484356029459005624, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3}
       propertyPath: m_Name
@@ -2890,9 +2886,9 @@ RectTransform:
   - {fileID: 6779400300325097680}
   - {fileID: 394283230}
   - {fileID: 670251071}
-  - {fileID: 111415221}
   - {fileID: 1791222926}
   - {fileID: 8048799925780851990}
+  - {fileID: 111415221}
   - {fileID: 297039008}
   - {fileID: 2627550138014681917}
   - {fileID: 1439596647}
@@ -3487,6 +3483,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Panel_Start
       objectReference: {fileID: 0}
+    - target: {fileID: 6419739384633392332, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0