장비, 몬스터 도감 통합 작업 중...

Assets/Ino_nerdnavis.txt

@@ -72,9 +72,8 @@ messageinfo 엄청 느린 버그
  - 던전 이동은 못하게
 챕터 포탈 활성화 시 터치하면 다음 챕터로
 
-맵 3,4 임포트 하기
-
 UI
- - 몬스터 도감
- - 장비 도감
- - 유물 도감
+몬스터 & 장비 도감
+ - 모두 받기
+ - 수집률
+ - 통합...

Assets/Script/Table/IngameStage/table_monsterlist.cs

@@ -18,6 +18,7 @@ public class MonsterTableData : TableDataBase
     public float f_DefaultScale;
     public int n_MonsterName;
     public string s_MonsterPrefab;
+    public string s_MonsterIcon;
 
     ObscuredFloat _BaseATKRate;
     public float f_BaseATKRate

Assets/Script/UI/Base/CardBase.cs

@@ -11,6 +11,8 @@ public class CardBase : MyCoroutine
     }
     public virtual void Set_UI() { }
 
+    public virtual void Set_Selected(bool active) { }
+
     public virtual TableDataBase Get_Data() { return null; }
     public virtual int Get_IntData() { return 0; }
 

Assets/Script/UI/Collection/Equipment/CollectionEquipmentUI.cs

@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-
-public class CollectionEquipmentUI : PCUIMenu
-{
-    public static CollectionEquipmentUI Ins;
-
-    public TabUIBase m_Tab;
-    public CollectionEquipmentUI_Scroll m_CollectionEquipmentUI_Scroll;
-    public CollectionEquipmentUI_Info m_CollectionEquipmentUI_Info;
-
-    List<TabUIData> list_tabData = new List<TabUIData>
-    {
-        new TabUIData{ n_btnName =  290 }, new TabUIData{ n_btnName =  291 }, new TabUIData{ n_btnName =  292 }
-    };
-    CollectionEquipmentCard m_SelectCard;
-
-    public override void Set()
-    {
-        Ins = this;
-        base.Set();
-        for (int i = 0; i < list_tabData.Count; i++)
-        {
-            list_tabData[i].onClick = Set_UI;
-            list_tabData[i].btnImg_off = "tab menu unselected 2";
-            list_tabData[i].btnImg_on = "tab menu selected 2";
-        }
-        m_Tab.Set(list_tabData);
-        Set_UI();
-    }
-
-    public void Set_UI()
-    {
-        m_CollectionEquipmentUI_Scroll.Set(m_Tab.Get_Index());
-        if (DSUtil.CheckNull(m_SelectCard))
-            Set_SelectCard(m_CollectionEquipmentUI_Scroll.Get_FirstCard());
-        else
-            Set_SelectCard(m_SelectCard);
-    }
-
-    public void Set_SelectCard(CollectionEquipmentCard card)
-    {
-        m_SelectCard = card;
-        m_CollectionEquipmentUI_Info.Set(m_SelectCard);
-    }
-}

Assets/Script/UI/Collection/Equipment_Monster.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3022fd6c671e0c40ae3c3f2af4a14a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/UI/Collection/Equipment_Monster/CollectionEMUIBase.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+public class CollectionEMUIBase : PCUIMenu
+{
+    public TabUIBase m_Tab;
+    public CollectionEM_Scroll m_CollectionScroll;
+    public CollectionEM_InfoBase m_CollectionInfo;
+
+    protected CardBase m_SelectCard;
+    protected List<TabUIData> list_tabData = new List<TabUIData> { new TabUIData(), new TabUIData(), new TabUIData() };
+
+    public override void Set()
+    {
+        base.Set();
+        for (int i = 0; i < list_tabData.Count; i++)
+        {
+            list_tabData[i].onClick = Set_UI;
+            list_tabData[i].btnImg_off = "tab menu unselected 2";
+            list_tabData[i].btnImg_on = "tab menu selected 2";
+        }
+    }
+
+    public virtual void Set_UI()
+    {
+        if (DSUtil.CheckNull(m_SelectCard))
+            Set_SelectCard(m_CollectionScroll.Get_FirstCard());
+        else
+            Set_SelectCard(m_SelectCard);
+    }
+
+    public void Set_SelectCard(CardBase card)
+    {
+        m_SelectCard = card;
+        m_CollectionInfo.Set(m_SelectCard);
+    }
+}

