UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

하이어라키 버그 수정

Browse Source
This commit is contained in:
jmaniuvc
2025-05-29 18:09:26 +09:00
parent 1de71f8790
commit 05bf9e1249
4 changed files with 163 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 15, z: 0, w: 15}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -127,7 +127,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

28
Assets/Prefabs/AAA/Panel_Hierarchy.prefab
View File

@@ -66,7 +66,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -74,7 +74,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 6
--- !u!1 &653326182588660957
GameObject:
m_ObjectHideFlags: 0
@@ -416,10 +416,10 @@ RectTransform:
- {fileID: 9173664286363540611}
m_Father: {fileID: 6653768687723039217}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1.0556641, y: -39.58394}
m_SizeDelta: {x: -40.102814, y: -90.82211}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 208.94434, y: -239.58394}
m_SizeDelta: {x: 379.8972, y: 309.1779}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3101259340876616321
MonoBehaviour:
@@ -495,7 +495,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.00004149973}
m_AnchoredPosition: {x: -0.00034048597, y: -0.00000043238896}
m_SizeDelta: {x: 282.99957, y: 2}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8511847140840865857
@@ -575,10 +575,10 @@ RectTransform:
- {fileID: 9032808939029018714}
m_Father: {fileID: 3108930383675076429}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -5.440796, y: -0.08999634}
m_SizeDelta: {x: -10.891602, y: 0.17001343}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 184.5592, y: -154.59}
m_SizeDelta: {x: 369.1084, y: 309.17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5236060555652118818
CanvasRenderer:
@@ -1479,11 +1479,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
m_Name:
m_EditorClassIdentifier:
Area: {fileID: 0}
state: 0
resizeDirection: 0
handleThickness: 5
minWidth: 100
minHeight: 100
isCanResize: 0
--- !u!114 &7420623846080680445
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2311,7 +2313,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -2319,7 +2321,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 6
--- !u!114 &2345256951127197424
MonoBehaviour:
m_ObjectHideFlags: 0

126
Assets/Prefabs/AAA/Panel_ObjectDetails.prefab
View File

@@ -177,7 +177,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -185,7 +185,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 6
--- !u!114 &309722690153808588
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -542,7 +542,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -550,7 +550,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 6
--- !u!1 &2879873035033371409
GameObject:
m_ObjectHideFlags: 0
@@ -701,6 +701,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4972319047720080745
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1500392400739562417}
- component: {fileID: 3009998039254600136}
- component: {fileID: 7423628469097937640}
m_Layer: 5
m_Name: Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1500392400739562417
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972319047720080745}
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
m_Children: []
m_Father: {fileID: 8548883030255984469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 4.8498993}
m_SizeDelta: {x: -15, y: -22.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3009998039254600136
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972319047720080745}
m_CullTransparentMesh: 1
--- !u!114 &7423628469097937640
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972319047720080745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5670507951867143541
GameObject:
m_ObjectHideFlags: 0
@@ -735,6 +810,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7454734005950276455}
- {fileID: 1500392400739562417}
- {fileID: 6366813177479495702}
- {fileID: 979949929095112567}
m_Father: {fileID: 0}
@@ -808,11 +884,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
m_Name:
m_EditorClassIdentifier:
Area: {fileID: 0}
state: 0
resizeDirection: 0
handleThickness: 5
minWidth: 100
minHeight: 100
isCanResize: 0
--- !u!114 &6393868047658525319
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -914,6 +992,8 @@ GameObject:
m_Component:
- component: {fileID: 6366813177479495702}
- component: {fileID: 574496857715440853}
- component: {fileID: 3531994758315167653}
- component: {fileID: 2453889831526813983}
m_Layer: 5
m_Name: Header
m_TagString: Untagged
@@ -954,6 +1034,44 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fa81ed666c3432441a47113a8812fc7c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &3531994758315167653
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136169929383467880}
m_CullTransparentMesh: 1
--- !u!114 &2453889831526813983
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136169929383467880}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7343595336361273330
GameObject:
m_ObjectHideFlags: 0

29
Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs
View File

@@ -29,6 +29,7 @@ namespace Studio.UI
public class UI_GUIWindow : UIBase, IPointerDownHandler, IPointerUpHandler, IPointerEnterHandler, IPointerMoveHandler, IDragHandler
{
RectTransform rect;
public RectTransform Area;
CursorManager cursorManager;
Vector2 initialMousePos;
@@ -44,6 +45,8 @@ namespace Studio.UI
Vector2 mouseOffset;
[SerializeField] bool isCanResize = false;
public override void AfterAwake()
{
cursorManager = ManagerHub.instance.Get<CursorManager>();
@@ -85,6 +88,9 @@ namespace Studio.UI
public void OnPointerMove(PointerEventData eventData)
{
if (!isCanResize)
return;
switch (state)
{
case GUIState.Resize:
@@ -104,7 +110,10 @@ namespace Studio.UI
Move();
break;
case GUIState.Resize:
UpdateScale();
if (isCanResize)
{
UpdateScale();
}
break;
}
}
@@ -203,7 +212,12 @@ namespace Studio.UI
Vector2 mousePos = Input.mousePosition;
Vector2 panelMovePos = mousePos + mouseOffset;
Vector2 size = rect.rect.size;
RectTransform tempRect = rect;
if (Area != null)
tempRect = Area;
Vector2 size = tempRect.rect.size;
float halfWidth = size.x / 2;
float halfHeight = size.y / 2;
@@ -268,10 +282,15 @@ namespace Studio.UI
void SetPanelPivot(Vector2 pivot)
{
if (rect == null) return;
RectTransform temp = rect;
Vector2 size = rect.rect.size;
Vector2 deltaPivot = rect.pivot - pivot;
if(Area != null)
temp = Area;
if (temp == null) return;
Vector2 size = temp.rect.size;
Vector2 deltaPivot = temp.pivot - pivot;
Vector3 deltaPosition = new Vector3(deltaPivot.x * size.x, deltaPivot.y * size.y);
rect.pivot = pivot;
rect.localPosition -= deltaPosition;