영웅관리 - 특성

Assets/ResWork/UIPrefabs/PC/PCAbility/PCAbilityCard.prefab

@@ -25,17 +25,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2252809544021816997}
-  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+  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: 5969364433759538082}
+  m_Father: {fileID: 1486883093403526311}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 92.5, y: 0}
+  m_AnchoredPosition: {x: 155, y: 92.5}
-  m_SizeDelta: {x: 100, y: 10}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &844894235237586840
 CanvasRenderer:
@@ -104,14 +104,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 6976789491890195651}
   m_Father: {fileID: 1486883093403526311}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 155, y: 0}
-  m_SizeDelta: {x: 195, y: 10}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8062291435518713371
 CanvasRenderer:
@@ -180,6 +179,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2375005860414737794}
+  - {fileID: 6976789491890195651}
+  - {fileID: 9172941584123605288}
   - {fileID: 5969364433759538082}
   - {fileID: 8524299016850333306}
   m_Father: {fileID: 9085924377172010863}
@@ -220,6 +221,7 @@ RectTransform:
   m_Children:
   - {fileID: 1486883093403526311}
   - {fileID: 1377126625597314447}
+  - {fileID: 9080495888545653675}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -243,6 +245,7 @@ MonoBehaviour:
   - {fileID: 3949571468496866527}
   texts:
   - {fileID: 5718204223712133624}
+  - {fileID: 936277217307237604}
   tfs_line:
   - {fileID: 2375005860414737794}
   - {fileID: 5969364433759538082}
@@ -278,14 +281,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 9172941584123605288}
   m_Father: {fileID: 1486883093403526311}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 155, y: 0}
-  m_SizeDelta: {x: 195, y: 10}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8132893730672000489
 CanvasRenderer:
@@ -756,6 +758,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6768160943123123062
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9080495888545653675}
+  - component: {fileID: 6505029634622500025}
+  - component: {fileID: 936277217307237604}
+  m_Layer: 5
+  m_Name: New TMP
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9080495888545653675
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6768160943123123062}
+  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: 9085924377172010863}
+  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: 0, y: 63}
+  m_SizeDelta: {x: 150, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6505029634622500025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6768160943123123062}
+  m_CullTransparentMesh: 1
+--- !u!114 &936277217307237604
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6768160943123123062}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: f7527dfacf15ef0498266646c70d7512, 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}
+  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: 50
+  m_fontSizeBase: 50
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 15
+  m_fontSizeMax: 60
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 4096
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 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 &9126088555955652907
 GameObject:
   m_ObjectHideFlags: 0
@@ -781,16 +917,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9126088555955652907}
-  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+  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: 8524299016850333306}
+  m_Father: {fileID: 1486883093403526311}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -92.5, y: 0}
+  m_AnchoredPosition: {x: 155, y: -92.5}
   m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8537409386161569967

Assets/Script/UI/PC/Ability/PCAbilityCard.cs

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 public class PCAbilityCard : CardBase
 {
     public Image[] images; // 0 아이콘
-    public TextMeshProUGUI[] texts; // 0 레벨
+    public TextMeshProUGUI[] texts; // 0 레벨, 1 테스트 코드
     public RectTransform[] tfs_line; // 0 가로1 (→), 1 세로 (↑), 2 가로2 (↑→), 3 세로 (↓), 4 가로2 (↓→)
 
     AbilityConfigTableData m_Data;
@@ -39,6 +39,10 @@ public class PCAbilityCard : CardBase
         images[0].enabled = true;
         images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_AbilityID);
         texts[0].text = $"{sdata.Get_AbilityLv(m_Data.n_AbilityID)}/{m_Data.n_MaxUpgradeLevel}";
+        texts[1].text = "";
+#if UNITY_EDITOR
+        texts[1].text = $"{m_Data.n_AbilityStep},{m_Data.n_AbilityOrder}";
+#endif
     }
 
     public void ConnectNodes()
