From fddeb252d2bd2a64595f17311f23de3b3d92e562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Thu, 14 Dec 2023 21:19:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B0=9B=EC=9D=80=20=EC=9C=A0=EB=8B=9B=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=BF=8C=EB=A0=A4=EC=A3=BC=EB=8A=94=20=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/0_Scenes/Game.unity | 392 +++++++++++------- .../1_Script/{ItemCtrl.cs => ItemPrefab.cs} | 2 +- .../{ItemCtrl.cs.meta => ItemPrefab.cs.meta} | 0 Client/Assets/1_Script/UnitPrefab.cs | 21 + Client/Assets/1_Script/UnitPrefab.cs.meta | 11 + Client/Assets/1_Script/UnitSetUiCtrl.cs | 99 ++++- Client/Assets/3_Prefab/Unit.prefab | 167 ++++++++ Client/Assets/3_Prefab/Unit.prefab.meta | 7 + 8 files changed, 539 insertions(+), 160 deletions(-) rename Client/Assets/1_Script/{ItemCtrl.cs => ItemPrefab.cs} (91%) rename Client/Assets/1_Script/{ItemCtrl.cs.meta => ItemPrefab.cs.meta} (100%) create mode 100644 Client/Assets/1_Script/UnitPrefab.cs create mode 100644 Client/Assets/1_Script/UnitPrefab.cs.meta create mode 100644 Client/Assets/3_Prefab/Unit.prefab create mode 100644 Client/Assets/3_Prefab/Unit.prefab.meta diff --git a/Client/Assets/0_Scenes/Game.unity b/Client/Assets/0_Scenes/Game.unity index e746170d..46f3f0b8 100644 --- a/Client/Assets/0_Scenes/Game.unity +++ b/Client/Assets/0_Scenes/Game.unity @@ -643,7 +643,7 @@ GameObject: - component: {fileID: 40040264} - component: {fileID: 40040265} m_Layer: 5 - m_Name: LeaderListUi + m_Name: UnitListUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3268,81 +3268,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315316774} m_CullTransparentMesh: 1 ---- !u!1 &324230807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 324230808} - - component: {fileID: 324230810} - - component: {fileID: 324230809} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &324230808 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 324230807} - 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: 2010376291} - 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: -50, y: -50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &324230809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 324230807} - 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: 4951b6b06dd1cf54fadaac415948c8a1, 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 &324230810 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 324230807} - m_CullTransparentMesh: 1 --- !u!1 &332257318 GameObject: m_ObjectHideFlags: 0 @@ -4246,6 +4171,7 @@ GameObject: - component: {fileID: 471455234} - component: {fileID: 471455236} - component: {fileID: 471455235} + - component: {fileID: 471455237} m_Layer: 5 m_Name: Image (1) m_TagString: Untagged @@ -4311,6 +4237,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 471455233} m_CullTransparentMesh: 1 +--- !u!114 &471455237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471455233} + 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: 938232308} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 544367046} + m_TargetAssemblyTypeName: UnitSetUiCtrl, Assembly-CSharp + m_MethodName: ButtonEquipment + 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!1 &478833966 GameObject: m_ObjectHideFlags: 0 @@ -4939,7 +4921,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemPrefab: {fileID: 3615028656093890924, guid: 43ebb3ab3b5855c409fdcbb8c5bf7cf8, type: 3} - content: {fileID: 71006698} + itemContent: {fileID: 71006698} + unitPrefab: {fileID: 6262298531716698382, guid: b9647f0b07b490c4cae9b18f67e515c3, type: 3} + unitContent: {fileID: 1872095651} + objInfo: {fileID: 478833966} + objItemView: {fileID: 1818855956} + objEquipment: {fileID: 918095905} + objDeck: {fileID: 1417853881} --- !u!1 &564622128 GameObject: m_ObjectHideFlags: 0 @@ -5509,6 +5497,7 @@ GameObject: - component: {fileID: 688769571} - component: {fileID: 688769573} - component: {fileID: 688769572} + - component: {fileID: 688769574} m_Layer: 5 m_Name: Image (3) m_TagString: Untagged @@ -5574,6 +5563,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688769570} m_CullTransparentMesh: 1 +--- !u!114 &688769574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688769570} + 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: 938232308} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 544367046} + m_TargetAssemblyTypeName: UnitSetUiCtrl, Assembly-CSharp + m_MethodName: ButtoncHaracteristic + 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!1 &704811666 GameObject: m_ObjectHideFlags: 0 @@ -7729,6 +7774,7 @@ GameObject: - component: {fileID: 938232307} - component: {fileID: 938232309} - component: {fileID: 938232308} + - component: {fileID: 938232310} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -7794,6 +7840,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 938232306} m_CullTransparentMesh: 1 +--- !u!114 &938232310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 938232306} + 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: 938232308} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 544367046} + m_TargetAssemblyTypeName: UnitSetUiCtrl, Assembly-CSharp + m_MethodName: ButtonStatus + 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!1 &948626527 GameObject: m_ObjectHideFlags: 0 @@ -12298,8 +12400,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2010376291} + m_Children: [] m_Father: {fileID: 1664405386} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -13631,6 +13732,7 @@ GameObject: - component: {fileID: 2002614647} - component: {fileID: 2002614649} - component: {fileID: 2002614648} + - component: {fileID: 2002614650} m_Layer: 5 m_Name: Image (2) m_TagString: Untagged @@ -13696,6 +13798,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002614646} m_CullTransparentMesh: 1 +--- !u!114 &2002614650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002614646} + 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: 938232308} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 544367046} + m_TargetAssemblyTypeName: UnitSetUiCtrl, Assembly-CSharp + m_MethodName: ButtonDeck + 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!1 &2005748971 GameObject: m_ObjectHideFlags: 0 @@ -13780,82 +13938,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2010376290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2010376291} - - component: {fileID: 2010376293} - - component: {fileID: 2010376292} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2010376291 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2010376290} - 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: 324230808} - m_Father: {fileID: 1872095651} - 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: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2010376292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2010376290} - 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: 3a55403f94f368b42ac608b403808598, 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: 1 ---- !u!222 &2010376293 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2010376290} - m_CullTransparentMesh: 1 --- !u!1 &2027355199 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/1_Script/ItemCtrl.cs b/Client/Assets/1_Script/ItemPrefab.cs similarity index 91% rename from Client/Assets/1_Script/ItemCtrl.cs rename to Client/Assets/1_Script/ItemPrefab.cs index 861604fb..f57110f9 100644 --- a/Client/Assets/1_Script/ItemCtrl.cs +++ b/Client/Assets/1_Script/ItemPrefab.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -public class ItemCtrl : MonoBehaviour +public class ItemPrefab : MonoBehaviour { [SerializeField] Image image; diff --git a/Client/Assets/1_Script/ItemCtrl.cs.meta b/Client/Assets/1_Script/ItemPrefab.cs.meta similarity index 100% rename from Client/Assets/1_Script/ItemCtrl.cs.meta rename to Client/Assets/1_Script/ItemPrefab.cs.meta diff --git a/Client/Assets/1_Script/UnitPrefab.cs b/Client/Assets/1_Script/UnitPrefab.cs new file mode 100644 index 00000000..f41ee1fe --- /dev/null +++ b/Client/Assets/1_Script/UnitPrefab.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UnitPrefab : MonoBehaviour +{ + [SerializeField] Image image; + + UnitData unitData; + GameObject unit; + UnitCtrl unitCtrl; + + public void SetData(DeckUnitInfo deckUnitInfo) + { + unitData = Statics.excelDatas.unitData[deckUnitInfo.unit_id]; + unit = Statics.stringUnits[unitData.name]; + unitCtrl = unit.GetComponent(); + image.sprite = unitCtrl.unitSprite; + } +} diff --git a/Client/Assets/1_Script/UnitPrefab.cs.meta b/Client/Assets/1_Script/UnitPrefab.cs.meta new file mode 100644 index 00000000..28883b93 --- /dev/null +++ b/Client/Assets/1_Script/UnitPrefab.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea3e8da25be60924e90142702933f1bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/1_Script/UnitSetUiCtrl.cs b/Client/Assets/1_Script/UnitSetUiCtrl.cs index 7e1acf25..eaeac606 100644 --- a/Client/Assets/1_Script/UnitSetUiCtrl.cs +++ b/Client/Assets/1_Script/UnitSetUiCtrl.cs @@ -1,15 +1,106 @@ +using System.Collections.Generic; using UnityEngine; -using UnityEngine.UI; public class UnitSetUiCtrl : MonoBehaviour { [SerializeField] GameObject itemPrefab; - [SerializeField] Transform content; + [SerializeField] Transform itemContent; + [SerializeField] GameObject unitPrefab; + [SerializeField] Transform unitContent; + + [SerializeField] GameObject objInfo; + [SerializeField] GameObject objItemView; + + [SerializeField] GameObject objEquipment; + [SerializeField] GameObject objDeck; + + GameObjectPool itemPrefabList; + GameObjectPool unitPrefabList; + + List onItemPrefabList; + List onUnitPrefabList; + + private void Awake() + { + onItemPrefabList = new List(); + onUnitPrefabList = new List(); + itemPrefabList = new GameObjectPool(5, () => + { + var obj = Instantiate(itemPrefab, itemContent); + obj.SetActive(false); + var clone = obj.GetComponent(); + return clone; + }); + unitPrefabList = new GameObjectPool(5, () => + { + var obj = Instantiate(unitPrefab, unitContent); + obj.SetActive(false); + var clone = obj.GetComponent(); + return clone; + }); + } + private void OnEnable() { - foreach(var item in Statics.equipment) + ButtonStatus(); + onItemPrefabList.Clear(); + foreach (var item in Statics.equipment) { - Instantiate(itemPrefab, content).GetComponent().SetData(item); + ItemPrefab prefab = itemPrefabList.pop(); + prefab.SetData(item); + prefab.gameObject.SetActive(true); + onItemPrefabList.Add(prefab); + } + + foreach (var item in Statics.deckUnit) + { + UnitPrefab prefab = unitPrefabList.pop(); + prefab.SetData(item.Value); + prefab.gameObject.SetActive(true); + onUnitPrefabList.Add(prefab); } } + + private void OnDisable() + { + foreach (var item in onItemPrefabList) + { + item.gameObject.SetActive(false); + itemPrefabList.push(item); + } + foreach (var item in onUnitPrefabList) + { + item.gameObject.SetActive(false); + unitPrefabList.push(item); + } + } + + public void ButtonStatus() + { + objInfo.SetActive(true); + objItemView.SetActive(false); + objEquipment.SetActive(false); + objDeck.SetActive(false); + } + public void ButtonEquipment() + { + objInfo.SetActive(false); + objItemView.SetActive(true); + objEquipment.SetActive(true); + objDeck.SetActive(false); + } + public void ButtonDeck() + { + objInfo.SetActive(false); + objItemView.SetActive(false); + objEquipment.SetActive(false); + objDeck.SetActive(true); + } + public void ButtoncHaracteristic() + { + objInfo.SetActive(false); + objItemView.SetActive(false); + objEquipment.SetActive(false); + objDeck.SetActive(false); + } } diff --git a/Client/Assets/3_Prefab/Unit.prefab b/Client/Assets/3_Prefab/Unit.prefab new file mode 100644 index 00000000..bb6bea40 --- /dev/null +++ b/Client/Assets/3_Prefab/Unit.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6262298531716698382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2282088773822048412} + - component: {fileID: 203990141783548481} + - component: {fileID: 4685290738526370478} + - component: {fileID: 7437585731462741064} + m_Layer: 5 + m_Name: Unit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2282088773822048412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6262298531716698382} + 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: 1239764910639272156} + 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: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &203990141783548481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6262298531716698382} + m_CullTransparentMesh: 1 +--- !u!114 &4685290738526370478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6262298531716698382} + 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: 3a55403f94f368b42ac608b403808598, 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: 1 +--- !u!114 &7437585731462741064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6262298531716698382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea3e8da25be60924e90142702933f1bd, type: 3} + m_Name: + m_EditorClassIdentifier: + image: {fileID: 408122529383440926} +--- !u!1 &8937056069279271503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1239764910639272156} + - component: {fileID: 6161014320006469804} + - component: {fileID: 408122529383440926} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1239764910639272156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937056069279271503} + 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: 2282088773822048412} + 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: -50, y: -50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6161014320006469804 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937056069279271503} + m_CullTransparentMesh: 1 +--- !u!114 &408122529383440926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8937056069279271503} + 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: 4951b6b06dd1cf54fadaac415948c8a1, 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/Unit.prefab.meta b/Client/Assets/3_Prefab/Unit.prefab.meta new file mode 100644 index 00000000..151c9dc2 --- /dev/null +++ b/Client/Assets/3_Prefab/Unit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b9647f0b07b490c4cae9b18f67e515c3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: