불필요 제거

Assets/Ino_nerdnavis.txt

@@ -92,6 +92,7 @@ messageinfo 엄청 느린 버그
  - 장비뽑기는 챕터에 따라 레벨 증가, 스킬 x
  - 장비(100회), 스킬(200회) 마다 설정된 장비 중 하나 선택해서 획득
 
- - 50회마다 전설 등급 확정
+ -- 혜택
- - 10회마다 영웅 등급 확정
+  - 50회마다 전설 등급 확정
- - 서버 데이터 및 뽑기
+  - 10회마다 영웅 등급 확정
+ -- 서버 데이터 및 뽑기

Assets/ResWork/Table/table_fairy.txt

@@ -1,34 +0,0 @@
-{
-"version" : 1,
-"table_fairy" : 
-[
-{"ID":1,"Grade":1,"Stat1":"FairyMoveSpeed","StatValue1":"1.5","StatValuePerLv1":"0.0015","Stat2":"FairySeek","StatValue2":5,"StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.01","StatValuePerLv3":"0.01","Icon":"icon_fairy01","Scale":"0.5","UIScale":"1.5","Prefab":"Slime","Name":"슬라임","Desc":"귀여운 노란 슬라임 요정. 아이템을 줍기에는 많이 느리다."},
-{"ID":2,"Grade":1,"Stat1":"FairyMoveSpeed","StatValue1":"1.5","StatValuePerLv1":"0.0015","Stat2":"FairySeek","StatValue2":5,"StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.01","StatValuePerLv3":"0.01","Icon":"icon_fairy02","Scale":"0.7","UIScale":"2.2","Prefab":"Sun Blossom","Name":"썬 블라썸","Desc":"귀여운 노란 꽃 요정. 아이템을 줍기에는 많이 느리다."},
-{"ID":3,"Grade":1,"Stat1":"FairyMoveSpeed","StatValue1":"1.5","StatValuePerLv1":"0.0015","Stat2":"FairySeek","StatValue2":5,"StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.01","StatValuePerLv3":"0.01","Icon":"icon_fairy03","Scale":"0.7","UIScale":2,"Prefab":"Chick","Name":"칙","Desc":"귀여운 노란 닭 요정. 아이템을 줍기에는 많이 느리다."},
-{"ID":4,"Grade":1,"Stat1":"FairyMoveSpeed","StatValue1":"1.5","StatValuePerLv1":"0.0015","Stat2":"FairySeek","StatValue2":5,"StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.01","StatValuePerLv3":"0.01","Icon":"icon_fairy04","Scale":"0.7","UIScale":"1.5","Prefab":"Bunny","Name":"버니","Desc":"귀여운 갈색 토끼 요정. 아이템을 줍기에는 많이 느리다."},
-{"ID":5,"Grade":2,"Stat1":"FairyMoveSpeed","StatValue1":2,"StatValuePerLv1":"0.002","Stat2":"FairySeek","StatValue2":"4.5","StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.02","StatValuePerLv3":"0.02","Icon":"icon_fairy05","Scale":"0.8","UIScale":2,"Prefab":"Cyclops","Name":"사이클롭스","Desc":"외눈박이 사이클롭스 요정. 골드를 좋아한다."},
-{"ID":6,"Grade":2,"Stat1":"FairyMoveSpeed","StatValue1":2,"StatValuePerLv1":"0.002","Stat2":"FairySeek","StatValue2":"4.5","StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.02","StatValuePerLv3":"0.02","Icon":"icon_fairy06","Scale":"0.7","UIScale":2,"Prefab":"Seed","Name":"씨드","Desc":"꽃이 되기 전의 씨앗 요정. 꽃이 피는데도 경험치가 필요한 듯 하다."},
-{"ID":7,"Grade":2,"Stat1":"FairyMoveSpeed","StatValue1":2,"StatValuePerLv1":"0.002","Stat2":"FairySeek","StatValue2":"4.5","StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.02","StatValuePerLv3":"0.02","Icon":"icon_fairy07","Scale":2,"UIScale":4,"Prefab":"Cute_Bird","Name":"큐트 버드","Desc":"항상 어벙한 새 요정. 의외로 아이템을 좋아한다."},
-{"ID":8,"Grade":2,"Stat1":"FairyMoveSpeed","StatValue1":2,"StatValuePerLv1":"0.002","Stat2":"FairySeek","StatValue2":"4.5","StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.02","StatValuePerLv3":"0.02","Icon":"icon_fairy08","Scale":"0.5","UIScale":1,"Prefab":"Pet_C_1","Name":"분홍고래","Desc":"화가 잔뜩나있는 분홍고래. 하지만 가슴은 따뜻하다."},
-{"ID":9,"Grade":3,"Stat1":"FairyMoveSpeed","StatValue1":"2.5","StatValuePerLv1":"0.0025","Stat2":"FairySeek","StatValue2":4,"StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.03","StatValuePerLv3":"0.03","Icon":"icon_fairy09","Scale":"0.5","UIScale":"1.5","Prefab":"Bee","Name":"비","Desc":"장난끼 많은 벌 요정. 골드를 좋아한다."},
-{"ID":10,"Grade":3,"Stat1":"FairyMoveSpeed","StatValue1":"2.5","StatValuePerLv1":"0.0025","Stat2":"FairySeek","StatValue2":4,"StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.03","StatValuePerLv3":"0.03","Icon":"icon_fairy10","Scale":"1.2","UIScale":3,"Prefab":"Posy","Name":"포시","Desc":"무슨 생각을 하는 지 모르는 요정. 경험치 획득량을 증가시켜준다."},
-{"ID":11,"Grade":3,"Stat1":"FairyMoveSpeed","StatValue1":"2.5","StatValuePerLv1":"0.0025","Stat2":"FairySeek","StatValue2":4,"StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.03","StatValuePerLv3":"0.03","Icon":"icon_fairy11","Scale":"0.5","UIScale":"1.5","Prefab":"Bat","Name":"뱃","Desc":"할로윈을 좋아하는 마녀가 만든 박쥐 요정. 초음파로 아이템을 찾는다."},
-{"ID":12,"Grade":3,"Stat1":"FairyMoveSpeed","StatValue1":"2.5","StatValuePerLv1":"0.0025","Stat2":"FairySeek","StatValue2":4,"StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.03","StatValuePerLv3":"0.03","Icon":"icon_fairy12","Scale":"0.7","UIScale":2,"Prefab":"Bud","Name":"버드","Desc":"할로윈을 좋아하는 마녀가 만든 장식용 꽃 요정. 좋아하는 것은 하트 찾기."},
-{"ID":13,"Grade":4,"Stat1":"FairyMoveSpeed","StatValue1":3,"StatValuePerLv1":"0.003","Stat2":"FairySeek","StatValue2":"3.5","StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.04","StatValuePerLv3":"0.04","Icon":"icon_fairy13","Scale":"0.7","UIScale":"1.2","Prefab":"Dino07","Name":"디노","Desc":"귀여운 공룡 인형 요정. 골드 획득량이 증가한다."},
-{"ID":14,"Grade":4,"Stat1":"FairyMoveSpeed","StatValue1":3,"StatValuePerLv1":"0.003","Stat2":"FairySeek","StatValue2":"3.5","StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.04","StatValuePerLv3":"0.04","Icon":"icon_fairy14","Scale":"0.4","UIScale":1,"Prefab":"DragonSD_20","Name":"드라고","Desc":"드래곤을 본딴 인형 요정. 경험치 획득량이 증가한다."},
-{"ID":15,"Grade":4,"Stat1":"FairyMoveSpeed","StatValue1":3,"StatValuePerLv1":"0.003","Stat2":"FairySeek","StatValue2":"3.5","StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.04","StatValuePerLv3":"0.04","Icon":"icon_fairy15","Scale":"0.5","UIScale":1,"Prefab":"Unicorn09","Name":"유니콘","Desc":"유니콘을 본딴 인형 요정. 보기 힘든 아이템을 찾아준다."},
-{"ID":16,"Grade":4,"Stat1":"FairyMoveSpeed","StatValue1":3,"StatValuePerLv1":"0.003","Stat2":"FairySeek","StatValue2":"3.5","StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.04","StatValuePerLv3":"0.04","Icon":"icon_fairy16","Scale":"1.3","UIScale":3,"Prefab":"Fire_Gazer_B","Name":"사우론의 눈","Desc":"연구에 지친 마녀의 눈을 대신하는 요정. 하트를 좋아한다."},
-{"ID":17,"Grade":5,"Stat1":"FairyMoveSpeed","StatValue1":"3.5","StatValuePerLv1":"0.0035","Stat2":"FairySeek","StatValue2":3,"StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.05","StatValuePerLv3":"0.05","Icon":"icon_fairy17","Scale":"0.5","UIScale":"1.2","Prefab":"Scorpling","Name":"스코플링","Desc":"귀여운 전갈 인형 요정. 골드 획득량을 증가시킨다."},
-{"ID":18,"Grade":5,"Stat1":"FairyMoveSpeed","StatValue1":"3.5","StatValuePerLv1":"0.0035","Stat2":"FairySeek","StatValue2":3,"StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.05","StatValuePerLv3":"0.05","Icon":"icon_fairy18","Scale":"0.5","UIScale":1,"Prefab":"Imp Mischief","Name":"임프","Desc":"마계에 서식하는 임프 요정. 풍부한 경험으로 마녀를 도와준다."},
-{"ID":19,"Grade":5,"Stat1":"FairyMoveSpeed","StatValue1":"3.5","StatValuePerLv1":"0.0035","Stat2":"FairySeek","StatValue2":3,"StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.05","StatValuePerLv3":"0.05","Icon":"icon_fairy19","Scale":"0.7","UIScale":"1.5","Prefab":"Angel","Name":"에인절","Desc":"천사에 의해 드물게 생겨나는 요정. 이미지와 다르게 세속적이다. 아이템을 좋아한다."},
-{"ID":20,"Grade":5,"Stat1":"FairyMoveSpeed","StatValue1":"3.5","StatValuePerLv1":"0.0035","Stat2":"FairySeek","StatValue2":3,"StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.05","StatValuePerLv3":"0.05","Icon":"icon_fairy20","Scale":1,"UIScale":"2.5","Prefab":"Fire_Pig_B","Name":"파이어 피그","Desc":"마녀의 숲에서 드물게 태어나는 돼지 요정. 생김새와 다르게 착하다."},
-{"ID":21,"Grade":6,"Stat1":"FairyMoveSpeed","StatValue1":4,"StatValuePerLv1":"0.004","Stat2":"FairySeek","StatValue2":"2.5","StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.1","StatValuePerLv3":"0.1","Icon":"icon_fairy21","Scale":"0.5","UIScale":1,"Prefab":"Leaf Fairy_1","Name":"아리엘","Desc":"나뭇잎 요정. 정신사납지만 골드를 증가시켜준다."},
-{"ID":22,"Grade":6,"Stat1":"FairyMoveSpeed","StatValue1":4,"StatValuePerLv1":"0.004","Stat2":"FairySeek","StatValue2":"2.5","StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.1","StatValuePerLv3":"0.1","Icon":"icon_fairy22","Scale":"0.5","UIScale":1,"Prefab":"Leaf Fairy_2","Name":"레쉬","Desc":"나뭇잎 요정. 정신사납지만 경험치를 증가시켜준다."},
-{"ID":23,"Grade":6,"Stat1":"FairyMoveSpeed","StatValue1":4,"StatValuePerLv1":"0.004","Stat2":"FairySeek","StatValue2":"2.5","StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.07","StatValuePerLv3":"0.07","Icon":"icon_fairy23","Scale":"0.5","UIScale":1,"Prefab":"Leaf Fairy_3","Name":"슈슈","Desc":"나뭇잎 요정. 정신사납지만 아이템 드랍률을 증가시켜준다."},
-{"ID":24,"Grade":6,"Stat1":"FairyMoveSpeed","StatValue1":4,"StatValuePerLv1":"0.004","Stat2":"FairySeek","StatValue2":"2.5","StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.1","StatValuePerLv3":"0.1","Icon":"icon_fairy24","Scale":"0.5","UIScale":1,"Prefab":"Leaf Fairy_4","Name":"페이","Desc":"나뭇잎 요정. 정신사납지만 하트 드랍률을 증가시켜준다."},
-{"ID":25,"Grade":7,"Stat1":"FairyMoveSpeed","StatValue1":5,"StatValuePerLv1":"0.005","Stat2":"FairySeek","StatValue2":"1.5","StatValuePerLv2":"0.001","Stat3":"GoldDrop","StatValue3":"0.15","StatValuePerLv3":"0.15","Icon":"icon_fairy25","Scale":"0.7","UIScale":"1.3","Prefab":"Egglet","Name":"에글렛","Desc":"알이 100억개 깨질 때 마다 태어난다는 요정. 생각보다 많이 태어난다."},
-{"ID":26,"Grade":7,"Stat1":"FairyMoveSpeed","StatValue1":5,"StatValuePerLv1":"0.005","Stat2":"FairySeek","StatValue2":"1.5","StatValuePerLv2":"0.001","Stat3":"AddExp","StatValue3":"0.15","StatValuePerLv3":"0.15","Icon":"icon_fairy26","Scale":"0.5","UIScale":"1.3","Prefab":"Ghost","Name":"고스트","Desc":"누구도 탄생의 순간을 본 적 없는 요정. 경험이 풍부한 것은 확실하다."},
-{"ID":27,"Grade":7,"Stat1":"FairyMoveSpeed","StatValue1":5,"StatValuePerLv1":"0.005","Stat2":"FairySeek","StatValue2":"1.5","StatValuePerLv2":"0.001","Stat3":"ItemDrop","StatValue3":"0.1","StatValuePerLv3":"0.1","Icon":"icon_fairy27","Scale":1,"UIScale":2,"Prefab":"Tampora_B","Name":"탐포라","Desc":"계란 후라이를 좋아하는 사람들에 의해 드물게 태어나는 요정. 이가 후라이팬을 지고 있다."},
-{"ID":28,"Grade":7,"Stat1":"FairyMoveSpeed","StatValue1":5,"StatValuePerLv1":"0.005","Stat2":"FairySeek","StatValue2":"1.5","StatValuePerLv2":"0.001","Stat3":"HeartDrop","StatValue3":"0.15","StatValuePerLv3":"0.15","Icon":"icon_fairy28","Scale":1,"UIScale":3,"Prefab":"Golem_A","Name":"골렘","Desc":"화산섬에서 온 요정. 외모와 다르게 공격적이지 않고, 따뜻한 것을 좋아한다."}
-]
-}

Assets/ResWork/Table/table_fairy.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 235844ee50bc71e48bd57c6851feff2f
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ResWork/Table/table_fairy.xls.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c399374cb19137a46aa614c217f29940
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ResWork/UIPrefabs/Title/Tables.prefab

@@ -49,7 +49,6 @@ GameObject:
   - component: {fileID: -6935173719014966727}
   - component: {fileID: -3566230038207785956}
   - component: {fileID: 6589233753258620715}
-  - component: {fileID: -8554978397079698689}
   - component: {fileID: -6303332850314313581}
   - component: {fileID: 5569114531535822453}
   - component: {fileID: 98134409025579038}
@@ -620,19 +619,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_json: {fileID: 4900000, guid: 274715161b59b6b48818514c3e09a65a, type: 3}
---- !u!114 &-8554978397079698689
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5043163894663193716}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a2a7af6ef448a714eaff3b50d4cddf0f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_json: {fileID: 4900000, guid: 235844ee50bc71e48bd57c6851feff2f, type: 3}
 --- !u!114 &-6303332850314313581
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Script/Character/FairyActor.cs

@@ -20,7 +20,7 @@ public class FairyActor : Actor
     {
         base.Set(isEnemy, owner, sdata, _id, _stop);
 
-        m_FairyTableData = table_fairy.Ins.Get_Data(_id);
+        //m_FairyTableData = table_fairy.Ins.Get_Data(_id);
         if (!_ui)
         {
             int lv = sdata.Get_SmeltingLv(_id);

Assets/Script/Server/ServerClass.cs

@@ -1600,14 +1600,14 @@ public partial class ServerData
             }
         }
 
