Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정

This commit is contained in:
정영민
2025-05-26 17:39:10 +09:00
parent a6746e5272
commit 1310ce1823
15 changed files with 3315 additions and 45 deletions

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -313,6 +313,7 @@ RectTransform:
- {fileID: 3529671530150024245} - {fileID: 3529671530150024245}
- {fileID: 1904820179092545403} - {fileID: 1904820179092545403}
- {fileID: 2817559703452216858} - {fileID: 2817559703452216858}
- {fileID: 3697621935846676485}
- {fileID: 7661377386543095833} - {fileID: 7661377386543095833}
m_Father: {fileID: 4361438021496185155} m_Father: {fileID: 4361438021496185155}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -523,7 +524,7 @@ MonoBehaviour:
onValueChanged: onValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_IsOn: 1 m_IsOn: 0
--- !u!1 &1132907136703894087 --- !u!1 &1132907136703894087
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -950,7 +951,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &7661377386543095833 --- !u!224 &7661377386543095833
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -967,9 +968,9 @@ RectTransform:
- {fileID: 5990296615040225915} - {fileID: 5990296615040225915}
m_Father: {fileID: 5415421396721871911} m_Father: {fileID: 5415421396721871911}
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: 250, y: -335}
m_SizeDelta: {x: 490, y: 60} m_SizeDelta: {x: 490, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6558770224018380659 --- !u!222 &6558770224018380659
@@ -1909,6 +1910,142 @@ MonoBehaviour:
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4472494304716214875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5897254447948056194}
- component: {fileID: 6720252286527775648}
- component: {fileID: 634818717784489615}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5897254447948056194
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4472494304716214875}
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: 3697621935846676485}
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 &6720252286527775648
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4472494304716214875}
m_CullTransparentMesh: 1
--- !u!114 &634818717784489615
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4472494304716214875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Asset Setting
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5847619413951945397 --- !u!1 &5847619413951945397
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2120,6 +2257,81 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &7380163422292576104
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1258723345625377198}
- component: {fileID: 320013156725883492}
- component: {fileID: 7841116886894938862}
m_Layer: 5
m_Name: Image_Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1258723345625377198
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380163422292576104}
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: 3697621935846676485}
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 &320013156725883492
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380163422292576104}
m_CullTransparentMesh: 1
--- !u!114 &7841116886894938862
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380163422292576104}
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.9960785, g: 0.6666667, b: 0.2509804, 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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: 1
--- !u!1 &7410169318399637521 --- !u!1 &7410169318399637521
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2321,6 +2533,132 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &7809808732213277844
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3697621935846676485}
- component: {fileID: 3699255322847400887}
- component: {fileID: 7787229179050832729}
- component: {fileID: 693345390380284954}
m_Layer: 5
m_Name: Toggle_AssetSetting
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3697621935846676485
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
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: 1258723345625377198}
- {fileID: 5897254447948056194}
m_Father: {fileID: 5415421396721871911}
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_SizeDelta: {x: 490, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3699255322847400887
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
m_CullTransparentMesh: 1
--- !u!114 &7787229179050832729
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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: 1
--- !u!114 &693345390380284954
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7787229179050832729}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!1 &8358864612680385020 --- !u!1 &8358864612680385020
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2339,7 +2677,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &4361438021496185155 --- !u!224 &4361438021496185155
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2413,6 +2751,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4a9d2a9315cb43a47a04c9d17ce89dc7, type: 3} m_Script: {fileID: 11500000, guid: 4a9d2a9315cb43a47a04c9d17ce89dc7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
selectedToggle: {fileID: 0}
preSelectedToggle: {fileID: 0}
--- !u!1 &8608038838614620023 --- !u!1 &8608038838614620023
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -34,10 +34,10 @@ RectTransform:
- {fileID: 1140445254036395828} - {fileID: 1140445254036395828}
m_Father: {fileID: 7796816603221540256} m_Father: {fileID: 7796816603221540256}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 200, y: 0} m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 400, y: 40} m_SizeDelta: {x: -40, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4032435796709969458 --- !u!222 &4032435796709969458
CanvasRenderer: CanvasRenderer:

View File

@@ -2214,8 +2214,10 @@ RectTransform:
- {fileID: 1418698196} - {fileID: 1418698196}
- {fileID: 1299223833} - {fileID: 1299223833}
- {fileID: 702158320} - {fileID: 702158320}
- {fileID: 722122563}
- {fileID: 2113204526} - {fileID: 2113204526}
- {fileID: 1523668493} - {fileID: 1523668493}
- {fileID: 1265526094}
- {fileID: 6877782817204804254} - {fileID: 6877782817204804254}
- {fileID: 7047787819321409150} - {fileID: 7047787819321409150}
- {fileID: 6779400300325097680} - {fileID: 6779400300325097680}
@@ -2243,7 +2245,6 @@ RectTransform:
- {fileID: 1158992910} - {fileID: 1158992910}
- {fileID: 416036583} - {fileID: 416036583}
- {fileID: 1223093458} - {fileID: 1223093458}
- {fileID: 1265526094}
- {fileID: 445006264} - {fileID: 445006264}
- {fileID: 802579212} - {fileID: 802579212}
- {fileID: 1937464244} - {fileID: 1937464244}
@@ -2277,6 +2278,7 @@ MonoBehaviour:
panel_authsetting: {fileID: 0} panel_authsetting: {fileID: 0}
panel_apisetting: {fileID: 0} panel_apisetting: {fileID: 0}
panel_mqttsetting: {fileID: 0} panel_mqttsetting: {fileID: 0}
panel_assetsetting: {fileID: 0}
panel_3dfactorysetting: {fileID: 0} panel_3dfactorysetting: {fileID: 0}
panel_dynamicobjectuisetting: {fileID: 0} panel_dynamicobjectuisetting: {fileID: 0}
panel_assetmanager: {fileID: 0} panel_assetmanager: {fileID: 0}
@@ -2651,6 +2653,240 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} m_CorrespondingSourceObject: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3}
m_PrefabInstance: {fileID: 7350069656945096785} m_PrefabInstance: {fileID: 7350069656945096785}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &722122562
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.x
value: 1015.5
objectReference: {fileID: 0}
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 507.75
objectReference: {fileID: 0}
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 192.5
objectReference: {fileID: 0}
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -75
objectReference: {fileID: 0}
- target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_ChildScaleWidth
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_ChildControlWidth
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1365027514354629154, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_ChildForceExpandWidth
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.x
value: -500
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.y
value: -100
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: -250
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 192.5
objectReference: {fileID: 0}
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 3602097825703806022, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_Name
value: Panel_AssetSetting
objectReference: {fileID: 0}
- target: {fileID: 3602097825703806022, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 192.5
objectReference: {fileID: 0}
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -125
objectReference: {fileID: 0}
- target: {fileID: 6640188506573938184, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_SizeDelta.x
value: 1015.5
objectReference: {fileID: 0}
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 507.75
objectReference: {fileID: 0}
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9128725341301159360, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
--- !u!224 &722122563 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
m_PrefabInstance: {fileID: 722122562}
m_PrefabAsset: {fileID: 0}
--- !u!1 &749092879 --- !u!1 &749092879
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -10052,9 +10288,69 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 545811781} m_TransformParent: {fileID: 545811781}
m_Modifications: m_Modifications:
- target: {fileID: 4157475003604670922, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_IsOn propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0}
- target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.y
value: -155
objectReference: {fileID: 0}
- target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.y
value: -215
objectReference: {fileID: 0}
- target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.y
value: -95
objectReference: {fileID: 0}
- target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.y
value: -275
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@@ -10136,10 +10432,30 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_AnchoredPosition.y
value: -35
objectReference: {fileID: 0}
- target: {fileID: 8358864612680385020, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - target: {fileID: 8358864612680385020, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Panel_StartSetting value: Panel_StartSetting
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8358864612680385020, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []

View File

@@ -33,6 +33,9 @@ namespace Studio.AssetTool
public Transform fbxAnchor; public Transform fbxAnchor;
public Action onLoadComplete; public Action onLoadComplete;
private List<string> filePaths = new List<string>();
private int loadingCount;
public FBXFileManager() public FBXFileManager()
{ {
dataRepo = new CustomAssetDataRepository(); dataRepo = new CustomAssetDataRepository();
@@ -48,25 +51,41 @@ namespace Studio.AssetTool
} }
public void LoadLocalFBXDirectorys(List<string> folderPaths)
{
loadingCount = folderPaths.Count;
foreach (var path in folderPaths)
{
LoadLocalFBXDirectory(path);
}
CoroutineRunner.instance.StartCoroutine(LoadAssetFiles(filePaths, OnDirectoryLoadComplete));
}
public void LoadLocalFBXDirectory(string folderPath) public void LoadLocalFBXDirectory(string folderPath)
{ {
List<string> filePaths = new List<string>(); var files = Directory.GetFiles(folderPath, "*.fbx", SearchOption.AllDirectories);
var path = folderPath;
var files = Directory.GetFiles(path, "*.fbx", SearchOption.AllDirectories);
foreach (var file in files) foreach (var file in files)
{ {
if (dataRepo.TryGetDataFromPath(path, out var p)) if (filePaths.Contains(NormalizePath(file)))
{
continue; continue;
}
filePaths.Add(file); filePaths.Add(NormalizePath(file));
}
}
string NormalizePath(string path)
{
return path.Replace("\\", "/"); // 또는 ToUpperInvariant(), OS에 따라
} }
CoroutineRunner.instance.StartCoroutine(LoadAssetFiles(filePaths)); private void OnDirectoryLoadComplete()
{
onLoadComplete?.Invoke();
} }
IEnumerator LoadAssetFiles(List<string> filePaths) private IEnumerator LoadAssetFiles(List<string> filePaths, Action onComplete)
{ {
foreach (var file in filePaths) foreach (var file in filePaths)
{ {
@@ -84,7 +103,8 @@ namespace Studio.AssetTool
assetData.folderName = folderName; assetData.folderName = folderName;
assetData.LoadLocalFBX(file); assetData.LoadLocalFBX(file);
yield return new WaitUntil(() => (assetData.isLoadComplete == true && assetData.progress == 1) || assetData.isLoadError == true); yield return new WaitUntil(() => (assetData.isLoadComplete && assetData.progress == 1) || assetData.isLoadError);
assetData.OnLoadComplete(); assetData.OnLoadComplete();
Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 200); Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 200);
@@ -93,7 +113,8 @@ namespace Studio.AssetTool
OnLoadComplete(assetData); OnLoadComplete(assetData);
} }
onLoadComplete?.Invoke();
onComplete?.Invoke(); // 한 폴더 끝나면 알림
} }
public void SaveToLocalData(List<CustomAssetData> assetDatas, string path = "") public void SaveToLocalData(List<CustomAssetData> assetDatas, string path = "")

View File

@@ -16,7 +16,9 @@ namespace Studio
{ {
var assetManager = ManagerHub.instance.Get<AssetManager>(); var assetManager = ManagerHub.instance.Get<AssetManager>();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>(); var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
assetManager.LoadLocalFBXDirectorys(canvas_Popup.panel_assetmanager.GetAssetManagerData().localAssetsPaths); assetManager.CombineAssetFolderPaths(canvas_Popup.panel_assetmanager.GetAssetManagerData().localAssetsPaths);
assetManager.CombineAssetFolderPaths(canvas_Popup.panel_assetsetting.GetAssetManagerData().localAssetsPaths);
assetManager.LoadLocalFBXDirectorys();
} }
} }
} }

