diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index e104c5dea..52ddc29ab 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -89,5 +89,4 @@ messageinfo 엄청 느린 버그 - 상품 ui 등... - 상점 테이블의 탭 연결 -장비 착용 에러 수정하자 diff --git a/Assets/ResWork/Table/Export/EquipSlotUpgrade.json b/Assets/ResWork/Table/Export/EquipSlotUpgrade.json index e30f47352..b708f684f 100644 --- a/Assets/ResWork/Table/Export/EquipSlotUpgrade.json +++ b/Assets/ResWork/Table/Export/EquipSlotUpgrade.json @@ -1 +1 @@ -[{"e_EquipParts": "Weapon", "e_EquipAttribute": "Physics ", "n_EquipSlotName": "2001", "e_OptionType": "ATK_Multiplier", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Weapon", "e_EquipAttribute": "Magic", "n_EquipSlotName": "2002", "e_OptionType": "ATK_Multiplier", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Weapon", "e_EquipAttribute": "None", "n_EquipSlotName": "2003", "e_OptionType": "Stat_EXTRA", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Armor", "e_EquipAttribute": "None", "n_EquipSlotName": "2004", "e_OptionType": "DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Armor", "e_EquipAttribute": "None", "n_EquipSlotName": "2005", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}] \ No newline at end of file +[{"e_EquipParts": "Weapon", "e_EquipAttribute": "Physics ", "n_EquipSlotName": "2001", "e_OptionType": "ATK_Multiplier", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Weapon", "e_EquipAttribute": "Magic", "n_EquipSlotName": "2002", "e_OptionType": "ATK_Multiplier", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Weapon", "e_EquipAttribute": "None", "n_EquipSlotName": "2003", "e_OptionType": "Stat_EXTRA", "n_DefaultValue": "3", "f_LevelPerValue": "1.5", "f_BalanceConstant": "0.032", "n_ConsumeGoodsID": "101", "n_DefaultValuePrice": "10", "f_LevelPerValuePrice": "5", "f_BalanceConstantPrice": "0.015"}, {"e_EquipParts": "Armor", "e_EquipAttribute": "None", "n_EquipSlotName": "2004", "e_OptionType": "DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Armor", "e_EquipAttribute": "None", "n_EquipSlotName": "2005", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Helmet", "e_EquipAttribute": "None", "n_EquipSlotName": "2006", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Extra", "e_EquipAttribute": "None", "n_EquipSlotName": "2007", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Necklace", "e_EquipAttribute": "None", "n_EquipSlotName": "2008", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}, {"e_EquipParts": "Ring", "e_EquipAttribute": "None", "n_EquipSlotName": "2009", "e_OptionType": "M_DEF", "n_DefaultValue": "1", "f_LevelPerValue": "0.5", "f_BalanceConstant": "0.025", "n_ConsumeGoodsID": "102", "n_DefaultValuePrice": "5", "f_LevelPerValuePrice": "3", "f_BalanceConstantPrice": "0.025"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 1a30472a9..08a307e4f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/Util/MyValue.cs b/Assets/Script/Util/MyValue.cs index 6bcebb7e9..ed802dc15 100644 --- a/Assets/Script/Util/MyValue.cs +++ b/Assets/Script/Util/MyValue.cs @@ -790,9 +790,12 @@ public class ActorStatInfo // 제련 값 적용 var smeltlv = m_sdata.Get_SmeltingLv(itemid); var smeltData = table_equipsmelting.Ins.Get_Data(smeltlv); - Set_Stat(true, equipData.e_AbilityType1, equipData.n_AbilityValue1 + equipData.n_AbilityValue1 * smeltData.f_IncreaseValueRate); - Set_Stat(true, equipData.e_AbilityType2, equipData.n_AbilityValue2 + equipData.n_AbilityValue2 * smeltData.f_IncreaseValueRate); - Set_Stat(true, equipData.e_AbilityType3, equipData.n_AbilityValue3 + equipData.n_AbilityValue3 * smeltData.f_IncreaseValueRate); + if (equipData.e_AbilityType1 != eStat.None) + Set_Stat(true, equipData.e_AbilityType1, equipData.n_AbilityValue1 + equipData.n_AbilityValue1 * smeltData.f_IncreaseValueRate); + if (equipData.e_AbilityType2 != eStat.None) + Set_Stat(true, equipData.e_AbilityType2, equipData.n_AbilityValue2 + equipData.n_AbilityValue2 * smeltData.f_IncreaseValueRate); + if (equipData.e_AbilityType3 != eStat.None) + Set_Stat(true, equipData.e_AbilityType3, equipData.n_AbilityValue3 + equipData.n_AbilityValue3 * smeltData.f_IncreaseValueRate); // 슬롯 값 적용 var slotdata = m_sdata.Get_SlotData(equipData.e_EquipParts);