-        if (!ServerInfo.Ins.m_ServerData.Check_ItemAmount(_std.ObtainCheckItem, 1, _std.ObtainCheckItemID, false))
+        //if (!ServerInfo.Ins.m_ServerData.Check_ItemAmount(_std.ObtainCheckItem, 1, _std.ObtainCheckItemID, false))
-        {
+        //{
-            if (_std.BuyLimit > 0) return Get_ShopBuyCount(_std.ID, 1) < _std.BuyLimit ? "" : "구매 완료";
+        //    if (_std.BuyLimit > 0) return Get_ShopBuyCount(_std.ID, 1) < _std.BuyLimit ? "" : "구매 완료";
-            else if (_std.BuyLimit_Day > 0) return Get_ShopBuyCount(_std.ID, 2) < _std.BuyLimit_Day ? "" : "구매 완료";
+        //    else if (_std.BuyLimit_Day > 0) return Get_ShopBuyCount(_std.ID, 2) < _std.BuyLimit_Day ? "" : "구매 완료";
-            else if (_std.BuyLimit_Week > 0) return Get_ShopBuyCount(_std.ID, 3) < _std.BuyLimit_Week ? "" : "구매 완료";
+        //    else if (_std.BuyLimit_Week > 0) return Get_ShopBuyCount(_std.ID, 3) < _std.BuyLimit_Week ? "" : "구매 완료";
-            else if (_std.BuyLimit_Month > 0) return Get_ShopBuyCount(_std.ID, 4) < _std.BuyLimit_Month ? "" : "구매 완료";
+        //    else if (_std.BuyLimit_Month > 0) return Get_ShopBuyCount(_std.ID, 4) < _std.BuyLimit_Month ? "" : "구매 완료";
-            return null;
+        //    return null;
-        }
+        //}
         return "구매 완료";
     }
     #endregion
@@ -1625,7 +1625,7 @@ public partial class ServerData
     }
     public void Add_PotionTime(int _id)
     {
-        Use_Item(eItem.Potion, 1, _id);
+        Use_Item(_id, 1);
         var key = _id.ToString();
         Potion[key][1] += MyValue.PotionAddMin * 60;
         Potion[key][1].RandomizeCryptoKey();
@@ -1721,15 +1721,6 @@ public partial class ServerData
                     if (TopMoney.isIns) TopMoney.Ins.Set();
                 }
                 break;
-            case eItem.Exp:
-                PC.Exp += (uint)_itemdata.Amount;
-                PC.Exp.RandomizeCryptoKey();
-                break;
-            case eItem.PC:
-                break;
-            case eItem.Pet:
-                break;
-
 
             case eItem.Weapon:
             case eItem.Armor:
@@ -1765,15 +1756,6 @@ public partial class ServerData
                 //    MessageInfo.Ins.Add_NotiToChatServer(DSUtil.Format("{0} {1}{2}[-] 획득", ServerInfo.Ins.UserName, MyValue.Get_GradeColor(_itemdata.Grade), _itemdata.Name));
                 //if (GameUI.Ins != null) GameUI.Ins.Add_newItem(_itemdata.ItemType, _itemdata.Get_ID());
                 break;
-            case eItem.AllGambleTicket:
-            case eItem.WeaponTicket:
-            case eItem.RingTicket:
-            case eItem.NeckTicket:
-            case eItem.BootsTicket:
-            case eItem.FairyTicket:
-            case eItem.MagicTicket:
-            case eItem.PetTicket:
-                break;
             case eItem.WeaponCostume:
                 break;
             case eItem.Farmer:
@@ -2049,147 +2031,6 @@ public partial class ServerData
         }
         return false;
     }
