코스튬 일반, 컬렉션 선택 등

2025-01-01 07:24:38 +09:00 · 2025-01-01 07:24:38 +09:00 · f4079afcda
parent f6cf63b748
commit f4079afcda
6 changed files with 347 additions and 38 deletions
--- a/Assets/Ino_nerdnavis.txt
+++ b/Assets/Ino_nerdnavis.txt
@ -36,7 +36,7 @@ classconfig 에 의해 정해짐

 몬스터 골드, 아이템 드랍

-인게임 - 터레인 제외, 메시 베이커로 통째로 묶기
+인게임 - 터레인 제외, 메시 베이커로 통째로 묶기 or 퍼펙트 컬링
 //로비 - 퍼펙트 컬링

 전직 후 애니메이션 변경
@ -45,4 +45,3 @@ classconfig 에 의해 정해짐

 코스튬
 - 코스튬 세트
- - 코스튬 변경 (테스트용으로 코스튬 3종 지급)
--- a/Assets/Res_Addr/MainUI/NewGameUI.prefab
+++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab
@ -10828,6 +10828,83 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &944443992666863457
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8416511964894312424}
+  - component: {fileID: 5522327300080818785}
+  - component: {fileID: 2393678143988177070}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8416511964894312424
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 944443992666863457}
+  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: 7953772858867825205}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &5522327300080818785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 944443992666863457}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &2393678143988177070
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 944443992666863457}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &952250631103197899
 GameObject:
  m_ObjectHideFlags: 0
@ -32470,10 +32547,10 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: SkillUI, Assembly-CSharp
-        m_MethodName: OnClick_SkillType
-        m_Mode: 5
+      - m_Target: {fileID: 228029834813712974}
+        m_TargetAssemblyTypeName: PCInfoUI_List, Assembly-CSharp
+        m_MethodName: OnClick_Type
+        m_Mode: 3
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@ -38944,6 +39021,96 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &2989313304488941374
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7953772858867825205}
+  - component: {fileID: 8945671664041836582}
+  - component: {fileID: 1273172503754572727}
+  - component: {fileID: 6891564055270868956}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7953772858867825205
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2989313304488941374}
+  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: 8416511964894312424}
+  m_Father: {fileID: 1494326228607932238}
+  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, y: 1}
+--- !u!222 &8945671664041836582
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2989313304488941374}
+  m_CullTransparentMesh: 1
+--- !u!114 &1273172503754572727
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2989313304488941374}
+  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: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
+  m_Type: 0
+  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 &6891564055270868956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2989313304488941374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &2995050082205291391
 GameObject:
  m_ObjectHideFlags: 0
@ -44514,6 +44681,7 @@ MonoBehaviour:
  RawImage_costume: {fileID: 176841558950769759}
  gos:
  - {fileID: 8756686011241429274}
+  CostumeIdWhenEnter: 0
 --- !u!1 &3425753977039102381
 GameObject:
  m_ObjectHideFlags: 0
@ -49575,6 +49743,7 @@ RectTransform:
  m_Children:
  - {fileID: 7537883044492853191}
  - {fileID: 8618841699705721517}
+  - {fileID: 1494326228607932238}
  m_Father: {fileID: 8112082934472033055}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
@ -49594,9 +49763,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c23b27b04088d024788c056e0e6c1372, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_ScrollRect: {fileID: 2149702243154952468}
-  m_Content: {fileID: 0}
-  go_card: {fileID: 1253780947347394577, guid: 63099ced842b56f4e82f62678c45301c, type: 3}
+  m_scrollview:
+  - {fileID: 2149702243154952468}
+  - {fileID: 5809440808760501180}
+  m_content: []
+  go_card:
+  - {fileID: 1253780947347394577, guid: 63099ced842b56f4e82f62678c45301c, type: 3}
 --- !u!1 &3805308398141458178
 GameObject:
  m_ObjectHideFlags: 0
