애드온 비트메모리 추가, 아이템 애드온 설명 변경

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab

@@ -1269,10 +1269,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -1302,10 +1302,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2137,10 +2137,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0

Assets/Resources/Animations/explosionGlovesAttack2.anim.meta

 fileFormatVersion: 2
-guid: 8577ae016a412764684fcba81af639cb
+guid: f0e3b19ee969d4f429ee9d8430bb4a58
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Assets/Resources/Animations/shockStickAttack1.anim

@@ -134,7 +134,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 7
+        value: 13
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 0
@@ -170,7 +170,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 0.65
+        time: 0.6333333
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -198,7 +198,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0
       - serializedVersion: 3
-        time: 0.6333333
+        time: 0.5833333
         value: 0
         inSlope: 0
         outSlope: 0
@@ -444,7 +444,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 7
+        value: 13
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 0
@@ -480,7 +480,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 0.65
+        time: 0.6333333
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -508,7 +508,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0
       - serializedVersion: 3
-        time: 0.6333333
+        time: 0.5833333
         value: 0
         inSlope: 0
         outSlope: 0

Assets/Resources/Sprites/Addons/bit memory.png.meta

+fileFormatVersion: 2
+guid: 5649ef203df468b4cbb72811520c9f51
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 445b1a656dd60644e92dce4dd2f3b2e5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Addons/bit memory_border.png.meta

+fileFormatVersion: 2
+guid: 78467e2ea11696e4f92091bba6323a62
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 64adf33e81021e24cb28e472c62fad28
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -247,8 +247,8 @@ public abstract class Enemy : MonoBehaviour {
             foreach (Item item in inventoryManager.itemList)
                 damageMultiplier *= item.GlobalFireDamageMultiplier();
 
-            GetDamaged(lifeStoneManager.lifeStoneRowNum * 0.3f * damageMultiplier);
-            EffectManager.Instance.StartNumber(0, gameObject.transform.parent.position, lifeStoneManager.lifeStoneRowNum * 0.3f);
+            GetDamaged(lifeStoneManager.lifeStoneRowNum * 0.15f * damageMultiplier);
+            EffectManager.Instance.StartNumber(0, gameObject.transform.parent.position, lifeStoneManager.lifeStoneRowNum * 0.15f);
         }
         debuffState[(int)EnemyDebuffCase.Fire] = DebuffState.Off;
         GetComponent<SpriteRenderer>().color = Color.white;

Assets/Scripts/Item/Addon.cs

@@ -10,7 +10,6 @@ public abstract class Addon {
     public Sprite sprite;
     public Sprite highlight;
     public Vector2 sizeInventory;
-    public string addonDescription;
     public string addonInfo;
 
     public Addon()
@@ -25,7 +24,6 @@ public abstract class Addon {
         sprite = null;
         highlight = null;
         sizeInventory = new Vector2(0, 0);
-        addonDescription = null;
         addonInfo = null;
     }
     public virtual float DamageAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/ApprenticesMark.cs

@@ -15,6 +15,7 @@ public class ApprenticesMark : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark_border"); ;
         sizeInventory = new Vector2(65, 80);
+        addonInfo = "피해량이 25% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/BitMemory.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 애드온명: 비트 메모리
+/// 번호: 36
+/// </summary>
+public class BitMemory : Addon
+{
+    float damageStack;
+    public override void Declare()
+    {
+        id = 36; name = "비트 메모리";
+        quality = ItemQuality.Masterpiece;
+        type = AddonType.Component;
+        sprite = Resources.Load<Sprite>("Sprites/Addons/bit memory");
+        highlight = Resources.Load<Sprite>("Sprites/Addons/bit memory_border");
+        sizeInventory = new Vector2(80, 80);
+        addonInfo = "500 = item";
+        damageStack = 0;
+    }
+
+    public override void OtherEffect(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
+    {
+        damageStack += attackInfo.damage;
+        if(damageStack >= 500)
+        {
+            MapManager.Instance.UpgradeRoom(RoomType.Item);
+            damageStack = 0;
+        }
+    }
+}

Assets/Scripts/Item/Addons/BitMemory.cs.meta

+fileFormatVersion: 2
+guid: 3d1863bbb9d819a41b46621a95e8296b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Item/Addons/BlacksmithsBrooch.cs

@@ -15,6 +15,7 @@ public class BlacksmithsBrooch : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/blacksmith's brooch");
         highlight = Resources.Load<Sprite>("Sprites/Addons/blacksmith's brooch_border");
         sizeInventory = new Vector2(65, 80);
+        addonInfo = "피해량이 55% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/CoollyPride.cs

@@ -15,8 +15,7 @@ public class CoollyPride : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/coolly pride");
         highlight = Resources.Load<Sprite>("Sprites/Addons/coolly pride_border");
         sizeInventory = new Vector2(55, 80);
-        addonDescription = "꺼지지 않을 것 처럼 타올랐지만, 이제는 완전히 식어버린 차숀의 긍지.";
-        addonInfo = "기본 피해량이 4 미만이면 적을 2초간 빙결시킵니다.";
+        addonInfo = "기본 피해량이 4 미만일 때, 적을 2초간 빙결시킨다.";
     }
 
     public override float[] DebuffAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/DesignofRagur.cs

@@ -15,15 +15,16 @@ public class DesignofRagur : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/design of ragur");
         highlight = Resources.Load<Sprite>("Sprites/Addons/design of ragur_border");
         sizeInventory = new Vector2(70, 80);
+        addonInfo = "콤보에 포함된 B의 개수만큼 피해량이 50% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {
         int aNum = 0;
         for (int i = 0; i < combo.Length; i++)
-            if (combo[i] == 'A')
+            if (combo[i] == 'B')
                 aNum++;
 
-        return 1f + aNum * 0.4f;
+        return 1f + aNum * 0.5f;
     }
 }

