From 63895136ca77cea88071c28002e4cdada0b7a3a4 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:53:55 +0900 Subject: [PATCH] =?UTF-8?q?7/1=EB=B9=8C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Localization/Command Shared Data.asset | 6 +- Assets/Localization/Command_en.asset | 4 +- Assets/Localization/Command_ko-KR.asset | 4 +- .../Localization/Localization Settings.asset | 2 +- Assets/Prefabs/AAA/Panel_StudioTopbar.prefab | 185 ++++++++++- Assets/Scenes/0.30.0.unity | 301 +++--------------- .../ObjectCommand/CopyObjectCommand.cs | 2 +- .../RemoveSelectObjectCommand.cs | 2 +- Assets/Scripts/Studio/Core/CommandInvoker.cs | 6 + .../Scripts/Studio/Managers/ProjectManager.cs | 4 +- .../Scripts/Studio/Managers/SearchManager.cs | 23 +- .../Studio/UI/Panel/Panel_AppSetting.cs | 4 + .../Studio/UI/Panel/Panel_StudioTopBar.cs | 3 + Assets/Scripts/XRLib/DataStructure/Trie.cs | 2 +- 14 files changed, 253 insertions(+), 295 deletions(-) diff --git a/Assets/Localization/Command Shared Data.asset b/Assets/Localization/Command Shared Data.asset index 5a91dd86..83c50bd2 100644 --- a/Assets/Localization/Command Shared Data.asset +++ b/Assets/Localization/Command Shared Data.asset @@ -44,11 +44,13 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 2918166198063104 - m_Key: Save And New Project + m_Key: 'Copy Object + +' m_Metadata: m_Items: [] - m_Id: 2925542997331968 - m_Key: Save And Open Proejct + m_Key: Remove Object m_Metadata: m_Items: [] - m_Id: 2925648920285184 diff --git a/Assets/Localization/Command_en.asset b/Assets/Localization/Command_en.asset index 18d644af..498e2519 100644 --- a/Assets/Localization/Command_en.asset +++ b/Assets/Localization/Command_en.asset @@ -47,11 +47,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 2918166198063104 - m_Localized: Save And New Project + m_Localized: Copy Object m_Metadata: m_Items: [] - m_Id: 2925542997331968 - m_Localized: Save And Open Proejct + m_Localized: Remove Object m_Metadata: m_Items: [] - m_Id: 2925648920285184 diff --git a/Assets/Localization/Command_ko-KR.asset b/Assets/Localization/Command_ko-KR.asset index 5ae71157..97f9fd00 100644 --- a/Assets/Localization/Command_ko-KR.asset +++ b/Assets/Localization/Command_ko-KR.asset @@ -47,11 +47,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 2918166198063104 - m_Localized: "\uC800\uC7A5 \uBC0F \uC0C8 \uD504\uB85C\uC81D\uD2B8" + m_Localized: "\uAC1D\uCCB4 \uBCF5\uC0AC" m_Metadata: m_Items: [] - m_Id: 2925542997331968 - m_Localized: "\uC800\uC7A5 \uBC0F \uD504\uB85C\uC81D\uD2B8 \uC5F4\uAE30" + m_Localized: "\uAC1D\uCCB4 \uC0AD\uC81C" m_Metadata: m_Items: [] - m_Id: 2925648920285184 diff --git a/Assets/Localization/Localization Settings.asset b/Assets/Localization/Localization Settings.asset index 2d9caefe..15fae427 100644 --- a/Assets/Localization/Localization Settings.asset +++ b/Assets/Localization/Localization Settings.asset @@ -26,7 +26,7 @@ MonoBehaviour: m_Items: [] m_ProjectLocaleIdentifier: m_Code: ko-KR - m_PreloadBehavior: 1 + m_PreloadBehavior: 3 m_InitializeSynchronously: 0 references: version: 2 diff --git a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab index 6ee818e6..00e22d9a 100644 --- a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab +++ b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab @@ -1302,6 +1302,7 @@ MonoBehaviour: Button_Run: {fileID: 0} Button_Close: {fileID: 0} Button_LanguageSetting: {fileID: 0} + Text_Language: {fileID: 0} --- !u!1 &1125765218071084743 GameObject: m_ObjectHideFlags: 0 @@ -3041,8 +3042,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3051,7 +3052,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -3551,6 +3552,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8580075652477381670} + - {fileID: 6290649851210927995} m_Father: {fileID: 6105994354646297837} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -6762,8 +6764,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6772,7 +6774,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7451,8 +7453,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7461,7 +7463,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -10733,6 +10735,157 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7669123702517555861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6290649851210927995} + - component: {fileID: 4658318050737482717} + - component: {fileID: 2920137130514090499} + - component: {fileID: 5344783717609916258} + m_Layer: 5 + m_Name: Text_Language + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6290649851210927995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7669123702517555861} + 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: 5175156938614111087} + 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_AnchoredPosition: {x: 18.9, y: -9.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4658318050737482717 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7669123702517555861} + m_CullTransparentMesh: 1 +--- !u!114 &2920137130514090499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7669123702517555861} + 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: EN + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 11 + m_fontSizeBase: 11 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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!114 &5344783717609916258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7669123702517555861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &7769666627040665028 GameObject: m_ObjectHideFlags: 0 @@ -10878,7 +11031,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: "\uAE30\uB2A5 \uAC80\uC0C9 .." m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} @@ -11854,8 +12007,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -11864,7 +12017,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -12005,8 +12158,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -12015,7 +12168,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 diff --git a/Assets/Scenes/0.30.0.unity b/Assets/Scenes/0.30.0.unity index 3c462c42..048e6da8 100644 --- a/Assets/Scenes/0.30.0.unity +++ b/Assets/Scenes/0.30.0.unity @@ -1025,66 +1025,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 909603313768631583, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1065617958303419244, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1065617958303419244, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - target: {fileID: 1105169851982576340, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_Name value: Panel_StudioTopbar objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1906793499465648256, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - target: {fileID: 1955157107292011281, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1101,34 +1045,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2191847735542068009, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2516340938489095201, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 - objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1157,10 +1073,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2734107196935352845, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_text - value: Data Update Setting - objectReference: {fileID: 0} - target: {fileID: 3081720614352094850, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1241,26 +1153,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3518374408192557755, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.x - value: 34.7 - objectReference: {fileID: 0} - - target: {fileID: 3518374408192557755, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 - objectReference: {fileID: 0} - target: {fileID: 3612353324306706568, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PreserveAspect - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3887689113271058331, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1277,38 +1173,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4150982390815816887, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4173484896289031105, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4173484896289031105, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1349,14 +1213,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4451917240437057383, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4451917240437057383, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1365,10 +1221,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4728269547262842792, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_text - value: Data Repository - objectReference: {fileID: 0} - target: {fileID: 4828121822976114357, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1425,14 +1277,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5358499166359212945, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5358499166359212945, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5557641235373680755, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1553,70 +1397,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6182157003277826644, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6210973074375535068, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6210973074375535068, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + - target: {fileID: 6290649851210927995, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 220 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + - target: {fileID: 6290649851210927995, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y - value: 149.3316 - objectReference: {fileID: 0} - - target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 6238171795191717421, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6340558249613605857, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_SizeDelta.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.x - value: 89.9 - objectReference: {fileID: 0} - - target: {fileID: 6381081787918499413, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 - objectReference: {fileID: 0} - target: {fileID: 6467883027692677993, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1729,26 +1521,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1817,22 +1589,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9055937186152068310, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9055937186152068310, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_PixelsPerUnitMultiplier - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 9089877903798422885, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.x - value: 105.1 - objectReference: {fileID: 0} - - target: {fileID: 9089877903798422885, guid: 13ace7584c1d4514cb2218354647e355, type: 3} - propertyPath: m_AnchoredPosition.y - value: -35 - objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1854,8 +1610,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 7859639716907446574, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3} @@ -3030,7 +2785,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2277027821890051672, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchoredPosition.x - value: 126.6001 + value: 126.60156 objectReference: {fileID: 0} - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_SizeDelta.x @@ -3056,6 +2811,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3159005925573434593, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_AnchoredPosition.x + value: -144.63281 + objectReference: {fileID: 0} - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -3184,6 +2943,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4585162413516526451, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_AnchoredPosition.x + value: 162.20312 + objectReference: {fileID: 0} - target: {fileID: 5132087015678815764, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -3208,6 +2971,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_AnchoredPosition.x + value: -50.398438 + objectReference: {fileID: 0} + - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.800781 + objectReference: {fileID: 0} - target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3679,8 +3450,6 @@ MonoBehaviour: _moveSettings: _canBeDisplayed: 1 _isExpanded: 1 - _moveSpeed: 6 - _accelerationRate: 15 _panSettings: _canBeDisplayed: 1 _isExpanded: 1 @@ -3717,6 +3486,8 @@ MonoBehaviour: _zoomMode: 0 _orthoStandardZoomSensitivity: 10 _perspStandardZoomSensitivity: 10 + _orthoFastZoomSensitivity: 30 + _perspFastZoomSensitivity: 30 _orthoSmoothZoomSensitivity: 5 _perspSmoothZoomSensitivity: 5 _orthoZoomSmoothValue: 5 @@ -9049,11 +8820,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1456553455777821898, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_AnchorMax.y - value: 0.9999937 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2345256951127197424, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_Size - value: 0.9999854 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3027341500357890096, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_AnchorMax.x @@ -9149,11 +8920,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_AnchoredPosition.x - value: -648 + value: -738 objectReference: {fileID: 0} - target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 218 objectReference: {fileID: 0} - target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11893,6 +11664,22 @@ PrefabInstance: propertyPath: m_Name value: Panel_Toolbox objectReference: {fileID: 0} + - target: {fileID: 3012754740992037236, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} + propertyPath: m_AnchoredPosition.x + value: 258.89844 + objectReference: {fileID: 0} + - target: {fileID: 3964166921491454580, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} + propertyPath: m_AnchoredPosition.x + value: 165.89844 + objectReference: {fileID: 0} + - target: {fileID: 5728574744260500265, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} + propertyPath: m_AnchoredPosition.x + value: 227.89844 + objectReference: {fileID: 0} + - target: {fileID: 8914158643671488508, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} + propertyPath: m_AnchoredPosition.x + value: 196.89844 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs index 01be2174..e65d9a3b 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs @@ -17,7 +17,7 @@ namespace Studio.Command } - public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } + public string id { get => "Copy Object"; set => throw new System.NotImplementedException(); } public bool CanExecute() { diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs index 95354d2c..fd1222be 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveSelectObjectCommand.cs @@ -13,7 +13,7 @@ namespace Studio.Command private List removeList = new List(); private List siblingIndex = new List(); - public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } + public string id { get => "Remove Object"; set => throw new System.NotImplementedException(); } public bool CanExecute() { diff --git a/Assets/Scripts/Studio/Core/CommandInvoker.cs b/Assets/Scripts/Studio/Core/CommandInvoker.cs index f011aad4..fe870e18 100644 --- a/Assets/Scripts/Studio/Core/CommandInvoker.cs +++ b/Assets/Scripts/Studio/Core/CommandInvoker.cs @@ -76,5 +76,11 @@ namespace Studio.Command var handler = new InputHandler(null, null, null, shortcutTable); return handler; } + public void ResetCommandStack() + { + redoableStack.Clear(); + undoableStack.Clear(); + commandStack.Clear(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index 8fcc1ea2..6e6d43d0 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -53,6 +53,8 @@ namespace Studio.Manage CommandInvoker.instance.Invoke(new RemoveAllObjectCommand()); fbxFileManager.ClearFilePaths(); + curProjectData = null; + CommandInvoker.instance.ResetCommandStack(); } public void TopMenuNewProjectSettingData() { @@ -87,8 +89,6 @@ namespace Studio.Manage .Select(asset => CreateAssetData(asset)) .ToList(); newProjectData = CreateProjectData(assetDatas); - Debug.Log(curProjectData); - Debug.Log(newProjectData); if (CompareSaveState(curProjectData, newProjectData)) { diff --git a/Assets/Scripts/Studio/Managers/SearchManager.cs b/Assets/Scripts/Studio/Managers/SearchManager.cs index 2a143585..45ad9ff7 100644 --- a/Assets/Scripts/Studio/Managers/SearchManager.cs +++ b/Assets/Scripts/Studio/Managers/SearchManager.cs @@ -23,19 +23,17 @@ namespace Studio.Manage AddCommand(new ActivateRotateGizmoCommand()); AddCommand(new ActivateScaleGizmoCommand()); AddCommand(new ResetGizmoCommand()); - //AddCommand(new CopyObjectCommand()); - //AddCommand(new RemoveAllObjectCommand()); - //AddCommand(new RemoveSelectObjectCommand()); - AddCommand(new NewProjectCommand()); - AddCommand(new OpenProjectCommand()); - AddCommand(new SaveAndNewProjectCommand()); - AddCommand(new SaveAndOpenProjectCommand()); + AddCommand(new CopyObjectCommand()); + AddCommand(new RemoveSelectObjectCommand()); AddCommand(new SaveProjectCommand()); - //AddCommand(new CreateConnectedAssetCommand()); AddCommand(new ExitProgramCommand()); + + var projectManager = ManagerHub.instance.Get(); + AddAction("New Project", projectManager.TopMenuNewProjectSettingData); + AddAction("Open Project", projectManager.TopMenuOpenProjectSettingData); } - private async Task AddCommand(string id, Action action) + public async Task Add(string id, Action action) { commands[id] = action; List words = await ManagerHub.instance.Get().commandHelper.GetLocalizedAllLocales(id); @@ -48,7 +46,12 @@ namespace Studio.Manage private async void AddCommand(ICommand command) { - await AddCommand(command.id, () => CommandInvoker.instance.Invoke(command)); + await Add(command.id, () => CommandInvoker.instance.Invoke(command)); + } + + public async void AddAction(string id, Action action) + { + await Add(id, action); } public List GetTrieContainingWords(string text) diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs index 766e8572..17849430 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs @@ -145,12 +145,16 @@ namespace Studio.UI Image_Selected.enabled = true; Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); Image_Selected.sprite = sprite; + var text = Button_ImageSelected.GetComponentInChildren(); + text.enabled = false; ratio = texture.height / (float)texture.width; } else { Image_Selected.enabled = false; + var text = Button_ImageSelected.GetComponentInChildren(); + text.enabled = true; Debug.LogError("이미지 로드 실패"); } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs index 66525b8c..5e9df67b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs @@ -1,5 +1,6 @@ using Studio.Manage; using System; +using TMPro; using UnityEngine; using UnityEngine.UI; using XRLib.UI; @@ -53,6 +54,7 @@ namespace Studio.UI /*ControlBox*/ public Button Button_LanguageSetting; + public TextMeshProUGUI Text_Language; public event Action onClickLanguageSetting; @@ -114,6 +116,7 @@ namespace Studio.UI private void OnClickLanguageSetting() { Debug.Log("On Click anguage Setting"); + Text_Language.text = Text_Language.text == "KR" ? "EN" : "KR"; onClickLanguageSetting?.Invoke(); } diff --git a/Assets/Scripts/XRLib/DataStructure/Trie.cs b/Assets/Scripts/XRLib/DataStructure/Trie.cs index 3efd24e9..aa77d8e3 100644 --- a/Assets/Scripts/XRLib/DataStructure/Trie.cs +++ b/Assets/Scripts/XRLib/DataStructure/Trie.cs @@ -53,7 +53,7 @@ namespace XRLib.Collections private void CollectWordsContainingSubstring(TrieNode node, string currentWord, string substring, List result) { - if (node.IsEndOfWord && currentWord.Contains(substring)) + if (node.IsEndOfWord && currentWord.ToLower().Contains(substring.ToLower())) { result.Add(currentWord); }