diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 3a074269c..da28d7773 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -1798,7 +1798,7 @@ handlers.Save_EquipItem_EnchantOption = function(args) } return Get_Return(1); } -handlers.Save_EquipItem_Enchant = function(args) +handlers.Save_EquipItem_Enchant = function(args) // 사용 x { var readonlydata = Get_UserReadOnlyData(); var error = Get_Error(readonlydata, args.Token); @@ -1841,7 +1841,6 @@ handlers.Save_EquipItem_Enchant = function(args) } return Get_Return(1); } - handlers.Save_Enchant_LvUp = function(args) { var readonlydata = Get_UserReadOnlyData(); @@ -1861,8 +1860,10 @@ handlers.Save_Enchant_LvUp = function(args) { ++s_enchant[1]; + Make_EqiupmentEnchantOption_perEnchant(urod, args.EnchantID); + Set_JsonUserData(urod); - return Get_Return(0); + return Get_Return(0, { newoption : urod.EnchantOption[args.EnchantID] }); } return Get_Return(1); } diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index 01b4d24be..62fafed81 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -1704,7 +1704,7 @@ public class ServerInfo : MyCoroutine }); } - public void Save_Enchant_LvUp(int eid, Action _act) + public void Save_Enchant_LvUp(int eid, Action _act) { NetWait.Ins.Set(true); PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest @@ -1727,7 +1727,7 @@ public class ServerInfo : MyCoroutine // (0 성공, 1 실패 (잠긴 인챈트 슬롯), 3 실패 (없는 아이템), 4 실패 (업그레이드 정보 없는 파츠)) switch (error) { - case 0: _act?.Invoke(); break; + case 0: _act?.Invoke(JsonConvert.DeserializeObject(str_result)); break; case 1: ToastUI.Ins.Set(388); break; case 2: ToastUI.Ins.Set(999900003); break; } diff --git a/Assets/Script/UI/Eqiupment/EquipmentEnchantCard.cs b/Assets/Script/UI/Eqiupment/EquipmentEnchantCard.cs index 52b6f50d8..ca9853fa2 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentEnchantCard.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentEnchantCard.cs @@ -59,10 +59,11 @@ public class EquipmentEnchantCard : CardBase var sdata = ServerInfo.Ins.m_ServerData; if (sdata.Check_ItemAmount(m_Data.n_EnchantID, m_EnchantRateTableData.n_NextLvRequireCount)) { - ServerInfo.Ins.Save_Enchant_LvUp(m_Data.n_EnchantID, () => + ServerInfo.Ins.Save_Enchant_LvUp(m_Data.n_EnchantID, result => { sdata.Use_Item(m_Data.n_EnchantID, m_EnchantRateTableData.n_NextLvRequireCount); sdata.Add_EnchantLv(m_Data.n_EnchantID); + sdata.EnchantOption[m_Data.n_EnchantID] = result.newoption; Set_UI(); }); }