Assets/Script/UI/Collection/Equipment_Monster/CollectionEMUIBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dd83b7316cd11e14ba3aaf29af540c46
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/UI/Collection/Equipment_Monster/CollectionEM_InfoBase.cs

@@ -2,31 +2,29 @@ using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 
-public class CollectionEquipmentUI_Info : uScrollViewMgr
+public class CollectionEM_InfoBase : uScrollViewMgr
 {
     public TextMeshProUGUI[] texts; // 0 다음 보상, 1 수집률
-    public GameObject[] gos; // 0 제작 버튼
     public GameObject go_noti;
 
-    CollectionEquipmentCard m_SelectCard;
-    EquipmentListTableData m_MakeData;
-    List<eAwakenUpgradeOptionType> list = new List<eAwakenUpgradeOptionType>
+    protected List<eAwakenUpgradeOptionType> list = new List<eAwakenUpgradeOptionType>
     {
         eAwakenUpgradeOptionType.STR_ADD, eAwakenUpgradeOptionType.DEX_ADD,
         eAwakenUpgradeOptionType.INT_ADD, eAwakenUpgradeOptionType.LUK_ADD
     };
 
-    public void Set(CollectionEquipmentCard card)
+    protected CardBase m_SelectCard;
+
+    public void Set(CardBase card)
     {
         if (!DSUtil.CheckNull(m_SelectCard))
-            m_SelectCard.go_selected.SetActive(false);
+            m_SelectCard.Set_Selected(false);
 
         m_SelectCard = card;
-        m_SelectCard.go_selected.SetActive(true);
+        m_SelectCard.Set_Selected(true);
 
         var sdata = ServerInfo.Ins.m_ServerData;
         var data = m_SelectCard.Get_Data() as CollectionListTableData;
-        m_MakeData = table_equipitemlist.Ins.Get_Data_orNull(data.n_TargetValue);
         var lv = sdata.Get_CollectionLv(data.n_TargetValue);
 
         Set_ScrollView(list);
@@ -42,7 +40,6 @@ public class CollectionEquipmentUI_Info : uScrollViewMgr
             DSUtil.Format(358, MyText.Get_eAwakenUpgradeOptionTypeName(data.n_RepeatRewardValue), data.n_RepeatRewardCount) :
             DSUtil.Format(359, MyText.Get_eAwakenUpgradeOptionTypeName(data.n_FirstRewardValue.ToString()), data.n_FirstRewardCount);
 
-        //gos[0].SetActive(!DSUtil.CheckNull(m_MakeData) && m_MakeData.e_EquipParts == eItem.Weapon);
         go_noti.SetActive(sdata.Noti_CollectionEquipment(data.e_TargetCondition, data.e_MenuCategory));
 
         var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
@@ -55,35 +52,4 @@ public class CollectionEquipmentUI_Info : uScrollViewMgr
         }
         texts[1].text = DSUtil.Format(360, obtaincount, count);
     }
