미션 ui 작업 중...

Assets/ResWork/Table/Export/MissionList.json

@@ -1 +1 @@
-[{"n_MissionIndex": "1", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100001", "e_MissionConditionType": "DAILY_MISSION_CLEAR_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "5", "e_RewardType": "", "n_RewardValue": "1", "n_RewardCount": "100", "b_RepeatMission": "False"}, {"n_MissionIndex": "2", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100002", "e_MissionConditionType": "KILL_MONSTER_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "20", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "1000", "b_RepeatMission": "False"}]
+[{"n_MissionIndex": "1", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100034", "e_MissionConditionType": "DAILY_MISSION_CLEAR_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "5", "e_RewardType": "", "n_RewardValue": "1", "n_RewardCount": "100", "b_RepeatMission": "False"}, {"n_MissionIndex": "2", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100001", "e_MissionConditionType": "KILL_MONSTER_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "20", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "1000", "b_RepeatMission": "False"}]

Assets/ResWork/UIPrefabs/Mission.meta

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

Assets/Script/Character/Mob/MobActor.cs

@@ -425,16 +425,16 @@ public class MobActor : Actor
             //{
             //    Time.timeScale = MyValue.Get_GameSpeed();
             //}, 0.4f);
-            sdata.Add_MissionCount(MyValue.arr_Mission[0], 3);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[0], 3);
-            sdata.Add_MissionCount(MyValue.arr_Mission[1], 2);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[1], 2);
         }
         else
         {
 #if UNITY_EDITOR
             if (SceneManager.GetActiveScene().name == "StatTest") return;
 #endif
-            sdata.Add_MissionCount(MyValue.arr_Mission[0], 2);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[0], 2);
-            sdata.Add_MissionCount(MyValue.arr_Mission[1], 1);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[1], 1);
         }
     }
     protected override void After_Die()

Assets/Script/Info/ADInfo.cs

@@ -122,8 +122,8 @@ public class ADInfo : MonoBehaviour
                 //MobileAds.SetiOSAppPauseOnBackground(false);
                 Action_success?.Invoke();
                 var sdata = ServerInfo.Ins.m_ServerData;
-                sdata.Add_MissionCount(MyValue.arr_Mission[0], 16);
+                //sdata.Add_MissionCount(MyValue.arr_Mission[0], 16);
-                sdata.Add_MissionCount(MyValue.arr_Mission[1], 14);
+                //sdata.Add_MissionCount(MyValue.arr_Mission[1], 14);
                 break;
             case 2:
                 GetReward = 0;

Assets/Script/Server/ServerClass.cs

@@ -78,11 +78,14 @@ public partial class ServerData
     /// { 던전타입, 0 Lv, 1 소탕값1, 2 소탕값2, 3 소탕값3  }
     /// </summary>
     public Dictionary<string, List<ObscuredInt>> Dungeon = new Dictionary<string, List<ObscuredInt>>();
+    /// <summary>
+    /// { 미션그룹, { 미션 ID, 0 미션 레벨, 1 미션 카운트 } }
+    /// </summary>
+    public Dictionary<string, Dictionary<string, List<ObscuredInt>>> Mission = new Dictionary<string, Dictionary<string, List<ObscuredInt>>>();
 
 
     public List<ServerData_Book> Book;
     public List<ServerData_ChapterQuest> ChapterQuest;
-    public Dictionary<string, List<List<ObscuredInt>>> Mission;
     public List<List<ObscuredInt>> Title, Pass;
     public Dictionary<string, ObscuredInt> Inven = new Dictionary<string, ObscuredInt>(); // ID, 개수
     public Dictionary<string, List<ObscuredInt>> Shop, Potion;
@@ -210,8 +213,6 @@ public partial class ServerData
             ChapterQuest.Add(cqdata);
         }
 
-        Mission = new Dictionary<string, List<List<ObscuredInt>>> { { MyValue.arr_Mission[0], new List<List<ObscuredInt>>() }, { MyValue.arr_Mission[1], new List<List<ObscuredInt>>() }, { MyValue.arr_Mission[2], new List<List<ObscuredInt>>() } };
-
         var titledata = table_title.Ins.Get_DataList();
         Title = new List<List<ObscuredInt>>();
         for (int i = 0; i < titledata.Count; i++) // 최초 새싹 칭호 지급,  최초 애기 집사 칭호 지급
@@ -271,10 +272,10 @@ public partial class ServerData
         temp.MobKill = DSUtil.Get_T_Dic(MobKill);
         temp.Farm = Farm.Get();
         temp.Dungeon = DSUtil.Get_T_Dic(Dungeon);
+        temp.Mission = DSUtil.Get_T_Dic(Mission);
 
 
         temp.Common = DSUtil.Get_T_List(Common);