-    int NoteNotiID;
-    public void Use_Item(eItem item, double _amount = 1d, int _id = 0, string _cause = "")
-    {
-        switch (item)
-        {
-            default:
-                var key = Get_Key(_id);
-                if (Item.ContainsKey(key))
-                {
-                    var amonut = Math.Truncate(_amount);
-                    Item[key][0] -= amonut;
-                    Item[key][0].RandomizeCryptoKey();
-                    Item[key][2] += amonut;
-                    Item[key][2].RandomizeCryptoKey();
-
-                    if (TopMoney.isIns) TopMoney.Ins.Set();
-                }
-                else if (Equipment.ContainsKey(key))
-                {
-                    Equipment[key][0] -= _amount;
-                    Equipment[key][0] = Math.Truncate(Equipment[key][0]);
-                    Equipment[key][0].RandomizeCryptoKey();
-                }
-                break;
-            case eItem.PC:
-                break;
-            case eItem.Pet:
-                break;
-
-
-            case eItem.Fairy:
-                //var equipment = Equipment[item.ToString()].Find(f => f[0] == _id);
-                //if (equipment[3] >= _amount)
-                //{
-                //    equipment[3] -= (int)_amount;
-                //    equipment[3].RandomizeCryptoKey();
-                //    Use_Item_Log(item, _id, _amount);
-                //    ServerInfo.Ins.Add_Log(0, DSUtil.Format("use,{0},{1},{2},{3}", item, _amount, equipment[3], _cause));
-                //}
-                break;
-            case eItem.Skill:
-                //var magic = Skill.Find(f => f[0] == _id);
-                //if (magic[1] >= _amount)
-                //{
-                //    magic[1] -= (int)_amount;
-                //    magic[1].RandomizeCryptoKey();
-                //    Use_Item_Log(item, _id, _amount);
-                //    ServerInfo.Ins.Add_Log(0, DSUtil.Format("use,{0},{1},{2},{3}", item, _amount, magic[1], _cause));
-                //}
-                break;
-            case eItem.AllGambleTicket:
-            case eItem.WeaponTicket:
-            case eItem.RingTicket:
-            case eItem.NeckTicket:
-            case eItem.BootsTicket:
-            case eItem.FairyTicket:
-            case eItem.MagicTicket:
-            case eItem.PetTicket:
-                break;
-            case eItem.Seed:
-            case eItem.Food:
-                break;
-            case eItem.Exp:
-                break;
-            case eItem.WeaponCostume:
-                break;
-            case eItem.Farmer:
-                break;
-            case eItem.Book:
-                break;
-            case eItem.Max: break;
-            case eItem.Potion:
-                var potionkey = _id.ToString();
-                if (Potion[potionkey][0] >= 1)
-                {
-                    --Potion[potionkey][0];
-                    Potion[potionkey][0].RandomizeCryptoKey();
-                    Use_Item_Log(item, _id, _amount);
-                    ServerInfo.Ins.Add_Log(0, DSUtil.Format("use,{0},{1},{2},{3}", item, _amount, Potion[potionkey][0], _cause));
-                }
-                break;
-        }
-    }
-    public double Get_ItemAmount(eItem item, int id = 0)
-    {
-        switch (item)
-        {
-            default:
-                var key = Get_Key(id);
-                if (Item.ContainsKey(key))
-                    return Item[key][0];
-                else if (Equipment.ContainsKey(key))
-                    return Equipment[key][0];
-                break;
-
-            case eItem.AllGambleTicket:
-            case eItem.WeaponTicket:
-            case eItem.RingTicket:
-            case eItem.NeckTicket:
-            case eItem.BootsTicket:
-            case eItem.FairyTicket:
-            case eItem.MagicTicket:
-            case eItem.PetTicket:
-                break;
-            case eItem.Exp:
-                return PC.Exp;
-            case eItem.PC:
-                return 0d;
-            case eItem.WeaponCostume:
-                break;
-            case eItem.Fairy:
-                return 0d;
-                //if (id == 0) return 0d;
-                //var equipment = Equipment[item.ToString()].Find(f => f[0] == id);
-                //return equipment[3];
-            case eItem.Skill:
-                if (id == 0) return 0d;
-                //return Skill.Find(f => f[0] == id)[1];
-                break;
-            case eItem.Pet:
-            case eItem.Farmer:
-                break;
-            case eItem.Book:
-                break;
-            case eItem.Food:
-                return 0d;
-            case eItem.Seed:
-                return 0d;
-            case eItem.Potion:
-                return Potion[id.ToString()][0];
-            
-        }
-        return 0d;
-    }
-    public bool Check_ItemAmount(eItem item, double _amount, int _id = 0, bool _showtoast = true)
-    {
-        bool result = Get_ItemAmount(item, _id) >= _amount;
-        //if (_showtoast && !result)
-          //  ToastUI.Ins.Set(160, MyText.Get_ItemName(_id));
-        return result;
-    }
     #endregion
 }
 

Assets/Script/Table/Base/table_itemdatabase.cs

@@ -1,78 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class table_itemdatabase : MonoBehaviour
-{
-    protected List<TableDataBase> list_Data = new List<TableDataBase>();
-
-    public EquipmentTableBase Read(eItem _item, Dictionary<string, object> json)
-    {
-        int grade = int.Parse(json["Grade"].ToString());
-        var temp = new EquipmentTableBase
-        {
-            ItemType = _item,
-            ID = int.Parse(json["ID"].ToString()),
-            Grade = (eItemGrade)grade,
-            Icon = json["Icon"].ToString(),
-            Name = json["Name"].ToString(),
-            Desc = json["Desc"].ToString(),
-        };
-        temp.Stone = grade * 4;
-
-        for (int i = 0; i < 3; i++)
-        {
-            int index = i + 1;
-            string stat = DSUtil.Format("Stat{0}", index);
-            if (json.ContainsKey(stat))
-                temp.list_stat.Add(new StatInfo
-                {
-                    Index = index,
-                    Stat = DSUtil.StringToEnum<eStat>(json[stat].ToString()),
-                    Value = float.Parse(json[DSUtil.Format("StatValue{0}", index)].ToString()),
-                    PerLvValue = float.Parse(json[DSUtil.Format("StatValuePerLv{0}", index)].ToString()),
-                });
-        }
-
-        return temp;
-    }
-
-    public List<TableDataBase> Get_DataList() { return list_Data; }
-    public List<ItemData> Get_ItemDatas(string _deck, eUICardType uitype)
-    {
-        var lst = new List<ItemData>();
-        for (int i = 0; i < list_Data.Count; i++)
-            lst.Add(Get_ItemData(_deck, uitype, list_Data[i].ID));
-        return lst;
-    }
-    public virtual EquipmentTableBase Get_Data(int _id)
-    {
-        for (int i = 0; i < list_Data.Count; i++)
-        {
-            if(list_Data[i].ID == _id) return list_Data[i] as EquipmentTableBase;
-        }
-        return null;
-    }
-    protected ItemData Get_ItemData(string _deck, eUICardType uitype, int _id)
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var wdata = Get_Data(_id);
-        var id = new ItemData(wdata.ItemType, wdata.ID, sdata.Get_ItemAmount(wdata.ItemType, wdata.ID), "", uitype);
-        id.Deck = _deck;
-        return id;
-    }
-    public List<StatInfo> Get_StatInfo(int _id) { return Get_Data(_id).list_stat; }
-    public double Get_StatValue(int _id, eStat _stat, int _lv)
-    {
-        var stat = Get_StatInfo(_id).Find(f => f.Stat == _stat);
-        if (stat != null)
-            return stat.Value + stat.PerLvValue * _lv;
-        return 0d;
-    }
-    public string Get_Icon(int _id)
-    {
-        var data = Get_Data(_id);
-        if (data == null) return "empty_slot_equipment";
-        return data.Icon;
-    }
-}

