diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 5e0c7d226..af9fb7cd9 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -86,14 +86,8 @@ messageinfo 엄청 느린 버그 우편함 - -맵3 배치 - - 포탈, 필드보스, 부활의 성소, 챕터보스 - -맵4 최적화 - - 기본 컬러 94,94,94 - - 오크 나무만 따로? - +맵 배치 (3,4,5) + - 포탈, 필드보스, 부활의 성소, 챕터보스 @@ -101,6 +95,7 @@ messageinfo 엄청 느린 버그 - 테스트맵 - 보스 이펙트 - pc 애님 (캐스팅 추가) - - pc 프리팹 + - pc 프리팹 (43종) - 스킬 드래그로 착용 - - 맵1 Tris 약 120만개, 버텍스 약 240만개 줄임 \ No newline at end of file + - 맵1 Tris 약 120만개, 버텍스 약 240만개 줄임 + - 맵4 최적화 \ No newline at end of file diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 15f68fc09..236ac8e7d 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -21922,6 +21922,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 05e5b8437e6808845bdfabe5845a36e7, type: 3} m_Name: m_EditorClassIdentifier: + gos_onoff: + - {fileID: 5869502722959881428} m_Card: {fileID: 2597386034399228464} texts_iteminfo: - {fileID: 4314144591713291840} @@ -55406,6 +55408,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e7432bdd1349ae4195d4effcba24e49, type: 3} m_Name: m_EditorClassIdentifier: + gos_onoff: + - {fileID: 8382453564522224256} m_Card: {fileID: 7762068634648654609} texts_iteminfo: - {fileID: 986883333296786315} diff --git a/Assets/Script/Mgr/PopupMgr.cs b/Assets/Script/Mgr/PopupMgr.cs index f1aff0b52..3741ac262 100644 --- a/Assets/Script/Mgr/PopupMgr.cs +++ b/Assets/Script/Mgr/PopupMgr.cs @@ -1,7 +1,3 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - public class PopupMgr : MonoBehaviourSingletonTemplate { public EquipmentItemPopup m_EquipmentItemPopup; diff --git a/Assets/Script/UI/Base/TabCardBase.cs b/Assets/Script/UI/Base/TabCardBase.cs index 2da779df9..5ed9580ad 100644 --- a/Assets/Script/UI/Base/TabCardBase.cs +++ b/Assets/Script/UI/Base/TabCardBase.cs @@ -75,7 +75,8 @@ public class TabCardBase : CardBase 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.onClick?.Invoke(); // 다음 실행 diff --git a/Assets/Script/UI/Base/TabUIBase.cs b/Assets/Script/UI/Base/TabUIBase.cs index 96f1f19c1..33ef0c48c 100644 --- a/Assets/Script/UI/Base/TabUIBase.cs +++ b/Assets/Script/UI/Base/TabUIBase.cs @@ -20,6 +20,7 @@ public class TabUIData public Color color_bg_off = Color.gray; public int n_Update = 0; + public bool CanTouch = true; public Action onClick; /// @@ -67,7 +68,7 @@ public class TabUIBase : uScrollViewMgr { if (list_CardBase[i].Get_IntData() == index) { - (list_CardBase[i] as TabCardBase).OnClick_Tab(); + (list_CardBase[i] as TabCardBase).OnClickTab_Force(); break; } } diff --git a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs index e61fa1fa7..266133928 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs @@ -31,6 +31,8 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase m_ESUTD = table_equipslotupgrade.Ins.Get_Data(m_Data.e_EquipParts, m_Data.e_EquipAttribute); Set_UI(); + + NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false); } void Set_UI() @@ -85,6 +87,7 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase { base.OnClick_Back(); NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Enchant.Set_UI(); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true); } public void Set_Position(bool right) diff --git a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs index 7ace5fc0c..55dc30a9e 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs @@ -1,7 +1,5 @@ -using System.Collections; using System.Collections.Generic; using TMPro; -using UnityEngine; public class EquipmentMakePopup : uScrollViewMgr { @@ -25,6 +23,7 @@ public class EquipmentMakePopup : uScrollViewMgr m_Data = data; SelectItem = list_itemdata.Find(f => f.n_ItemID == data.n_EquipID); Set_UI(); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false); } public override void Set_UI() @@ -134,5 +133,6 @@ public class EquipmentMakePopup : uScrollViewMgr { base.OnClick_Back(); list_itemdata.Clear(); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true); } } \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentPopup.cs index bc62cfac9..215fcc865 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentPopup.cs @@ -1,14 +1,17 @@ using TMPro; +using UnityEngine; public class EquipmentPopup : EquipmentPopupItemInfoBase { public EquipmentPopupBase[] obtains; // 0 미보유, 1 보유 public TextMeshProUGUI text_equipstatus; + public GameObject[] gos_onoff; public override void Set(EquipmentListTableData data) { base.Set(data); Set_UI(); + DSUtil.InActivateGameObjects(gos_onoff); } public void Set_UI() @@ -31,4 +34,10 @@ public class EquipmentPopup : EquipmentPopupItemInfoBase text_equipstatus.text = table_localtext.Ins.Get_Text(208); } } + + public override void OnClick_Back() + { + base.OnClick_Back(); + DSUtil.ActivateGameObjects(gos_onoff); + } } \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentUI.cs b/Assets/Script/UI/Eqiupment/EquipmentUI.cs index 2a0211c15..0174230cb 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentUI.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentUI.cs @@ -34,6 +34,21 @@ public class EquipmentUI : BotMenuBase 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() { var index = m_Tab.Get_Index();