장비 화면에서 팝업이 활성화 될 경우 뒤쪽 ui 비활성화 및 장비 탭 터치안되게 추가했습니다.

This commit is contained in:
Ino 2025-04-14 07:57:12 +09:00
parent ed914defb7
commit fe0f39166c
9 changed files with 42 additions and 18 deletions

View File

@ -86,21 +86,16 @@ messageinfo 엄청 느린 버그
우편함 우편함
맵 배치 (3,4,5)
맵3 배치
- 포탈, 필드보스, 부활의 성소, 챕터보스 - 포탈, 필드보스, 부활의 성소, 챕터보스
맵4 최적화
- 기본 컬러 94,94,94
- 오크 나무만 따로?
작업 완료 작업 완료
- 테스트맵 - 테스트맵
- 보스 이펙트 - 보스 이펙트
- pc 애님 (캐스팅 추가) - pc 애님 (캐스팅 추가)
- pc 프리팹 - pc 프리팹 (43종)
- 스킬 드래그로 착용 - 스킬 드래그로 착용
- 맵1 Tris 약 120만개, 버텍스 약 240만개 줄임 - 맵1 Tris 약 120만개, 버텍스 약 240만개 줄임
- 맵4 최적화

View File

@ -21922,6 +21922,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 05e5b8437e6808845bdfabe5845a36e7, type: 3} m_Script: {fileID: 11500000, guid: 05e5b8437e6808845bdfabe5845a36e7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
gos_onoff:
- {fileID: 5869502722959881428}
m_Card: {fileID: 2597386034399228464} m_Card: {fileID: 2597386034399228464}
texts_iteminfo: texts_iteminfo:
- {fileID: 4314144591713291840} - {fileID: 4314144591713291840}
@ -55406,6 +55408,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0e7432bdd1349ae4195d4effcba24e49, type: 3} m_Script: {fileID: 11500000, guid: 0e7432bdd1349ae4195d4effcba24e49, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
gos_onoff:
- {fileID: 8382453564522224256}
m_Card: {fileID: 7762068634648654609} m_Card: {fileID: 7762068634648654609}
texts_iteminfo: texts_iteminfo:
- {fileID: 986883333296786315} - {fileID: 986883333296786315}

View File

@ -1,7 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PopupMgr : MonoBehaviourSingletonTemplate<PopupMgr> public class PopupMgr : MonoBehaviourSingletonTemplate<PopupMgr>
{ {
public EquipmentItemPopup m_EquipmentItemPopup; public EquipmentItemPopup m_EquipmentItemPopup;

View File

@ -75,7 +75,8 @@ public class TabCardBase : CardBase
public override int Get_IntData() { return m_Data.m_Index; } public override int Get_IntData() { return m_Data.m_Index; }
public void OnClick_Tab() public void OnClick_Tab() { if (m_Data.CanTouch) OnClickTab_Force(); }
public void OnClickTab_Force()
{ {
m_Data.onTabAction?.Invoke(m_Data.m_Index); // 먼저 실행 m_Data.onTabAction?.Invoke(m_Data.m_Index); // 먼저 실행
m_Data.onClick?.Invoke(); // 다음 실행 m_Data.onClick?.Invoke(); // 다음 실행

View File

@ -20,6 +20,7 @@ public class TabUIData
public Color color_bg_off = Color.gray; public Color color_bg_off = Color.gray;
public int n_Update = 0; public int n_Update = 0;
public bool CanTouch = true;
public Action onClick; public Action onClick;
/// <summary> /// <summary>
@ -67,7 +68,7 @@ public class TabUIBase : uScrollViewMgr
{ {
if (list_CardBase[i].Get_IntData() == index) if (list_CardBase[i].Get_IntData() == index)
{ {
(list_CardBase[i] as TabCardBase).OnClick_Tab(); (list_CardBase[i] as TabCardBase).OnClickTab_Force();
break; break;
} }
} }

View File

@ -31,6 +31,8 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase
m_ESUTD = table_equipslotupgrade.Ins.Get_Data(m_Data.e_EquipParts, m_Data.e_EquipAttribute); m_ESUTD = table_equipslotupgrade.Ins.Get_Data(m_Data.e_EquipParts, m_Data.e_EquipAttribute);
Set_UI(); Set_UI();
NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false);
} }
void Set_UI() void Set_UI()
@ -85,6 +87,7 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase
{ {
base.OnClick_Back(); base.OnClick_Back();
NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Enchant.Set_UI(); NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Enchant.Set_UI();
NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true);
} }
public void Set_Position(bool right) public void Set_Position(bool right)

View File

@ -1,7 +1,5 @@
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using TMPro; using TMPro;
using UnityEngine;
public class EquipmentMakePopup : uScrollViewMgr public class EquipmentMakePopup : uScrollViewMgr
{ {
@ -25,6 +23,7 @@ public class EquipmentMakePopup : uScrollViewMgr
m_Data = data; m_Data = data;
SelectItem = list_itemdata.Find(f => f.n_ItemID == data.n_EquipID); SelectItem = list_itemdata.Find(f => f.n_ItemID == data.n_EquipID);
Set_UI(); Set_UI();
NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false);
} }
public override void Set_UI() public override void Set_UI()
@ -134,5 +133,6 @@ public class EquipmentMakePopup : uScrollViewMgr
{ {
base.OnClick_Back(); base.OnClick_Back();
list_itemdata.Clear(); list_itemdata.Clear();
NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true);
} }
} }

View File

@ -1,14 +1,17 @@
using TMPro; using TMPro;
using UnityEngine;
public class EquipmentPopup : EquipmentPopupItemInfoBase public class EquipmentPopup : EquipmentPopupItemInfoBase
{ {
public EquipmentPopupBase[] obtains; // 0 미보유, 1 보유 public EquipmentPopupBase[] obtains; // 0 미보유, 1 보유
public TextMeshProUGUI text_equipstatus; public TextMeshProUGUI text_equipstatus;
public GameObject[] gos_onoff;
public override void Set(EquipmentListTableData data) public override void Set(EquipmentListTableData data)
{ {
base.Set(data); base.Set(data);
Set_UI(); Set_UI();
DSUtil.InActivateGameObjects(gos_onoff);
} }
public void Set_UI() public void Set_UI()
@ -31,4 +34,10 @@ public class EquipmentPopup : EquipmentPopupItemInfoBase
text_equipstatus.text = table_localtext.Ins.Get_Text(208); text_equipstatus.text = table_localtext.Ins.Get_Text(208);
} }
} }
public override void OnClick_Back()
{
base.OnClick_Back();
DSUtil.ActivateGameObjects(gos_onoff);
}
} }

View File

@ -34,6 +34,21 @@ public class EquipmentUI : BotMenuBase
OnClick_Button(); OnClick_Button();
} }
public void Set_Scrollview(bool active)
{
if (active)
{
OnClick_Button();
list_tabData.ForEach(f => f.CanTouch = true);
}
else
{
m_EquipmentUI_Items.gameObject.SetActive(false);
m_EquipmentUI_Enchant.gameObject.SetActive(false);
list_tabData.ForEach(f => f.CanTouch = false);
}
}
public void OnClick_Button() public void OnClick_Button()
{ {
var index = m_Tab.Get_Index(); var index = m_Tab.Get_Index();