Assets/Script/Table/Base/table_itemdatabase.cs.meta

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

Assets/Script/Table/table_fairy.cs

@@ -1,31 +0,0 @@
-using MiniJSON;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class table_fairy : table_itemdatabase
-{
-    public static table_fairy Ins;
-
-    public TextAsset m_json;
-
-    private void Awake()
-    {
-        Ins = this;
-
-        Dictionary<string, object> jsonData = Json.Deserialize(m_json.text) as Dictionary<string, object>;
-
-        // ["items"]은 items.txt 안의 items를 가리킨다. 툴 우측 하단 파일 종류란에서 설정 가능.
-        List<object> obj = jsonData[GetType().Name] as List<object>;
-
-        foreach (object objt in obj)
-        {
-            Dictionary<string, object> json = objt as Dictionary<string, object>;
-            var temp = Read(eItem.Fairy, json);
-            temp.Prefab = json["Prefab"].ToString();
-            temp.Scale = float.Parse(json["Scale"].ToString());
-            temp.UIScale = float.Parse(json["UIScale"].ToString());
-            list_Data.Add(temp);
-        }
-    }
-}

Assets/Script/Table/table_fairy.cs.meta

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

Assets/Script/UI/Center/NickChange.cs

@@ -22,7 +22,7 @@ public class NickChange : BackKeyAdd
     public void OnClick_Change()
     {
         var sdata = ServerInfo.Ins.m_ServerData;
-        if (sdata.Check_ItemAmount(eItem.Gem, price))
+        if (sdata.Check_ItemAmount(1, price))
         {
             if (m_Input.value.Equals(ServerInfo.Ins.UserName))
                 text_warning.text = table_localtext.Ins.Get_Text(153);
@@ -38,7 +38,7 @@ public class NickChange : BackKeyAdd
                 text_warning.text = table_localtext.Ins.Get_Text(158);
             else
             {
-                sdata.Use_Item(eItem.Gem, price);
+                sdata.Use_Item(1, price);
                 sdata.Add_Common(eCommon.NickChange);
                 ServerInfo.Ins.UpdateUserTitleDisplayName(m_Input.value,
                     () =>

Assets/Script/UI/Center/OffLineReward.cs

@@ -39,7 +39,7 @@ public class OffLineReward : LobbyNonMenuBase
         Gold += Gold * actorinfo.Get_Stat(eStat.GOLD_Multiplier);
         Gold.RandomizeCryptoKey();
         var itemlst = sdata.Add_Item(new ItemData(eItem.Gold, 0, Gold, "off", eUICardType.GetItem));
-        itemlst.AddRange(sdata.Add_Item(new ItemData(eItem.Exp, 0, GoldExpStone * min * 2.5d, "off", eUICardType.GetItem)));
+        //itemlst.AddRange(sdata.Add_Item(new ItemData(eItem.Exp, 0, GoldExpStone * min * 2.5d, "off", eUICardType.GetItem)));
 
         //ObscuredDouble Stone = GoldExpStone * min * 0.09d * Random.Range(0.9f, 1.1f);
         //Stone += Stone * actorinfo.Get_Stat(eStat.WeaponStoneDrop);

Assets/Script/UI/Common/UIItemCard.cs

@@ -34,7 +34,7 @@ public class ItemData
         ID = id; ID.RandomizeCryptoKey();
         Grade = eItemGrade.Common;
         //Name = MyText.Get_ItemName(ID);
-        Desc = MyText.Get_ItemDesc(ItemType, ID);
+        //Desc = MyText.Get_ItemDesc(ItemType, ID);
         var sdata = ServerInfo.Ins.m_ServerData;
         if (sdata == null) return;
         if (id > 0)
@@ -71,7 +71,7 @@ public class ItemData
                     //equipmenttabledata = table_weapon.Ins.Get_Data(ID);
                     break;
                 case eItem.Fairy:
-                    equipmenttabledata = table_fairy.Ins.Get_Data(ID);
+                    //equipmenttabledata = table_fairy.Ins.Get_Data(ID);
                     break;
                 case eItem.Pet:
                     break;
@@ -99,30 +99,6 @@ public class ItemData
         }
     }
     public int Get_ID() { return ID; }
-
-    public List<StatInfo> Get_StatInfo()
-    {
-        switch (ItemType)
-        {
-            //case eItem.Weapon: return table_equipitemlist.Ins.Get_StatInfo(ID);
-            case eItem.Fairy: return table_fairy.Ins.Get_StatInfo(ID);
-            //case eItem.Pet:  table_pet.Ins.Get_StatInfo(ID);
-            case eItem.Skill:
-            case eItem.Farmer:
-                break;
-        }
-
-        return new List<StatInfo> { new StatInfo { Stat = eStat.None }, new StatInfo { Stat = eStat.None }, new StatInfo { Stat = eStat.None } };
-    }
-
-    public double Get_NeedStoneAmount(int _addlv = 0) { return System.Math.Truncate(Stone * Mathf.Pow(Lv + _addlv, 1.1f)); }
-    public double Get_UsedAllStone()
-    {
-        var stone = 0d;
-        for (int i = 1; i < Lv; i++)
-            stone += System.Math.Truncate(Stone * Mathf.Pow(i, 1.1f));
-        return stone;
-    }
 }
 
 public class UIItemCard : CardCoolTimeBase
@@ -211,7 +187,7 @@ public class UIItemCard : CardCoolTimeBase
                         gos[3].SetActive(!isIngameSkillCard && sdata.IsEquipItem(m_ItemData.Get_ID()));
                     gos[4].SetActive(GameUI.Ins.ExistNewItem(m_ItemData.ItemType, m_ItemData.Get_ID()));
                     slider.gameObject.SetActive(true);
-                    var amount = sdata.Get_ItemAmount(m_ItemData.ItemType, m_ItemData.Get_ID());
+                    var amount = 0;//sdata.Get_ItemAmount(m_ItemData.ItemType, m_ItemData.Get_ID());
                     int mixamount = MyValue.arr_NeedMixCount[(int)m_ItemData.Grade];
                     labels[(int)eUICardLabel.Amount].text = DSUtil.Format("{0}/{1}", amount, mixamount);
                     if (mixamount > 0f) slider.value = (float)(amount / mixamount);
@@ -302,7 +278,7 @@ public class UIItemCard : CardCoolTimeBase
             case eUICardType.UIEquip:
                 labels[(int)eUICardLabel.Lv].text = $"Lv.{lv}";
                 slider.gameObject.SetActive(true);
-                var amount = sdata.Get_ItemAmount(eItem.Skill, m_MagicTableData.n_SkillID);
+                var amount = sdata.Get_ItemAmount(m_MagicTableData.n_SkillID);
                 var mixamount = 5;// MyValue.arr_NeedMixCount[(int)m_MagicTableData.e_Grade];
                 labels[(int)eUICardLabel.Amount].text = DSUtil.Format("{0}/{1}", amount, mixamount);
                 slider.value = (float)(amount / mixamount);

Assets/Script/UI/Eqiupment/EquipmentCard.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -27,7 +25,7 @@ public class EquipmentCard : CardBase
     {
         var sdata = ServerInfo.Ins.m_ServerData;
         texts[0].text = sdata.Get_SmeltingLv(m_Data.n_EquipID).ToString();
-        var amount = sdata.Get_ItemAmount(m_Data.e_EquipParts, m_Data.n_EquipID);
+        var amount = sdata.Get_ItemAmount(m_Data.n_EquipID);
         texts[1].text = amount > 99 ? "99+" : amount.ToString();
 
         if (sdata.IsObtainItem(m_Data.n_EquipID))

Assets/Script/UI/GameUI.cs

@@ -41,12 +41,6 @@ public class Lobby_Bundle
         gos_noti[1].SetActive(GameUI.Ins.ExistNewItem(eItem.Weapon) || GameUI.Ins.ExistNewItem(eItem.Ring) || GameUI.Ins.ExistNewItem(eItem.Necklace) || GameUI.Ins.ExistNewItem(eItem.Extra) || GameUI.Ins.ExistNewItem(eItem.Fairy));
         gos_noti[2].SetActive(GameUI.Ins.ExistNewItem(eItem.Pet));
         gos_noti[3].SetActive(sdata.ExistCanCompleteBook());
-        gos_noti[4].SetActive((MyValue.CanEnter_Content(eContentOpen.Memory_Filed) && sdata.Check_ItemAmount(eItem.MemoryField, 1, 0, false)) ||
-                              (MyValue.CanEnter_Content(eContentOpen.Memory_Forest) && sdata.Check_ItemAmount(eItem.MemoryForest, 1, 0, false)) ||
-                              (MyValue.CanEnter_Content(eContentOpen.Memory_Dungeon) && sdata.Check_ItemAmount(eItem.MemoryDungeon, 1, 0, false)) ||
-                              (MyValue.CanEnter_Content(eContentOpen.Memory_Witch) && sdata.Check_ItemAmount(eItem.MemoryWitchGrade, 1, 0, false)) ||
-                              (MyValue.CanEnter_Content(eContentOpen.Memory_PetBattle) && sdata.Check_ItemAmount(eItem.MemoryPetBattle, 1, 0, false)));
-        if (!gos_noti[4].activeSelf) gos_noti[4].SetActive(MyValue.CanGetMemoryForestReward());
         gos_noti[5].SetActive(sdata.CanShow_ShopAD());
         gos_noti[7].SetActive(false);
         gos_noti[10].SetActive(TitleGetUI.list_gettitle.Count > 0);
@@ -65,8 +59,6 @@ public class Lobby_Bundle
             }
         }
 
