From 37f890caf7d4a0d40b488c5142a63ea194c79217 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Sat, 1 Feb 2025 19:08:38 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=ED=95=9C=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=9D=B8?= =?UTF-8?q?=EB=8D=B1=EC=8A=A4=20=EC=97=B0=EB=8F=99=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Resources/GameData/player.json | 1 + .../Resources/GameData/player.json.meta | 2 +- .../Resources/UI/Prefabs/Charater Slot.prefab | 46 ++++++ .../UI/Prefabs/UI.CharaterSelectUI.prefab | 132 +++++++++++++++++- .../Gameton/Scripts/UI/CharaterSelectUI.cs | 13 +- .../Scripts/UI/CharaterSelectUI_SlotItem.cs | 19 ++- 6 files changed, 205 insertions(+), 8 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/player.json b/Gameton-06/Assets/Gameton/Resources/GameData/player.json index 40b85085..ff277625 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/player.json +++ b/Gameton-06/Assets/Gameton/Resources/GameData/player.json @@ -2,6 +2,7 @@ { "id": 0, "type": "w", + "name": "lulu", "health": 100, "score": 20000, "chance": 3 diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta b/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta index bc6059c7..5621e8b1 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta +++ b/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 012e701c4d789cf4eb1f019522610ab3 +guid: 600bff2ad41a20e4ca73b7f19f46a312 TextScriptImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Charater Slot.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Charater Slot.prefab index 451c3e6c..e8129190 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Charater Slot.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Charater Slot.prefab @@ -145,6 +145,7 @@ GameObject: - component: {fileID: 7583156814540936988} - component: {fileID: 702490663243956496} - component: {fileID: 3830091928539515416} + - component: {fileID: 734177729910012558} m_Layer: 0 m_Name: Charater Slot m_TagString: Untagged @@ -195,6 +196,51 @@ MonoBehaviour: m_EditorClassIdentifier: character_image: {fileID: 3237735562706147477} charater_name: {fileID: 2061677498746279789} + index: 0 +--- !u!114 &734177729910012558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6381712861469355420} + 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: 1 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7614705130711533582 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab index cbdefadd..255c1ec9 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab @@ -1228,6 +1228,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6058810809619323447} m_Modifications: + - target: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} + propertyPath: charaterSelectUI + value: + objectReference: {fileID: 4108690129144757636} - target: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} propertyPath: m_Name value: Charater Slot 1 @@ -1315,19 +1319,71 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808649148131007605} m_SourcePrefab: {fileID: 100100000, guid: 1f860600238397744a71b475377fcabf, type: 3} --- !u!114 &3528982872769538249 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} m_PrefabInstance: {fileID: 422862728691835601} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 6723356787782831949} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 349f3b01eba66bc4c9c86ef4754ab095, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &6723356787782831949 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} + m_PrefabInstance: {fileID: 422862728691835601} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1808649148131007605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6723356787782831949} + 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: 1 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!224 &7845982601740711373 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7583156814540936988, guid: 1f860600238397744a71b475377fcabf, type: 3} @@ -1349,6 +1405,10 @@ PrefabInstance: propertyPath: character_image value: objectReference: {fileID: 581733256949693630} + - target: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} + propertyPath: charaterSelectUI + value: + objectReference: {fileID: 4108690129144757636} - target: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} propertyPath: m_Name value: Charater Slot 4 @@ -1484,6 +1544,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6058810809619323447} m_Modifications: + - target: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} + propertyPath: charaterSelectUI + value: + objectReference: {fileID: 4108690129144757636} - target: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} propertyPath: m_Name value: Charater Slot 2 @@ -1571,14 +1635,17 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} + insertIndex: -1 + addedObject: {fileID: 417592955329651310} m_SourcePrefab: {fileID: 100100000, guid: 1f860600238397744a71b475377fcabf, type: 3} --- !u!114 &289952920867731665 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} m_PrefabInstance: {fileID: 3540153619159986889} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 7615939899932548949} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 349f3b01eba66bc4c9c86ef4754ab095, type: 3} @@ -1589,6 +1656,55 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7583156814540936988, guid: 1f860600238397744a71b475377fcabf, type: 3} m_PrefabInstance: {fileID: 3540153619159986889} m_PrefabAsset: {fileID: 0} +--- !u!1 &7615939899932548949 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} + m_PrefabInstance: {fileID: 3540153619159986889} + m_PrefabAsset: {fileID: 0} +--- !u!114 &417592955329651310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615939899932548949} + 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: 1 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &4578623345633955814 PrefabInstance: m_ObjectHideFlags: 0 @@ -1605,6 +1721,10 @@ PrefabInstance: propertyPath: character_image value: objectReference: {fileID: 1397302238596913011} + - target: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} + propertyPath: charaterSelectUI + value: + objectReference: {fileID: 4108690129144757636} - target: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} propertyPath: m_Name value: Charater Slot 3 @@ -1748,6 +1868,10 @@ PrefabInstance: propertyPath: character_image value: objectReference: {fileID: 7708228101356740039} + - target: {fileID: 3830091928539515416, guid: 1f860600238397744a71b475377fcabf, type: 3} + propertyPath: charaterSelectUI + value: + objectReference: {fileID: 4108690129144757636} - target: {fileID: 6381712861469355420, guid: 1f860600238397744a71b475377fcabf, type: 3} propertyPath: m_Name value: Charater Slot 5 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI.cs index 9642ba52..fc8a5e73 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI.cs @@ -14,6 +14,8 @@ namespace TON [SerializeField] private List playerDatas; + private int currentSelectCharacterIndex; + public List CharacterSlots = new List(); public SerializableDictionary CharacterSpriteDict = new SerializableDictionary(); @@ -37,7 +39,7 @@ namespace TON if (sprite) { - CharacterSlots[i].SetCharaterData(sprite, name); + CharacterSlots[i].SetCharaterData(sprite, name, i); } } @@ -48,9 +50,16 @@ namespace TON playerDatas = datas; } + public void SelectCharacter(int index) + { + Debug.Log("선택한 캐릭터 인덱스" + index); + currentSelectCharacterIndex = index; + playButton.interactable = true; + } + public void OnClickPlayButton() { - + Debug.Log(currentSelectCharacterIndex); } public void OnClickCreateButton() diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI_SlotItem.cs b/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI_SlotItem.cs index 39a7bf11..539ba193 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI_SlotItem.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI_SlotItem.cs @@ -10,12 +10,29 @@ namespace TON { [SerializeField] private Image character_image; [SerializeField] private TextMeshProUGUI charater_name; + [SerializeField] private int index; - public void SetCharaterData(Sprite image, string name) + private CharaterSelectUI charaterSelectUI; + + public void SetCharaterData(Sprite image, string name, int i) { character_image.sprite = image; charater_name.text = name; + index = i; } + private void Start() + { + // 상위 오브젝트에서 CharacterSelectUI 찾기 + charaterSelectUI = FindObjectOfType(); + + // 버튼 클릭 이벤트 등록 + GetComponent