-        temp.Mission = DSUtil.Get_T_Dic(Mission);
 
         temp.Book = new List<ServerData_Book_Read>();
         for (int i = 0; i < Book.Count; i++)
@@ -318,10 +319,10 @@ public class ServerData_Read
     public Dictionary<string, int> Collection;
     public Dictionary<string, double> MobKill;
     public SD_Farm_Read Farm;
+    public Dictionary<string, Dictionary<string, List<int>>> Mission = new Dictionary<string, Dictionary<string, List<int>>>();
 
     public List<ServerData_Book_Read> Book;
     public List<ServerData_ChapterQuest_Read> ChapterQuest;
-    public Dictionary<string, List<List<int>>> Mission;
     public List<int> Common;
     public List<double> Money;
     public List<List<int>> Title, Pass;
@@ -370,11 +371,10 @@ public class ServerData_Read
         temp.MobKill = DSUtil.Get_T_Dic(MobKill);
         temp.Farm = Farm.Get();
         temp.Dungeon = DSUtil.Get_T_Dic(Dungeon);
-
+        temp.Mission = DSUtil.Get_T_Dic(Mission);
 
 
         temp.Common = DSUtil.Get_T_List(Common);
-        temp.Mission = DSUtil.Get_T_Dic(Mission);
 
         temp.Book = new List<ServerData_Book>();
         for (int i = 0; i < Book.Count; i++)
@@ -1017,7 +1017,7 @@ public partial class ServerData
         Set_Common(eCommon.Roullette_Count, 0);
         Set_Common(eCommon.Roullette_LuckyCount, 0);
         Set_Common(eCommon.Roullette_ADCount, 0);
-        Init_DailyQuest();
+        Init_Mission(0);
         Init_Pass();
         Init_Shop();
 
@@ -1040,6 +1040,7 @@ public partial class ServerData
         Set_Common(eCommon.DOY_Week, numweek);
         LastTime = ServerInfo.ServerTime;
         Init_ShopWeek();
+        Init_Mission(1);
     }
     public void Init_Month()
     {
@@ -1090,36 +1091,62 @@ public partial class ServerData
     #endregion
 
     #region 미션
-    public void Init_DailyQuest()
+    public void Init_Mission(int group)
     {
-        var daily = Mission[MyValue.arr_Mission[0]];
+        var key1 = Get_Key(group);
-        for (int i = 0; i < daily.Count; i++)
+        if (Mission.ContainsKey(key1))
         {
-            daily[i][1] = daily[i][2] = 0;
+            var lst = table_missionlist.Ins.Get_DataList(group);
-            daily[i][1].RandomizeCryptoKey();
+            for (int i = 0; i < lst.Count; i++)
-            daily[i][2].RandomizeCryptoKey();
+            {
+                var key2 = Get_Key(lst[i].n_MissionIndex);
+                if (Mission[key1].ContainsKey(key2))
+                {
+                    Mission[key1][key2][0] = Mission[key1][key2][1] = 0;
+                    Mission[key1][key2][0].RandomizeCryptoKey();
+                    Mission[key1][key2][1].RandomizeCryptoKey();
+                }
+            }
         }
     }
-    public void Set_MissionCount(string _key, int _id, int _v)
+    public void Set_MissionCount(int group, int _id, int _v)
     {
-        var ms = Mission[_key].Find(f => f[0] == _id);
+        var key1 = Get_Key(group);
-        if (ms != null)
+        if (Mission.ContainsKey(key1))
         {
-            ms[1] = _v;
+            var key2 = Get_Key(_id);
-            ms[1].RandomizeCryptoKey();
+            if (Mission[key1].ContainsKey(key2))
+            {
+                Mission[key1][key2][1] = _v;
+                Mission[key1][key2][1].RandomizeCryptoKey();
+            }
         }
     }
-    public void Add_MissionCount(string _key, int _id, int _v = 1)
+    public void Add_MissionCount(int group, int _id, int _v = 1)
     {
         if (_v < 1) return;
-        var ms = Mission[_key].Find(f => f[0] == _id);
+        var key1 = Get_Key(group);
-        if (ms != null)
+        if (Mission.ContainsKey(key1))
         {
-            ms[1] += _v;
+            var key2 = Get_Key(_id);
-            ms[1].RandomizeCryptoKey();
+            if (Mission[key1].ContainsKey(key2))
+            {
+                Mission[key1][key2][1] += _v;
+                Mission[key1][key2][1].RandomizeCryptoKey();
+            }
         }
     }
-    public int Get_MissionCount(string _key, int _id) { return Mission[_key].Find(f => f[0] == _id)[1]; }
+    public int Get_MissionCount(int group, int _id)
+    {
+        var key1 = Get_Key(group);
+        if (Mission.ContainsKey(key1))
+        {
+            var key2 = Get_Key(_id);
+            if (Mission[key1].ContainsKey(key2))
+                return Mission[key1][key2][1];
+        }
+        return 0;
+    }
     public bool CanGet_MissionDaily()
     {
         //var dm = Mission[MyValue.arr_Mission[0]];
@@ -1148,53 +1175,6 @@ public partial class ServerData
         //}
         return false;
     }
-    public int Get_AchiCount(int _missionid)
-    {
-        ObscuredInt count = 0;
-        if (_missionid >= 501 && _missionid <= 504)
-        { // 고서 완성 개수
-            var bookcount = table_book.Ins.Get_DataList().Count;
-            for (int i = 0; i < bookcount; i++)
-                count += IsComplete_Book(i + 1) ? 1 : 0;
-        }
-        else if (_missionid == 505) // 전설 지팡이 개수
-            count = Get_EquipmentObtainCount(0, 21, 24);
-        else if (_missionid == 506) // 신화 지팡이 개수
-            count = Get_EquipmentObtainCount(0, 25, 28);
-        else if (_missionid == 507) // 전설 반지 개수
-            count = Get_EquipmentObtainCount(2, 21, 24);
-        else if (_missionid == 508) // 신화 반지 개수
-            count = Get_EquipmentObtainCount(2, 25, 28);
-        else if (_missionid == 509) // 전설 목걸이 개수
-            count = Get_EquipmentObtainCount(3, 21, 24);
-        else if (_missionid == 510) // 신화 목걸이 개수
-            count = Get_EquipmentObtainCount(3, 25, 28);
-        else if (_missionid == 511) // 전설 신발 개수
-            count = Get_EquipmentObtainCount(4, 21, 24);
-        else if (_missionid == 512) // 신화 신발 개수
-            count = Get_EquipmentObtainCount(4, 25, 28);
-        else if (_missionid == 513) // 전설 요정 개수
-            count = Get_EquipmentObtainCount(5, 21, 24);
-        else if (_missionid == 514) // 신화 요정 개수
-            count = Get_EquipmentObtainCount(5, 25, 28);
-        else if (_missionid == 515) // 전설 마법 개수
-            count = Get_MagicObtainCount(21, 24);
-        else if (_missionid == 516) // 신화 마법 개수
-            count = Get_MagicObtainCount(25, 28);
-        else if (_missionid >= 517 && _missionid <= 523)
-        { // 마법 모두 개화 개수
-            foreach (var item in Skill)
-            {
-                if (item.Value[2] >= 3)
-                    ++count;
-            }
-        }
-        else if (_missionid > 600)
-            count = Mission[MyValue.arr_Mission[2]].Find(f => f[0] == _missionid)[1];
-
-        count.RandomizeCryptoKey();
-        return count;
-    }
     public bool CanGet_MissionAchi(int chapter)
     {
         //var dm = Mission[MyValue.arr_Mission[2]];
@@ -1391,11 +1371,11 @@ public partial class ServerData
                 //}
                 break;
             default: // 몬스터 처치
-                if (Get_MissionCount(MyValue.arr_Mission[1], 1) >= passdata.ConditionValue)
+                //if (Get_MissionCount(MyValue.arr_Mission[1], 1) >= passdata.ConditionValue)
-                {
+                //{
-                    rtn[0] = checkstep_free;
+                //    rtn[0] = checkstep_free;
-                    rtn[1] = checkstep_pay;
+                //    rtn[1] = checkstep_pay;
-                }
+                //}
                 break;
         }
 

Assets/Script/Table/Mission/table_missionlist.cs

@@ -22,7 +22,7 @@ public class MissionListTableData : TableDataBase
     }
 
     public string s_LinkedQuestType;
-    public string n_MissionDesc;
+    public int n_MissionDesc;
     public ePurpose e_MissionConditionType;
 
     protected ObscuredInt _MissionConditionValue;
@@ -81,12 +81,11 @@ public class table_missionlist : table_missionbase
 
         for (int i = 0; i < Get_DataList().Count; i++)
         {
-            //var temp = Get_DataList()[i];
+            var temp = Get_DataList()[i];
-            //var itemtype = temp.e_ItemType;
+            var itemtype = temp.n_MissionGroupId;
-            //if (!dic_itemlist.ContainsKey(itemtype))
+            if (!dic_datas.ContainsKey(temp.n_MissionGroupId))
-            //    dic_itemlist.Add(itemtype, new List<ItemListTableData>());
+                dic_datas.Add(temp.n_MissionGroupId, new List<MissionListTableData>());
-            //dic_itemlist[itemtype].Add(temp);
+            dic_datas[temp.n_MissionGroupId].Add(temp);
-            //dic_items.Add(temp.n_ItemID, temp);
         }
 
         base.Start();

