From 144a9054605b987316860104969ba9aed52b970f Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:58:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?InputField=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C?= =?UTF-8?q?=20GetKey=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=EA=B0=80=20=ED=98=B8?= =?UTF-8?q?=EC=B6=9C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C,=20Hierarchy?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B0=9D=EC=B2=B4=20=ED=81=B4=EB=A6=AD=20?= =?UTF-8?q?=EC=8B=9C=20=ED=95=B4=EB=8B=B9=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20?= =?UTF-8?q?=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Studio/Managers/CameraManager.cs | 4 +++- .../Scripts/Studio/Managers/UserInputManager.cs | 15 +++++++++++++++ .../UI/Panel/Panel_InterferedObjectList.cs | 2 +- .../Studio/UI/TreeView/HierarchyScrollRect.cs | 16 ++++++++++++++-- ProjectSettings/LocalizationSettings.asset | 2 +- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Studio/Managers/CameraManager.cs b/Assets/Scripts/Studio/Managers/CameraManager.cs index bcd99d05..5dbf3aef 100644 --- a/Assets/Scripts/Studio/Managers/CameraManager.cs +++ b/Assets/Scripts/Studio/Managers/CameraManager.cs @@ -14,8 +14,10 @@ namespace Studio.Manage viewAngle = new Vector3(45, 145, 0); } - public void MoveToTwinObjectPos(TwinObject target) + public void MoveToTwinObjectPos(GameObject target) { + if (target == null) + return; var command = new MoveToTargetCommand(target.transform, viewAngle, cameraDistance); CommandInvoker.instance.Invoke(command); } diff --git a/Assets/Scripts/Studio/Managers/UserInputManager.cs b/Assets/Scripts/Studio/Managers/UserInputManager.cs index 6a79b145..ac5f4d4f 100644 --- a/Assets/Scripts/Studio/Managers/UserInputManager.cs +++ b/Assets/Scripts/Studio/Managers/UserInputManager.cs @@ -1,7 +1,9 @@ using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; +using UnityEngine.EventSystems; using XRLib; namespace Studio.Manage @@ -106,6 +108,9 @@ namespace Studio.Manage } void Update() { + if (IsEditInputField()) + return; + foreach (var key in downKeyActionTable.Keys) { if (Input.GetKeyDown(key)) @@ -149,5 +154,15 @@ namespace Studio.Manage updateLoop?.Invoke(); } + + bool IsEditInputField() + { + GameObject selectedObj = EventSystem.current.currentSelectedGameObject; + + if (selectedObj == null) + return false; + + return selectedObj.GetComponent() != null; + } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs b/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs index 08f4ff84..0989491c 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs @@ -30,7 +30,7 @@ namespace Studio.UI public void CreateContentButton((TwinObject, TwinObject) pair) { var newButton = Object.Instantiate(buttonPrefab, content).GetComponent(); - newButton.OnClickButton += cameraManager.MoveToTwinObjectPos; + //newButton.OnClickButton += cameraManager.MoveToTwinObjectPos; newButton.Initialize(pair.Item1, pair.Item2); createdButtons.Add(pair, newButton); } diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs index f191a53d..5fa9554b 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollRect.cs @@ -6,6 +6,7 @@ using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; using Studio.UI; +using Studio.Manage; namespace Studio.HierarchyTree { @@ -24,6 +25,9 @@ namespace Studio.HierarchyTree private HierarchyScrollItemUI hoverItemUI; private Coroutine coroutinePendPopup; public UnityEvent onExit; + private float lastClickTime = 0f; + private const float doubleClickInterval = 0.3f; + public override void OnBeginDrag(PointerEventData eventData) { if (eventData.button != PointerEventData.InputButton.Left) @@ -83,8 +87,6 @@ namespace Studio.HierarchyTree } } - - public override void OnEndDrag(PointerEventData eventData) { if (eventData.button == PointerEventData.InputButton.Left) @@ -142,19 +144,29 @@ namespace Studio.HierarchyTree base.OnEndDrag(eventData); } } + public void OnPointerDown(PointerEventData eventData) { if (eventData.button == PointerEventData.InputButton.Left) { HierarchyScrollItemUI itemUI = GetTargetItemUI(eventData); + if (itemUI != null) { sourceItem = itemUI.currentItem; + + float timeSinceLastClick = Time.time - lastClickTime; + + if (timeSinceLastClick <= doubleClickInterval) + { + ManagerHub.instance.Get().MoveToTwinObjectPos(sourceItem.linkedObject); + } } if (sourceItem != null) { coroutinePendPopup = StartCoroutine(CoroutinePendPopup()); } + lastClickTime = Time.time; } } public void OnPointerUp(PointerEventData eventData) diff --git a/ProjectSettings/LocalizationSettings.asset b/ProjectSettings/LocalizationSettings.asset index 652b53df..681af65e 100644 --- a/ProjectSettings/LocalizationSettings.asset +++ b/ProjectSettings/LocalizationSettings.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_StringTable: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: GUID:b7e3230909563f049a2b6af27abfd127 m_AssetTable: m_TableReference: m_TableCollectionName: From f87a7ed987af2184a0b3b0091b3693d1d8641155 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:41:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=95=98=EC=9D=B4=EC=96=B4=EB=9D=BC?= =?UTF-8?q?=ED=82=A4=20=EC=95=84=EC=9D=B4=ED=85=9C=20hover=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/TreeView/HierarchyPooledScrollView.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs index 601b7b1f..92562a0b 100644 --- a/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyPooledScrollView.cs @@ -258,15 +258,15 @@ namespace Studio.HierarchyTree } public void OnSelectSingle(HierarchyItem item) { - if (selectedItems.Count == 1 && selectedItems[0] == item) - { - selectedItems.Clear(); - } - else - { + //if (selectedItems.Count == 1 && selectedItems[0] == item) + //{ + // selectedItems.Clear(); + //} + //else + //{ selectedItems.Clear(); selectedItems.Add(item); - } + //} foreach (var itemUI in activeItems) { itemUI.SetSelected(selectedItems); From b8233087c4e5b3bdf7f10408a838b3bef7e2ecdf Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:57:29 +0900 Subject: [PATCH 3/3] =?UTF-8?q?LocalizationSetting=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectSettings/LocalizationSettings.asset | 2 +- .../StandaloneWindows64/catalog_0.1.bin | Bin 4459 -> 4970 bytes .../StandaloneWindows64/catalog_0.1.hash | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectSettings/LocalizationSettings.asset b/ProjectSettings/LocalizationSettings.asset index 681af65e..3bdef6a5 100644 --- a/ProjectSettings/LocalizationSettings.asset +++ b/ProjectSettings/LocalizationSettings.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_StringTable: m_TableReference: - m_TableCollectionName: GUID:b7e3230909563f049a2b6af27abfd127 + m_TableCollectionName: GUID:ab1e4fa9b84503341a204ed3ec095aa8 m_AssetTable: m_TableReference: m_TableCollectionName: diff --git a/ServerData/StandaloneWindows64/catalog_0.1.bin b/ServerData/StandaloneWindows64/catalog_0.1.bin index ddcddac669cfec43054ac7367e00f2095e417d10..5e9da1a670fdf0830061f637594297804bee3b05 100644 GIT binary patch literal 4970 zcmcgw4UAny6(0J7_GepYOKPFOqb=!fvimys-noAbC9mB!P`8z`TPRBPIrq-o-Dlt4 z*S`B+r7cL>AhDz&q}r+t)}YXe7DbC%Xi!92K_waxlcvN75{wP8N}{5s=y%?`Z};xH zh0+9X^X-|LJ9EBs&dfb?UYG6sL)$pU*aF}$fQ!xn;M?OF`w{Rg#tu$n>@YBMI%8J? z_XFPm+Ad;j4sbPK05X-EAnyPkN#)NWe+#@0ya~*^xG9%Gegyag@F`$lDj$P<3ivhf zGB9;UQ_h8K2X0B_0Avk#FqJ=s`~`3l_#-fTW>bC)G6JrEFH4oG>LigtStqMyDekVs zH67QwWlfeV{Yx?9rnpqwvLfy;#X8@slS;iB>eVuq{dy1+hlbWvE1OG7SCjn8IH}1v z)UA<)P{KQN-Su*9+XRAkKVGjvO&j7;(EDE7LDYncIIw|(o!W} z!t?kyv1QSN7cll8JUbvC2G#-J1rSd*+5*IENNvli1OXWu9QJ2QOMlbj3D|mK`7<<6 zNBaciY{+AfS3*910V^yV#|kshUzE zL3bVc`%}8*=R>zNNpx*lJyzu*QXB|2#_-!2>Wjy-!Vl1&gAakCvf_NGo2;rq)$)H9 z6pb~$6+|t+?*+Mm{@#>)D%M-CPy`0ohHDxDgwm1=&oIr9JB}l?kq;Unt3b`R?01p* ziW+_;`OHX?@2$tR(x6@=YXf(z@59HT@Nva@T`5+TPbZF8{|+{#l!tmQdZl{Vw98LT z*go&6NWGGS37#ztM@5DcN#%;b^o4Xx%Z+3x1K$ZO#&T=|=6wl&4gqf_OOJnVGGo6) zdk)4kyWOid)pb(4VIxH)c>@z#VV^jW725FC{RU&SO)E#NYNms$@V+(Q#{5^YB^{Vg z=Y`G*ma$7PX9)rA5$-lRIzjNI9dIWQuI-qna3f25VIVEr3PVQ)oTrf}LBabM{FXH- z**9;!@UeQZ;LdAzJz-yS{3HU(Sm1if3stDSz_NYM<=Rz|@O@aWT!@XYq- zuDS7p&2Uo$yD_FA4*=Q7tiw1(=7!OcNov(n+}~AeBqxhDfJGPvoR%61%Irsi*ZUt@K4`%?O6j`SVd^Y*3p-E-ux<95Fk?W5>`p}L1t1%}Js79xef*uHx1mzi zGH%CttqnBV9qk(`T^p*1rD2Aa8z^5|p@DN}bIGL$UC#@-6)6>_&g}d@#`5gerpC

9!MJ|H*>-LFK|1-a$n3DDbOs4;(3` zX@Jh^O)PXe=nW58RRuG_Kw`P1>OJ3hbnb1%$) zf-d=t!8vr_&B3>zhEmy|AU}lQQEsJl_!9cL$*l05yZ4%<%~|0_6LEnn$%>T6NQRICm6nhsa7irj#}@t_RYV80jr7U`Eks?gs7 zNu+COE*>I%0Bs`u2O``erFyDGgRj1)mmC~1(4;+Bo7t zok(dpM|qh_%51->bt$Hi*8hoWBgDFh*A!KXW_2oR9Q6Aj$+4@60S`I0745lb_cStD zuDy>^S+3FR$Wb!u>Ft>JF7KNLJq=A{(AOYeI|~z??VDDPaU2m#TAOQQ1;SW+j$@6r z*j@@f2v{h1}(y>_gK%-&NMFm zk!9gO!9tNg4mlOZ%$mjuU6^VC=kS9ja9wGKwqy8~(A@K9W7%L5R;uMvF#Jsl`c+ee zc4BIW+zfz_^=(ONdNAMo1nx;Ed+Dmu0)w*n66K`4iByUDB6_2TK!V0>)}+F;oElTcs`Gm_EaD&$#uk` z({e&LG>p$?bUlPN?wMx3)~FI6&%AsZZTg}}u|oVQvC%_D{0{HPv5DA*9Hc8;99V7z zuHiE77CSKBg0KAmb=%IHv z;~nwtNO>LYTT-KVg_}ZIf(N!CWTXQ-a%32(MiG#%-Ho+$0XBILWEc;njHLAqfN~o> z#Q1E=NaHz-d9Fg4BpjPtPT(ow1%4D5K7Qn>&~&7HEu(h=aysR?*0#?=pR8|(SENe@ zh8B_Z15ZGmB@AhDp_QdW90XLkobCiXWXBq`DfhMdpGNOVx*u(P0&GoHmn%{|ntAm@v?=(cmV!^ok{&YQMZ6>PX*>rh3}vD4 y4qVdbJB4kx3H;78Sz80rCPS=Z6RBI!>n6V|Uq!ZW2Bb8Ve2XsMa{U9Vos722O4o&8P}UcI=Xv!5XGTTT(SO4 zC04baiOYxI#;45Wx^ErZ*73`q7N0rUHT$uJXVy`)z9URmMW!1Gg>bEa3)ix}NQ6QL zuCys99hf(YKeqvU`pwOA7BF@Y<0~Q0t@ePvrJ<8_<95nQ@+2m-)BfuYRyqa#5rCGd zZ`xO_id&<*p@B*UzCs6+O$-6dR+)6iPaOqse9LRS7`OK_>oHDcV+{`3ty%LY~ zq|L**N5>=8N;0}y$6e)e=oQx5_8>}kj;dpEs(_Qq;;E#lSKujy!W+_ieF)-zT|E`u=Qp5vk7wQVU+1eO_^ zp5aR6ItG_s7R=uNV=mv?+sv7RuQhgepYFN!-p=K7f22FUPnoqt;ReDCg^C;_)Y`O_ z85knMMm2cA{hi3>SAhECA3pPw`BVGyC}jJQ#lHjj%svG6GjbzW+XfFkM@GI7p^vrBVxWdI!(j-k z?8bpXUEiVW)VM9nCGo^Z>_ilFzDUsBz*gW+U>&d@cnP}h z1MPe9_)R}wQHzZYji>fK`o$I0Q%C{7&%H$#C7E>Ml@u)6FE$7n@y*W^KszE=ohI z+1w5t#0%Hq>e|xtlX4@ISFO-y~1q3ySp!=(7OD{2O?1FayPW z8|3s*%)iH&)@2-})Aj~V!JD#C@@54lQdA@!Y@X~*n=Zs{Q@xk4(iPx821=&p zl5RX?st;pgpF!kpQf~4L?|p&&HFmRliSMp@B$K@WX(H{OvaBrkya zo)pno#%TUfqu|<%w)Q4A6l<59$0K-jP2fFMy)8 z+qj8I&+?`6Y_0+?G9Wa$7x{thK9|#b24hl{`O`dxI;dsiA>E5Hrdm7C`@l*}M=NFh POQuR`5HfO)j`{xrx&z4C diff --git a/ServerData/StandaloneWindows64/catalog_0.1.hash b/ServerData/StandaloneWindows64/catalog_0.1.hash index c8d9c221..33d98f76 100644 --- a/ServerData/StandaloneWindows64/catalog_0.1.hash +++ b/ServerData/StandaloneWindows64/catalog_0.1.hash @@ -1 +1 @@ -000e1e56b63491cd2948148ccce2b84c \ No newline at end of file +77439a0de80e9b4861c25c52b97dc770 \ No newline at end of file