From df7cddd4d861a273d24a0a2f7655cef890a609f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Mon, 18 Mar 2024 21:09:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=A0=90=20=EA=B8=B0=EB=A1=9D=20?= =?UTF-8?q?=EB=B0=9B=EA=B8=B0=20=ED=94=84=EB=A1=9C=ED=86=A0=EC=BD=9C=20?= =?UTF-8?q?=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/0_Scenes/Game.unity | 76 +++++++++++++++++++ .../Assets/1_Script/System/Http/Protocol.cs | 9 ++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/Client/Assets/0_Scenes/Game.unity b/Client/Assets/0_Scenes/Game.unity index 37d29336..599aebf6 100644 --- a/Client/Assets/0_Scenes/Game.unity +++ b/Client/Assets/0_Scenes/Game.unity @@ -1946,6 +1946,7 @@ RectTransform: - {fileID: 432455696} - {fileID: 1647398731} - {fileID: 49774427} + - {fileID: 1699950330} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -18281,6 +18282,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: part: 3 +--- !u!1 &1699950329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1699950330} + - component: {fileID: 1699950332} + - component: {fileID: 1699950331} + m_Layer: 5 + m_Name: StroyUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1699950330 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699950329} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 131930850} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1699950331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699950329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1699950332 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699950329} + m_CullTransparentMesh: 1 --- !u!1 &1700456131 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/1_Script/System/Http/Protocol.cs b/Client/Assets/1_Script/System/Http/Protocol.cs index 4c1b0258..898d4a57 100644 --- a/Client/Assets/1_Script/System/Http/Protocol.cs +++ b/Client/Assets/1_Script/System/Http/Protocol.cs @@ -75,6 +75,7 @@ public class LoginResp : Request public List consumable_item { get; set; } public List etc_item { get; set; } public List reset_shop_item { get; set; } + public List shop_item { get; set; } public void Request(LoginReq loginReq, Action onRequestFinished, Action errorRequestFinished) { @@ -308,7 +309,6 @@ public class EtcItem public class ResetShopItem { public long id { get; set; } - public long reset_shop_item_data_id { get; set; } public string name { get; set; } public long shop_index { get; set; } @@ -318,4 +318,11 @@ public class ResetShopItem public int buy_count { get; set; } public int count { get; set; } public DateTime end_date { get; set; } +} + +public class ShopItem +{ + public long id { get; set; } + public long shop_item_data_id { get; set; } + public DateTime end_date { get; set; } } \ No newline at end of file