@ -74197,14 +74369,14 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: SkillUI, Assembly-CSharp
-        m_MethodName: OnClick_SkillType
-        m_Mode: 5
+      - m_Target: {fileID: 228029834813712974}
+        m_TargetAssemblyTypeName: PCInfoUI_List, Assembly-CSharp
+        m_MethodName: OnClick_Type
+        m_Mode: 3
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
+          m_IntArgument: 1
          m_FloatArgument: 0
          m_StringArgument: Passive
          m_BoolArgument: 0
@ -109982,12 +110154,12 @@ GameObject:
  - component: {fileID: 9196317094130010376}
  - component: {fileID: 2149702243154952468}
  m_Layer: 5
-  m_Name: scrollview_
+  m_Name: scrollview_list
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8618841699705721517
 RectTransform:
  m_ObjectHideFlags: 0
@ -110510,6 +110682,113 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8564094185518630953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1494326228607932238}
+  - component: {fileID: 1903587635836921722}
+  - component: {fileID: 8314740088471690955}
+  - component: {fileID: 5809440808760501180}
+  m_Layer: 5
+  m_Name: scrollview_collection
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1494326228607932238
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8564094185518630953}
+  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: 7953772858867825205}
+  m_Father: {fileID: 2547393748655425458}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -282.2, y: -33.75}
+  m_SizeDelta: {x: 564.4, y: 831.76}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1903587635836921722
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8564094185518630953}
+  m_CullTransparentMesh: 1
+--- !u!114 &8314740088471690955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8564094185518630953}
+  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.8235295, g: 0.81568635, b: 0.8470589, 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: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
+  m_Type: 0
+  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 &5809440808760501180
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8564094185518630953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 8416511964894312424}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 7953772858867825205}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8568744135292609288
 GameObject:
  m_ObjectHideFlags: 0
@ -117502,10 +117781,10 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: SkillUI, Assembly-CSharp
-        m_MethodName: OnClick_SkillType
-        m_Mode: 5
+      - m_Target: {fileID: 228029834813712974}
+        m_TargetAssemblyTypeName: PCInfoUI_List, Assembly-CSharp
+        m_MethodName: OnClick_Type
+        m_Mode: 3
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
--- a/Assets/Script/UI/PC/Info/PCInfoUI.cs
+++ b/Assets/Script/UI/PC/Info/PCInfoUI.cs
@ -17,6 +17,6 @@ public class PCInfoUI : PCUIMenu

    public void Set_UI(bool enter)
    {
-        m_PCInfoUI_List.Set(enter, 0); // m_PCInfoUI_Center 는 여기서 세팅
+        m_PCInfoUI_List.Set(enter); // m_PCInfoUI_Center 는 여기서 세팅
    }
 }
--- a/Assets/Script/UI/PC/Info/PCInfoUI_List.cs
+++ b/Assets/Script/UI/PC/Info/PCInfoUI_List.cs
@ -1,20 +1,35 @@
-public class PCInfoUI_List : uScrollViewMgr
+public class PCInfoUI_List : uScrollViewArrMgr
 {
-    public void Set(bool enter, int index)
+    int m_Index;
+
+    public void Set(bool enter)
+    {
+        if (m_Index == 0)
        {
            var lst = table_itemlist.Ins.Get_DataList(eItem.PCCostume);
-        Set_ScrollView(lst);
+            Set_ScrollView(m_Index, lst, true);

            var equipid = ServerInfo.Ins.m_ServerData.Get_EqiupmentEquip(eItem.PCCostume);
-        PCInfoUI_PCListCard equipcard = list_CardBase[0] as PCInfoUI_PCListCard;
-        for (int i = 0; i < list_CardBase.Count; i++)
+            PCInfoUI_PCListCard equipcard = dic_cardbase[m_Index][0] as PCInfoUI_PCListCard;
+            for (int i = 0; i < dic_cardbase[m_Index].Count; i++)
            {
-            if (list_CardBase[i].Get_IntData() == equipid)
+                if (dic_cardbase[m_Index][i].Get_IntData() == equipid)
                {
-                equipcard = list_CardBase[i] as PCInfoUI_PCListCard;
+                    equipcard = dic_cardbase[m_Index][i] as PCInfoUI_PCListCard;
                    break;
                }
            }
            PCInfoUI.Ins.m_PCInfoUI_Center.Set(enter, equipcard);
        }
+        else
+        {
+
+        }
+    }
+
+    public void OnClick_Type(int index)
+    {
+        m_Index = index;
+        Set(false);
+    }
 }