-        // 마실 수 있는 포션이 있거나, 조합 가능한 것이 있으면 on
-        gos_noti[16].SetActive(MyValue.CanDrinkPotion() || MyValue.CanCombineKettle(eItem.Potion) || MyValue.CanCombineKettle(eItem.Relic));
         // 룰렛 광고 있거나 룰렛 뽑기권 개수가 충분하거나 보너스 뽑기라면 on
         gos_noti[18].SetActive(sdata.Get_Common(eCommon.Roullette_ADCount) < 2 || sdata.Get_Common(eCommon.Roullette_Count) + 1 <= sdata.Get_Common(eCommon.Roullette_Ticket) || sdata.Get_Common(eCommon.Roullette_Count) >= (sdata.Get_Common(eCommon.Roullette_LuckyCount) + 1) * 5);
         // 받을 수 있는 출석부 보상이 있을 때

Assets/Script/UI/Shop/Content_Shop_Clover.cs

@@ -23,9 +23,9 @@ public class Content_Shop_Clover : Content_Shop_Base
     public void OnClick_ResetItems()
     {
         var sdata = ServerInfo.Ins.m_ServerData;
-        if (sdata.Check_ItemAmount(eItem.Gem, 250))
+        if (sdata.Check_ItemAmount(1, 250))
         {
-            sdata.Use_Item(eItem.Gem, 250, 0, "cloverRS");
+            sdata.Use_Item(1, 250);
             DataCheckMgr.Ins.Reset_CloverItems();
             OnEnable();
             ServerInfo.Ins.Write(null);

Assets/Script/UI/Shop/ShopCardBase.cs

@@ -199,26 +199,26 @@ public class ShopCardBase : CardBase
         }
         else
         {
-            if (Get_PriceItem() != eItem.None && sdata.Check_ItemAmount(Get_PriceItem(), m_ShopTableData.Price))
+            //if (Get_PriceItem() != eItem.None && sdata.Check_ItemAmount(Get_PriceItem(), m_ShopTableData.Price))
-            {
+            //{
-                if (string.IsNullOrEmpty(buycondition))
+            //    if (string.IsNullOrEmpty(buycondition))
-                {
+            //    {
-                    if (m_ShopTableData.Item == eItem.Gold)
+            //        if (m_ShopTableData.Item == eItem.Gold)
-                    {
+            //        {
-                    }
+            //        }
-                    else
+            //        else
-                    {
+            //        {
-                        var cause = DSUtil.Format("shop {0}", m_ShopTableData.ID);
+            //            var cause = DSUtil.Format("shop {0}", m_ShopTableData.ID);
-                        sdata.Use_Item(Get_PriceItem(), m_ShopTableData.Price, 0, cause);
+            //            sdata.Use_Item(Get_PriceItem(), m_ShopTableData.Price, 0, cause);
-                        Add_BuyCount();
+            //            Add_BuyCount();
-                        GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(m_ShopTableData.Item, m_ShopTableData.ItemID, m_ShopTableData.Amount, cause, eUICardType.GetItem)));
+            //            GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(m_ShopTableData.Item, m_ShopTableData.ItemID, m_ShopTableData.Amount, cause, eUICardType.GetItem)));
-                        GetItemUI.Ins.Show_Items();
+            //            GetItemUI.Ins.Show_Items();
-                        Set_Limit();
+            //            Set_Limit();
-                    }
+            //        }
-                }
+            //    }
-                else
+            //    else
-                    ToastUI.Ins.Set(173);
+            //        ToastUI.Ins.Set(173);
-            }
+            //}
         }
     }
     void Buy_ShopAD()

Assets/Script/UI/Shop/ShopCountPopup.cs

@@ -21,11 +21,11 @@ public class ShopCountPopup : BackKeyAdd
 
         sprites[0].spriteName = icon;
 
