diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index af9fb7cd9..97b056c79 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -83,19 +83,9 @@ messageinfo 엄청 느린 버그 출석부 - 이벤트 (7일) - 일반 -우편함 맵 배치 (3,4,5) - 포탈, 필드보스, 부활의 성소, 챕터보스 - -작업 완료 - - 테스트맵 - - 보스 이펙트 - - pc 애님 (캐스팅 추가) - - pc 프리팹 (43종) - - 스킬 드래그로 착용 - - 맵1 Tris 약 120만개, 버텍스 약 240만개 줄임 - - 맵4 최적화 \ No newline at end of file diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index e032a917d..dd82d7384 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -183,8 +183,6 @@ handlers.Get_MailReward = function(args) var error = Get_Error(args.Token); if(error < 0) return {error:error}; - server.UpdateUserReadOnlyData({ PlayFabId: currentPlayerId, Permission: "Public", Data: {"UserInfo": JSON.stringify(args.AllData)} }); - var userdata = server.GetUserData({ PlayFabId: currentPlayerId, Keys: ["Mail"] }).Data; if (!CheckNullOrEmpty(userdata.Mail)) { diff --git a/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab b/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab index d031ab69d..6c12d1bd8 100644 --- a/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab +++ b/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab @@ -962,8 +962,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: MissionCard, Assembly-CSharp + - m_Target: {fileID: -2514396356274504821} + m_TargetAssemblyTypeName: MailCard, Assembly-CSharp m_MethodName: OnClick_GetReward m_Mode: 1 m_Arguments: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 66e6d7961..cfd524e19 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -53740,9 +53740,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5743882714988958725} - m_TargetAssemblyTypeName: MissionUI, Assembly-CSharp - m_MethodName: OnClick_GetAll + - m_Target: {fileID: 167911515820273903} + m_TargetAssemblyTypeName: MailUI, Assembly-CSharp + m_MethodName: Get_AllMail m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index 17a04671a..676e13690 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -808,7 +808,6 @@ public class ServerInfo : MyCoroutine { Token = m_LoginInfo.EntityToken.EntityToken, RemainTime = _remaintime, - AllData = m_ServerData.Get_ServerRead(), } }, result => diff --git a/Assets/Script/UI/Center/Mail/MailCard.cs b/Assets/Script/UI/Center/Mail/MailCard.cs index a5df1264a..e35530ff5 100644 --- a/Assets/Script/UI/Center/Mail/MailCard.cs +++ b/Assets/Script/UI/Center/Mail/MailCard.cs @@ -37,9 +37,7 @@ public class MailCard : CardBase break; default: sinfo.m_ServerData.Add_Item(id, amount); - sinfo.Write(() => - { - }); + sinfo.Write(() => { ObtainItemUI.Ins.Set(new ItemSimpleData { itemid = id, amount = amount }); }); break; } MailUI.Ins.Del_Mail(m_ServerMailData); diff --git a/Assets/Script/UI/Center/Mail/MailUI.cs b/Assets/Script/UI/Center/Mail/MailUI.cs index f94f85d63..23bdf4502 100644 --- a/Assets/Script/UI/Center/Mail/MailUI.cs +++ b/Assets/Script/UI/Center/Mail/MailUI.cs @@ -25,11 +25,13 @@ public class MailUI : MonoBehaviourSingletonuScrollViewMgr { CardBase_AllOff(); gos[1].SetActive(true); + NewGameUI.Ins.gos_noti[0].SetActive(false); } else { gos[1].SetActive(false); Set_ScrollView(mail.Mail); + NewGameUI.Ins.gos_noti[0].SetActive(true); } } @@ -46,27 +48,20 @@ public class MailUI : MonoBehaviourSingletonuScrollViewMgr ServerInfo.Ins.Get_AllMail(mail => { - var obtainlist = new List(); + var obtainlist = new List(); var sdata = ServerInfo.Ins.m_ServerData; for (int i = 0; i < mail.Mail.Count; i++) { var temp = MailData.Mail.Find(f => DateTime.Compare(f.RemnantTime, mail.Mail[i].RemnantTime) == 0); if (temp != null) { - //obtainlist.AddRange(sdata.Add_Item(new ItemData(temp.Item, temp.ID, temp.RewardAmount, "Mail", eUICardType.GetItem))); - //if (temp.IsShopItem > 0) - //{ - // var shopdata = table_shop.Ins.Get_Data(temp.Item, temp.ID); - // if (shopdata != null) - // obtainlist.AddRange(sdata.Add_Item(new ItemData(eItem.mClover, 0, shopdata.Mileage, DSUtil.Format("shop {0} {1}", temp.Item, temp.ID), eUICardType.GetItem))); - //} + obtainlist.Add(new ItemSimpleData { itemid = temp.ItemID, amount = temp.Amount }); } } - if (obtainlist.Count > 0) GetItemUI.Ins.Set(obtainlist); ServerInfo.Ins.Write(() => { - if (obtainlist.Count > 0) GetItemUI.Ins.Show_Items(); + if (obtainlist.Count > 0) ObtainItemUI.Ins.Set(obtainlist); MailData = null; Set_UI(MailData); });