Assets/Script/UI/Center/Chapter/ChapterTabCard.cs

@@ -30,7 +30,7 @@ public class ChapterTabCard : CardBase
     {
         if (GameUI.Ins.LobbyUI.Get_RankUI().gameObject.activeInHierarchy)
             GameUI.Ins.LobbyUI.Get_RankUI().Set_TimeAttack(Chapter);
-        else if (GameUI.Ins.LobbyUI.Get_MissionUI().gameObject.activeInHierarchy)
+        //else if (GameUI.Ins.LobbyUI.Get_MissionUI().gameObject.activeInHierarchy)
-            GameUI.Ins.LobbyUI.Get_MissionUI().gos_contents[2].GetComponent<Mission_Achi>().Set_UI(Chapter);
+        //    GameUI.Ins.LobbyUI.Get_MissionUI().gos_contents[2].GetComponent<Mission_Achi>().Set_UI(Chapter);
     }
 }

Assets/Script/UI/Center/Mission/MissionCard.cs

@@ -1,56 +0,0 @@
-using UnityEngine;
-
-public class MissionCard : CardBase
-{
-    public MissionCard_Daily m_MissionCard_Daily;
-    public MissionCard_Repeat m_MissionCard_Repeat;
-    public MissionCard_Achi m_MissionCard_Achi;
-
-    public UISprite sprite_reward;
-    public UILabel[] labels; // 0 보상 갯수, 1 목표, 2 0/0, 3 진행여부
-    public UISlider slider;
-    public GameObject go_getbtn;
-
-    public override void Set<T>(T _base)
-    {
-        base.Set(_base);
-        var data = _base as MissionListTableData;
-
-        if (data.n_MissionGroupId == 0)
-        {
-            m_MissionCard_Achi.enabled = m_MissionCard_Repeat.enabled = false;
-            m_MissionCard_Daily.Set(data);
-        }
-        else if (data.n_MissionGroupId == 1)
-        {
-            m_MissionCard_Achi.enabled = m_MissionCard_Daily.enabled = false;
-            m_MissionCard_Repeat.Set(data);
-        }
-        else
-        {
-            m_MissionCard_Repeat.enabled = m_MissionCard_Daily.enabled = false;
-            m_MissionCard_Achi.Set(data);
-        }
-    }
-
-    public virtual void OnClick_RewardInfo()
-    {
-        if (m_MissionCard_Daily.enabled)
-            m_MissionCard_Daily.OnClick_RewardInfo();
-        else if (m_MissionCard_Repeat.enabled)
-            m_MissionCard_Repeat.OnClick_RewardInfo();
-        else
-            m_MissionCard_Achi.OnClick_RewardInfo();
-    }
-
-    public virtual void OnClick_GetReward()
-    {
-        if (m_MissionCard_Daily.enabled)
-            m_MissionCard_Daily.OnClick_GetReward();
-        else if (m_MissionCard_Repeat.enabled)
-            m_MissionCard_Repeat.OnClick_GetReward();
-        else
-            m_MissionCard_Achi.OnClick_GetReward();
-        GameUI.Ins.LobbyUI.Set_Noti();
-    }
-}

Assets/Script/UI/Center/Mission/MissionCard_Achi.cs

