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

Merge branch 'main' into pgd/20250328

Browse Source
This commit is contained in:
geondo55
2025-03-28 10:35:54 +09:00
parent 9d61d84b5c 86c830d313
commit 64e87aabda
24 changed files with 1524 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Prefabs/UI/ButtonDropdownItem.prefab
View File

@@ -68,8 +68,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6ec9606ed4ae1114797a6477c630dc6a, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 7b41071fb8834ed41a0bc8bd6a8bb179, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -99,7 +99,7 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
m_NormalColor: {r: 0.23137257, g: 0.21176472, b: 0.23529413, a: 1}
m_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.19607843}
m_PressedColor: {r: 1, g: 1, b: 1, a: 0.39215687}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 0.19607843}
@@ -210,8 +210,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4280163870
m_fontColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -392,7 +392,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Name
m_text: New Project
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
@@ -401,8 +401,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4280163870
m_fontColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:

80
Assets/Prefabs/UI/Panel_Toolbar.prefab
View File

@@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7367666761743632185
RectTransform:
m_ObjectHideFlags: 0
@@ -32,9 +32,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -453.94763}
m_SizeDelta: {x: 52, y: 17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1974133206715249498
@@ -93,7 +93,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &414224002534486290
RectTransform:
m_ObjectHideFlags: 0
@@ -108,9 +108,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -607.38}
m_SizeDelta: {x: 52, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7524546202564496179
@@ -733,7 +733,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1320424381887671650
RectTransform:
m_ObjectHideFlags: 0
@@ -748,9 +748,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -378.15762}
m_SizeDelta: {x: 52, y: 48.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &492374494980950310
@@ -852,7 +852,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5101234416374833355
RectTransform:
m_ObjectHideFlags: 0
@@ -867,10 +867,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5063094354339566518}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 78, y: 673.38}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &242023999714044123
CanvasRenderer:
@@ -928,7 +928,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &269682911969170924
RectTransform:
m_ObjectHideFlags: 0
@@ -943,9 +943,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -423.84763}
m_SizeDelta: {x: 52, y: 43.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6297910813628756313
@@ -1048,7 +1048,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8724315168120992586
RectTransform:
m_ObjectHideFlags: 0
@@ -1063,9 +1063,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -520.38}
m_SizeDelta: {x: 52, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4921952839850238858
@@ -1167,7 +1167,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1400667469818923675
RectTransform:
m_ObjectHideFlags: 0
@@ -1182,9 +1182,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -636.88}
m_SizeDelta: {x: 52, y: 17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5915200524200085290
@@ -1363,7 +1363,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5629649863965164906
RectTransform:
m_ObjectHideFlags: 0
@@ -1378,9 +1378,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -476.38}
m_SizeDelta: {x: 52, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &226384276843947453
@@ -2103,7 +2103,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3967798624049251461
RectTransform:
m_ObjectHideFlags: 0
@@ -2118,9 +2118,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -564.38}
m_SizeDelta: {x: 52, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4400899168752327041
@@ -2418,7 +2418,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &725388289401433734
RectTransform:
m_ObjectHideFlags: 0
@@ -2433,9 +2433,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8282480354653124321}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -81.408646}
m_SizeDelta: {x: 52, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5291881148893066494

576
Assets/Prefabs/UI/Panel_TopBar.prefab
View File

File diff suppressed because it is too large Load Diff