-
-    public void OnClick_Make()
-    {
-        if (!DSUtil.CheckNull(m_MakeData) && m_MakeData.e_EquipParts == eItem.Weapon)
-            PopupMgr.Ins.m_EquipmentMakePopup.Set(m_MakeData);
-    }
-
-    public void OnClick_GetAll()
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var data = m_SelectCard.Get_Data() as CollectionListTableData;
-        var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
-        for (int i = 0; i < lst.Count; i++)
-        {
-            while (true)
-            {
-                var amount = sdata.Get_ItemAmount(lst[i].n_TargetValue);
-                var conditon = lst[i].Get_ConditionCount(sdata.Get_CollectionLv(lst[i].n_TargetValue));
-                if (amount >= conditon)
-                {
-                    sdata.Use_Item(lst[i].n_TargetValue, conditon);
-                    sdata.Add_CollectionLv(lst[i].n_TargetValue);
-                }
-                else
-                    break;
-            }
-        }
-
-        CollectionEquipmentUI.Ins.Set_UI();
-        MyValue.Get_ActorStatInfoorNull(eRole.PC);
-    }
 }

Assets/Script/UI/Collection/Equipment_Monster/CollectionEM_InfoBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4102c778c2a193f41a33ece032ee0fae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/UI/Collection/Equipment_Monster/CollectionEM_Scroll.cs

@@ -0,0 +1,9 @@
+public class CollectionEM_Scroll : uScrollViewMgr
+{
+    public void Set(eTargetCondition target, int index)
+    {
+        Set_ScrollView(table_collectionlist.Ins.Get_DataList(target, index + 1));
+    }
+
+    public CardBase Get_FirstCard() { return list_CardBase[0]; }
+}

Assets/Script/UI/Collection/Equipment_Monster/CollectionEM_Scroll.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 34ccac485f152ed4399f85cd71fb31a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/UI/Collection/Equipment_Monster/Equipment/CollectionEquipmentCard.cs

@@ -44,6 +44,8 @@ public class CollectionEquipmentCard : CardBase
         return sdata.Check_ItemAmount(m_Data.n_TargetValue, m_Data.Get_ConditionCount(lv), showtoast);
     }
 