@@ -1,79 +0,0 @@
-using CodeStage.AntiCheat.ObscuredTypes;
-using System.Collections.Generic;
-
-public class MissionCard_Achi : MissionCard
-{
-    MissionListTableData m_MissionTableData;
-    List<ObscuredInt> S_Data;
-    ObscuredInt m_CurCount;
-
-    private void Awake()
-    {
-        var mcard = GetComponent<MissionCard>();
-        sprite_reward = mcard.sprite_reward;
-        labels = mcard.labels;
-        slider = mcard.slider;
-        go_getbtn = mcard.go_getbtn;
-
-        labels[3].text = "";
-    }
-
-    public void Set(MissionListTableData _base)
-    {
-        enabled = true;
-        m_MissionTableData = _base;
-        var sdata = ServerInfo.Ins.m_ServerData;
-        S_Data = sdata.Mission[MyValue.arr_Mission[2]].Find(f => f[0] == _base.n_MissionIndex);
-        m_CurCount = sdata.Get_AchiCount(_base.n_MissionIndex);
-        m_CurCount.RandomizeCryptoKey();
-
-        //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID).Icon;
-        //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount);
-        //labels[1].text = m_MissionTableData.Desc;
-        //labels[2].text = DSUtil.Format("{0}/{1}", m_CurCount, m_MissionTableData.n_PurposeCount);
-
-        go_getbtn.SetActive(false);
-        if (S_Data[2] > 0)
-        {
-            labels[3].text = "완료";
-            name = DSUtil.Format("2_{0}", _base.n_MissionIndex);
-        }
-        else
-        {
-            //if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount)
-            //{
-            //    name = DSUtil.Format("0_{0}", _base.n_MissionIndex);
-            //    go_getbtn.SetActive(true);
-            //}
-            //else
-            //{
-            //    labels[3].text = "";
-            //    name = DSUtil.Format("1_{0}", _base.n_MissionIndex);
-            //}
-        }
-
-        //slider.value = (float)m_CurCount / m_MissionTableData.n_PurposeCount;
-    }
-
-    public override void OnClick_RewardInfo()
-    {
-        //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem));
-    }
-
-    public override void OnClick_GetReward()
-    {
-        //if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount)
-        //{
-        //    var sdata = ServerInfo.Ins.m_ServerData;
-        //    var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, DSUtil.Format("업적 ", m_MissionTableData.ID), eUICardType.GetItem);
-        //    sdata.Add_Item(itemdata);
-        //    S_Data[2] = 1;
-        //    S_Data[2].RandomizeCryptoKey();
-        //    GetItemUI.Ins.Set(new List<ItemData> { itemdata });
-        //    GetItemUI.Ins.Show_Items();
-        //    //MyText.ShowToast_ItemText(itemdata);
-        //    GameUI.Ins.LobbyUI.Get_MissionUI().Set();
-        //    NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward);
-        //}
-    }
-}

Assets/Script/UI/Center/Mission/MissionCard_Achi.cs.meta

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

Assets/Script/UI/Center/Mission/MissionCard_Daily.cs

@@ -1,91 +0,0 @@
-using CodeStage.AntiCheat.ObscuredTypes;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class MissionCard_Daily : MissionCard
-{
-    MissionListTableData m_MissionTableData;
-    List<ObscuredInt> S_Data;
-
-    private void Awake()
-    {
-        var mcard = GetComponent<MissionCard>();
-        sprite_reward = mcard.sprite_reward;
-        labels = mcard.labels;
-        slider = mcard.slider;
-        go_getbtn = mcard.go_getbtn;
-    }
-
-    public void Set(MissionListTableData _base)
-    {
-        //if(_base.e_Purpose == ePurpose.SowSeed || _base.e_Purpose == ePurpose.Harvest)
-        //{
-        //    if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.MaxMapID) < 15)
-        //    {
-        //        gameObject.SetActive(false);
-        //        return;
-        //    }
-        //    else
-        //        gameObject.SetActive(true);
-        //}
-
-        enabled = true;
-        m_MissionTableData = _base;
-        S_Data = ServerInfo.Ins.m_ServerData.Mission[MyValue.arr_Mission[0]].Find(f => f[0] == _base.n_MissionIndex);
-
-        //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon;
-        //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount);
-        //labels[1].text = m_MissionTableData.Desc;
-        //labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount);
-
-        go_getbtn.SetActive(false);
-        if (S_Data[2] > 0)
-        {
-            labels[3].text = "완료";
-            name = "2";
-        }
-        else
-        {
-            //if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount)
-            //{
-            //    name = "0";
-            //    go_getbtn.SetActive(true);
-            //}
-            //else
-            //{
-            //    labels[3].text = "진행 중";
-            //    name = "1";
-            //}
-        }
-
-        //slider.value = (float)S_Data[1] / m_MissionTableData.n_PurposeCount;
-
-        //if (m_MissionTableData.e_Purpose == ePurpose.PlayTime)
-        //    Set_Repeat_for1sec(() =>
-        //    {
-        //        labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount);
-        //    });
-    }
-
-    public override void OnClick_RewardInfo()
-    {
-        //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem));
-    }
-
-    public override void OnClick_GetReward()
-    {
-        //if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount)
-        //{
-        //    var sdata = ServerInfo.Ins.m_ServerData;
-        //    var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount);
-        //    sdata.Add_Item(itemdata);
-        //    S_Data[2] = 1;
-        //    S_Data[2].RandomizeCryptoKey();
-        //    sdata.Add_MissionCount(MyValue.arr_Mission[0], 18);
-        //    //MyText.ShowToast_ItemText(itemdata);
-        //    GameUI.Ins.LobbyUI.Get_MissionUI().Set();
-        //    NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward);
-        //}
-    }
-}

Assets/Script/UI/Center/Mission/MissionCard_Daily.cs.meta

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

Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs

