Merge pull request 'UI 개념에 따라 캔버스 분류' (#23) from sjm/250320 into main

Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/23
This commit was merged in pull request #23.
This commit is contained in:
2025-03-21 09:18:55 +09:00
10 changed files with 2273 additions and 2305 deletions

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &108399682685117252
--- !u!1 &1752436153166904875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,64 +8,66 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2930070536755843644}
- component: {fileID: 1100163029799911133}
- component: {fileID: 4570092045008172323}
- component: {fileID: 858662611294098778}
- component: {fileID: 8063061762217387458}
- component: {fileID: 3755351105531793139}
- component: {fileID: 5679024446158893067}
m_Layer: 5
m_Name: Shadow
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2930070536755843644
--- !u!224 &858662611294098778
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 108399682685117252}
m_GameObject: {fileID: 1752436153166904875}
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_Children:
- {fileID: 8794793065024440784}
m_Father: {fileID: 4444559960204675072}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: -4.9999695}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1100163029799911133
--- !u!222 &8063061762217387458
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 108399682685117252}
m_GameObject: {fileID: 1752436153166904875}
m_CullTransparentMesh: 1
--- !u!114 &4570092045008172323
--- !u!114 &3755351105531793139
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 108399682685117252}
m_GameObject: {fileID: 1752436153166904875}
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: 0, g: 0, b: 0, a: 0.5882353}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f56ca32cb6412e8408f7cbb20ec76055, type: 3}
m_Sprite: {fileID: 21300000, guid: 6ec9606ed4ae1114797a6477c630dc6a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -74,8 +76,21 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 32.34
--- !u!1 &774373496056104532
m_PixelsPerUnitMultiplier: 2.24
--- !u!114 &5679024446158893067
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1752436153166904875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &3000466206423382505
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -83,10 +98,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6115021042724496437}
- component: {fileID: 2767969458231737201}
- component: {fileID: 2359586239837124416}
- component: {fileID: 1299728568838431484}
- component: {fileID: 596939414232525656}
- component: {fileID: 4482934591067357660}
- component: {fileID: 391506118757370851}
- component: {fileID: 1583791358107340251}
m_Layer: 5
m_Name: Button_Close
m_TagString: Untagged
@@ -94,13 +109,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6115021042724496437
--- !u!224 &596939414232525656
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774373496056104532}
m_GameObject: {fileID: 3000466206423382505}
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}
@@ -110,24 +125,24 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -21.699997, y: -20}
m_SizeDelta: {x: 30, y: 30}
m_AnchoredPosition: {x: -17.5, y: -17.5}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2767969458231737201
--- !u!222 &4482934591067357660
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774373496056104532}
m_GameObject: {fileID: 3000466206423382505}
m_CullTransparentMesh: 1
--- !u!114 &2359586239837124416
--- !u!114 &391506118757370851
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774373496056104532}
m_GameObject: {fileID: 3000466206423382505}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -151,13 +166,13 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1299728568838431484
--- !u!114 &1583791358107340251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774373496056104532}
m_GameObject: {fileID: 3000466206423382505}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -191,7 +206,7 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2359586239837124416}
m_TargetGraphic: {fileID: 391506118757370851}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@@ -206,6 +221,9 @@ GameObject:
- component: {fileID: 4444559960204675072}
- component: {fileID: 7374201767071692113}
- component: {fileID: 9089351166348331899}
- component: {fileID: 3479757816345089807}
- component: {fileID: 3612038932643535991}
- component: {fileID: 8294886338763645294}
m_Layer: 5
m_Name: Hierarchy
m_TagString: Untagged
@@ -225,11 +243,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2930070536755843644}
- {fileID: 2880675653867137807}
- {fileID: 8331046284471563056}
- {fileID: 6115021042724496437}
- {fileID: 7359866927968935575}
- {fileID: 4035606760311257224}
- {fileID: 858662611294098778}
- {fileID: 4728389478933228312}
- {fileID: 596939414232525656}
- {fileID: 5323386877323582152}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -268,7 +286,59 @@ MonoBehaviour:
handleThickness: 5
minWidth: 100
minHeight: 100
--- !u!1 &5153900539240009752
--- !u!114 &3479757816345089807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4377203108027948534}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding: {x: 0, y: 0, z: 0, w: 0}
m_Softness: {x: 0, y: 0}
--- !u!222 &3612038932643535991
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4377203108027948534}
m_CullTransparentMesh: 1
--- !u!114 &8294886338763645294
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4377203108027948534}
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: 0, g: 0, b: 0, 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 &6888547614727604078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -276,10 +346,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8331046284471563056}
- component: {fileID: 5483491738458937253}
- component: {fileID: 8264446539914379586}
- component: {fileID: 7091825816469131137}
- component: {fileID: 4728389478933228312}
- component: {fileID: 4918174470710344974}
- component: {fileID: 3159042131990763741}
- component: {fileID: 7814885048193694400}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -287,14 +357,14 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8331046284471563056
--- !u!224 &4728389478933228312
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5153900539240009752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_GameObject: {fileID: 6888547614727604078}
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
@@ -302,25 +372,25 @@ RectTransform:
m_Father: {fileID: 4444559960204675072}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: -20, y: 30}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 150, y: -17.5}
m_SizeDelta: {x: 280, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5483491738458937253
--- !u!222 &4918174470710344974
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5153900539240009752}
m_GameObject: {fileID: 6888547614727604078}
m_CullTransparentMesh: 1
--- !u!114 &8264446539914379586
--- !u!114 &3159042131990763741
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5153900539240009752}
m_GameObject: {fileID: 6888547614727604078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -405,19 +475,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &7091825816469131137
--- !u!114 &7814885048193694400
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5153900539240009752}
m_GameObject: {fileID: 6888547614727604078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa81ed666c3432441a47113a8812fc7c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5647583068695603879
--- !u!1 &8733818001291671729
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -425,99 +495,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2880675653867137807}
- component: {fileID: 7639607360302911519}
- component: {fileID: 28440160142757052}
- component: {fileID: 782682427926387881}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2880675653867137807
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5647583068695603879}
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:
- {fileID: 2713419815640095674}
m_Father: {fileID: 4444559960204675072}
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: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7639607360302911519
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5647583068695603879}
m_CullTransparentMesh: 1
--- !u!114 &28440160142757052
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5647583068695603879}
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: 21300000, guid: 6ec9606ed4ae1114797a6477c630dc6a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2.24
--- !u!114 &782682427926387881
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5647583068695603879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &5828306493492393132
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2713419815640095674}
- component: {fileID: 8067106505575826918}
- component: {fileID: 8889324212457065372}
- component: {fileID: 8794793065024440784}
- component: {fileID: 9096041477941030286}
- component: {fileID: 1438087069347725430}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
@@ -525,40 +505,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2713419815640095674
--- !u!224 &8794793065024440784
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5828306493492393132}
m_GameObject: {fileID: 8733818001291671729}
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: 2880675653867137807}
m_Father: {fileID: 858662611294098778}
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: 0}
m_SizeDelta: {x: -2, y: -2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8067106505575826918
--- !u!222 &9096041477941030286
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5828306493492393132}
m_GameObject: {fileID: 8733818001291671729}
m_CullTransparentMesh: 1
--- !u!114 &8889324212457065372
--- !u!114 &1438087069347725430
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5828306493492393132}
m_GameObject: {fileID: 8733818001291671729}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -566,7 +546,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -582,7 +562,82 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2.53
--- !u!1001 &3898158526280252428
--- !u!1 &9005995077467421122
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4035606760311257224}
- component: {fileID: 2925260301799436998}
- component: {fileID: 6821435398405814335}
m_Layer: 5
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4035606760311257224
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9005995077467421122}
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: 4444559960204675072}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: -5}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2925260301799436998
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9005995077467421122}
m_CullTransparentMesh: 1
--- !u!114 &6821435398405814335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9005995077467421122}
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: 0, g: 0, b: 0, a: 0.5882353}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f56ca32cb6412e8408f7cbb20ec76055, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 32.34
--- !u!1001 &1862816057387579475
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -680,23 +735,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4494893725557815844, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_Size
value: 0.95405644
value: 0.954065
objectReference: {fileID: 0}
- target: {fileID: 4494893725557815844, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_Value
value: 1.0000046
objectReference: {fileID: 0}
- target: {fileID: 5143485001752436147, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5143485001752436147, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMin.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143485001752436147, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.x
value: -15
value: 132
objectReference: {fileID: 0}
- target: {fileID: 5143485001752436147, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -710,25 +757,21 @@ PrefabInstance:
propertyPath: m_RaycastTarget
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5298001966367028606, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5298001966367028606, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5298001966367028606, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 13
value: -132
objectReference: {fileID: 0}
- target: {fileID: 5298001966367028606, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5672874548983414067, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.x
value: -12.999622
value: -0.0000023841858
objectReference: {fileID: 0}
- target: {fileID: 5672874548983414067, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0006269596
value: 0.0003128234
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_Pivot.x
@@ -740,7 +783,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMax.y
@@ -752,15 +795,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_SizeDelta.x
value: -10
value: 290
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_SizeDelta.y
value: -59.999996
value: 444.92102
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_LocalPosition.x
@@ -792,11 +835,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 150
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.079
value: -272.5395
objectReference: {fileID: 0}
- target: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -810,21 +853,9 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7333730248286312492, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7333730248286312492, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7333730248286312492, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7333730248286312492, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 290
objectReference: {fileID: 0}
- target: {fileID: 7333730248286312492, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -851,8 +882,8 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
--- !u!224 &7359866927968935575 stripped
--- !u!224 &5323386877323582152 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5781062250184041115, guid: c7fa5154df436e54bb0b444dfc25575d, type: 3}
m_PrefabInstance: {fileID: 3898158526280252428}
m_PrefabInstance: {fileID: 1862816057387579475}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -45,10 +45,10 @@ namespace XED.Asset
}
void Start()
{
assetScrollRect = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollRect;
assetScrollView = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollView;
componentScrollView = FindSingle<Canvas_Windows>().panel_componentlibrary.scrollView;
InterworkingDataScrollView = FindSingle<Canvas_Windows>().panel_interworkingdatalist.scrollView;
assetScrollRect = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollRect;
assetScrollView = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollView;
componentScrollView = FindSingle<Canvas_Popup>().panel_componentlibrary.scrollView;
InterworkingDataScrollView = FindSingle<Canvas_Popup>().panel_interworkingdatalist.scrollView;
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
assetScrollRect.onDragBegin.AddListener(OnAssetSelected);

View File

@@ -21,7 +21,6 @@ namespace XED.Manage
var canvas_static = FindSingle<Canvas_Static>();
var canvas_Popup = FindSingle<Canvas_Popup>();
var canvas_Windows = FindSingle<Canvas_Windows>();
var canvas_DragArea = FindSingle<Canvas_DragArea>();
var agvManager = FindSingle<AGVManager>();
@@ -33,9 +32,9 @@ namespace XED.Manage
var customAssetConnector = FindSingle<CustomAssetConnector>();
var renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
GameObject assetWindow = canvas_Windows.panel_assetlibrary.gameObject;
GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData;
GameObject componentWindow = canvas_Windows.panel_componentlibrary.gameObject;
GameObject componentWindow = canvas_Popup.panel_componentlibrary.gameObject;
UIConnection();
StatusConnection();
@@ -45,22 +44,22 @@ namespace XED.Manage
void ManagerConnection()
{
customAssetConnector.onRemoveObjects += renderObjectHandler.DeselectAll;
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectinfo.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectalign.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += canvas_Windows.panel_objectinfo.SetObjectInfo;
customAssetConnector.onRemoveObjects += canvas_Windows.panel_objectinfo.ResetObjectInfo;
customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectinfo.gameObject.SetActive(false); });
customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectalign.gameObject.SetActive(false); });
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectinfo.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectalign.gameObject.SetActive(true); });
customAssetConnector.onSelectObjects += canvas_Popup.panel_objectinfo.SetObjectInfo;
customAssetConnector.onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo;
customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); });
customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectalign.gameObject.SetActive(false); });
//customAssetConnector.onAssetDropped += (() => componentWindow.SetActive(true));
renderObjectHandler.onDeselectAll += canvas_Windows.panel_objectinfo.ResetObjectInfo;
renderObjectHandler.onTransformChanged += canvas_Windows.panel_objectinfo.OnTransformChanged;
renderObjectHandler.onDeselectAll += canvas_Popup.panel_objectinfo.ResetObjectInfo;
renderObjectHandler.onTransformChanged += canvas_Popup.panel_objectinfo.OnTransformChanged;
renderObjectHandler.onDragBegin += canvas_DragArea.panel_draghandler.OnBeginDrag;
renderObjectHandler.onDragEnd += canvas_DragArea.panel_draghandler.OnEndDrag;
renderObjectHandler.onDragForceEnd += canvas_DragArea.panel_draghandler.ForceEndDrag;
saveLoadFBXData.onBeginLoadAsset += (() => assetWindow.SetActive(true));
canvas_Windows.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
agvNodeManager.onNodeConnectionAdded += agvNodeLinkManager.AddLine;
agvNodeManager.onNodeConnectionUpdated += agvNodeLinkManager.UpdateLine;
@@ -115,9 +114,9 @@ namespace XED.Manage
canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing);
canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing);
canvas_Windows.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Windows.panel_assetproperties.Open);
canvas_Windows.panel_assetproperties.onClickPreview += canvas_Windows.panel_predefinedtype.Open;
canvas_Windows.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData;
canvas_Popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Popup.panel_assetproperties.Open);
canvas_Popup.panel_assetproperties.onClickPreview += canvas_Popup.panel_predefinedtype.Open;
canvas_Popup.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData;
}
void StatusConnection()