View File

@@ -13,14 +13,14 @@ namespace Studio
{ {
public class AssetManager : Manager public class AssetManager : Manager
{ {
private List<string> folderPath = new List<string>(); private List<string> folderPathList = new List<string>();
private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>(); private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
public Action<AssetManagerData> onAssetManagerDatas; public Action<AssetManagerData> onAssetManagerDatas;
public override void Init() public override void Init()
{ {
folderPath.Clear(); folderPathList.Clear();
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>(); var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>(); var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
@@ -30,23 +30,29 @@ namespace Studio
fbxFileManager.onLoadComplete += OnLoadCustomAsset; fbxFileManager.onLoadComplete += OnLoadCustomAsset;
onAssetManagerDatas += canvas_Popup.panel_assetmanager.SetAssetManager; onAssetManagerDatas += canvas_Popup.panel_assetmanager.SetAssetManager;
onAssetManagerDatas += canvas_Popup.panel_assetsetting.SetAssetManager;
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad(); onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
} }
public void LoadLocalFBXDirectorys(List<string> folderPaths) public void CombineAssetFolderPaths(List<string> folderPaths)
{ {
folderPath.Clear(); foreach(var folderPath in folderPaths)
{
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>(); if (folderPathList.Contains(folderPath))
foreach(var path in folderPaths)
{ {
if (folderPath.Contains(path))
continue; continue;
fbxFileManager.LoadLocalFBXDirectory(path);
folderPath.Add(path);
} }
folderPathList.Add(folderPath);
}
}
public void LoadLocalFBXDirectorys()
{
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
fbxFileManager.LoadLocalFBXDirectorys(folderPathList);
var assetManagerData = new AssetManagerData();
assetManagerData.localAssetsPaths.AddRange(folderPathList);
onAssetManagerDatas?.Invoke(assetManagerData);
} }
private void OnLoadCustomAsset() private void OnLoadCustomAsset()

View File

@@ -38,6 +38,7 @@ namespace Studio.Manage
canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active; canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active;
canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active; canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active;
canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active; canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active;
canvas_popup.panel_startsetting.onClickAssetSetting += canvas_popup.panel_assetsetting.Active;
canvas_popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData; canvas_popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData;
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;

View File

@@ -29,16 +29,17 @@ namespace Studio.Manage
private void ResetProjectSettingData() private void ResetProjectSettingData()
{ {
connector = ManagerHub.instance.Get<CustomAssetConnector>(); connector = ManagerHub.instance.Get<CustomAssetConnector>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
var assetManager = ManagerHub.instance.Get<AssetManager>(); var assetManager = ManagerHub.instance.Get<AssetManager>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingService>(); var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingService>();
var sceneStartSetting = new SceneStartSetting(); var sceneStartSetting = new SceneStartSetting();
sceneSettingService.SetSceneStartSetting(sceneStartSetting); sceneSettingService.SetSceneStartSetting(sceneStartSetting);
foreach (var customAssetData in connector.connectedAssets) foreach (var customAssetData in fbxFileManager.dataRepo.assetDatas)
{ {
connector.assetScrollView.RemoveItem(customAssetData.assetData.folderName, AssetLibraryItemType.folder); connector.assetScrollView.RemoveItem(customAssetData.folderName, AssetLibraryItemType.folder);
connector.assetScrollView.RemoveItem(customAssetData.assetData.assetName, AssetLibraryItemType.file); connector.assetScrollView.RemoveItem(customAssetData.assetName, AssetLibraryItemType.file);
} }
CommandInvoker.instance.Invoke(new RemoveAllObjectCommand()); CommandInvoker.instance.Invoke(new RemoveAllObjectCommand());
@@ -73,7 +74,8 @@ namespace Studio.Manage
sceneSettingService.SetAPISettingData(curProjectData.sceneStartSetting.apiSetting); sceneSettingService.SetAPISettingData(curProjectData.sceneStartSetting.apiSetting);
sceneSettingService.SetMQTTSettingData(curProjectData.sceneStartSetting.mqttSetting); sceneSettingService.SetMQTTSettingData(curProjectData.sceneStartSetting.mqttSetting);
assetManager.LoadLocalFBXDirectorys(curProjectData.assetManagerData.localAssetsPaths); assetManager.CombineAssetFolderPaths(curProjectData.assetManagerData.localAssetsPaths);
assetManager.LoadLocalFBXDirectorys();
} }
else else
{ {

View File

@@ -25,6 +25,7 @@ namespace Studio
public Panel_AuthSetting panel_authsetting; public Panel_AuthSetting panel_authsetting;
public Panel_APISetting panel_apisetting; public Panel_APISetting panel_apisetting;
public Panel_MQTTSetting panel_mqttsetting; public Panel_MQTTSetting panel_mqttsetting;
public Panel_AssetSetting panel_assetsetting;
public Panel_3DFactorySetting panel_3dfactorysetting; public Panel_3DFactorySetting panel_3dfactorysetting;
public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting; public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting;
@@ -90,6 +91,7 @@ namespace Studio
panel_newprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new NewProjectCommand()); panel_newprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new NewProjectCommand());
panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new OpenProjectCommand()); panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new OpenProjectCommand());
panel_assetmanager.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand()); panel_assetmanager.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand());
panel_assetsetting.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand());
panel_topmenunewprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new TopMenuNewProjectCommand()); panel_topmenunewprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new TopMenuNewProjectCommand());
panel_topmenuopenprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new TopMenuOpenProjectCommand()); panel_topmenuopenprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new TopMenuOpenProjectCommand());

