Merge pull request 'RTG Gizmo 거리에 따른 크기 조정, UI 표현 우선순위 수정' (#208) from pgd/20250715_3 into main

Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/208
This commit was merged in pull request #208.
This commit is contained in:
pgd
2025-07-16 09:37:16 +09:00
5 changed files with 121 additions and 109 deletions

View File

@@ -307,10 +307,10 @@ RectTransform:
- {fileID: 2641865167890791995} - {fileID: 2641865167890791995}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 110, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 210, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3489228134480339777 --- !u!222 &3489228134480339777
CanvasRenderer: CanvasRenderer:
@@ -1090,10 +1090,10 @@ RectTransform:
- {fileID: 6894040108453440889} - {fileID: 6894040108453440889}
m_Father: {fileID: 5106551296758095294} m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -124}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5212800262809355448 --- !u!222 &5212800262809355448
CanvasRenderer: CanvasRenderer:
@@ -1467,10 +1467,10 @@ RectTransform:
- {fileID: 6467883027692677993} - {fileID: 6467883027692677993}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 100.0695, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 190.139, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1981890397451977413 --- !u!222 &1981890397451977413
CanvasRenderer: CanvasRenderer:
@@ -3282,10 +3282,10 @@ RectTransform:
- {fileID: 6668256650124147009} - {fileID: 6668256650124147009}
m_Father: {fileID: 5106551296758095294} m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7527628306696851762 --- !u!222 &7527628306696851762
CanvasRenderer: CanvasRenderer:
@@ -3862,10 +3862,10 @@ RectTransform:
- {fileID: 3488610485283054401} - {fileID: 3488610485283054401}
m_Father: {fileID: 3612353324306706568} m_Father: {fileID: 3612353324306706568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 120, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 230, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7519002699685595081 --- !u!222 &7519002699685595081
CanvasRenderer: CanvasRenderer:
@@ -4810,10 +4810,10 @@ RectTransform:
- {fileID: 7631676095961012699} - {fileID: 7631676095961012699}
m_Father: {fileID: 3612353324306706568} m_Father: {fileID: 3612353324306706568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 120, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 230, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5915613553988833987 --- !u!222 &5915613553988833987
CanvasRenderer: CanvasRenderer:
@@ -4950,10 +4950,10 @@ RectTransform:
- {fileID: 239898139430097969} - {fileID: 239898139430097969}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 110, y: -124}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 210, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4247297422581378552 --- !u!222 &4247297422581378552
CanvasRenderer: CanvasRenderer:
@@ -7313,10 +7313,10 @@ RectTransform:
- {fileID: 4934558975903239102} - {fileID: 4934558975903239102}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 110, y: -90}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 210, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3369121211994654138 --- !u!222 &3369121211994654138
CanvasRenderer: CanvasRenderer:
@@ -8007,10 +8007,10 @@ RectTransform:
- {fileID: 7773128163535172080} - {fileID: 7773128163535172080}
m_Father: {fileID: 5106551296758095294} m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -158}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1538201362206907658 --- !u!222 &1538201362206907658
CanvasRenderer: CanvasRenderer:
@@ -9512,10 +9512,10 @@ RectTransform:
- {fileID: 8983976402599428563} - {fileID: 8983976402599428563}
m_Father: {fileID: 5106551296758095294} m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -90}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8819351641869115221 --- !u!222 &8819351641869115221
CanvasRenderer: CanvasRenderer:
@@ -9678,7 +9678,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@@ -11877,10 +11877,10 @@ RectTransform:
- {fileID: 3407360332968577993} - {fileID: 3407360332968577993}
m_Father: {fileID: 8236132945779869188} m_Father: {fileID: 8236132945779869188}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 110, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 210, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4300145224472273166 --- !u!222 &4300145224472273166
CanvasRenderer: CanvasRenderer:
@@ -12545,10 +12545,10 @@ RectTransform:
- {fileID: 6769054886412449106} - {fileID: 6769054886412449106}
m_Father: {fileID: 5106551296758095294} m_Father: {fileID: 5106551296758095294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 150, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 290, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6487236260048461744 --- !u!222 &6487236260048461744
CanvasRenderer: CanvasRenderer:
@@ -12978,10 +12978,10 @@ RectTransform:
- {fileID: 4551446790370479478} - {fileID: 4551446790370479478}
m_Father: {fileID: 7049248817799997631} m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 64.48075, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 118.9615, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8129281279843792023 --- !u!222 &8129281279843792023
CanvasRenderer: CanvasRenderer:
@@ -13118,10 +13118,10 @@ RectTransform:
- {fileID: 643449707283617506} - {fileID: 643449707283617506}
m_Father: {fileID: 7049248817799997631} m_Father: {fileID: 7049248817799997631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 64.48075, y: -56}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 118.9615, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3258050494349403066 --- !u!222 &3258050494349403066
CanvasRenderer: CanvasRenderer:
@@ -13431,10 +13431,10 @@ RectTransform:
- {fileID: 290966527929266020} - {fileID: 290966527929266020}
m_Father: {fileID: 6340558249613605857} m_Father: {fileID: 6340558249613605857}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 100.0695, y: -22}
m_SizeDelta: {x: 0, y: 30} m_SizeDelta: {x: 190.139, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8978547910611737479 --- !u!222 &8978547910611737479
CanvasRenderer: CanvasRenderer:

View File

@@ -4784,7 +4784,7 @@ MonoBehaviour:
_text: Scale gizmo _text: Scale gizmo
- _tooltip: Allows you to change universal gizmo settings. - _tooltip: Allows you to change universal gizmo settings.
_text: Universal gizmo _text: Universal gizmo
_activeTabIndex: 2 _activeTabIndex: 4
_settings: _settings:
_canBeDisplayed: 1 _canBeDisplayed: 1
_isExpanded: 1 _isExpanded: 1
@@ -5273,13 +5273,13 @@ MonoBehaviour:
_sglSliderCapVis: 01010000 _sglSliderCapVis: 01010000
_moveGizmoLookAndFeel3D: _moveGizmoLookAndFeel3D:
_canBeDisplayed: 1 _canBeDisplayed: 1
_isExpanded: 0 _isExpanded: 1
_isMidCapVisible: 0 _isMidCapVisible: 0
_midCapLookAndFeel: _midCapLookAndFeel:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5319,7 +5319,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5336,7 +5336,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5359,7 +5359,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5376,7 +5376,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5399,7 +5399,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5416,7 +5416,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5439,7 +5439,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5456,7 +5456,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5479,7 +5479,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5496,7 +5496,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5519,7 +5519,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -5536,7 +5536,7 @@ MonoBehaviour:
_capType: 0 _capType: 0
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5557,7 +5557,7 @@ MonoBehaviour:
_hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1} _hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1}
_dblSlidersLookAndFeel: _dblSlidersLookAndFeel:
- _planeType: 0 - _planeType: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1.5 _quadWidth: 1.5
_quadHeight: 1.5 _quadHeight: 1.5
@@ -5588,7 +5588,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 0 - _planeType: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1.5 _quadWidth: 1.5
_quadHeight: 1.5 _quadHeight: 1.5
@@ -5619,7 +5619,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 0 - _planeType: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1.5 _quadWidth: 1.5
_quadHeight: 1.5 _quadHeight: 1.5
@@ -5653,7 +5653,7 @@ MonoBehaviour:
_canBeDisplayed: 1 _canBeDisplayed: 1
_isExpanded: 1 _isExpanded: 1
_enable2DMode: _enable2DMode:
_isEnabled: 1 _isEnabled: 0
_key: 0 _key: 0
_lCtrl: 0 _lCtrl: 0
_lCmd: 0 _lCmd: 0
@@ -5775,13 +5775,13 @@ MonoBehaviour:
_scaleSensitivity: 1 _scaleSensitivity: 1
_rotationGizmoLookAndFeel3D: _rotationGizmoLookAndFeel3D:
_canBeDisplayed: 1 _canBeDisplayed: 1
_isExpanded: 0 _isExpanded: 1
_isMidCapVisible: 1 _isMidCapVisible: 1
_midCapLookAndFeel: _midCapLookAndFeel:
_capType: 3 _capType: 3
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -5803,7 +5803,7 @@ MonoBehaviour:
_axesVis: 010101 _axesVis: 010101
_axesLookAndFeel: _axesLookAndFeel:
- _planeType: 2 - _planeType: 2
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -5834,7 +5834,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 2 - _planeType: 2
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -5865,7 +5865,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 2 - _planeType: 2
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -6059,12 +6059,12 @@ MonoBehaviour:
_scaleSensitivity: 1 _scaleSensitivity: 1
_scaleGizmoLookAndFeel3D: _scaleGizmoLookAndFeel3D:
_canBeDisplayed: 1 _canBeDisplayed: 1
_isExpanded: 0 _isExpanded: 1
_midCapLookAndFeel: _midCapLookAndFeel:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6098,7 +6098,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6115,7 +6115,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6138,7 +6138,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6155,7 +6155,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6178,7 +6178,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6195,7 +6195,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6218,7 +6218,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6235,7 +6235,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6258,7 +6258,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6275,7 +6275,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6298,7 +6298,7 @@ MonoBehaviour:
_lineType: 0 _lineType: 0
_fillMode: 0 _fillMode: 0
_length: 5.5 _length: 5.5
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_boxHeight: 0.18 _boxHeight: 0.18
_boxDepth: 0.18 _boxDepth: 0.18
@@ -6315,7 +6315,7 @@ MonoBehaviour:
_capType: 2 _capType: 2
_fillMode: 0 _fillMode: 0
_shadeMode: 0 _shadeMode: 0
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_coneHeight: 1.65 _coneHeight: 1.65
_coneRadius: 0.5 _coneRadius: 0.5
@@ -6336,7 +6336,7 @@ MonoBehaviour:
_hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1} _hoveredColor: {r: 0.96470594, g: 0.9490197, b: 0.19607845, a: 1}
_dblSlidersLookAndFeel: _dblSlidersLookAndFeel:
- _planeType: 1 - _planeType: 1
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -6367,7 +6367,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 1 - _planeType: 1
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -6398,7 +6398,7 @@ MonoBehaviour:
_color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1} _color: {r: 0.5, g: 0.5, b: 0.5, a: 0.1}
_borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8} _borderColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.8}
- _planeType: 1 - _planeType: 1
_scale: 1 _scale: 1.2
_useZoomFactor: 1 _useZoomFactor: 1
_quadWidth: 1 _quadWidth: 1
_quadHeight: 1 _quadHeight: 1
@@ -11061,7 +11061,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25 m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 2
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!1 &3194360978488024824 --- !u!1 &3194360978488024824
GameObject: GameObject:
@@ -11684,6 +11684,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Panel_Toolbox value: Panel_Toolbox
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1799883531746712332, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3012754740992037236, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} - target: {fileID: 3012754740992037236, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 258.89844 value: 258.89844

View File

@@ -13,10 +13,10 @@ namespace Studio.Manage
GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject; GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject;
GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject; GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject;
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject; Panel_AssetLibrary assetLibraryWindow = canvas_Popup.panel_assetlibrary;
GameObject repository = canvas_Popup.panel_datarepository.gameObject; GameObject repository = canvas_Popup.panel_datarepository.gameObject;
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true)); canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += assetLibraryWindow.Open;
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true)); canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true)); canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true));
} }

View File

@@ -1,8 +1,8 @@
using UnityEngine;
using XRLib.UI;
using Studio.HierarchyTree;
using UnityEngine.UI;
using Studio.AssetLibraryTree; using Studio.AssetLibraryTree;
using Studio.HierarchyTree;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio.UI namespace Studio.UI
{ {
@@ -23,6 +23,12 @@ namespace Studio.UI
Button_Close.onClick.AddListener(OnClickClose); Button_Close.onClick.AddListener(OnClickClose);
} }
public void Open()
{
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
}
private void OnClickClose() private void OnClickClose()
{ {
scrollView.DeselectAll(); scrollView.DeselectAll();

View File

@@ -1,3 +1,4 @@
using Studio.Manage;
using System; using System;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
@@ -60,6 +61,7 @@ namespace Studio.UI
public void Close() public void Close()
{ {
CanvasManager.instance.GetCanvas<Canvas_Static>().panel_toolbox.SetActive(true);
SetActive(false); SetActive(false);
} }
} }