-        m_ArrowUI.Set(totalamount =>
+        //m_ArrowUI.Set(totalamount =>
-        {
+        //{
-            labels[0].text = DSUtil.GetThousandCommaText(totalamount * useperamount);
+        //    labels[0].text = DSUtil.GetThousandCommaText(totalamount * useperamount);
-            labels[1].text = NumberFormatter.FormatNumber(totalamount * peramount);
+        //    labels[1].text = NumberFormatter.FormatNumber(totalamount * peramount);
-        }, (int)(ServerInfo.Ins.m_ServerData.Get_ItemAmount(useitem) / useperamount), false);
+        //}, (int)(ServerInfo.Ins.m_ServerData.Get_ItemAmount(useitem) / useperamount), false);
     }
 
     public void OnClick_Buy()
@@ -33,14 +33,14 @@ public class ShopCountPopup : BackKeyAdd
         if (m_ArrowUI.Get_TotalCount() > 0)
         {
             var sdata = ServerInfo.Ins.m_ServerData;
-            if (sdata.Check_ItemAmount(m_Price, m_ArrowUI.Get_TotalCount() * m_PricePerAmount))
+            //if (sdata.Check_ItemAmount(m_Price, m_ArrowUI.Get_TotalCount() * m_PricePerAmount))
-            {
+            //{
-                OnClick_Back();
+            //    OnClick_Back();
-                var useamount = m_ArrowUI.Get_TotalCount() * m_PricePerAmount;
+            //    var useamount = m_ArrowUI.Get_TotalCount() * m_PricePerAmount;
-                sdata.Use_Item(m_Price, useamount, 0, "shop gold");
+            //    sdata.Use_Item(m_Price, useamount, 0, "shop gold");
-                GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(m_BuyItem, 0, m_BuyItemPerAmount * m_ArrowUI.Get_TotalCount(), "", eUICardType.GetItem)), true);
+            //    GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(m_BuyItem, 0, m_BuyItemPerAmount * m_ArrowUI.Get_TotalCount(), "", eUICardType.GetItem)), true);
-                ServerInfo.Ins.Write(GetItemUI.Ins.Show_Items);
+            //    ServerInfo.Ins.Write(GetItemUI.Ins.Show_Items);
-            }
+            //}
         }
     }
 }

Assets/Script/UI/Shop/ShopEventCard.cs

@@ -18,10 +18,8 @@ public class ShopEventCard : MonoBehaviour
         switch (m_ID)
         {
             case eShopEvent.Open: // 챕터3 클리어
-                for (int i = 0; i < 8; i++) list_reward.Add(new ObtainItemData { m_Item = eItem.AllGambleTicket + i, m_Amount = 50 });
                 break;
             case eShopEvent.FirstInapp: // 아무거나 결제
-                for (int i = 0; i < 8; i++) list_reward.Add(new ObtainItemData { m_Item = eItem.AllGambleTicket + i, m_Amount = 100 });
                 break;
             case eShopEvent.CafeJoin:
                 break;

Assets/Script/UI/Skill/SelectSkillUI.cs

@@ -29,7 +29,7 @@ public class SelectSkillUI : MyCoroutine
         ActorInfo.Ins.All_Stop(true);
         m_afterSelect = _afterSelect;
         Set_Cards();
-        labels[0].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.SelectSkillShuffle).ToString();
+        //labels[0].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.SelectSkillShuffle).ToString();
         m_RemainTime = 10f;
         labels[1].text = DSUtil.Format("{0:N0}초후 스킬이 자동선택됩니다.", m_RemainTime);
 
@@ -67,12 +67,12 @@ public class SelectSkillUI : MyCoroutine
     public void OnClick_Shuffle()
     {
         var sdata = ServerInfo.Ins.m_ServerData;
-        if (sdata.Check_ItemAmount(eItem.SelectSkillShuffle, 1))
+        //if (sdata.Check_ItemAmount(eItem.SelectSkillShuffle, 1))
-        {
+        //{
-            m_RemainTime = 10f;
+        //    m_RemainTime = 10f;
-            sdata.Use_Item(eItem.SelectSkillShuffle);
+        //    sdata.Use_Item(eItem.SelectSkillShuffle);
-            labels[0].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.SelectSkillShuffle).ToString();
+        //    labels[0].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.SelectSkillShuffle).ToString();
-            Set_Cards();
+        //    Set_Cards();
-        }
+        //}
     }
 }

Assets/Script/UI/Stage/StageInfoUI_DPS.cs

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

Assets/Script/UI/Stage/StageResult.cs

@@ -43,7 +43,7 @@ public class StageResult : BackKeyAdd
         var sdata = ServerInfo.Ins.m_ServerData;
         var curLv = sdata.PC.Lv;
         sdata.Add_Item(new ItemData(eItem.Gold, 0, m_GainGold));
-        sdata.Add_Item(new ItemData(eItem.Exp, 0, m_GainExp));
+        //sdata.Add_Item(new ItemData(eItem.Exp, 0, m_GainExp));
         var afterLv = sdata.PC.Lv;
         m_TweenPosition.transform.localPosition = Vector3.right * 6000f;
         if (curLv < afterLv)
@@ -164,8 +164,8 @@ public class StageResult : BackKeyAdd
         var index = chapter - 101;
         if (chapter == 101 && sdata.Get_Common(eCommon.FieldFirstFree) == 0)
             sdata.Add_Common(eCommon.FieldFirstFree);
-        else
+        //else
-            sdata.Use_Item(eItem.MemoryField + index);
+        //    sdata.Use_Item(eItem.MemoryField + index);
         //if (index == 0) sdata.Add_MissionCount(MyValue.arr_Mission[1], 31);
         //else if (index == 2) sdata.Add_MissionCount(MyValue.arr_Mission[1], 33);
     }

Assets/Script/Util/MyEnum.cs

@@ -255,9 +255,6 @@ public enum eItem
     None,
     // Money
     Gold, Gem, WeaponStone, RingStone, NeckStone, BootsStone, FairyStone, SelectSkillShuffle, ChapterQuestShuffle, mClover, MemoryField, MemoryForest, MemoryDungeon, MemoryWitchGrade, MemoryPetBattle,
-    // 뽑기권
-    AllGambleTicket, WeaponTicket, RingTicket, NeckTicket, BootsTicket, FairyTicket, MagicTicket, PetTicket,
-    Exp,
     PC, PCCostume, Weapon, Armor, Helmet, Extra, Necklace, Ring,
     Fairy, WeaponCostume, Pet, Worker, Farmer, Book, Page, Food, Seed,
     Title, Inven, Pass, Potion, Relic, Essence,

Assets/Script/Util/MyText.cs

@@ -74,88 +74,6 @@ public static class MyText
         }
         return table_localtext.Ins.Get_Text(361);
     }