Assets/Scripts/Item/Addons/FeatherofRheA.cs

@@ -15,6 +15,7 @@ public class FeatherofRheA : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/feather of rhea"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/feather of rhea_border"); ;
         sizeInventory = new Vector2(77.5f, 77.5f);
+        addonInfo = "체공 중에 공격할 때, 피해량이 75% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/GlowingHerb.cs

@@ -15,8 +15,7 @@ public class GlowingHerb : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/glowing herb"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/glowing herb_border"); ;
         sizeInventory = new Vector2(77.5f, 75);
-        addonDescription = "활활 타오르며 매콤한 맛이 날 것 같지만 평범하게 쓰다. - 하부 료진";
-        addonInfo = "타격시 적을 3초간 화상 상태로 만듭니다.";
+        addonInfo = "적을 2초간 불태운다.";
     }
 
     public override float[] DebuffAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
@@ -24,7 +23,7 @@ public class GlowingHerb : Addon
         float[] varArray = new float[(int)EnemyDebuffCase.END_POINTER];
         for (int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++) varArray[i] = 0f;
 
-        varArray[(int)EnemyDebuffCase.Fire] = 3f;
+        varArray[(int)EnemyDebuffCase.Fire] = 2f;
 
         return varArray;
     }

Assets/Scripts/Item/Addons/Gluttony.cs

@@ -17,8 +17,7 @@ public class Gluttony : Addon
         highlight = Resources.Load<Sprite>("Sprites/Addons/gluttony_border"); ;
         sizeInventory = new Vector2(80, 80);
         lifeStoneManager = LifeStoneManager.Instance;
-        addonDescription = "식욕은 누구에게나 존재한다. - 토미 다라바.";
-        addonInfo = "적을 처치하면 생명석이 1개 회복됩니다.";
+        addonInfo = "적을 처치하면 생명석이 1개 회복된다.";
     }
     public override void OtherEffect(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/JanusCoin.cs

@@ -15,6 +15,7 @@ public class JanusCoin : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/janus coin");
         highlight = Resources.Load<Sprite>("Sprites/Addons/janus coin_border");
         sizeInventory = new Vector2(75, 80);
+        addonInfo = "타격시 50% 확률로 2의 피해를 입거나 적의 현재 체력의 25%에 해당하는 추가 피해를 입힌다.";
     }
     public override float DamageFinalAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/ParchmentPiece.cs

@@ -15,8 +15,7 @@ public class ParchmentPiece : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece_border"); ;
         sizeInventory = new Vector2(70, 77.5f);
-        addonDescription = "쓸모없는 애드온";
-        addonInfo = "피해량이 3 미만이면 피해량이 100% 증가합니다.";
+        addonInfo = "피해량이 3 미만이면 피해량이 100% 증가한다.";
     }
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/Sandbag.cs

@@ -15,6 +15,7 @@ public class Sandbag : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/sandbag"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/sandbag_border"); ;
         sizeInventory = new Vector2(80, 80);
+        addonInfo = "직후의 연계 시간이 50% 감소하지만, 피해량이 150% 증가한다.";
     }
     public override void OtherEffect(string combo)
     {
@@ -22,6 +23,6 @@ public class Sandbag : Addon
     }
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {
-        return 2f;
+        return 2.5f;
     }
 }
\ No newline at end of file

Assets/Scripts/Item/Addons/SmallLens.cs

