From bed3f2d9fdd1c55afa0bf2817efb328bebd97290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Wed, 1 Nov 2023 21:24:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EB=8B=9B=20=EC=83=9D=EC=82=B0=20?= =?UTF-8?q?=EA=B1=B4=EB=AC=BC=20=EC=83=9D=EC=84=B1=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/0_Scenes/Play.unity | 642 +++++++++++++++----- Client/Assets/1_Script/Info/BuildingCtrl.cs | 42 +- Client/Assets/1_Script/PlayCtrl.cs | 23 +- 3 files changed, 547 insertions(+), 160 deletions(-) diff --git a/Client/Assets/0_Scenes/Play.unity b/Client/Assets/0_Scenes/Play.unity index 5b3b11b9..fbe981dd 100644 --- a/Client/Assets/0_Scenes/Play.unity +++ b/Client/Assets/0_Scenes/Play.unity @@ -320,17 +320,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 3950219} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &3950219 MonoBehaviour: @@ -468,14 +468,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 3 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -856,8 +856,29 @@ MonoBehaviour: newBuildingUI: {fileID: 1842952264} buildingLevelupUI: {fileID: 1785205477} backButton: {fileID: 1396764732} + units: + - {fileID: 1949180232321779611, guid: 49e392c236699c847aed4866abb2335d, type: 3} + - {fileID: -6150474728477210055, guid: bdf90406a02966b4781544b262167e1b, type: 3} + - {fileID: 6378634513466364443, guid: 9b56846c8cf27d44cb278c3aa0a1147e, type: 3} + - {fileID: -4203858676371876518, guid: 6af2b537b964eb049a1031d0fe5611f1, type: 3} + - {fileID: -7112508950674410464, guid: c743e306ed982854b9b4f7d04a028f22, type: 3} + - {fileID: 955092010516457788, guid: e3f40bd51f6186842a414ae17a605ab7, type: 3} + - {fileID: 1812894275950873291, guid: d3a1d6b9bdf271442a2af197b361ccc1, type: 3} + - {fileID: 5791056106300521427, guid: f88154bd30745ee4799f94eff1ef9df2, type: 3} + - {fileID: 1573152061896382127, guid: 08572250e125db74489b23757b35d6fc, type: 3} + unitImages: + - {fileID: 21300000, guid: 0b976f51cbd350847acfd531507de93b, type: 3} + - {fileID: 21300000, guid: 98d97513fb3a0dd4db5f9751fb0ecc73, type: 3} + - {fileID: 21300000, guid: 45164c8169ba3204c8802b2721b8a269, type: 3} + - {fileID: 21300000, guid: d6f28569af70097498989b582ae5c665, type: 3} + - {fileID: 21300000, guid: a07de19792bd78946a82d906864cb044, type: 3} + - {fileID: 21300000, guid: 5fc0efe85b23e144dbd4aede9ebf0e3c, type: 3} + - {fileID: 21300000, guid: 19212e068479324499fd9c2df695e1a5, type: 3} + - {fileID: 21300000, guid: 9a5fe966de57a3a4084292167498822b, type: 3} + - {fileID: 21300000, guid: b4d800f3867055b488a2005b95086ec9, type: 3} player: {fileID: 0} enemy: {fileID: 0} + buildingCtrl: {fileID: 0} --- !u!1 &87469833 GameObject: m_ObjectHideFlags: 0 @@ -1064,17 +1085,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 109947150} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &109947150 MonoBehaviour: @@ -1212,14 +1233,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 7 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -1346,17 +1367,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 122298489} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &122298489 MonoBehaviour: @@ -1673,17 +1694,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 174988170} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &174988170 MonoBehaviour: @@ -1972,14 +1993,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -2106,17 +2127,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 234479276} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &234479276 MonoBehaviour: @@ -2300,14 +2321,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 2 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -2810,7 +2831,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 401326401} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: LevelUpBuilding + 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 &401326401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2970,14 +3003,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 8 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -3404,17 +3437,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 579903801} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &579903801 MonoBehaviour: @@ -3443,6 +3476,7 @@ GameObject: - component: {fileID: 589201254} - component: {fileID: 589201253} - component: {fileID: 589201255} + - component: {fileID: 589201256} m_Layer: 5 m_Name: TowerUi (4) m_TagString: Untagged @@ -3522,7 +3556,63 @@ MonoBehaviour: m_EditorClassIdentifier: isProduction: 1 lineCount: 4 - buildingLevel: 0 + buildingLevel: 1 +--- !u!114 &589201256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 589201251} + 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: 589201253} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 589201255} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + 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 &655988520 GameObject: m_ObjectHideFlags: 0 @@ -3854,17 +3944,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 664205928} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &664205928 MonoBehaviour: @@ -4153,17 +4243,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 745060296} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &745060296 MonoBehaviour: @@ -4301,14 +4391,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 5 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -4766,7 +4856,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 914591068} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: DeleteBuilding + 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 &914591068 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4926,14 +5028,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 4 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -5279,17 +5381,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1010636244} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1010636244 MonoBehaviour: @@ -5318,6 +5420,7 @@ GameObject: - component: {fileID: 1019007069} - component: {fileID: 1019007068} - component: {fileID: 1019007070} + - component: {fileID: 1019007071} m_Layer: 5 m_Name: TowerUi m_TagString: Untagged @@ -5397,7 +5500,63 @@ MonoBehaviour: m_EditorClassIdentifier: isProduction: 1 lineCount: 0 - buildingLevel: 0 + buildingLevel: 1 +--- !u!114 &1019007071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019007066} + 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: 1019007068} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1019007070} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + 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 &1020732441 GameObject: m_ObjectHideFlags: 0 @@ -5618,6 +5777,7 @@ GameObject: - component: {fileID: 1090203495} - component: {fileID: 1090203494} - component: {fileID: 1090203496} + - component: {fileID: 1090203497} m_Layer: 5 m_Name: TowerUi (1) m_TagString: Untagged @@ -5697,7 +5857,63 @@ MonoBehaviour: m_EditorClassIdentifier: isProduction: 1 lineCount: 1 - buildingLevel: 0 + buildingLevel: 1 +--- !u!114 &1090203497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090203492} + 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: 1090203494} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1090203496} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + 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 &1112173545 GameObject: m_ObjectHideFlags: 0 @@ -6104,17 +6320,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1139255895} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1139255895 MonoBehaviour: @@ -6253,17 +6469,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1149620906} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1149620906 MonoBehaviour: @@ -6477,17 +6693,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1228833171} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1228833171 MonoBehaviour: @@ -6702,6 +6918,7 @@ GameObject: - component: {fileID: 1314094866} - component: {fileID: 1314094865} - component: {fileID: 1314094867} + - component: {fileID: 1314094868} m_Layer: 5 m_Name: TowerUi (2) m_TagString: Untagged @@ -6781,7 +6998,63 @@ MonoBehaviour: m_EditorClassIdentifier: isProduction: 1 lineCount: 2 - buildingLevel: 0 + buildingLevel: 1 +--- !u!114 &1314094868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314094863} + 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: 1314094865} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1314094867} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + 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 &1331707545 GameObject: m_ObjectHideFlags: 0 @@ -7205,17 +7478,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1362409632} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1362409632 MonoBehaviour: @@ -7683,10 +7956,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -8058,17 +8331,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1450071028} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1450071028 MonoBehaviour: @@ -8877,17 +9150,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1599027065} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1599027065 MonoBehaviour: @@ -8987,10 +9260,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: uiExit + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -9270,17 +9543,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1682351737} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1682351737 MonoBehaviour: @@ -9729,17 +10002,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1758504610} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1758504610 MonoBehaviour: @@ -10315,17 +10588,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1819762397} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1819762397 MonoBehaviour: @@ -10359,7 +10632,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1842952265 RectTransform: m_ObjectHideFlags: 0 @@ -10438,6 +10711,7 @@ GameObject: - component: {fileID: 1886491694} - component: {fileID: 1886491693} - component: {fileID: 1886491695} + - component: {fileID: 1886491696} m_Layer: 5 m_Name: TowerUi (3) m_TagString: Untagged @@ -10517,7 +10791,63 @@ MonoBehaviour: m_EditorClassIdentifier: isProduction: 1 lineCount: 3 - buildingLevel: 0 + buildingLevel: 1 +--- !u!114 &1886491696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1886491691} + 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: 1886491693} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1886491695} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + 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 &1890048951 GameObject: m_ObjectHideFlags: 0 @@ -10874,17 +11204,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1925687762} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1925687762 MonoBehaviour: @@ -11023,17 +11353,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1950855423} + m_TargetAssemblyTypeName: BuildingCtrl, Assembly-CSharp + m_MethodName: Button + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 1 + m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1950855423 MonoBehaviour: @@ -11255,14 +11585,14 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1396764732} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 54711398} + m_TargetAssemblyTypeName: PlayCtrl, Assembly-CSharp + m_MethodName: SelectUnit + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 6 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 diff --git a/Client/Assets/1_Script/Info/BuildingCtrl.cs b/Client/Assets/1_Script/Info/BuildingCtrl.cs index 4a4af874..81786f92 100644 --- a/Client/Assets/1_Script/Info/BuildingCtrl.cs +++ b/Client/Assets/1_Script/Info/BuildingCtrl.cs @@ -2,6 +2,7 @@ using MEC; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.UI; public class BuildingCtrl : MonoBehaviour { @@ -9,6 +10,10 @@ public class BuildingCtrl : MonoBehaviour public int lineCount; public int buildingLevel; + UnitCtrl unitInfo; + + Image img; + private void Start() { Timing.RunCoroutine(BuildingSet()); @@ -19,12 +24,10 @@ public class BuildingCtrl : MonoBehaviour //ui재정렬 RectTransform rt = gameObject.GetComponent(); RectTransform changeRt = gameObject.GetComponentsInChildren()[1]; + img = changeRt.GetComponent(); float sizeSet = (rt.sizeDelta.y / 2) - 10; changeRt.offsetMin = new Vector2(-sizeSet, 10.0f); changeRt.offsetMax = new Vector2(sizeSet, -10.0f); - - //나의정보 playerCtrl에 전달 - //PlayCtrl.Instance.player.buildings[lineCount]. } public void Button() @@ -41,5 +44,38 @@ public class BuildingCtrl : MonoBehaviour PlayCtrl.Instance.newBuildingUI.SetActive(true); PlayCtrl.Instance.backButton.SetActive(true); } + //나의 정보를 PlayCtrl에 전달후 특정 상황이 되면 상호작용 하게 만들기 + PlayCtrl.Instance.buildingCtrl = this; + } + + public void LevelUp() + { + if (buildingLevel >= 5) + { + Debug.Log("건물이 최대 레벨 입니다."); + return; + } + buildingLevel++; + } + + public void DeletBuilding() + { + if (isProduction) + { + Debug.Log("생산건물은 파괴할 수 없습니다."); + return; + } + unitInfo = null; + img.sprite = null; + img.color = Color.clear; + buildingLevel = 0; + } + + public void NewBuilding(UnitCtrl unitInfo, Sprite unitImg ) + { + this.unitInfo = unitInfo; + img.sprite = unitImg; + img.color = Color.white; + buildingLevel++; } } diff --git a/Client/Assets/1_Script/PlayCtrl.cs b/Client/Assets/1_Script/PlayCtrl.cs index cb713fe1..56a06bb1 100644 --- a/Client/Assets/1_Script/PlayCtrl.cs +++ b/Client/Assets/1_Script/PlayCtrl.cs @@ -20,9 +20,12 @@ public class PlayCtrl : SingletonMonoBehaviour public GameObject newBuildingUI; public GameObject buildingLevelupUI; public GameObject backButton; - + public UnitCtrl[] units; + public Sprite[] unitImages; + public SummonsUnit player; public SummonsUnit enemy; + public BuildingCtrl buildingCtrl; //선택된 ui의 정보를 저장할 수 있게 만들기. //레벨업 ui만들기 @@ -79,6 +82,24 @@ public class PlayCtrl : SingletonMonoBehaviour newBuildingUI.SetActive(false); buildingLevelupUI.SetActive(false); backButton.SetActive(false); + buildingCtrl = null; + } + public void SelectUnit(int count) + { + buildingCtrl.NewBuilding(units[count], unitImages[count]); + uiExit(); + } + + public void DeleteBuilding() + { + buildingCtrl.DeletBuilding(); + uiExit(); + } + + public void LevelUpBuilding() + { + buildingCtrl.LevelUp(); + uiExit(); } }