-    public static string Get_ItemDesc(eItem _item, int _id = 0)
-    {
-        switch (_item)
-        {
-            case eItem.Gold: return "강화를 하는 데 사용하는 재화";
-            case eItem.Gem: return "누구나 반기는 보석";
-            case eItem.Exp: return "마녀가 여정을 하며 얻은 경험치\n마녀 레벨이 오를수록 마녀도 강해진다.";
-            case eItem.WeaponStone: return "지팡이를 강화할 수 있는 신비한 돌";
-            case eItem.RingStone: return "반지를 강화할 수 있는 신비한 돌";
-            case eItem.NeckStone: return "목걸이를 강화할 수 있는 신비한 돌";
-            case eItem.BootsStone: return "신발을 강화할 수 있는 신비한 돌";
-            case eItem.FairyStone: return "요정을 강화할 수 있는 신비한 돌";
-            case eItem.ChapterQuestShuffle: return "다른 쪽지로 교환할 수 있는 주사위";
-            case eItem.mClover: return "신비한 상점을 이용할 수 있다.";
-            case eItem.AllGambleTicket: return "지팡이, 반지, 목걸이, 신발, 요정, 마법, 펫 중 하나를 뽑을 수 있는 티켓";
-            case eItem.MemoryField: return "기억의 들판에 입장할 수 있다.";
-            case eItem.MemoryForest: return "기억의 숲에 입장할 수 있다.";
-            case eItem.MemoryDungeon: return "기억의 던전에 입장할 수 있다.";
-            case eItem.MemoryWitchGrade: return "기억의 마녀와 싸울 수 있다.";
-            case eItem.MemoryPetBattle: return "기억의 투견장에 입장할 수 있다.";
-            case eItem.WeaponTicket: return "지팡이를 뽑을 수 있는 티켓";
-            case eItem.RingTicket: return "반지를 뽑을 수 있는 티켓";
-            case eItem.NeckTicket: return "목걸이를 뽑을 수 있는 티켓";
-            case eItem.BootsTicket: return "신발을 뽑을 수 있는 티켓";
-            case eItem.FairyTicket: return "요정을 뽑을 수 있는 티켓";
-            case eItem.MagicTicket: return "마법을 뽑을 수 있는 티켓";
-            case eItem.PetTicket: return "펫을 뽑을 수 있는 티켓";
-            case eItem.SelectSkillShuffle: return "스킬을 변경할 수 있는 주사위";
-
-            //case eItem.PC: return _id > 0 ? table_itemlist.Ins.Get_Data(_id).Get_Desc() : "?";
-            //case eItem.Weapon: return _id > 0 ? table_weapon.Ins.Get_Data(_id).Desc : "?";
-            case eItem.Skill: return _id > 0 ? table_skilllist.Ins.Get_Data_orNull(_id).Get_SkillDesc() : "?";
-            case eItem.Pet: return _id > 0 ? table_petlist.Ins.Get_Data_orNull(_id).Get_Desc() : "?";
-            case eItem.Fairy: return _id > 0 ? table_fairy.Ins.Get_Data(_id).Desc : "?";
-            case eItem.Book: return _id > 0 ? table_book.Ins.Get_Data(_id).Desc : "?";
-            case eItem.Page:
-                if (_id > 0)
-                {
-                    var pagedata = table_bookpage.Ins.Get_Data(_id);
-                    //return DSUtil.Format("{0}의 {1}번째 페이지이다.\n고대 언어로 적혀있다.", Get_ItemName(eItem.Book, pagedata.Book), pagedata.Page);
-                }
-                return "";
-            case eItem.Seed:
-                return "마이팜에 심을 수 있는 씨앗. 마녀의 솥에 넣는 재료로 자란다.";
-            case eItem.Food:
-                return "마녀의 솥에 넣을 수 있는 재료.";
-            //case eItem.Vegetable: return _id > 0 ? table_farm.Ins.Get_Data(_id).Name : "?";
-            //case eItem.Seed: return DSUtil.Format("{0} 씨앗", _id > 0 ? table_farm.Ins.Get_Data(_id).Name : "?");
-            case eItem.Pass:
-                return table_shop.Ins.Get_Data(_item, _id).Desc;
-            case eItem.ADRemove:
-                return "광고를 보지 않고 보상을 획득할 수 있다.";
-            case eItem.IdontKnow:
-                return "정해진 등급의 아이템 중 하나를 무작위로 획득한다.";
-            case eItem.Relic:
-            case eItem.Potion:
-                return table_kettle.Ins.Get_Data(_id).Desc;
-            case eItem.Title:
-                return table_title.Ins.Get_Data(_id).Desc;
-            case eItem.DailyInit:
-                return "매일 진행되는 초기화";
-            case eItem.RoulletteTicket:
-                return "룰렛을 돌릴 수 있다.";
-        }
-
-        return DSUtil.Format("{0}_{1}", _item, _id);
-    }
-    public static string Get_EquipmentSpecial(eItem _item, int _id)
-    {
-        if (_id > 0)
-            switch (_item)
-            {
-                //case eItem.Weapon:
-                //    return DSUtil.Format("{0} 강화", table_skilllist.Ins.Get_Data(table_weapon.Ins.Get_Data(_id).Skill, ServerInfo.Ins.m_ServerData).n_SkillName);
-                case eItem.WeaponCostume:
-                    break;
-                case eItem.Ring:
-                case eItem.Fairy:
-                    return Get_StatName(table_fairy.Ins.Get_StatInfo(_id)[2].Stat);
-            }
-        return "착용 장비 없음";
-    }
     public static string Get_PercentValueText(double _v) { return DSUtil.Format("{0:#,##0.##}%", _v * 100d); }
 
     public static void Show_CheckMailBox() { NetWait.Ins.Set(false); Popup.Ins.Set(ePopupType.One, 23); }

Assets/Script/Util/MyValue.cs

@@ -219,43 +219,6 @@ public static class MyValue
         return false;
     }
     #endregion
-    #region 노티 체크
-    public static bool CanGetMemoryForestReward()
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        return false;
-    }
-    public static bool CanDrinkPotion()
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var pTdata = table_kettle.Ins.Get_DataList(eItem.Potion);
-        for (int i = 0; i < pTdata.Count; i++)
-        {
-            if (sdata.Check_ItemAmount(eItem.Potion, 1, pTdata[i].ID, false))
-                return true;
-        }
-        return false;
-    }
-    public static bool CanCombineKettle(eItem potion_or_relic)
-    {
-        var sdata = ServerInfo.Ins.m_ServerData;
-        var pTdata = table_kettle.Ins.Get_DataList(potion_or_relic);
-        for (int i = 0; i < pTdata.Count; i++)
-        {
-            var temp = pTdata[i] as KettleTableData;
-            bool existfood = false;
-            for (int j = 0; j < temp.list_CombineData.Count; j++)
-            {
-                var temp2 = temp.list_CombineData[j];
-                existfood = sdata.Check_ItemAmount(eItem.Food, temp2.FoodNeedAmount, temp2.FoodID, false);
-                if (!existfood)
-                    break;
-            }
-            if (existfood) return true;
-        }
-        return false;
-    }
-    #endregion
 }
 
 public enum eContentOpen