diff --git a/Assets/ResWork/Table/Export/PCCostumeCollectionList.json b/Assets/ResWork/Table/Export/PCCostumeCollectionList.json new file mode 100644 index 000000000..ca6c6da32 --- /dev/null +++ b/Assets/ResWork/Table/Export/PCCostumeCollectionList.json @@ -0,0 +1,20 @@ +[ + { + "exception": "참고용 텍스트", + "n_CollectionName": "컬렉션 이름", + "n_CostumeID1": "코스튬ID1", + "n_CostumeID2": "코스튬ID2", + "n_CostumeID3": "코스튬ID3", + "e_Stat": "능력치", + "n_StatValue": "능력치 상승값" + }, + { + "exception": "아이 3종", + "n_CollectionName": "101101", + "n_CostumeID1": "110001", + "n_CostumeID2": "110002", + "n_CostumeID3": "110003", + "e_Stat": "STR", + "n_StatValue": "5" + } +] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/PCCostumeCollectionList.json.meta b/Assets/ResWork/Table/Export/PCCostumeCollectionList.json.meta new file mode 100644 index 000000000..a9041c62e --- /dev/null +++ b/Assets/ResWork/Table/Export/PCCostumeCollectionList.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90ee9fe8d2cf13c4b8981011ff7b3820 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Title/Tables.prefab b/Assets/ResWork/UIPrefabs/Title/Tables.prefab index 27d5b0bab..83e68ad5c 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -38,6 +38,7 @@ GameObject: - component: {fileID: -6382248281986488679} - component: {fileID: -281431134350910714} - component: {fileID: 1888006685352618916} + - component: {fileID: 3782814260024528886} - component: {fileID: 2534282277955434348} - component: {fileID: 5549183088889209134} - component: {fileID: -295535229374951711} @@ -473,6 +474,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: 6ea8217e5232f0d4280e8125bdafb1a5, type: 3} +--- !u!114 &3782814260024528886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043163894663193716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7d423cd450a5f047a2a52ba00dca5a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_json: {fileID: 4900000, guid: 90ee9fe8d2cf13c4b8981011ff7b3820, type: 3} --- !u!114 &2534282277955434348 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 4b5916c0d..63292d2fe 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -49769,6 +49769,7 @@ MonoBehaviour: m_content: [] go_card: - {fileID: 1253780947347394577, guid: 63099ced842b56f4e82f62678c45301c, type: 3} + - {fileID: 7336582814339228709, guid: f938817985797b04abc422ab4a071945, type: 3} --- !u!1 &3805308398141458178 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Table/PC/table_pccostumecollectionlist.cs b/Assets/Script/Table/PC/table_pccostumecollectionlist.cs new file mode 100644 index 000000000..2af0b8ac8 --- /dev/null +++ b/Assets/Script/Table/PC/table_pccostumecollectionlist.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using CodeStage.AntiCheat.ObscuredTypes; +using Newtonsoft.Json; + +[Serializable] +public class PCCostumeCollectionListTableData : TableDataBase +{ + public int n_CollectionName; + + ObscuredInt _CostumeID1; + public int n_CostumeID1 + { + get { return _CostumeID1; } + set { _CostumeID1 = value; _CostumeID1.RandomizeCryptoKey(); } + } + ObscuredInt _CostumeID2; + public int n_CostumeID2 + { + get { return _CostumeID2; } + set { _CostumeID2 = value; _CostumeID2.RandomizeCryptoKey(); } + } + ObscuredInt _CostumeID3; + public int n_CostumeID3 + { + get { return _CostumeID3; } + set { _CostumeID3 = value; _CostumeID3.RandomizeCryptoKey(); } + } + + public eStat e_Stat; + ObscuredInt _StatValue; + public int n_StatValue + { + get { return _StatValue; } + set { _StatValue = value; _StatValue.RandomizeCryptoKey(); } + } + + public List list_CostumeID = new List(); +} + +public class table_pccostumecollectionlist : table_missionbase +{ + public static table_pccostumecollectionlist Ins; + List tableDatas; + + protected override void Awake() + { + base.Awake(); + Ins = this; + Set_lastjson2(); + } + + protected override void Start() + { + tableDatas = JsonConvert.DeserializeObject>(json_last); + for (int i = 0; i < Get_DataList().Count; i++) + { + var temp = Get_DataList()[i]; + temp.list_CostumeID.Add(temp.n_CostumeID1); + temp.list_CostumeID.Add(temp.n_CostumeID2); + temp.list_CostumeID.Add(temp.n_CostumeID3); + } + + base.Start(); + } + + public List Get_DataList() { return tableDatas; } +} \ No newline at end of file diff --git a/Assets/Script/Table/PC/table_pccostumecollectionlist.cs.meta b/Assets/Script/Table/PC/table_pccostumecollectionlist.cs.meta new file mode 100644 index 000000000..0fdf4c086 --- /dev/null +++ b/Assets/Script/Table/PC/table_pccostumecollectionlist.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7d423cd450a5f047a2a52ba00dca5a5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_List.cs b/Assets/Script/UI/PC/Info/PCInfoUI_List.cs index 49e6f64bb..9260e5712 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_List.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_List.cs @@ -22,9 +22,7 @@ public class PCInfoUI_List : uScrollViewArrMgr PCInfoUI.Ins.m_PCInfoUI_Center.Set(enter, equipcard); } else - { - - } + Set_ScrollView(m_Index, table_pccostumecollectionlist.Ins.Get_DataList(), true); } public void OnClick_Type(int index)