diff --git a/Client/Assets/1_Script/Prefab/ShopTypeitemPrefab.cs b/Client/Assets/1_Script/Prefab/ShopTypeitemPrefab.cs index 684b52c8..c60ef951 100644 --- a/Client/Assets/1_Script/Prefab/ShopTypeitemPrefab.cs +++ b/Client/Assets/1_Script/Prefab/ShopTypeitemPrefab.cs @@ -28,6 +28,10 @@ public class ShopTypeitemPrefab : MonoBehaviour BuyShopItemResp resp = new BuyShopItemResp(); resp.Request((data) => { + long addGold = (long)data.gold; + long addCash = (long)data.cash; + addGold -= (long)Statics.gold; + addCash -= (long)Statics.cash; Statics.gold = data.gold; Statics.cash = data.cash; GameCtrl.Instance.MoneyUpdate(); @@ -35,6 +39,7 @@ public class ShopTypeitemPrefab : MonoBehaviour Statics.itemManager.box.add(data.equipment); Statics.itemManager.box.add(data.consumableItem); Statics.itemManager.box.add(data.etcItem); + GetItemWindows.Instance.SetUI(addGold, addCash, data.deck_unit, data.equipment, data.consumableItem, data.etcItem); }, shopItemData.index); } } diff --git a/Client/Assets/1_Script/System/GetItemWindows.cs b/Client/Assets/1_Script/System/GetItemWindows.cs new file mode 100644 index 00000000..e59963da --- /dev/null +++ b/Client/Assets/1_Script/System/GetItemWindows.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GetItemWindows : SingletonMonoBehaviour +{ + //¾ÆÀÌÅÛ È¹µæ Á¤º¸ ÇÊ¿ä + //¾ÆÀÌÅÛ ÀÌÆåÆ® + + private bool isAnim = false; + protected override void OnAwake() + { + gameObject.SetActive(false); + } + + public void SetUI(long addGold, long addCash, List deckUnit, List equipment, List consumableItem, List etcItem) + { + isAnim = true; + gameObject.SetActive(true); + if (addGold > 0) + Debug.Log($"{addGold}°ñµå ȹµæ!"); + if (addCash > 0) + Debug.Log($"{addCash}Äɽ¬ ȹµæ!"); + if (deckUnit != null && deckUnit.Count != 0) + { + for(int n = 0; n < deckUnit.Count; n++) + { + Debug.Log($"{deckUnit[n].unit_data_id}Äɸ¯ÅÍ {deckUnit[n].count}°³È¹µæ!"); + } + } + if (equipment != null && equipment.Count != 0) + { + for (int n = 0; n < equipment.Count; n++) + { + Debug.Log($"{equipment[n].equipment_data_id}Àåºñ ȹµæ!"); + } + } + if (consumableItem != null && consumableItem.Count != 0) + { + for (int n = 0; n < consumableItem.Count; n++) + { + Debug.Log($"{consumableItem[n].consumable_item_data_id}¾ÆÀÌÅÆ {consumableItem[n].count}°³È¹µæ!"); + } + } + if (etcItem != null && etcItem.Count != 0) + { + for (int n = 0; n < etcItem.Count; n++) + { + Debug.Log($"{etcItem[n].etc_item_data_id}¾ÆÀÌÅÆ {etcItem[n].count}°³È¹µæ!"); + } + } + //Àӽà + isAnim = false; + } + + public void OnExit() + { + if (!isAnim) + gameObject.SetActive(false); + } +} diff --git a/Client/Assets/1_Script/System/GetItemWindows.cs.meta b/Client/Assets/1_Script/System/GetItemWindows.cs.meta new file mode 100644 index 00000000..9fb49726 --- /dev/null +++ b/Client/Assets/1_Script/System/GetItemWindows.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a76e41e1274208c44acdf1c89f34b382 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/3_Prefab/SystemUI.prefab b/Client/Assets/3_Prefab/SystemUI.prefab index f503fd4f..909e0f47 100644 --- a/Client/Assets/3_Prefab/SystemUI.prefab +++ b/Client/Assets/3_Prefab/SystemUI.prefab @@ -1042,6 +1042,151 @@ MonoBehaviour: - {fileID: 2315353821242935284} music: {fileID: 1339032037845161422} sound: {fileID: 3565590459475949819} +--- !u!1 &5296450069761795811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1493844650035290569} + - component: {fileID: 3287049546096693451} + - component: {fileID: 5141860824621156582} + - component: {fileID: 2469188759659571987} + - component: {fileID: 3304700966441670880} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1493844650035290569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296450069761795811} + 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: 6231225143325377119} + 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!222 &3287049546096693451 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296450069761795811} + m_CullTransparentMesh: 1 +--- !u!114 &5141860824621156582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296450069761795811} + 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: 0.5019608} + 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!114 &2469188759659571987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296450069761795811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5141860824621156582} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3304700966441670880} + m_TargetAssemblyTypeName: GetItemWindows, Assembly-CSharp + m_MethodName: OnExit + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &3304700966441670880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296450069761795811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a76e41e1274208c44acdf1c89f34b382, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5441656290973680372 GameObject: m_ObjectHideFlags: 0 @@ -2602,6 +2747,7 @@ RectTransform: m_Children: - {fileID: 5135377912375770638} - {fileID: 5805385023064880260} + - {fileID: 1493844650035290569} m_Father: {fileID: 6231225142295759458} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0}