diff --git a/Client/Assets/0_Scenes/Game.unity b/Client/Assets/0_Scenes/Game.unity index 2f9204f4..1fa531bf 100644 --- a/Client/Assets/0_Scenes/Game.unity +++ b/Client/Assets/0_Scenes/Game.unity @@ -6360,13 +6360,14 @@ GameObject: - component: {fileID: 432455696} - component: {fileID: 432455698} - component: {fileID: 432455697} + - component: {fileID: 432455699} m_Layer: 5 m_Name: BagUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &432455696 RectTransform: m_ObjectHideFlags: 0 @@ -6427,6 +6428,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 432455695} m_CullTransparentMesh: 1 +--- !u!114 &432455699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432455695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c19cd471555ca645877647cda6bb6e3, type: 3} + m_Name: + m_EditorClassIdentifier: + invenItemPrefab: {fileID: 3423870288807355427, guid: 55591c8da2f99684bb7d32e9ec881e1f, type: 3} + invenItemContent: {fileID: 1881783529} --- !u!1 &440143453 GameObject: m_ObjectHideFlags: 0 @@ -10317,82 +10332,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 818340197} m_CullTransparentMesh: 1 ---- !u!1 &831290625 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 831290626} - - component: {fileID: 831290628} - - component: {fileID: 831290627} - m_Layer: 5 - m_Name: InvenItemPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &831290626 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 831290625} - 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: - - {fileID: 1115858016} - m_Father: {fileID: 1881783529} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -80} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &831290627 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 831290625} - 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: 21300000, guid: 1f719d86d81457747817d0bae81e5d2e, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!222 &831290628 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 831290625} - m_CullTransparentMesh: 1 --- !u!1 &831588407 GameObject: m_ObjectHideFlags: 0 @@ -13811,81 +13750,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1107270103} m_CullTransparentMesh: 1 ---- !u!1 &1115858015 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1115858016} - - component: {fileID: 1115858018} - - component: {fileID: 1115858017} - m_Layer: 5 - m_Name: ItemImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1115858016 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115858015} - 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: 831290626} - 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: -40, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1115858017 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115858015} - 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: 21300000, guid: 64a997ede40a95043813653694bb8b06, type: 3} - 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 &1115858018 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115858015} - m_CullTransparentMesh: 1 --- !u!1 &1117135537 GameObject: m_ObjectHideFlags: 0 @@ -19969,14 +19833,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 831290626} + m_Children: [] m_Father: {fileID: 2042614231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 155} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1881783530 MonoBehaviour: diff --git a/Client/Assets/1_Script/GameUI/BagUICtrl.cs b/Client/Assets/1_Script/GameUI/BagUICtrl.cs new file mode 100644 index 00000000..166f607d --- /dev/null +++ b/Client/Assets/1_Script/GameUI/BagUICtrl.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using UnityEngine; + +public class BagUICtrl : MonoBehaviour +{ + [SerializeField] GameObject invenItemPrefab; + [SerializeField] Transform invenItemContent; + + List invenItemList; + + private void Awake() + { + invenItemList = new List(); + } + + + private void OnEnable() + { + int count = Statics.excelDatas.consumableItemData.Count;// + Statics.excelDatas.etcItemData.Count + if (invenItemList.Count != count) + { + foreach (var item in Statics.excelDatas.consumableItemData) + { + InvenItemPrefab obj = Instantiate(invenItemPrefab, invenItemContent).GetComponent(); + obj.Set(item.Value); + invenItemList.Add(obj); + } + } + else + { + foreach (var item in invenItemList) + { + item.UpdateDate(); + } + } + } + +} diff --git a/Client/Assets/1_Script/GameUI/BagUICtrl.cs.meta b/Client/Assets/1_Script/GameUI/BagUICtrl.cs.meta new file mode 100644 index 00000000..e90becb3 --- /dev/null +++ b/Client/Assets/1_Script/GameUI/BagUICtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c19cd471555ca645877647cda6bb6e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs b/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs new file mode 100644 index 00000000..181cf3e2 --- /dev/null +++ b/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs @@ -0,0 +1,37 @@ +using UnityEngine; +using UnityEngine.UI; + +public class InvenItemPrefab : MonoBehaviour +{ + [SerializeField] Image img; + + ConsumableItemData consumableItemData; + + int count; + + public void Set(ConsumableItemData consumableItemData) + { + this.consumableItemData = consumableItemData; + SetCount(); + } + + public void UpdateDate() + { + SetCount(); + } + + private void SetCount() + { + ConsumableItem consumableItem = Statics.itemManager.box.FindConsumableItemDataId(consumableItemData.index); + if (consumableItem != null) + { + this.count = 0; + gameObject.SetActive(false); + } + else + { + this.count = consumableItem.count; + gameObject.SetActive(true); + } + } +} diff --git a/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs.meta b/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs.meta new file mode 100644 index 00000000..d01b0279 --- /dev/null +++ b/Client/Assets/1_Script/Prefab/InvenItemPrefab.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8528af2b1078c784ba46754bdc6a8084 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/1_Script/System/ItemManager.cs b/Client/Assets/1_Script/System/ItemManager.cs index 93d9b6e6..5ce85637 100644 --- a/Client/Assets/1_Script/System/ItemManager.cs +++ b/Client/Assets/1_Script/System/ItemManager.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Unity.VisualScripting; using static UnityEditor.Progress; public class ItemManager @@ -73,10 +74,14 @@ public class ItemBox return _equipment.Find(n => n.id == id); } - public ConsumableItem FindConsumableItem(long id) + public ConsumableItem FindConsumableItemId(long id) { return _consumableItem.Find(n => n.id == id); } + public ConsumableItem FindConsumableItemDataId(long dataId) + { + return _consumableItem.Find(n => n.consumable_item_data_id == dataId); + } public EtcItem FindEtcItem(long id) { @@ -126,7 +131,7 @@ public class ItemBox public void add(ConsumableItem item) { - ConsumableItem select = FindConsumableItem(item.id); + ConsumableItem select = FindConsumableItemId(item.id); if (select != null) select.count += item.count; else diff --git a/Client/Assets/3_Prefab/InvenItemPrefab.prefab b/Client/Assets/3_Prefab/InvenItemPrefab.prefab new file mode 100644 index 00000000..89adabc2 --- /dev/null +++ b/Client/Assets/3_Prefab/InvenItemPrefab.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3423870288807355427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2910847900653727685} + - component: {fileID: 5088084670914996096} + - component: {fileID: 7483860228140879360} + - component: {fileID: 5597056308306428060} + m_Layer: 5 + m_Name: InvenItemPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2910847900653727685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3423870288807355427} + 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: + - {fileID: 203786632778988602} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5088084670914996096 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3423870288807355427} + m_CullTransparentMesh: 1 +--- !u!114 &7483860228140879360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3423870288807355427} + 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: 21300000, guid: c23b971090c3ab84da5d5786d04cfa9f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &5597056308306428060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3423870288807355427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8528af2b1078c784ba46754bdc6a8084, type: 3} + m_Name: + m_EditorClassIdentifier: + img: {fileID: 7483860228140879360} +--- !u!1 &6031679860202500696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 203786632778988602} + - component: {fileID: 1559766191295785544} + - component: {fileID: 6476555671440333947} + m_Layer: 5 + m_Name: ItemImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &203786632778988602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6031679860202500696} + 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: 2910847900653727685} + 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: -40, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1559766191295785544 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6031679860202500696} + m_CullTransparentMesh: 1 +--- !u!114 &6476555671440333947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6031679860202500696} + 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: 21300000, guid: 64a997ede40a95043813653694bb8b06, type: 3} + 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 diff --git a/Client/Assets/3_Prefab/InvenItemPrefab.prefab.meta b/Client/Assets/3_Prefab/InvenItemPrefab.prefab.meta new file mode 100644 index 00000000..963a151d --- /dev/null +++ b/Client/Assets/3_Prefab/InvenItemPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 55591c8da2f99684bb7d32e9ec881e1f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: