diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 490252929..fb196427a 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -159,72 +159,6 @@ function Del_Mail(itemname) log.info(itemname + ' 아이템을 우편함에서 찾지 못했습니다.'); return false; } -handlers.Get_MailList = function(args) -{ - var error = Get_Error(args.Token); - var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; - return Get_Return(error, { Mail: JSON.parse(userdata.Mail.Value) }); -} -handlers.Get_MailReward = function(args) -{ - var error = Get_Error(args.Token); - if(error < 0) return {error:error}; - - var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; - if (!CheckNullOrEmpty(userdata.Mail)) - { - var urod = Get_JsonUserData(); - var mailjson = JSON.parse(userdata.Mail.Value); - var existmail = false; - var getdate = new Date(args.RemainTime); - for (var i in mailjson) - { - var maildate = new Date(mailjson[i].RemainTime); - if (maildate.getTime() === getdate.getTime()) - { - existmail = true; - Add_Item(urod, mailjson[i].ItemID, mailjson[i].Amount); - delete mailjson[i]; - break; - } - } - mailjson = mailjson.filter(function(x) { return x !== null }); // null 모두 지우기 - - if (existmail) - { - server.UpdateUserData({ PlayFabId: currentPlayerId, Permission: "Public", Data: {"Mail": JSON.stringify(mailjson)} }); - Set_JsonUserData(urod); - return Get_Return(error, { Mail: mailjson } ); - } - else - return Get_Return(3); - } - else - return Get_Return(3); -} -handlers.Get_AllMail = function(args) -{ - var error = Get_Error(args.Token); - if(error < 0) return {error:error}; - - var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; - if (!CheckNullOrEmpty(userdata.Mail)) - { - var mailjson = JSON.parse(userdata.Mail.Value); - server.UpdateUserData({ PlayFabId: currentPlayerId, Permission: "Public", Data: {"Mail": "[]"} }); - - return { - error : error, - Mail: mailjson - }; - } - else - { - return { - error : 3 - } - } -} handlers.Get_UserInfo = function (args) { var urod = server.GetUserReadOnlyData({ PlayFabId: currentPlayerId }).Data; @@ -367,6 +301,71 @@ handlers.Save_CheatItem = function(args) Set_JsonUserData(urod); } +handlers.Get_MailList = function(args) +{ + var error = Get_Error(args.Token); + var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; + return Get_Return(error, { Mail: JSON.parse(userdata.Mail.Value) }); +} +handlers.Get_MailReward = function(args) +{ + var error = Get_Error(args.Token); + if (error < 0) return Get_Return(error); + + var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; + if (!CheckNullOrEmpty(userdata.Mail)) + { + var urod = Get_JsonUserData(); + var mailjson = JSON.parse(userdata.Mail.Value); + var existmail = false; + var getdate = new Date(args.RemainTime); + for (var i in mailjson) + { + var maildate = new Date(mailjson[i].RemainTime); + if (maildate.getTime() === getdate.getTime()) + { + existmail = true; + Add_Item(urod, mailjson[i].ItemID, mailjson[i].Amount); + delete mailjson[i]; + break; + } + } + mailjson = mailjson.filter(function(x) { return x !== null }); // null 모두 지우기 + + if (existmail) + { + server.UpdateUserData({ PlayFabId: currentPlayerId, Permission: "Public", Data: {"Mail": JSON.stringify(mailjson)} }); + Set_JsonUserData(urod); + return Get_Return(error, { Mail: mailjson } ); + } + else + return Get_Return(3); + } + else + return Get_Return(3); +} +handlers.Get_AllMail = function(args) +{ + var error = Get_Error(args.Token); + if (error < 0) return Get_Return(error); + + var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; + if (!CheckNullOrEmpty(userdata.Mail)) + { + var urod = Get_JsonUserData(); + var mailjson = JSON.parse(userdata.Mail.Value); + for (var i in mailjson) + Add_Item(urod, mailjson[i].ItemID, mailjson[i].Amount); + + server.UpdateUserData({ PlayFabId: currentPlayerId, Permission: "Public", Data: {"Mail": "[]"} }); + Set_JsonUserData(urod); + + return Get_Return(error, { Mail: mailjson }); + } + else + return Get_Return(3); +} + handlers.Save_StageResult = function(args) { var error = Get_Error(args.Token); if (error < 0) return Get_Return(error); diff --git a/Assets/Script/UI/Center/Mail/MailUI.cs b/Assets/Script/UI/Center/Mail/MailUI.cs index 0f7a8bc3c..82a2d0131 100644 --- a/Assets/Script/UI/Center/Mail/MailUI.cs +++ b/Assets/Script/UI/Center/Mail/MailUI.cs @@ -61,12 +61,9 @@ public class MailUI : MonoBehaviourSingletonuScrollViewMgr obtainlist = Get_MailReward(obtainlist); - ServerInfo.Ins.Write(() => - { - if (obtainlist.Count > 0) ObtainItemUI.Ins.Set(obtainlist); - MailData = null; - Set_UI(MailData); - }); + if (obtainlist.Count > 0) ObtainItemUI.Ins.Set(obtainlist); + MailData = null; + Set_UI(MailData); }); }