@@ -1,82 +0,0 @@
-using CodeStage.AntiCheat.ObscuredTypes;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class MissionCard_Repeat : MissionCard
-{
-    MissionListTableData m_MissionTableData;
-    List<ObscuredInt> S_Data;
-
-    private void Awake()
-    {
-        var mcard = GetComponent<MissionCard>();
-        sprite_reward = mcard.sprite_reward;
-        labels = mcard.labels;
-        slider = mcard.slider;
-        go_getbtn = mcard.go_getbtn;
-
-        labels[3].text = "진행 중";
-    }
-
-    public void Set(MissionListTableData _base)
-    {
-        enabled = true;
-        m_MissionTableData = _base;
-        S_Data = ServerInfo.Ins.m_ServerData.Mission[MyValue.arr_Mission[1]].Find(f => f[0] == _base.n_MissionIndex);
-        var curCount = Get_CurCount();
-
-        //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon;
-        //int addLv = curCount / m_MissionTableData.n_PurposeCount;
-        //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount * (addLv > 0 ? addLv : 1));
-        //labels[1].text = DSUtil.Format("{0} ({1})", m_MissionTableData.Desc, S_Data[2]);
-
-        //labels[2].text = DSUtil.Format("{0}/{1}", curCount, m_MissionTableData.n_PurposeCount);
-        //slider.value = (float)curCount / m_MissionTableData.n_PurposeCount;
-
-        //if (slider.value >= 1f)
-        //{
-        //    name = "0";
-        //    go_getbtn.SetActive(true);
-        //}
-        //else
-        //{
-        //    name = "1";
-        //    go_getbtn.SetActive(false);
-        //}
-
-        //if (m_MissionTableData.e_Purpose == ePurpose.PlayTime)
-        //    Set_Repeat_for1sec(() =>
-        //    {
-        //        labels[2].text = DSUtil.Format("{0}/{1}", Get_CurCount(), m_MissionTableData.n_PurposeCount);
-        //    });
-    }
-
-    int Get_CurCount()
-    {
-        return 0;
-        //return S_Data[1] - S_Data[2] * m_MissionTableData.n_PurposeCount;
-    }
-
-    public override void OnClick_RewardInfo()
-    {
-        //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem));
-    }
-
-    public override void OnClick_GetReward()
-    {
-        //var curCount = Get_CurCount();
-        //if (curCount >= m_MissionTableData.n_PurposeCount)
-        //{
-        //    var sdata = ServerInfo.Ins.m_ServerData;
-        //    var addlv = curCount / m_MissionTableData.n_PurposeCount;
-        //    var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.ID, m_MissionTableData.n_RewardAmount * addlv);
-        //    sdata.Add_Item(itemdata);
-        //    S_Data[2] += addlv;
-        //    S_Data[2].RandomizeCryptoKey();
-        //    //MyText.ShowToast_ItemText(itemdata);
-        //    GameUI.Ins.LobbyUI.Get_MissionUI().Set();
-        //    NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward);
-        //}
-    }
-}

Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs.meta

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

Assets/Script/UI/Center/Mission/MissionUI.cs

@@ -1,23 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class MissionUI : MenuBase
-{
-    public GameObject go_ChapterTab;
-
-    protected override void Set_Contents()
-    {
-        base.Set_Contents();
-        go_ChapterTab.SetActive(CurTab == 2);
-    }
-
-    public override void Set_Noti()
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-
-        gos_noti[0].SetActive(sdata.CanGet_MissionDaily()); // 0 일일
-        gos_noti[1].SetActive(sdata.CanGet_MissionRepeat()); // 1 반복
-        gos_noti[2].SetActive(sdata.CanGet_MissionAchi(-1)); // 2 업적
-    }
-}

Assets/Script/UI/Center/Mission/Mission_Achi.cs

@@ -1,23 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Mission_Achi : ScrollViewArrMgr
-{
-    int Chapter = 0;
-
-    private void OnEnable()
-    {
-        // TODO 정인호 : 맵이 바껴서 미션 구조도 바껴야 함
-        //Set_ScrollView(0, table_stage.Ins.Get_ChapterDataList(1, true));
-        //Set_UI(Chapter);
-    }
-
-    public void Set_UI(int _chapter)
-    {
-        Chapter = _chapter;
-        dic_cardbase[0].ForEach(f => (f as ChapterTabCard).Set_OnOff(Chapter));
-        Set_ScrollView(1, table_missionlist.Ins.Get_DataList(Chapter), true);
-        Set_Coroutine(() => { Reset_Pos(1, true); }, Time.deltaTime);
-    }
-}

Assets/Script/UI/Center/Mission/Mission_Achi.cs.meta

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

