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

Merge branch 'jym/250522_00' into jym/250522_01

Browse Source 
# Conflicts:
#	Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs
This commit is contained in:
정영민
2025-05-22 17:29:47 +09:00
parent c4486b3c26 66f6da34c9
commit 1a0c845095
96 changed files with 15105 additions and 131671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2464
Assets/Prefabs/AAA/Panel_AlarmConnectModal.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_AlarmConnectModal.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c70df26a59bf353419dcf25ee33b394d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5226
Assets/Prefabs/AAA/Panel_DataConnectModal.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_DataConnectModal.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 96b73e9674fb61c489cee99ad24c044c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9200
Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ca5e845ff3c23fb41a1de8c2563209f1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

71
Assets/Prefabs/AAA/Panel_NewProjectInfo.prefab
View File

@@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69, y: -30}
m_SizeDelta: {x: 395, y: 260}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4447635709919238091
MonoBehaviour:
@@ -405,8 +405,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: 197.5, y: -235}
m_SizeDelta: {x: 395, y: 50}
m_AnchoredPosition: {x: 190, y: -235}
m_SizeDelta: {x: 380, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3869925964300780349
MonoBehaviour:
@@ -439,7 +439,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_ChildAlignment: 4
m_Spacing: 15
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
@@ -461,6 +461,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
InputField_ProjectTemplate: {fileID: 0}
Button_Dropdown: {fileID: 0}
--- !u!1 &1566409390313159280
GameObject:
m_ObjectHideFlags: 0
@@ -494,10 +495,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1006177941616694947}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2597334574092785859
CanvasRenderer:
@@ -527,7 +528,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 3faebebfb41380b4f8820adf0d965690, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -615,9 +616,9 @@ RectTransform:
- {fileID: 1387504124464107639}
m_Father: {fileID: 1006177941616694947}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 330, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6489818086456709659
@@ -830,9 +831,9 @@ RectTransform:
- {fileID: 3298123843380424090}
m_Father: {fileID: 8106588635392288030}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 330, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3678092585867565062
@@ -1248,9 +1249,9 @@ RectTransform:
- {fileID: 8531504345396472170}
m_Father: {fileID: 136411123651892915}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -115}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 330, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6960228995400798344
@@ -1426,9 +1427,9 @@ RectTransform:
- {fileID: 8036671826876076572}
m_Father: {fileID: 2374106145558075720}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1458952179684348920
@@ -1549,7 +1550,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -30, y: 30}
m_SizeDelta: {x: 150, y: 50}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 1, y: 0}
--- !u!114 &2127692188490003074
MonoBehaviour:
@@ -1627,8 +1628,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: 197.5, y: -175}
m_SizeDelta: {x: 395, y: 50}
m_AnchoredPosition: {x: 190, y: -175}
m_SizeDelta: {x: 380, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1531445533758858613
MonoBehaviour:
@@ -1661,7 +1662,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_ChildAlignment: 4
m_Spacing: 15
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
@@ -1999,7 +2000,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60.67, y: 23.01}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7393072861479048946
CanvasRenderer:
@@ -2273,10 +2274,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8106588635392288030}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 370, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &257133671529932623
CanvasRenderer:
@@ -2306,7 +2307,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 2ef3369460b480c41a1ca769aa259384, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2430,7 +2431,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7897775839679072582
RectTransform:
m_ObjectHideFlags: 0
@@ -2438,7 +2439,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6092324537095634317}
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
@@ -2649,7 +2650,7 @@ RectTransform:
m_Father: {fileID: 6761078585089155405}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -3130,7 +3131,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -313, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5481025570043610218
MonoBehaviour: