From 07a1484c22fdfea62e26d05e6ec619358b564604 Mon Sep 17 00:00:00 2001 From: Ino Date: Sat, 15 Feb 2025 08:33:26 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8E=AB=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Res_Addr/MainUI/NewGameUI.prefab | 138 ++++++++++++++++++++ Assets/Script/UI/PC/Info/PCInfoUI_Center.cs | 11 +- Assets/Script/UI/Pet/PetCard.cs | 5 +- 3 files changed, 150 insertions(+), 4 deletions(-) diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index bc4d63a1f..46dcd991f 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -41009,6 +41009,7 @@ RectTransform: - {fileID: 8002134659956599193} - {fileID: 42553751937855882} - {fileID: 6904404412040606782} + - {fileID: 5104620965870021668} m_Father: {fileID: 8112082934472033055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -41029,6 +41030,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tf_model: {fileID: 42553751937855882} + m_MyPet: {fileID: 3781744238540789006} texts: - {fileID: 3053266705143488882} - {fileID: 6175458548714744768} @@ -121601,6 +121603,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &4864732774426298234 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 351039660577574170} + m_Modifications: + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 354 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -216 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9007322096005080681, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + propertyPath: m_Name + value: PetCard + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ac29e59f046396945852e680e8d0ac29, type: 3} +--- !u!114 &3781744238540789006 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8644788085243761268, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + m_PrefabInstance: {fileID: 4864732774426298234} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddcda1b58ecc4b141a7ed99710211738, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5104620965870021668 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 384003431067609950, guid: ac29e59f046396945852e680e8d0ac29, + type: 3} + m_PrefabInstance: {fileID: 4864732774426298234} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4882285292632764020 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs index 9433f2e06..e6c5f74a2 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class PCInfoUI_Center : UI3DModel { + public PetCard m_MyPet; public TextMeshProUGUI[] texts; // 0 코스튬 이름, 1 코스튬 대사 public RawImage RawImage_costume; public GameObject[] gos; // 0 코스튬 착용 버튼 @@ -17,13 +18,21 @@ public class PCInfoUI_Center : UI3DModel public void Set(bool enter, PCInfoUI_PCListCard choiceCard) { + var sdata = ServerInfo.Ins.m_ServerData; + if (!DSUtil.CheckNull(SelectCard)) SelectCard.gos[0].SetActive(false); SelectCard = choiceCard; SelectCard.gos[0].SetActive(true); - if (enter) CostumeIdWhenEnter = choiceCard.Get_IntData(); + //if (enter) + { + m_MyPet.Set(table_petlist.Ins.Get_Data_orNull(sdata.Get_EqiupmentEquip(eItem.Pet))); + m_MyPet.Set_CardType(eUICardType.NoTouch); + if (sdata.IsObtainItem(choiceCard.Get_IntData())) + CostumeIdWhenEnter = choiceCard.Get_IntData(); + } var costumeid = SelectCard.Get_IntData(); var costumeData = table_costumelist.Ins.Get_Data_orNull(costumeid); diff --git a/Assets/Script/UI/Pet/PetCard.cs b/Assets/Script/UI/Pet/PetCard.cs index 6cec8f4dc..8c7201a62 100644 --- a/Assets/Script/UI/Pet/PetCard.cs +++ b/Assets/Script/UI/Pet/PetCard.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -30,7 +28,8 @@ public class PetCard : CardBase public void OnClick_Pet() { - NewGameUI.Ins.m_PetUI.m_PetUI_Right.SelectPet(this); + if (CardType != eUICardType.NoTouch) + NewGameUI.Ins.m_PetUI.m_PetUI_Right.SelectPet(this); } public override TableDataBase Get_Data() { return m_Data; }