diff --git a/MementoMori.Ortega/Share/Data/ApiInterface/User/GetMypageRequest.cs b/MementoMori.Ortega/Share/Data/ApiInterface/User/GetMypageRequest.cs index c9996a1..57d26f6 100644 --- a/MementoMori.Ortega/Share/Data/ApiInterface/User/GetMypageRequest.cs +++ b/MementoMori.Ortega/Share/Data/ApiInterface/User/GetMypageRequest.cs @@ -1,4 +1,5 @@ -using MessagePack; +using MementoMori.Ortega.Share.Enums; +using MessagePack; namespace MementoMori.Ortega.Share.Data.ApiInterface.User { @@ -6,5 +7,6 @@ namespace MementoMori.Ortega.Share.Data.ApiInterface.User [OrtegaApi("user/getMypage", true, false)] public class GetMypageRequest : ApiRequestBase { + public LanguageType LanguageType { get; set; } } } diff --git a/MementoMori.Ortega/Share/Data/Battle/EffectGroup.cs b/MementoMori.Ortega/Share/Data/Battle/EffectGroup.cs index 94dc387..8e5ad57 100644 --- a/MementoMori.Ortega/Share/Data/Battle/EffectGroup.cs +++ b/MementoMori.Ortega/Share/Data/Battle/EffectGroup.cs @@ -22,6 +22,8 @@ public class EffectGroup : IDeepCopy public int LinkTargetGuid { get; set; } + public int GranterGuid { get; set; } + public bool IsExtendEffectTurn { get; set; } public EffectGroup DeepCopy() diff --git a/MementoMori.Ortega/Share/Data/MyPage/MypageIconInfo.cs b/MementoMori.Ortega/Share/Data/MyPage/MypageIconInfo.cs index 75bea90..87fc947 100644 --- a/MementoMori.Ortega/Share/Data/MyPage/MypageIconInfo.cs +++ b/MementoMori.Ortega/Share/Data/MyPage/MypageIconInfo.cs @@ -19,7 +19,13 @@ public class MypageIconInfo public long ImageId { get; set; } - public bool IsDisplayBadge { get; set; } + public bool IsBlackout { get; set; } + + public bool IsDisplayBadge { get; set; } + + public long NotOpenEventStoreIconId { get; set; } + + public long OpenContentLocalTimestamp { get; set; } public int SortOrder { get; set; } diff --git a/MementoMori.Ortega/Share/ErrorCode.cs b/MementoMori.Ortega/Share/ErrorCode.cs index 018c876..0ac6657 100644 --- a/MementoMori.Ortega/Share/ErrorCode.cs +++ b/MementoMori.Ortega/Share/ErrorCode.cs @@ -969,6 +969,8 @@ public enum ErrorCode ShopInvalidDisplayPeriodType, [Description("IOS側の一時的な問題で復元処理を利用してください。")] ShopIosVerifyReceiptProblem, + [Description("レシートデータが見つかりません。")] + ShopNotFoundReceipt, [Description("ユーザーのステータスデータが見つかりません。")] ChatUserStatusDtoNotFound = 271000, [Description("ユーザーのアカウントデータが見つかりません。")] diff --git a/MementoMori/MementoMoriFuncs.Ops.cs b/MementoMori/MementoMoriFuncs.Ops.cs index 72b726d..74612fa 100644 --- a/MementoMori/MementoMoriFuncs.Ops.cs +++ b/MementoMori/MementoMoriFuncs.Ops.cs @@ -1227,7 +1227,7 @@ await ExecuteQuickAction(async (log, token) => public async Task GetMyPage() { - await ExecuteQuickAction(async (log, token) => { Mypage = await GetResponse(new GetMypageRequest()); }); + await ExecuteQuickAction(async (log, token) => { Mypage = await GetResponse(new GetMypageRequest(){LanguageType = NetworkManager.LanguageType}); }); } public async Task Debug()