View File

@@ -9,6 +9,15 @@ namespace XED
{
public class Canvas_Popup : CanvasBase
{
public Panel_AccessibilitySettings panel_accessibilitysettings;
public Panel_ColorPicker panel_colorpicker;
public Panel_ComponentLibrary panel_componentlibrary;
public Panel_AssetLibrary panel_assetlibrary;
public Panel_InterworkingDataList panel_interworkingdatalist;
public Panel_AssetProperties panel_assetproperties;
public Panel_PredefinedType panel_predefinedtype;
public Panel_ObjectInfo panel_objectinfo;
public Panel_ObjectAlign panel_objectalign;
public AGVNodePopup agvnodepopup;
public AGVNodeModePopup agvnodemodepopup;
public Panel_Tooltip panel_tooltip;
@@ -19,6 +28,16 @@ namespace XED
public override void AfterAwake()
{
GetComponent<Canvas>().sortingOrder = 1;
foreach (var panel in GetComponentsInChildren<PanelBase>(true))
{
panel.onEnableEvent += SetPanelAsLastSibling;
}
}
void SetPanelAsLastSibling(UIBase panel)
{
panel.gameObject.transform.SetAsLastSibling();
}
}
}

View File

@@ -1,19 +0,0 @@
using UnityEngine;
using XRLib;
using XRLib.UI;
namespace XED.UI
{
public class Canvas_Windows : CanvasBase
{
public Panel_AccessibilitySettings panel_accessibilitysettings;
public Panel_ColorPicker panel_colorpicker;
public Panel_ComponentLibrary panel_componentlibrary;
public Panel_AssetLibrary panel_assetlibrary;
public Panel_InterworkingDataList panel_interworkingdatalist;
public Panel_AssetProperties panel_assetproperties;
public Panel_PredefinedType panel_predefinedtype;
public Panel_ObjectInfo panel_objectinfo;
public Panel_ObjectAlign panel_objectalign;
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 79743f1c37d29b54b9bf38654b053cec

View File

@@ -72,7 +72,6 @@ namespace XED.UI
private void OnEnable()
{
InitializeState();
SetPanelAsLastSibling();
}
private void OnDisable()

View File

@@ -37,7 +37,7 @@ namespace XED.UI
var customAssetConnector = FindSingle<CustomAssetConnector>();
btnExport.onClick.AddListener(customAssetConnector.assetDataHandler.SaveSelectedAssetDatasToLocal);
btnImport.onClick.AddListener(customAssetConnector.assetDataHandler.LoadLocalAssetDatas);
scrollRect = FindSingle<Canvas_Windows>().panel_assetlibrary.scrollRect;
scrollRect = FindSingle<Canvas_Popup>().panel_assetlibrary.scrollRect;
scrollRect.menuPopup = gameObject;
SetActive(false);
}