+    public override void Set_Selected(bool active) { go_selected.SetActive(active); }
+
     public void OnClick_Card()
     {
         CollectionEquipmentUI.Ins.Set_SelectCard(this);

Assets/Script/UI/Collection/Equipment_Monster/Equipment/CollectionEquipmentUI.cs

@@ -0,0 +1,20 @@
+public class CollectionEquipmentUI : CollectionEMUIBase
+{
+    public static CollectionEquipmentUI Ins;
+
+    public override void Set()
+    {
+        Ins = this;
+        base.Set();
+        for (int i = 0; i < list_tabData.Count; i++)
+            list_tabData[i].n_btnName = 290 + i;
+        m_Tab.Set(list_tabData);
+        Set_UI();
+    }
+
+    public override void Set_UI()
+    {
+        m_CollectionScroll.Set(eTargetCondition.TakeEquip, m_Tab.Get_Index());
+        base.Set_UI();
+    }
+}

Assets/Script/UI/Collection/Equipment_Monster/Equipment/CollectionEquipmentUI_Info.cs

@@ -0,0 +1,46 @@
+using UnityEngine;
+
+public class CollectionEquipmentUI_Info : CollectionEM_InfoBase
+{
+    public GameObject[] gos; // 0 제작 버튼
+
+    EquipmentListTableData m_MakeData;
+
+    public void Set(CollectionEquipmentCard card)
+    {
+        base.Set(card);
+        var data = m_SelectCard.Get_Data() as CollectionListTableData;
+        m_MakeData = table_equipitemlist.Ins.Get_Data_orNull(data.n_TargetValue);
+    }
+
+    public void OnClick_Make()
+    {
+        if (!DSUtil.CheckNull(m_MakeData) && m_MakeData.e_EquipParts == eItem.Weapon)
+            PopupMgr.Ins.m_EquipmentMakePopup.Set(m_MakeData);
+    }
+
+    public void OnClick_GetAll()
+    {
+        var sdata = ServerInfo.Ins.m_ServerData;
+        var data = m_SelectCard.Get_Data() as CollectionListTableData;
+        var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
+        for (int i = 0; i < lst.Count; i++)
+        {
+            while (true)
+            {
+                var amount = sdata.Get_ItemAmount(lst[i].n_TargetValue);
+                var conditon = lst[i].Get_ConditionCount(sdata.Get_CollectionLv(lst[i].n_TargetValue));
+                if (amount >= conditon)
+                {
+                    sdata.Use_Item(lst[i].n_TargetValue, conditon);
+                    sdata.Add_CollectionLv(lst[i].n_TargetValue);
+                }
+                else
+                    break;
+            }
+        }
+
+        CollectionEquipmentUI.Ins.Set_UI();
+        MyValue.Get_ActorStatInfoorNull(eRole.PC);
+    }
+}

Assets/Script/UI/Collection/Equipment_Monster/Monster/CollectionMonsterCard.cs

@@ -19,7 +19,7 @@ public class CollectionMonsterCard : CardBase
         var mobData = table_monsterlist.Ins.Get_Data_orNull(m_Data.n_TargetValue);
 
         images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(1);
-        images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(mobData.n_MonsterID);
+        images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(mobData.s_MonsterIcon);
 
         texts[0].text = mobData.Get_Name();
         texts[1].text = m_Data.n_RepeatRewardValue;

Assets/Script/UI/Collection/Equipment_Monster/Monster/CollectionMonsterUI.cs

@@ -1,27 +1,36 @@
-using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 
 public class CollectionMonsterUI : PCUIMenu
 {
     public static CollectionMonsterUI Ins;
 
+    public TabUIBase m_Tab;
     public CollectionMonsterUI_Scroll m_Scroll;
     public CollectionMonsterUI_Info m_Info;
 
-    int m_Index = 1;
+    List<TabUIData> list_tabData = new List<TabUIData>
+    {
+        new TabUIData{ n_btnName =  297 }, new TabUIData{ n_btnName =  298 }, new TabUIData{ n_btnName =  299 }
+    };
     CollectionMonsterCard m_SelectCard;
 
     public override void Set()
     {
         Ins = this;
         base.Set();
-        OnClick_Tab(m_Index);
+        for (int i = 0; i < list_tabData.Count; i++)
+        {
+            list_tabData[i].onClick = Set_UI;
+            list_tabData[i].btnImg_off = "tab menu unselected 2";
+            list_tabData[i].btnImg_on = "tab menu selected 2";
+        }
+        m_Tab.Set(list_tabData);
+        Set_UI();
     }
 
     public void Set_UI()
     {
-        m_Scroll.Set(m_Index);
+        m_Scroll.Set(m_Tab.Get_Index());
         if (DSUtil.CheckNull(m_SelectCard))
             Set_SelectCard(m_Scroll.Get_FirstCard());
         else
@@ -33,10 +42,4 @@ public class CollectionMonsterUI : PCUIMenu
         m_SelectCard = card;
         m_Info.Set(m_SelectCard);
     }
-
-    public void OnClick_Tab(int index)
-    {
-        m_Index = index;
-        Set_UI();
-    }
 }

Assets/Script/UI/Collection/Equipment_Monster/Monster/CollectionMonsterUI_Info.cs

@@ -0,0 +1,27 @@
+public class CollectionMonsterUI_Info : CollectionEM_InfoBase
+{
+    public void OnClick_GetAll()
+    {
+        var sdata = ServerInfo.Ins.m_ServerData;
+        var data = m_SelectCard.Get_Data() as CollectionListTableData;
+        var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
+        for (int i = 0; i < lst.Count; i++)
+        {
+            while (true)
+            {
+                var amount = sdata.Get_CollectionMobKill(lst[i].n_TargetValue);
+                var conditon = lst[i].Get_ConditionCount(sdata.Get_CollectionLv(lst[i].n_TargetValue));
+                if (amount >= conditon)
+                {
+                    sdata.Use_CollectionMobKill(lst[i].n_TargetValue, conditon);
+                    sdata.Add_CollectionLv(lst[i].n_TargetValue);
+                }
+                else
+                    break;
+            }
+        }
+
+        CollectionMonsterUI.Ins.Set_UI();
+        MyValue.Get_ActorStatInfoorNull(eRole.PC);
+    }
+}

Assets/Script/UI/Collection/Equipment_Monster/Monster/CollectionMonsterUI_Scroll.cs

@@ -1,12 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
 public class CollectionMonsterUI_Scroll : uScrollViewMgr
 {
     public override void Set(int index)
     {
-        Set_ScrollView(table_collectionlist.Ins.Get_DataList(eTargetCondition.KillMonster, index));
+        Set_ScrollView(table_collectionlist.Ins.Get_DataList(eTargetCondition.KillMonster, index + 1));
     }
 
     public CollectionMonsterCard Get_FirstCard() { return list_CardBase[0] as CollectionMonsterCard; }

Assets/Script/UI/Collection/Monster/CollectionMonsterUI_Info.cs

@@ -1,71 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-
-public class CollectionMonsterUI_Info : uScrollViewMgr
-{
-    public TextMeshProUGUI[] texts; // 0 다음 보상
-    public GameObject go_noti;
-
-    CollectionMonsterCard m_SelectCard;
-    List<eAwakenUpgradeOptionType> list = new List<eAwakenUpgradeOptionType>
-    {
-        eAwakenUpgradeOptionType.STR_ADD, eAwakenUpgradeOptionType.DEX_ADD,
-        eAwakenUpgradeOptionType.INT_ADD, eAwakenUpgradeOptionType.LUK_ADD
-    };
-
-    public void Set(CollectionMonsterCard card)
-    {
-        if (!DSUtil.CheckNull(m_SelectCard))
-            m_SelectCard.go_selected.SetActive(false);
-
-        m_SelectCard = card;
-        m_SelectCard.go_selected.SetActive(true);
-
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var data = m_SelectCard.Get_Data() as CollectionListTableData;
-        var lv = sdata.Get_CollectionLv(data.n_TargetValue);
-
-        Set_ScrollView(list);
-        for (int i = 0; i < list.Count; i++)
-        {
-            if (list[i] == data.n_FirstRewardValue)
-                list_CardBase[i].Set(lv > 0 ? data.n_FirstRewardCount : 0);
-            if (list[i].ToString().Equals(data.n_RepeatRewardValue))
-                list_CardBase[i].Set(Mathf.Max(lv - 1, 0) * data.n_RepeatRewardCount);
-        }
-
-        if (lv > 0)
-            texts[0].text = $"레벨 업 시 획득 보상\n{data.n_RepeatRewardValue} : {data.n_RepeatRewardCount}";
-        else
-            texts[0].text = $"최초 획득 보상\n{data.n_FirstRewardValue} : {data.n_FirstRewardCount}";
-
-        go_noti.SetActive(sdata.Noti_CollectionMob(data.e_TargetCondition, data.e_MenuCategory));
-    }
-
-    public void OnClick_GetAll()
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var data = m_SelectCard.Get_Data() as CollectionListTableData;
-        var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
-        for (int i = 0; i < lst.Count; i++)
-        {
-            while (true)
-            {
-                var amount = sdata.Get_CollectionMobKill(lst[i].n_TargetValue);
-                var conditon = lst[i].Get_ConditionCount(sdata.Get_CollectionLv(lst[i].n_TargetValue));
-                if (amount >= conditon)
-                {
-                    sdata.Use_CollectionMobKill(lst[i].n_TargetValue, conditon);
-                    sdata.Add_CollectionLv(lst[i].n_TargetValue);
-                }
-                else
-                    break;
-            }
-        }
-
-        CollectionMonsterUI.Ins.Set_UI();
-        MyValue.Get_ActorStatInfoorNull(eRole.PC);
-    }
-}