@@ -50,38 +54,44 @@ public class PCAbilityCard : CardBase
 
         var requires = table_abilityconfig.Ins.Get_RequireDataList(m_Data.n_AbilityID);
         for (int i = 0; i < requires.Count; i++)
-            Set_Connect(requires[i]);
+            Set_Connect(i, requires[i]);
     }
 
-    void Set_Connect(AbilityConfigTableData requiredata)
+    void Set_Connect(int index, AbilityConfigTableData requiredata)
     {
-        var step = requiredata.n_AbilityStep - m_Data.n_AbilityStep;
-        if (requiredata.n_AbilityOrder == m_Data.n_AbilityOrder)
-        { // 옆으로
         tfs_line[0].gameObject.SetActive(true);
+        var widthindex = index == 0 ? 2 : 4;
+
+        var step = requiredata.n_AbilityStep - m_Data.n_AbilityStep; // 값이 최소 1
+        var order = requiredata.n_AbilityOrder - m_Data.n_AbilityOrder; // 값이 -2 ~ 2 까지
+        var updown = Mathf.Abs(order);
+        if (order == 0)
+        { // 옆으로
             tfs_line[0].sizeDelta = new Vector2(step * 327.5f, tfs_line[0].sizeDelta.y);
         }
-        else if (requiredata.n_AbilityOrder < m_Data.n_AbilityOrder)
+        else if (order < 0)
         { // 위로
-            tfs_line[0].gameObject.SetActive(true);
             tfs_line[0].sizeDelta = new Vector2(168.8f, tfs_line[0].sizeDelta.y);
 
             tfs_line[1].gameObject.SetActive(true);
-            tfs_line[1].anchoredPosition = new Vector2(163.75f, 0f);
+            tfs_line[1].anchoredPosition = new Vector2(163.75f, -5f);
+            tfs_line[1].sizeDelta = new Vector2(updown * 195f, tfs_line[1].sizeDelta.y);
 
-            tfs_line[2].gameObject.SetActive(true);
+            tfs_line[widthindex].gameObject.SetActive(true);
-            tfs_line[2].sizeDelta = new Vector2(step * 327.5f - 163.75f, tfs_line[3].sizeDelta.y);
+            tfs_line[widthindex].anchoredPosition = new Vector2(159f, updown * 190f);
+            tfs_line[widthindex].sizeDelta = new Vector2(step * 327.5f - 163.75f, tfs_line[widthindex].sizeDelta.y);
         }
         else
         { // 아래로
-            tfs_line[0].gameObject.SetActive(true);
             tfs_line[0].sizeDelta = new Vector2(168.8f, tfs_line[0].sizeDelta.y);
 
             tfs_line[3].gameObject.SetActive(true);
-            tfs_line[3].anchoredPosition = new Vector2(163.75f, 0f);
+            tfs_line[3].anchoredPosition = new Vector2(163.75f, 5f);
+            tfs_line[3].sizeDelta = new Vector2(updown * 195f, tfs_line[3].sizeDelta.y);
 
-            tfs_line[4].gameObject.SetActive(true);
+            tfs_line[widthindex].gameObject.SetActive(true);
-            tfs_line[4].sizeDelta = new Vector2(step * 327.5f - 163.75f, tfs_line[3].sizeDelta.y);
+            tfs_line[widthindex].anchoredPosition = new Vector2(159f, updown * -190f);
+            tfs_line[widthindex].sizeDelta = new Vector2(step * 327.5f - 163.75f, tfs_line[widthindex].sizeDelta.y);
         }
     }
 

Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_6d3e12.mat

@@ -75,9 +75,9 @@ Material:
     - _OutlineWidth: 0.6
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.47407407
+    - _ScaleRatioA: 0.8
     - _ScaleRatioB: 0.65
-    - _ScaleRatioC: 0.25
+    - _ScaleRatioC: 0.69
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0