View File

@@ -22,7 +22,6 @@ namespace Studio.UVC.UI
public override void AfterAwake() public override void AfterAwake()
{ {
base.AfterAwake();
//titleKey = "realtime_load_factor"; //titleKey = "realtime_load_factor";
Init(); Init();
} }

View File

@@ -0,0 +1,115 @@
using Studio.Util;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio.UI
{
public class Panel_AssetSetting : PanelBase
{
private ToggleGroup toggleGroup;
private Toggle Toggle_ServerAssets;
private Toggle Toggle_LocalAssets;
private Toggle Toggle_AssetHierarchy;
private RectTransform TabToggles;
private RectTransform ServerAssets;
private RectTransform LocalAssets;
private RectTransform AssetHierarchy;
private RectTransform Content_LocalAssets;
private Button Button_AddFolderPathItem;
private UI_FolderPathItem prf_folderPathItem;
private List<UI_FolderPathItem> folderPathItems = new List<UI_FolderPathItem>();
private List<string> selectedURLs = new List<string>();
public Action onSelectedURLs;
public override void AfterAwake()
{
prf_folderPathItem = Resources.Load<UI_FolderPathItem>("Prefabs/UI/PRF_FolderPathItem");
toggleGroup = TabToggles.GetComponent<ToggleGroup>();
Toggle_ServerAssets.onValueChanged.AddListener(OnServerAssetsValueChanged);
Toggle_LocalAssets.onValueChanged.AddListener(OnLocalAssetsValueChanged);
Toggle_AssetHierarchy.onValueChanged.AddListener(OnSAssetHierarchyValueChanged);
Toggle_ServerAssets.group = toggleGroup;
Toggle_LocalAssets.group = toggleGroup;
Toggle_AssetHierarchy.group = toggleGroup;
Button_AddFolderPathItem.onClick.AddListener(OnClickAddFolderPathItemButton);
folderPathItems.Clear();
}
public void Active(bool isOn)
{
SetActive(isOn);
}
private void OnServerAssetsValueChanged(bool isOn)
{
ServerAssets.gameObject.SetActive(isOn);
}
private void OnLocalAssetsValueChanged(bool isOn)
{
LocalAssets.gameObject.SetActive(isOn);
}
private void OnSAssetHierarchyValueChanged(bool isOn)
{
AssetHierarchy.gameObject.SetActive(isOn);
}
private void OnClickAddFolderPathItemButton()
{
selectedURLs.Clear();
var item = Instantiate(prf_folderPathItem, Content_LocalAssets);
folderPathItems.Add(item);
item.onEndEditInputFieldURL += LoadAsstsPath;
Button_AddFolderPathItem.transform.SetAsLastSibling();
}
private void LoadAsstsPath()
{
foreach (var item in folderPathItems)
{
selectedURLs.Add(item.GetURL());
}
onSelectedURLs?.Invoke();
}
public AssetManagerData GetAssetManagerData()
{
var assetManagerData = new AssetManagerData();
assetManagerData.localAssetsPaths.AddRange(selectedURLs);
return assetManagerData;
}
public void SetAssetManager(AssetManagerData assetManagerData)
{
selectedURLs.Clear();
foreach (var item in folderPathItems)
{
Destroy(item.gameObject);
}
folderPathItems.Clear();
if (assetManagerData == null)
return;
foreach (var localPath in assetManagerData.localAssetsPaths)
{
var item = Instantiate(prf_folderPathItem, Content_LocalAssets);
item.onEndEditInputFieldURL += LoadAsstsPath;
item.SetData(localPath);
folderPathItems.Add(item);
selectedURLs.Add(item.GetURL());
Button_AddFolderPathItem.transform.SetAsLastSibling();
}
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 8543d7683b4faae4aabe0ec115c412f3

View File

@@ -19,12 +19,14 @@ namespace Studio
private Toggle Toggle_APISetting; private Toggle Toggle_APISetting;
private Toggle Toggle_MQTTSetting; private Toggle Toggle_MQTTSetting;
private Toggle Toggle_3DFactorySetting; private Toggle Toggle_3DFactorySetting;
private Toggle Toggle_AssetSetting;
public Action<bool> onClickAppSetting; public Action<bool> onClickAppSetting;
public Action<bool> onClickAuthSetting; public Action<bool> onClickAuthSetting;
public Action<bool> onClickAPISetting; public Action<bool> onClickAPISetting;
public Action<bool> onClickMQTTSetting; public Action<bool> onClickMQTTSetting;
public Action<bool> onClick3DFactorySetting; public Action<bool> onClick3DFactorySetting;
public Action<bool> onClickAssetSetting;
#region TestButton #region TestButton
private Button Button_Load; private Button Button_Load;
@@ -73,6 +75,7 @@ namespace Studio
Toggle_APISetting.onValueChanged.AddListener(OnClickAPISettingButton); Toggle_APISetting.onValueChanged.AddListener(OnClickAPISettingButton);
Toggle_MQTTSetting.onValueChanged.AddListener(OnClickMQTTSettingButton); Toggle_MQTTSetting.onValueChanged.AddListener(OnClickMQTTSettingButton);
Toggle_3DFactorySetting.onValueChanged.AddListener(OnClick3DFactorySettingButton); Toggle_3DFactorySetting.onValueChanged.AddListener(OnClick3DFactorySettingButton);
Toggle_AssetSetting.onValueChanged.AddListener(OnClickAssetSettingButton);
Button_Load.onClick.AddListener(OnClickLoadButton); Button_Load.onClick.AddListener(OnClickLoadButton);
Button_Save.onClick.AddListener(OnClickSaveButton); Button_Save.onClick.AddListener(OnClickSaveButton);
@@ -108,6 +111,11 @@ namespace Studio
SetToggleChanged(Toggle_3DFactorySetting, isOn); SetToggleChanged(Toggle_3DFactorySetting, isOn);
onClick3DFactorySetting?.Invoke(isOn); onClick3DFactorySetting?.Invoke(isOn);
} }
private void OnClickAssetSettingButton(bool isOn)
{
SetToggleChanged(Toggle_AssetSetting, isOn);
onClickAssetSetting?.Invoke(isOn);
}
private void OnClickSaveButton() private void OnClickSaveButton()
{ {
onClickSaveButton?.Invoke(); onClickSaveButton?.Invoke();