new pet ui 작업 중... 2

This commit is contained in:
Ino 2025-07-14 10:41:08 +09:00
parent fe64f66bd2
commit 41260f2f21
5 changed files with 1314 additions and 1196 deletions

View File

@ -1,80 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &868159341762337042
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3961354497400868063}
- component: {fileID: 3497567999639675482}
- component: {fileID: 7980265120296234660}
m_Layer: 5
m_Name: Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3961354497400868063
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 868159341762337042}
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: 384003431067609950}
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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3497567999639675482
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 868159341762337042}
m_CullTransparentMesh: 1
--- !u!114 &7980265120296234660
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 868159341762337042}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, 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!1 &914636269424546270 --- !u!1 &914636269424546270
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -109,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 84.8, y: -21.9} m_AnchoredPosition: {x: 83.2, y: -18.5}
m_SizeDelta: {x: 147, y: 30} m_SizeDelta: {x: 147, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6202927014981136828 --- !u!222 &6202927014981136828
@ -143,8 +68,7 @@ MonoBehaviour:
m_text: Lv.00 m_text: Lv.00
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -168,8 +92,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 30 m_fontSize: 25
m_fontSizeBase: 30 m_fontSizeBase: 25
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 10 m_fontSizeMin: 10
@ -245,8 +169,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 15.8} m_AnchoredPosition: {x: 0, y: 13.5}
m_SizeDelta: {x: 91, y: 27} m_SizeDelta: {x: 110, y: 22.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6859385401789456719 --- !u!222 &6859385401789456719
CanvasRenderer: CanvasRenderer:
@ -276,8 +200,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2bd1672dc57a9224a8a645669807fc3f, type: 3} m_Sprite: {fileID: 21300000, guid: 2a328e6a4c5557546bf78786dcd1d497, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -351,8 +275,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} m_Sprite: {fileID: 21300000, guid: abfaf37dcfcf2fe4a946a9bcd48f7f7d, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -512,8 +436,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4284624941
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -530,8 +454,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 15 m_fontSize: 17
m_fontSizeBase: 15 m_fontSizeBase: 17
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 10 m_fontSizeMin: 10
@ -652,8 +576,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: bde12b5d7b8b4e04a95a1678a53970c4, type: 3} m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -763,14 +687,13 @@ RectTransform:
- {fileID: 174326312141517295} - {fileID: 174326312141517295}
- {fileID: 9107383989674822762} - {fileID: 9107383989674822762}
- {fileID: 2840616627139525804} - {fileID: 2840616627139525804}
- {fileID: 3961354497400868063}
- {fileID: 557299874840289680} - {fileID: 557299874840289680}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 147, y: 147} m_SizeDelta: {x: 115, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8644788085243761268 --- !u!114 &8644788085243761268
MonoBehaviour: MonoBehaviour:
@ -791,5 +714,4 @@ MonoBehaviour:
- {fileID: 1042294412523057670} - {fileID: 1042294412523057670}
gos: gos:
- {fileID: 1040122946534592559} - {fileID: 1040122946534592559}
- {fileID: 868159341762337042}
- {fileID: 2346486054145280688} - {fileID: 2346486054145280688}

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ public class PetCard : CardBase
{ {
public Image[] images; // 0 등급, 1 아이콘 public Image[] images; // 0 등급, 1 아이콘
public TextMeshProUGUI[] texts; // 0 레벨 public TextMeshProUGUI[] texts; // 0 레벨
public GameObject[] gos; // 0 출전, 1 선택 여부, 2 획득x public GameObject[] gos; // 0 출전, 1 획득x
PetListTableData m_Data; PetListTableData m_Data;
@ -21,9 +21,14 @@ public class PetCard : CardBase
texts[0].text = $"Lv.{sdata.Get_PetLv(m_Data.n_PetID)}"; texts[0].text = $"Lv.{sdata.Get_PetLv(m_Data.n_PetID)}";
Set_Selected(false);
gos[0].SetActive(sdata.Get_EqiupmentEquip(eItem.Pet) == m_Data.n_PetID); gos[0].SetActive(sdata.Get_EqiupmentEquip(eItem.Pet) == m_Data.n_PetID);
gos[1].SetActive(false); gos[1].SetActive(sdata.Get_PetLv(m_Data.n_PetID) < 1);
gos[2].SetActive(sdata.Get_PetLv(m_Data.n_PetID) < 1); }
public override void Set_Selected(bool active)
{
images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(active ? "slot 2" : "slot 1");
} }
public void OnClick_Pet() public void OnClick_Pet()

View File

@ -6,7 +6,7 @@ public class PetUI_Right : uScrollViewMgr
{ {
public PetUI_Left m_PetUI_Left; public PetUI_Left m_PetUI_Left;
public Image[] images; // 0 강화재료1, 1 강화재료2 public Image[] images; // 0 강화재료1, 1 강화재료2
public TextMeshProUGUI[] texts; // 0 강화재료1, 1 강화재료2 public TextMeshProUGUI[] texts; // 0 강화재료1, 1 강화재료2, 2 레벨업 효과, 3 레벨업 효과 값
public GameObject go_noti; public GameObject go_noti;
PetCard m_SelectPet; PetCard m_SelectPet;
@ -46,7 +46,7 @@ public class PetUI_Right : uScrollViewMgr
public void SelectPet(PetCard pet) public void SelectPet(PetCard pet)
{ {
if (!DSUtil.CheckNull(m_SelectPet)) if (!DSUtil.CheckNull(m_SelectPet))
m_SelectPet.gos[1].SetActive(false); m_SelectPet.Set_Selected(false);
if (DSUtil.CheckNull(pet)) if (DSUtil.CheckNull(pet))
{ {
@ -64,7 +64,7 @@ public class PetUI_Right : uScrollViewMgr
else else
m_SelectPet = pet; m_SelectPet = pet;
m_SelectPet.gos[1].SetActive(true); m_SelectPet.Set_Selected(true);
// 왼쪽 정보 설정 // 왼쪽 정보 설정
m_PetUI_Left.Set(Get_SelectPetData()); m_PetUI_Left.Set(Get_SelectPetData());

View File

@ -104,7 +104,7 @@ Material:
- _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} - _OutlineColor: {r: 0.068084724, g: 0.073842846, b: 0.16981131, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}