--- a/Assets/Script/UI/Stage/MyInfoUI.cs
+++ b/Assets/Script/UI/Stage/MyInfoUI.cs
@ -38,7 +38,7 @@ public class MyInfoUI : MonoBehaviourSingletonuScrollViewArrMgr<MyInfoUI>
        mainStatCardDatas[1].val = (int)pcactorinfo.Get_Stat(eStat.DEX);
        mainStatCardDatas[2].val = (int)pcactorinfo.Get_Stat(eStat.INT);
        mainStatCardDatas[3].val = (int)pcactorinfo.Get_Stat(eStat.LUK);
-        Set_ScrollView(0, mainStatCardDatas);
+        Set_ScrollView(0, mainStatCardDatas, false);
    }

    private void OnEnable()
@ -57,7 +57,7 @@ public class MyInfoUI : MonoBehaviourSingletonuScrollViewArrMgr<MyInfoUI>
        texts[3].text = DSUtil.Format("{0}%", DSUtil.GetCommaText_N2(slider_exp.value * 100f));

        Set_MainStats();
-        Set_ScrollView(1, list_buffindex);
+        Set_ScrollView(1, list_buffindex, false);

        //if (list_PotionStatusCard.Count == 0)
        //{
--- a/Assets/Script/Util/uScrollViewArrMgr.cs
+++ b/Assets/Script/Util/uScrollViewArrMgr.cs
@ -15,7 +15,7 @@ public class uScrollViewArrMgr : BackKeyAdd
    {
        if (list_cardParent.Count == 0)
        {
-            if (m_scrollview != null && m_scrollview.Length > 0)
+            if (!DSUtil.CheckNull(m_scrollview) && m_scrollview.Length > 0)
            {
                for (int i = 0; i < m_scrollview.Length; i++)
                {
@ -23,7 +23,7 @@ public class uScrollViewArrMgr : BackKeyAdd
                    dic_cardbase.Add(i, new List<CardBase>());
                }
            }
-            else if (m_content != null && m_content.Length > 0)
+            else if (!DSUtil.CheckNull(m_content) && m_content.Length > 0)
            {
                for (int i = 0; i < m_content.Length; i++)
                {
@ -54,10 +54,26 @@ public class uScrollViewArrMgr : BackKeyAdd
        return temp;
    }

-    protected virtual void Set_ScrollView<T>(int _index, List<T> _lst, bool _forcerepos = false)
+    protected virtual void Set_ScrollView<T>(int _index, List<T> _lst, bool offotherscroll)
    {
        CardBase_AllOff(_index);

+        if (offotherscroll)
+        {
+            if (!DSUtil.CheckNull(m_scrollview) && m_scrollview.Length > 0)
+            {
+                for (int i = 0; i < m_scrollview.Length; i++)
+                    m_scrollview[i].gameObject.SetActive(false);
+                m_scrollview[_index].gameObject.SetActive(true);
+            }
+            else if (!DSUtil.CheckNull(m_content) && m_content.Length > 0)
+            {
+                for (int i = 0; i < m_content.Length; i++)
+                    m_content[i].gameObject.SetActive(false);
+                m_content[_index].gameObject.SetActive(true);
+            }
+        }
+
        for (int i = 0; i < _lst.Count; i++)
            MakeCard(_index, i).Set(_lst[i]);
    }