Assets/Script/UI/Center/Mission/Mission_Daily.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Mission_Daily : ScrollViewMgr
-{
-    private void OnEnable()
-    {
-        Set_ScrollView(table_missionlist.Ins.Get_DataList(), true);
-    }
-}

Assets/Script/UI/Center/Mission/Mission_Daily.cs.meta

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

Assets/Script/UI/Center/Mission/Mission_Repeat.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Mission_Repeat : ScrollViewMgr
-{
-    private void OnEnable()
-    {
-        Set_ScrollView(table_missionlist.Ins.Get_DataList(), true);
-    }
-}

Assets/Script/UI/Center/Mission/Mission_Repeat.cs.meta

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

Assets/Script/UI/Center/Pass/PassContent.cs

@@ -79,7 +79,7 @@ public class PassContent : ScrollViewMgr
                 sprites[2].color = new Color32(13, 210, 94, 255);
                 break;
             default:
-                labels[3].text = DSUtil.Format("몬스터 처치\n{0}", sdata.Get_MissionCount(MyValue.arr_Mission[1], 1));
+                //labels[3].text = DSUtil.Format("몬스터 처치\n{0}", sdata.Get_MissionCount(MyValue.arr_Mission[1], 1));
                 labels[4].text = "몬스터패스";
                 sprites[2].color = new Color32(255, 230, 50, 255);
                 break;

Assets/Script/UI/Common/MixPopup.cs

@@ -67,7 +67,7 @@ public class MixPopup : MenuBase
                             sdata.Use_Item(m_ItemData.ItemType, needMixAmount, m_ItemData.Get_ID());
                             m_ItemData.Amount -= needMixAmount;
                             itemlst.AddRange(sdata.Add_Item(new ItemData(m_ItemData.ItemType, id, 1, "", eUICardType.GetItem)));
-                            if (Get_RepeatMissionID_Mix() > 0) sdata.Add_MissionCount(MyValue.arr_Mission[1], Get_RepeatMissionID_Mix());
+                            //if (Get_RepeatMissionID_Mix() > 0) sdata.Add_MissionCount(MyValue.arr_Mission[1], Get_RepeatMissionID_Mix());
                         }
                     }
                 }

Assets/Script/UI/GameUI.cs

@@ -28,7 +28,6 @@ public class Lobby_Bundle
     public PresetUI Get_PresetUI() { return arr_NonMenu[6] as PresetUI; }
     public OffLineReward Get_OffLineReward() { return arr_NonMenu[7] as OffLineReward; }
     public RankUI Get_RankUI() { return arr_CenterNonMenu[0] as RankUI; }
-    public MissionUI Get_MissionUI() { return arr_CenterNonMenu[1] as MissionUI; }
     public MixPopup Get_MixPopup() { return arr_CenterNonMenu[2] as MixPopup; }
     public PassUI Get_PassUI() { return arr_CenterNonMenu[3] as PassUI; }
     public NoticeUI Get_NoticeUI() { return arr_CenterNonMenu[4] as NoticeUI; }
@@ -143,8 +142,6 @@ public class Lobby_Bundle
             case "btn_notice": Get_NoticeUI().Set(); break;
             case "btn_mail": Get_MailUI().Set(false); break;
             case "btn_achievement":
-                if (MyValue.CanEnter_Content(eContentOpen.Mission))
-                    Get_MissionUI().Set();
                 break;
             case "btn_title":
                 if (MyValue.CanEnter_Content(eContentOpen.Title))

Assets/Script/UI/Mission/MissionCard.cs

@@ -0,0 +1,29 @@
+using TMPro;
+using UnityEngine.UI;
+
+public class MissionCard : CardBase
+{
+    public Image[] images; // 0 보상 아이콘, 1 보상 버튼
+    public TextMeshProUGUI[] texts; // 0 조건, 1 보상수량, 2 진행상황
+    public Slider slider_proc;
+
+    MissionListTableData m_Data;
+
+    public override void Set<T>(T _base)
+    {
+        base.Set(_base);
+        var sdata = ServerInfo.Ins.m_ServerData;
+        m_Data = _base as MissionListTableData;
+        var amount = sdata.Get_MissionCount(m_Data.n_MissionGroupId, m_Data.n_MissionIndex);
+
+        images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_RewardValue);
+        texts[0].text = table_localtext.Ins.Get_Text(m_Data.n_MissionDesc);
+        texts[1].text = m_Data.n_RewardCount.ToString();
+        texts[2].text = $"{amount}/{m_Data.l_MissionConditionCount}";
+        slider_proc.value = DSUtil.Get_SliderValue(amount / (float)m_Data.l_MissionConditionCount);
+    }
+
+    public virtual void OnClick_GetReward()
+    {
+    }
+}

