Skip to content

Commit

Permalink
Merge pull request #3671 from planetarium/release/90.1.2
Browse files Browse the repository at this point in the history
BackMerge Release/90.1.2 to develop
  • Loading branch information
jonny-jeahyunchoi authored Nov 23, 2023
2 parents 91e06e3 + adb19bc commit 579be2a
Show file tree
Hide file tree
Showing 50 changed files with 1,850 additions and 338 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,21 @@ public async
PurchaseRequestAsync(
Store store,
string receipt,
Address agentAddr,
Address avatarAddr,
string planetId)
string agentAddr,
string avatarAddr,
string planetId,
string transactionId,
string appleOriginalTransactionID)
{
var receiptJson = JsonNode.Parse(receipt);

var reqJson = new JsonObject
{
{ "store", (int)store },
{ "agentAddress", agentAddr },
{ "avatarAddress", avatarAddr},
{ "planetId", planetId},
{ "data", receiptJson },
{ "agentAddress", agentAddr.ToHex() },
{ "avatarAddress", avatarAddr.ToHex() },
{ "planetId", planetId}
};

Debug.Log($"PurchaseRequestAsync : {reqJson}");
Expand All @@ -84,6 +86,14 @@ public async
reqJson.ToJsonString(JsonSerializerOptions),
System.Text.Encoding.UTF8,
"application/json");

reqContent.Headers.Add("agentAddress", agentAddr);
reqContent.Headers.Add("orderId", transactionId);
if (!string.IsNullOrEmpty(appleOriginalTransactionID))
{
reqContent.Headers.Add("appleOriginalTransactionID", appleOriginalTransactionID);
}

using var res = await _client.PostAsync(_endpoints.PurchaseRequest, reqContent);
return await ProcessResponseAsync(res);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ public void Dispose()

public async Task<ReceiptDetailSchema?> PurchaseRequestAsync(
string receipt,
Address agentAddr,
Address avatarAddr,
string planetId)
string agentAddr,
string avatarAddr,
string planetId,
string transactionId,
string appleOriginalTransactionID)
{
if (!IsInitialized)
{
Expand All @@ -163,7 +165,9 @@ await _client.PurchaseRequestAsync(
receipt,
agentAddr,
avatarAddr,
planetId);
planetId,
transactionId,
appleOriginalTransactionID);
if (code != HttpStatusCode.OK ||
!string.IsNullOrEmpty(error))
{
Expand Down
150 changes: 150 additions & 0 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_ConsumableTooltip.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,81 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: -2838122723255354076}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: -2838122723255354076}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1785787159470936913, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -727,6 +802,81 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: -2838122723255354076}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: -2838122723255354076}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2405228427834927448, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down
150 changes: 150 additions & 0 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_CostumeTooltip.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,81 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -20.51
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6657123366891336328}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6657123366891336328}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1780549777782881423, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1785787159470936913, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -772,6 +847,81 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6657123366891336328}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6657123366891336328}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnEnterButtonArea
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.ItemTooltip, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2337100688356226806, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2405228427834927448, guid: 208eab8c17f4afb41a89eedbfe42f722,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down
Loading

0 comments on commit 579be2a

Please sign in to comment.