@@ -15,6 +15,7 @@ public class SmallLens : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/small lens");
         highlight = Resources.Load<Sprite>("Sprites/Addons/small lens_border");
         sizeInventory = new Vector2(72.5f, 77.5f);
+        addonInfo = "직후의 연계 시간이 75% 증가한다.";
     }
 
     public override void OtherEffect(string combo)

Assets/Scripts/Item/InventoryManager.cs

@@ -61,7 +61,7 @@ public class InventoryManager : Singleton<InventoryManager> {
         addonPool[2].Add("DesignofRagur");
         addonPool[2].Add("Sandbag");
 
-        //addonPool[3].Add("");
+        addonPool[3].Add("BitMemory");
 
 
         for (int i = 0; i < 4; i++)
@@ -87,16 +87,19 @@ public class InventoryManager : Singleton<InventoryManager> {
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("BitSword", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        /*ItemInstantiate("Bow", player.transform.position, 1f);
+        ItemInstantiate("Bow", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("OilCask", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("ExplosionGloves", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        ItemInstantiate("BitSword", player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
         AddonInstantiate("GlowingHerb", player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);*/
+        yield return new WaitForSeconds(0.3f);
+        AddonInstantiate("BlacksmithsBrooch", player.transform.position, 1f);
+        yield return new WaitForSeconds(0.3f);
+        AddonInstantiate("BitMemory", player.transform.position, 1f);
+        yield return new WaitForSeconds(0.3f);
+
     }
 
     IEnumerator PopoutCoroutine(GameObject obj)
@@ -297,9 +300,17 @@ public class InventoryManager : Singleton<InventoryManager> {
             foreach (Item tmpItem in itemList)
                 for (int j = 0; j < tmpItem.skillNum; j++)
                     if (item.combo[i].Equals(tmpItem.combo[j]))
+                    {
+                        GameManager.Instance.player.GetComponent<Player>().DisplayText(tmpItem.name + "와(과) 콤보가 중복됩니다!");
                         return false;
+                    }
 
-        if (itemList.Count > 8) return false;
+
+        if (itemList.Count > 8)
+        {
+            GameManager.Instance.player.GetComponent<Player>().DisplayText("아이템이 너무 많습니다!");
+            return false;
+        }
 
         itemList.Add(item);
         ui.SetOnPosition(itemList, addonList);
@@ -313,7 +324,11 @@ public class InventoryManager : Singleton<InventoryManager> {
     /// <returns></returns>
     public bool PushAddon(Addon addon)
     {
-        if (addonList.Count > 8) return false;
+        if (addonList.Count > 8)
+        {
+            GameManager.Instance.player.GetComponent<Player>().DisplayText("애드온이 너무 많습니다!");
+            return false;
+        }
 
         addonList.Add(addon);
         ui.SetOnPosition(itemList, addonList);

Assets/Scripts/Item/InventoryUI.cs

@@ -38,6 +38,7 @@ public class InventoryUI : MonoBehaviour {
     GameObject addonInfo;
     public int selectedItem = -1;
     string[] qualityString = new string[4] { "습작", "범작", "수작", "걸작" };
+    string[] typeString = new string[4] { "소품", "물질", "부품", "이론" };
 
     InventoryManager inventoryManager;
 
@@ -109,7 +110,7 @@ public class InventoryUI : MonoBehaviour {
             tmpObj.SetActive(true);
             addonInfo.transform.Find("Quality").GetComponent<Text>().text = qualityString[(int)currentAddon.quality];
             addonInfo.transform.Find("Name").GetComponent<Text>().text = currentAddon.name;
-            addonInfo.transform.Find("Description").GetComponent<Text>().text = currentAddon.addonDescription;
+            addonInfo.transform.Find("Description").GetComponent<Text>().text = typeString[(int)currentAddon.type];
             addonInfo.transform.Find("Info").GetComponent<Text>().text = currentAddon.addonInfo;
         }
     }
@@ -196,7 +197,7 @@ public class InventoryUI : MonoBehaviour {
                     infoAddons[i].SetActive(true);
                     infoAddonsFrame[i].transform.Find("Quality").GetComponent<Text>().text = qualityString[(int)itemList[selectedItem].addons[i].quality];
                     infoAddonsFrame[i].transform.Find("Name").GetComponent<Text>().text = itemList[selectedItem].addons[i].name;
-                    infoAddonsFrame[i].transform.Find("Description").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonDescription;
+                    infoAddonsFrame[i].transform.Find("Description").GetComponent<Text>().text = typeString[(int)itemList[selectedItem].addons[i].type];
                     infoAddonsFrame[i].transform.Find("Info").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonInfo;
 
 

Assets/Scripts/Item/Items/BitSword.cs

@@ -21,10 +21,10 @@ public class BitSword: Item
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(135f, 135f);
-        itemInfo = "";
-        comboName = new string[3] { "I", "", "" };
-        comboCool = new float[3] { 50, 0, 0 };
-        comboCurrentCool = new float[3] { 50, 0, 0 };
+        itemInfo = "A x 25 = i";
+        comboName = new string[3] { "i", "", "" };
+        comboCool = new float[3] { 25, 0, 0 };
+        comboCurrentCool = new float[3] { 25, 0, 0 };
         coolSprite[0] = Resources.Load<Sprite>("Sprites/Cools/bit sword_cool1");
     }
 

Assets/Scripts/Item/Items/Bow.cs

@@ -22,7 +22,7 @@ public class Bow : Item {
         animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(137.5f, 137.5f);
-        itemInfo = "단순한 나무활. 군더더기 없는 깔끔한 모습이지만 금방이라도 부셔질 듯이 조잡한 것을 보니 싸구려 인듯 하다.";
+        itemInfo = "무난한 원거리 무기. 화살을 쏜 후 경직시간을 조심해야 한다.";
         comboName = new string[3] { "쏘기", "위로 쏘기", "" };
 
         player = GameManager.Instance.player;

Assets/Scripts/Item/Items/Dagger.cs

@@ -20,7 +20,7 @@ public class Dagger : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/daggerAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(127.5f, 125);
-        itemInfo = "옛날 옛적 호랑이 담배 피던 시절부터 존재하던 단검이다.";
+        itemInfo = "가장 기본적인 무기. 그러나 준수한 콤보 공격이 가능하다.";
         comboName = new string[3] { "베기", "찌르기", "" };
     }
 }

Assets/Scripts/Item/Items/ExplosionGloves.cs

@@ -24,7 +24,7 @@ public class ExplosionGloves : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(115f, 117.5f);
-        itemInfo = "보기보다 강력한 폭발을 일으킨다. 폭발을 일으킬때마다 장갑이 떨리는게 느껴진다.";
+        itemInfo = "벽에 표식을 그린 후, 신호를 보내 폭파시켜 큰 피해를 준다.";
         comboName = new string[3] { "설치", "폭파", "" };
         markPrefab = Resources.Load<GameObject>("Prefabs/Projectiles/ExplosionMark");
         InitMark();

Assets/Scripts/Item/Items/FeatherFan.cs

@@ -21,7 +21,7 @@ public class FeatherFan : Item
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(140f, 140f);
-        itemInfo = "";
+        itemInfo = "적을 밀어내는 거리가 900% 증가한다.";
         comboName = new string[3] { "", "", "" };
     }
 

Assets/Scripts/Item/Items/OilCask.cs

@@ -21,7 +21,7 @@ public class OilCask : Item
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(105f, 127.5f);
-        itemInfo = "";
+        itemInfo = "화염 피해가 100% 증가한다.";
         comboName = new string[3] { "", "", "" };
     }
 

Assets/Scripts/Item/Items/ShockStick.cs

@@ -12,7 +12,7 @@ public class ShockStick : Item {
 
     public override void Declare()
     {
-        id = 52; name = "감전 봉";
+        id = 52; name = "감전봉";
         quality = ItemQuality.Superior;
         skillNum = 2;
         combo = new string[3] { "ABA", "CBABB", "" };
@@ -23,7 +23,7 @@ public class ShockStick : Item {
         animation[1] = Resources.Load<AnimationClip>("Animations/shockStickAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(140f, 140f);
-        itemInfo = "몸이 타는 것 같은 수준으로 아프다. 명령을 내릴 때 효과적일 것 같다.";
+        itemInfo = "적을 2초간 기절시킨다. 충전 5회 적중 시 방전을 사용할 수 있다.";
         comboName = new string[3] { "충전", "방전", "" };
 
         comboCool = new float[3] { 0, 5, 0 };
@@ -63,7 +63,7 @@ public class ShockStick : Item {
         {
             if(Vector3.Distance(enemy.gameObject.transform.position,player.transform.position) <= 6f)
             {
-                PlayerAttackInfo attack = new PlayerAttackInfo(20f, 0f, new float[(int)EnemyDebuffCase.END_POINTER] { 0, 0, 2, 0, 0 });
+                PlayerAttackInfo attack = new PlayerAttackInfo(30f, 0f, new float[(int)EnemyDebuffCase.END_POINTER] { 0, 0, 2, 0, 0 });
                 AttackCalculation(attack, enemy, combo[1]);
                 enemy.GetDamaged(attack);
                 EffectManager.Instance.StartEffect(0, enemy.gameObject.transform.position);