From 4d6a7eb32ed992fa718aaf1b992e3849736f5a7f Mon Sep 17 00:00:00 2001 From: SweetJJuya Date: Mon, 2 Dec 2024 20:28:46 +0900 Subject: [PATCH 1/2] Temp_Save --- Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs | 21 +++--- .../Tycoon/Roguelike/Card_CountDisabled.png | Bin 2413 -> 2688 bytes .../Ui/Tycoon/Roguelike/Card_CountEnabled.png | Bin 2537 -> 2748 bytes Assets/05.Prefabs/Uis/Tycoons/Card.prefab | 67 ++++++++++++++++-- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs index f1cf42b7d..fe0918db8 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs @@ -224,20 +224,21 @@ namespace BlueWater.Uis Vector3 initialScale = _panel.localScale; Vector3 targetScale = new Vector3(1.05f, 1.05f, 1.0f); // 타겟 스케일 설정 - // 마우스 포인터의 화면 좌표(eventData.position)를 이미지의 로컬 좌표(localPoint)로 변환 - if (RectTransformUtility.ScreenPointToLocalPointInRectangle(_rectTransform, Input.mousePosition, _uiCamera, - out var localPoint)) + // RectTransform의 화면 좌표를 가져오기 위한 변수 + RectTransform rectTransform = GetComponent(); + + if (RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, null, out var localPoint)) { - // RectTransform의 중심을 기준으로 정규화된 값으로 변환 + // RectTransform의 크기를 기준으로 좌표를 정규화 Vector2 normalizedPoint = new Vector2( - (localPoint.x / _rectTransform.rect.width) + 0.5f, - (localPoint.y / _rectTransform.rect.height) + 0.5f + localPoint.x / rectTransform.rect.width, + localPoint.y / rectTransform.rect.height ); - // 좌표를 중심 기준으로 (-0.5, -0.5)에서 (0.5, 0.5)로 변환 (이미지 중앙이 0,0이 되도록) - Vector2 centeredNormalizedPoint = normalizedPoint - new Vector2(0.5f, 0.5f); + // 좌표를 중심 기준으로 (-0.5, -0.5)에서 (0.5, 0.5)로 변환 + Vector2 centeredNormalizedPoint = normalizedPoint * 2f; - // Debug.Log($"Normalized Point: {centeredNormalizedPoint}"); + // Debug.Log($"Normalized Point: {centeredNormalizedPoint}"); // X와 Y축의 회전 각도를 마우스 위치에 따라 계산 (최대 회전 각도를 15도로 제한) float rotationX = Mathf.Clamp(-centeredNormalizedPoint.y * _maxRotationAngle * 2 * _returnSpeedTime, @@ -245,6 +246,8 @@ namespace BlueWater.Uis float rotationY = Mathf.Clamp(centeredNormalizedPoint.x * _maxRotationAngle * 2 * _returnSpeedTime, -_maxRotationAngle, _maxRotationAngle); + Debug.Log($"Normalized Point: {rotationX} x {rotationY}"); + // 회전을 적용 (X축은 위아래 기울기, Y축은 좌우 기울기) _panel.GetComponent().localRotation = Quaternion.Euler(rotationX, rotationY, 0f); diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png index f4339c67f70e046a7cadfe533262d9b00f5936d8..775e45058dee9bc6ecb9f3eb5c26535908924ed7 100644 GIT binary patch delta 996 zcmaDW)F3*+f{C4Jqg5vpuaT~SQHY_1m4UgHvFYRsObTcsf0+VQEKQ7zl8uwhb(4(} zQ*|vYOpFRaO6E4?YQhm9bM@y``(??CYXy+V_>8BT6&FakCuFclmsP^Yrea2zq3b9&| z74kX7_eBMYrl{6VWmK8$8K@z$#bM>$DHqsl6P+2G-oCl!aH3+y7a!IYVXKo&q-L^R z;5O5m+9g-dvF}h{(}aV{mrP}jJT9Dg{`t`Yi!Hnh#B&ar)fk*%|53)$!ZUZ$z5@kH z69vwuT`pwUE7jZftUK|+?}@qsMg>m4*qT>{c$HYqUF+;|P`t*7C&^+Xi<2zBhkT;O zT)*zP_0OeRL~0J1A6A>gWE`v|y8wvZd;eu(q4p!3tLt>(%XZdcxN$T*-Hv$xtNS z_`ziLTHzUvd)g*A>F^kZFMnF9AYL^0#xarX^sKOJGrPAc%&}Gsy&$Hs-@zl1F>OL? zjrMAXSD$h%HYQo?9$B(y>MtvSltqg|w0`nAacwj_F;$V{y}I0liB%iZW<*9?WFHfI zaDjtGT2^=OH|-XYq$l;;i_%y=iS*vgx%OS5W1^#)n?nA@j^6(Jjs}a3PF&%5BG!B3 z=ug=tck{d_L@Q5-&-h}r-e_{Y;R%0bfwh9av-dYAOnqMQo|#u@#zN5<{k8^|->YbF zCnW?;iS?0EcJz3BKYz={Pud-uHd@8A3q8wSvf^sizGep>>D+o5UeB!1obn6%>Hl|SK? zyCQU=^!yjEU;Xr@s5qP0|6K+R51Dcc+!7NWzG`h04Yx=$TUT(#X7{0uOj=G_A1=P0 x@}*P%(w{WlpZhiKo70v1;#d8wk3X&ci#caegYT=`F+L1H;OXk;vd$@?2>|3Ksx<%r delta 812 zcmV+{1JnF~73~s`I06PVu{wzYleq;Ilh^_nleq;IlLZ4vlYs>$vvUKc0+Z(kS$`&t zs`&r_0^dnQK~!ko?V8I@8c`U>e?$;OB@8nL5+{M-ZL~>sZ(l-RqpnSF=~I-H@(N9L z*%~FfsP1agr47mH;yY&s+9MSh;V|jqznSa#1A#Jd8beI8 znP*kYABH&v%F}?niI>wnXTml!$ufI883^pg8+*IDIEdjrlNOUU46!9-m$v8^}2zQJm`_p=UtOZ6H5^#rjo`_P=}s@_)kyA~z%7eUK7YI!DVU{A2f3f1dp2px^qqq#)A!RRvCkYzVxLWy#7@cz*AA2wuBR_6 zj23$Ob1n3QBZZzm(0@*=^w!X2FxhneTuX0_rznQL9;xQ0UJMB)77ja<2kh(AYX|tM8)<%N q-RWx`{mee#rQTHYzhBD{{RSN#WZ;fSHIo1U002ovPDHLkU;%>e9c?ZE diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png index 5c3563f75e60543c4435d289f4928f1ebb9b70a2..1e7f731d39cdecee24b4f93fd5c99728f3610e66 100644 GIT binary patch delta 1058 zcmaDUyhn6`1rs~dMypOHUL#!tqYy(2D+6;Y1B=NQm=w@N{xSuqBqy4fnWd$r>Lwed zndn-Ynk4BaB^w*+8knS+r5Tz6NmJ9!h0H6MCO>8oot(g`NR*DrjVvN)mK|eVQ@__Y zQip+oIlZ<=TF+^qUhOR$4M{C^-kFAS$chH!?7t~TR zdyCg3UasUxIg1Y$3l!aQouyVA?8wWLGmTyC`pIPX);&djC)~fc)O?OP5%a76gY@|e zZFVoZ4b@h>&)IxhSfI$n<<}Y}iThjQ=Jj#TtW{IlYOd0AFye**!os>sLOlF=+$Y;LpEGK0E$}{Z@U0>%^L^>u#tDsfm%=6PSj$bAx%{28 z#zFBKBc7xe*<3AbWs~C$UpTT)?q}XbYYx>PE%|MZI`wzYHXONfpEG#*bpfvry%G{? z_XIe2CBo#tIc+KxSemaEX~xKNo%PV=H5>gB%Cbybgpv{`?5T`e$7;0n8mIZP2OC$~Yf$d%}oY(jyV?slu?Ig*T)8c&Q;IN|biX5?RmDFV{X zD!Psp_8Yr;zPznpv`?Xb8Sylqm0|*GlC0kIg(N) ztPnk6Bej0sRrx2kehPUU;!ZkWFM-{#6JFn(0KHUDYs=xVDZoSMEHue&0DO;ntS3jKi60*7dMrLWp-+xQL z3w+45I^t(u+L5cJts`wvU1d{i{DE~o&&E3?kqZ}HNUr&#v2VeGmu5$rLn0Tl@B2Mh zYwy=0$unOsMgMt!DSEy1(F>EGCDp(1W$#|NAvBQ3_F;wLm82{^ZU6H(HT=(4#?D(; zl(-;apFu%JQE#Cn!))U>CW0E@uKzgwzA02Wyc$u3ybX~!coS26mTi^?}RF~hY<{|$>>8yU(#QCZ__zmvzie G2~7ZE3(rpg delta 936 zcmV;Z16TaK73mX@I06PVu{wzYleq;Ilh^_nleq;IlLZ4vlYs>$vvUKc0+Z(kS$~yA zA_o8f16xT%K~!ko?V8O?6mb~GKd6xkh1(0ehlrGd?4*Z1WH(E}f>xsr?(Cv$NN26c z>Msz@Zqkdc)uCj&CYk?2WXFmWJCwJCj)w4bc;+|muG8kejpNYa3&YHB=9v#OzqjZ6 zAR+`o1P+APsqzF(z-3?pSOh);>wmz8t#$j{qTMD2G?g2-G9a)Yuz6IigH zvEO?TXaGil@6Jor)d;72E6`jX2pj`e0iorHFx_8$2&3tKjj1rJz_HRmpb=OCgp)^w=Lzp1jGiYnw!$m{ zjirD*aek+nxc3l7GjV+fg@1Wk90*)=I`&v>_aK};6U!a|F76COhgqE`lF{9VFiJ)Z z$V&FGTnJ>?nJ20-#FjHOZ_P8qg+X-f^aIcd$}bQ`qg@7M&3u)=fmqJ6Ba`wUNG6rN zoUsalEC9ldbN+)cx^d2cEVzT{eqxi_8sS;OzaY;NLT!!N0yMdS#D4&xHSAvqqt>wb zDls>ZaX`4*=6{f@Z3bk*4de|V-0Ji{$nEn6WZn(r3m{DP`5)xr6$A3c4dfRfq~rbv zNm~ZwryGb~d^zBMkXM5SWFycZf%&xp)7b+v{7wXALJZ6jW$!E+>zqYnCk|+dHZ+~wig?rupgSg+l!>#V#Nj{A1G##|E_tQcCPtaW|Hf1{P!<1>d z)Fk#tKsa?&c#-rT;zd$pE5ygrlGt0e!Z*#xAMy6f%)~XOLVPRTR>(DawDU&}s-anJ zi1FTRqh|$Zsg(5=v2C#GTW`s2)?1_+X6WM_GxTl+&Ct7D`F&>Sqsp71+lS^{dwQs& zbbETJ!()5eyR%c zI2L!Wgu@*w1oYae*LmQRT}boW*1COe-fq(igeqQC^S@rpC;9^&|0+rM&_}=k0000< KMNUMnLSTYLl)~x& diff --git a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab index d236c8b92..b33bd882d 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab @@ -393,15 +393,15 @@ MonoBehaviour: m_Calls: [] m_text: "\uCE74\uB4DC \uC124\uBA85" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} + m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} + m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -515,7 +515,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 8 + m_ChildAlignment: 7 m_Spacing: 5 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -863,6 +863,7 @@ GameObject: - component: {fileID: 3981473352066336261} - component: {fileID: 553588331708226939} - component: {fileID: 2953333486680660764} + - component: {fileID: 8149153454839836463} m_Layer: 5 m_Name: CardArea m_TagString: Untagged @@ -939,3 +940,59 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1c4a04abae2e284384797a0c5044e99, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8149153454839836463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830682350495907633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 553588331708226939} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2953333486680660764} + m_TargetAssemblyTypeName: BlueWater.Uis.TycoonCardArea, Assembly-CSharp + m_MethodName: OnClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 From 45de8c07b2faa533fdb9c24ffd830c0cd41dffb9 Mon Sep 17 00:00:00 2001 From: SweetJJuya Date: Mon, 2 Dec 2024 20:40:40 +0900 Subject: [PATCH 2/2] 0.3.5.4 --- Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs | 2 ++ Assets/05.Prefabs/Uis/Tycoons/Card.prefab | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs index fe0918db8..e998a0fe6 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs @@ -224,6 +224,7 @@ namespace BlueWater.Uis Vector3 initialScale = _panel.localScale; Vector3 targetScale = new Vector3(1.05f, 1.05f, 1.0f); // 타겟 스케일 설정 + /* // RectTransform의 화면 좌표를 가져오기 위한 변수 RectTransform rectTransform = GetComponent(); @@ -254,6 +255,7 @@ namespace BlueWater.Uis _cardImage.GetComponent().localRotation = Quaternion.Euler(-rotationX, 0f, 0f); } + */ // 스케일 보간 (Lerp) float t = Mathf.Clamp01(_returnSpeedTime); float easedT = 1 - Mathf.Pow(2, -10 * t); diff --git a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab index b33bd882d..5883be5b7 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab @@ -142,7 +142,7 @@ MonoBehaviour: m_Calls: [] m_text: 100 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontAsset: {fileID: 0} m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -360,8 +360,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 30} - m_SizeDelta: {x: 400, y: 240} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 400, y: 200} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3904437696116363940 CanvasRenderer: