diff --git a/Assets/ResWork/Table/Export/EquipCrafting.json b/Assets/ResWork/Table/Export/EquipCrafting.json index 433b99382..3a215f936 100644 --- a/Assets/ResWork/Table/Export/EquipCrafting.json +++ b/Assets/ResWork/Table/Export/EquipCrafting.json @@ -1 +1 @@ -[{"n_CraftingItemID": "10101001", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "1", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "10", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010101", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10101002", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "2", "n_MaterialValue1": "10101001", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "203", "n_MaterialCount3": "10", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10101003", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "202", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10301001", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10201001", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "11", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "1010104", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10003", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "203", "n_MaterialCount3": "100", "n_LinkPointID1": "1010103", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10004", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "101", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "102", "n_CraftingGoodsPrice": "201", "n_CraftingGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}] \ No newline at end of file +[{"n_CraftingItemID": "10101001", "n_MainGoodsID": "201", "n__MainGoodsCount": "1", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "10", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "10101002", "n_MainGoodsID": "201", "n__MainGoodsCount": "2", "n_MaterialValue1": "10101001", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "203", "n_MaterialCount3": "10"}, {"n_CraftingItemID": "10101003", "n_MainGoodsID": "201", "n__MainGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "202", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "10301001", "n_MainGoodsID": "201", "n__MainGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "10201001", "n_MainGoodsID": "201", "n__MainGoodsCount": "4", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "202", "n_MaterialCount2": "11", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "10003", "n_MainGoodsID": "201", "n__MainGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "203", "n_MaterialCount3": "100"}, {"n_CraftingItemID": "10004", "n_MainGoodsID": "201", "n__MainGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "101", "n_MainGoodsID": "201", "n__MainGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}, {"n_CraftingItemID": "102", "n_MainGoodsID": "201", "n__MainGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "202", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index bd41111fc..525237f45 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/Table/Equipment/table_equipcrafting.cs b/Assets/Script/Table/Equipment/table_equipcrafting.cs index a8160c54d..0af46eeee 100644 --- a/Assets/Script/Table/Equipment/table_equipcrafting.cs +++ b/Assets/Script/Table/Equipment/table_equipcrafting.cs @@ -13,18 +13,18 @@ public class EquipmentCraftingTableData : TableDataBase set { _CraftingItemID = value; _CraftingItemID.RandomizeCryptoKey(); } } // 제작할 아이템 ID - ObscuredInt _CraftingGoodsPrice; - public int n_CraftingGoodsPrice + ObscuredInt _MainGoodsID; + public int n_MainGoodsID { - get { return _CraftingGoodsPrice; } - set { _CraftingGoodsPrice = value; _CraftingGoodsPrice.RandomizeCryptoKey(); } + get { return _MainGoodsID; } + set { _MainGoodsID = value; _MainGoodsID.RandomizeCryptoKey(); } } // 제작할 아이템에 소모될 메인 재화 ID - ObscuredInt _CraftingGoodsCount; - public int n_CraftingGoodsCount + ObscuredInt _MainGoodsCount; + public int n_MainGoodsCount { - get { return _CraftingGoodsCount; } - set { _CraftingGoodsCount = value; _CraftingGoodsCount.RandomizeCryptoKey(); } + get { return _MainGoodsCount; } + set { _MainGoodsCount = value; _MainGoodsCount.RandomizeCryptoKey(); } } // 제작할 아이템에 소모될 메인 재화 수량 ObscuredInt _MaterialValue1; @@ -69,42 +69,6 @@ public class EquipmentCraftingTableData : TableDataBase set { _MaterialCount3 = value; _MaterialCount3.RandomizeCryptoKey(); } } // 재료3 수량 - ObscuredInt _LinkPointID1; - public int n_LinkPointID1 - { - get { return _LinkPointID1; } - set { _LinkPointID1 = value; _LinkPointID1.RandomizeCryptoKey(); } - } // 획득처 바로가기1 - - ObscuredInt _LinkPointID2; - public int n_LinkPointID2 - { - get { return _LinkPointID2; } - set { _LinkPointID2 = value; _LinkPointID2.RandomizeCryptoKey(); } - } // 획득처 바로가기2 - - ObscuredInt _LinkPointID3; - public int n_LinkPointID3 - { - get { return _LinkPointID3; } - set { _LinkPointID3 = value; _LinkPointID3.RandomizeCryptoKey(); } - } // 획득처 바로가기3 - - ObscuredInt _LinkPointID4; - public int n_LinkPointID4 - { - get { return _LinkPointID4; } - set { _LinkPointID4 = value; _LinkPointID4.RandomizeCryptoKey(); } - } // 획득처 바로가기4 - - ObscuredInt _LinkPointID5; - public int n_LinkPointID5 - { - get { return _LinkPointID5; } - set { _LinkPointID5 = value; _LinkPointID5.RandomizeCryptoKey(); } - } // 획득처 바로가기5 - - ObscuredInt _MaterialCount; public int MaterialCount { diff --git a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs index 358adb3da..09417f1c7 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs @@ -62,13 +62,19 @@ public class EquipmentMakePopup : uScrollViewMgr MaterialCards[0].Set_NeedAmount(Tdata.n_MaterialCount1); MaterialCards[1].Set(table_itemlist.Ins.Get_Data(Tdata.n_MaterialValue2)); MaterialCards[1].Set_NeedAmount(Tdata.n_MaterialCount2); - MaterialCards[2].Set(table_itemlist.Ins.Get_Data(Tdata.n_MaterialValue3)); - MaterialCards[2].Set_NeedAmount(Tdata.n_MaterialCount3); - var craftinggoodsamount = sdata.Get_ItemAmount(Tdata.n_CraftingGoodsPrice); - if (craftinggoodsamount >= Tdata.n_CraftingGoodsCount) - text_goodsamount.text = $"{craftinggoodsamount}/{NumberFormatter.FormatNumber(Tdata.n_CraftingGoodsCount)}"; + if (Tdata.n_MaterialValue3 > 0) + { + MaterialCards[2].Set(table_itemlist.Ins.Get_Data(Tdata.n_MaterialValue3)); + MaterialCards[2].Set_NeedAmount(Tdata.n_MaterialCount3); + } else - text_goodsamount.text = $"{craftinggoodsamount}/{NumberFormatter.FormatNumber(Tdata.n_CraftingGoodsCount)}"; + MaterialCards[2].Set_Null(); + + var craftinggoodsamount = sdata.Get_ItemAmount(Tdata.n_MainGoodsID); + if (craftinggoodsamount >= Tdata.n_MainGoodsCount) + text_goodsamount.text = $"{craftinggoodsamount}/{NumberFormatter.FormatNumber(Tdata.n_MainGoodsCount)}"; + else + text_goodsamount.text = $"{craftinggoodsamount}/{NumberFormatter.FormatNumber(Tdata.n_MainGoodsCount)}"; } #if UNITY_EDITOR else @@ -90,7 +96,7 @@ public class EquipmentMakePopup : uScrollViewMgr { if (Tdata.n_MaterialValue3 == 0 || sdata.Check_ItemAmount(Tdata.n_MaterialValue3, Tdata.n_MaterialCount3)) { - if (Tdata.n_CraftingGoodsPrice == 0 || sdata.Check_ItemAmount(Tdata.n_CraftingGoodsPrice, Tdata.n_CraftingGoodsCount)) + if (Tdata.n_MainGoodsID == 0 || sdata.Check_ItemAmount(Tdata.n_MainGoodsID, Tdata.n_MainGoodsCount)) { return true; } @@ -112,7 +118,7 @@ public class EquipmentMakePopup : uScrollViewMgr if (Tdata.n_MaterialValue1 > 0) sdata.Use_Item(Tdata.n_MaterialValue1, Tdata.n_MaterialCount1); if (Tdata.n_MaterialValue2 > 0) sdata.Use_Item(Tdata.n_MaterialValue2, Tdata.n_MaterialCount2); if (Tdata.n_MaterialValue3 > 0) sdata.Use_Item(Tdata.n_MaterialValue3, Tdata.n_MaterialCount3); - if (Tdata.n_CraftingGoodsPrice > 0) sdata.Use_Item(Tdata.n_CraftingGoodsPrice, Tdata.n_CraftingGoodsCount); + if (Tdata.n_MainGoodsID > 0) sdata.Use_Item(Tdata.n_MainGoodsID, Tdata.n_MainGoodsCount); sdata.Add_Item(Tdata.n_CraftingItemID, 1); Set_UI(); if (PopupMgr.Ins.m_EquipmentPopup.isActiveAndEnabled) diff --git a/Assets/Script/UI/Eqiupment/EquipmentSimpleCard.cs b/Assets/Script/UI/Eqiupment/EquipmentSimpleCard.cs index c8aaa0347..e8c738838 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentSimpleCard.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentSimpleCard.cs @@ -29,7 +29,12 @@ public class EquipmentSimpleCard : CardBase DSUtil.InActivateGameObjects(gos); } else - gameObject.SetActive(false); + Set_Null(); + } + + public void Set_Null() + { + gameObject.SetActive(false); } public void Set_Child() diff --git a/Assets/Script/UI/Eqiupment/EquipmentUI.cs b/Assets/Script/UI/Eqiupment/EquipmentUI.cs index 575012856..512929514 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentUI.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentUI.cs @@ -32,8 +32,9 @@ public class EquipmentUI : BotMenuBase } m_Tab.Set(list_tabData); if (m_Tab.Get_Index() == 0) - m_Tab.Set_Index(1); // 최초 진입 시 인챈트라면 무기로 변경 - OnClick_Button(); + m_Tab.OnClick_Tab_byScript(1); // 진입 시 인챈트라면 무기로 변경 + else + OnClick_Button(); Set_ScrollView(list_infostat); }