Assets/Script/UI/Mission/MissionUI.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+public class MissionUI : uScrollViewMgr
+{
+    public TabUIBase m_Tab;
+
+    List<TabUIData> list_tabData = new List<TabUIData>
+    {
+        new TabUIData{ n_btnName = 364 }, new TabUIData{ n_btnName = 365 }, new TabUIData{ n_btnName = 366 },
+    };
+
+    public override void Set()
+    {
+        base.Set();
+        for (int i = 0; i < list_tabData.Count; i++)
+        {
+            list_tabData[i].onClick = Set_UI;
+        }
+        m_Tab.Set(list_tabData);
+        Set_UI();
+    }
+
+    public override void Set_UI()
+    {
+        Set_ScrollView(table_missionlist.Ins.Get_DataList(m_Tab.Get_Index()));
+    }
+}

Assets/Script/UI/NewGameUI.cs

@@ -20,6 +20,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
     public BattleUI m_BattleUI;
     public IngamePetCard[] arr_PetCard;
     public BotMenuBase[] FarmMenu;
+    public MissionUI m_MissionUI;
 
     bool ShowQuick = true;
 
@@ -92,7 +93,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
             case "btn_skill": m_SkillUI.Set(); break;
             case "btn_pet": m_PetUI.Set(); break;
             case "btn_collection": m_CollectionUI.Set(); break;
-            case "btn_mission": break;
+            case "btn_mission": m_MissionUI.Set(); break;
 
             case "btn_farm": InGameInfo.Ins.Load_Map(0); break;
             case "btn_btn_plantingseed": break;

Assets/Script/UI/Skill/SelectSkillUI.cs

@@ -60,8 +60,8 @@ public class SelectSkillUI : MyCoroutine
         m_afterSelect?.Invoke();
         ActorInfo.Ins.All_Stop(false);
         var sdata = ServerInfo.Ins.m_ServerData;
-        sdata.Add_MissionCount(MyValue.arr_Mission[0], 17);
+        //sdata.Add_MissionCount(MyValue.arr_Mission[0], 17);
-        sdata.Add_MissionCount(MyValue.arr_Mission[1], 15);
+        //sdata.Add_MissionCount(MyValue.arr_Mission[1], 15);
     }
 
     public void OnClick_Shuffle()

Assets/Script/UI/Stage/StageInfoUI_DPS.cs

@@ -27,7 +27,7 @@ public class StageInfoUI_DPS : MonoBehaviour
             }
             InGameInfo.Ins.SaveItems();
             sdata.Use_Item(eItem.MemoryForest);
-            sdata.Add_MissionCount(MyValue.arr_Mission[1], 32);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[1], 32);
 
             ServerInfo.Ins.Write(() =>
             {

Assets/Script/UI/Stage/StageResult.cs

@@ -170,8 +170,8 @@ public class StageResult : BackKeyAdd
             sdata.Add_Common(eCommon.FieldFirstFree);
         else
             sdata.Use_Item(eItem.MemoryField + index);
-        if (index == 0) sdata.Add_MissionCount(MyValue.arr_Mission[1], 31);
+        //if (index == 0) sdata.Add_MissionCount(MyValue.arr_Mission[1], 31);
-        else if (index == 2) sdata.Add_MissionCount(MyValue.arr_Mission[1], 33);
+        //else if (index == 2) sdata.Add_MissionCount(MyValue.arr_Mission[1], 33);
     }
 
     public void LvUpMoveFinish() { gos[3].SetActive(true); }

Assets/Script/Util/DataCheckMgr.cs

@@ -73,8 +73,8 @@ public class DataCheckMgr : MyCoroutine
 
             sdata.Sub_ShopADTime(-1);
             sdata.Add_Common(eCommon.PlayTime);
-            sdata.Add_MissionCount(MyValue.arr_Mission[0], 13);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[0], 13);
-            sdata.Add_MissionCount(MyValue.arr_Mission[1], 11);
+            //sdata.Add_MissionCount(MyValue.arr_Mission[1], 11);
             sdata.Sub_AllPotionTime();
             sdata.Sub_Common(eCommon.CloverShopResetTime);
 

Assets/Script/Util/MyValue.cs

@@ -34,7 +34,6 @@ public static class MyValue
     };
     public static List<eItem> list_Equipment = new List<eItem>
     { eItem.Weapon, eItem.Armor, eItem.Helmet, eItem.Extra, eItem.Necklace, eItem.Ring };
-    public static string[] arr_Mission = new string[] { "Daily", "Repeat", "Achievement" }; // 가이드는 Common에서 따로 저장
 
     public static Dictionary<eMainStatType, Dictionary<eStat, float>> dic_MainStatMultiplier = new Dictionary<eMainStatType, Dictionary<eStat, float>>
     {