Merge remote-tracking branch 'origin/item' into LifeStone

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

@@ -11,6 +11,23 @@ Prefab:
   m_SourcePrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1560605499280558}
   m_IsPrefabAsset: 1
+--- !u!1 &1004051359923830
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224255082055272874}
+  - component: {fileID: 222959522593680230}
+  - component: {fileID: 114239457438286642}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1004773021389024
 GameObject:
   m_ObjectHideFlags: 1
@@ -56,7 +73,7 @@ GameObject:
   - component: {fileID: 222006738291098212}
   - component: {fileID: 114806896438471400}
   m_Layer: 5
-  m_Name: Description
+  m_Name: Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -164,6 +181,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1125411684357136
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224965162862329216}
+  - component: {fileID: 222706300458699176}
+  - component: {fileID: 114512550949938678}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1125633288512872
 GameObject:
   m_ObjectHideFlags: 1
@@ -277,7 +311,7 @@ GameObject:
   - component: {fileID: 222881811434949598}
   - component: {fileID: 114137538252472334}
   m_Layer: 5
-  m_Name: Description
+  m_Name: Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -566,7 +600,7 @@ GameObject:
   - component: {fileID: 222954607474597530}
   - component: {fileID: 114762831278616470}
   m_Layer: 5
-  m_Name: Description
+  m_Name: Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -606,6 +640,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1514825023214090
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224089928543874960}
+  - component: {fileID: 222287369663776452}
+  - component: {fileID: 114813829858370262}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1560605499280558
 GameObject:
   m_ObjectHideFlags: 0
@@ -931,6 +982,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1882340433512326
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224068583978201364}
+  - component: {fileID: 222084250413140192}
+  - component: {fileID: 114965099369347128}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1890868960096556
 GameObject:
   m_ObjectHideFlags: 1
@@ -1010,7 +1078,7 @@ GameObject:
   - component: {fileID: 222497198420951448}
   - component: {fileID: 114483125526621874}
   m_Layer: 5
-  m_Name: Description
+  m_Name: Info
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1484,6 +1552,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114239457438286642
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1004051359923830}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114248543603659372
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2135,6 +2236,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &114512550949938678
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1125411684357136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114515661564662424
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2516,6 +2650,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114813829858370262
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1514825023214090}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114829223577490432
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2844,6 +3011,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114965099369347128
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1882340433512326}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114979698845127616
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2906,6 +3106,13 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1253765269442250}
   m_CullTransparentMesh: 0
+--- !u!222 &222084250413140192
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1882340433512326}
+  m_CullTransparentMesh: 0
 --- !u!222 &222101980230127394
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -2962,6 +3169,13 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1776251997144528}
   m_CullTransparentMesh: 0
+--- !u!222 &222287369663776452
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1514825023214090}
+  m_CullTransparentMesh: 0
 --- !u!222 &222287492432690054
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3130,6 +3344,13 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1960970529375016}
   m_CullTransparentMesh: 0
+--- !u!222 &222706300458699176
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1125411684357136}
+  m_CullTransparentMesh: 0
 --- !u!222 &222715602428211726
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3249,6 +3470,13 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1415037836102326}
   m_CullTransparentMesh: 0
+--- !u!222 &222959522593680230
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1004051359923830}
+  m_CullTransparentMesh: 0
 --- !u!222 &222974339910655962
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -3369,12 +3597,30 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224618072368546468}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -36, y: -17.5}
+  m_SizeDelta: {x: 406, y: 68}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224068583978201364
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1882340433512326}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224618072368546468}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -22, y: -69.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_AnchoredPosition: {x: -36, y: -90}
+  m_SizeDelta: {x: 406, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224073559880629636
 RectTransform:
@@ -3428,9 +3674,27 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -43, y: 91.5}
+  m_AnchoredPosition: {x: -43, y: 100}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224089928543874960
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1514825023214090}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224561095018798596}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -36, y: -90}
+  m_SizeDelta: {x: 406, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224128321665305960
 RectTransform:
   m_ObjectHideFlags: 1
@@ -3442,12 +3706,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224216406053780268}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -22, y: -69.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_AnchoredPosition: {x: -36, y: -17.5}
+  m_SizeDelta: {x: 406, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224137214707512560
 RectTransform:
@@ -3568,7 +3832,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -43, y: 91.5}
+  m_AnchoredPosition: {x: -43, y: 100}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224198027914676356
@@ -3586,7 +3850,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -43, y: 91.5}
+  m_AnchoredPosition: {x: -43, y: 100}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224216406053780268
@@ -3602,6 +3866,7 @@ RectTransform:
   - {fileID: 224447395369926638}
   - {fileID: 224083122370743694}
   - {fileID: 224429664558353378}
+  - {fileID: 224965162862329216}
   - {fileID: 224128321665305960}
   m_Father: {fileID: 224358157952434602}
   m_RootOrder: 10
@@ -3626,7 +3891,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.6, y: 25}
+  m_AnchoredPosition: {x: 67.6, y: 50}
   m_SizeDelta: {x: 321.1, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224231396142250978
@@ -3683,6 +3948,24 @@ RectTransform:
   m_AnchoredPosition: {x: -389.5, y: -0.5}
   m_SizeDelta: {x: 175, y: 175}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224255082055272874
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1004051359923830}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224599194736108168}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -36, y: -90}
+  m_SizeDelta: {x: 406, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224267864943479800
 RectTransform:
   m_ObjectHideFlags: 1
@@ -3805,7 +4088,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -253.65, y: 88.94992}
-  m_SizeDelta: {x: 144.3, y: 54.2}
+  m_SizeDelta: {x: 532.7, y: 54.2}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224429664558353378
 RectTransform:
@@ -3822,7 +4105,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.6, y: 25}
+  m_AnchoredPosition: {x: 67.6, y: 50}
   m_SizeDelta: {x: 321.1, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224441728605704258
@@ -3908,12 +4191,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224561095018798596}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -22, y: -69.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_AnchoredPosition: {x: -36, y: -17.5}
+  m_SizeDelta: {x: 406, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224487573599250656
 RectTransform:
@@ -4018,6 +4301,7 @@ RectTransform:
   - {fileID: 224234749847798032}
   - {fileID: 224161093930525842}
   - {fileID: 224230215658644044}
+  - {fileID: 224089928543874960}
   - {fileID: 224472498755576056}
   m_Father: {fileID: 224358157952434602}
   m_RootOrder: 11
@@ -4038,12 +4322,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224599194736108168}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -22, y: -69.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_AnchoredPosition: {x: -36, y: -17.5}
+  m_SizeDelta: {x: 406, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224599194736108168
 RectTransform:
@@ -4058,6 +4342,7 @@ RectTransform:
   - {fileID: 224145557615908318}
   - {fileID: 224851807554590988}
   - {fileID: 224774393181463022}
+  - {fileID: 224255082055272874}
   - {fileID: 224566355955157224}
   m_Father: {fileID: 224358157952434602}
   m_RootOrder: 9
@@ -4080,6 +4365,7 @@ RectTransform:
   - {fileID: 224962187461313488}
   - {fileID: 224198027914676356}
   - {fileID: 224986284003676062}
+  - {fileID: 224068583978201364}
   - {fileID: 224025842062708722}
   m_Father: {fileID: 224358157952434602}
   m_RootOrder: 8
@@ -4230,7 +4516,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.6, y: 25}
+  m_AnchoredPosition: {x: 67.6, y: 50}
   m_SizeDelta: {x: 321.1, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224783930886652934
@@ -4305,7 +4591,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -43, y: 91.5}
+  m_AnchoredPosition: {x: -43, y: 100}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224858612513000566
@@ -4425,6 +4711,24 @@ RectTransform:
   m_AnchoredPosition: {x: -175, y: 68}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224965162862329216
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1125411684357136}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224216406053780268}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -36, y: -90}
+  m_SizeDelta: {x: 406, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224986284003676062
 RectTransform:
   m_ObjectHideFlags: 1
@@ -4440,6 +4744,6 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.6, y: 25}
+  m_AnchoredPosition: {x: 67.6, y: 50}
   m_SizeDelta: {x: 321.1, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Scripts/Item/Addon.cs

@@ -11,6 +11,7 @@ public abstract class Addon {
     public Sprite highlight;
     public Vector2 sizeInventory;
     public string addonDescription;
+    public string addonInfo;
 
     public Addon()
     {
@@ -25,6 +26,7 @@ public abstract class Addon {
         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/CoollyPride.cs

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

Assets/Scripts/Item/Addons/GlowingHerb.cs

@@ -15,6 +15,8 @@ public class GlowingHerb : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
         sizeInventory = new Vector2(80, 80);
+        addonDescription = "활활 타오르며 매콤한 맛이 날 것 같지만 평범하게 쓰다. - 하부 료진";
+        addonInfo = "타격시 적을 3초간 화상 상태로 만듭니다.";
     }
 
     public override float[] DebuffAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/Gluttony.cs

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

Assets/Scripts/Item/Addons/ParchmentPiece.cs

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

Assets/Scripts/Item/InventoryUI.cs

@@ -151,6 +151,7 @@ public class InventoryUI : MonoBehaviour {
                     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("Info").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonInfo;
 
 
                 }

Assets/Scripts/Item/Items/Baculus.cs

@@ -9,7 +9,7 @@ public class Baculus : Item
 {
     public override void Declare()
     {
-        id = 15; name = "Baculus";
+        id = 15; name = "바쿨루스";
         quality = ItemQuality.Ordinary;
         skillNum = 2;
         combo = new string[3] { "BCB", "ACBC", "" };
@@ -20,5 +20,7 @@ public class Baculus : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(90, 160);
+        itemInfo = "신을 숭배하는 자들이 들고 있던 청백색의 주교 지팡이. 영험한 힘이 느껴진다.";
+        comboName = new string[3] { "기도", "징벌", "" };
     }
 }

Assets/Scripts/Item/Items/Bow.cs

@@ -11,7 +11,7 @@ public class Bow : Item {
 
 	public override void Declare()
     {
-        id = 2; name = "bow";
+        id = 2; name = "활";
         quality = ItemQuality.Study;
         skillNum = 2;
         combo = new string[3] { "BB", "BC", "" };
@@ -22,6 +22,8 @@ public class Bow : Item {
         animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(137.5f, 137.5f);
+        itemInfo = "단순한 나무활. 군더더기 없는 깔끔한 모습이지만 금방이라도 부셔질 듯이 조잡한 것을 보니 싸구려 인듯 하다.";
+        comboName = new string[3] { "쏘기", "위로 쏘기", "" };
 
         player = GameObject.Find("Player");
         arrow = Resources.Load<GameObject>("Prefabs/Projectiles/bow_arrow");

Assets/Scripts/Item/Items/Dagger.cs

@@ -9,7 +9,7 @@ public class Dagger : Item
 {
     public override void Declare()
     {
-        id = 1; name = "dagger";
+        id = 1; name = "단검(Sweet Sword)";
         quality = ItemQuality.Study;
         skillNum = 2;
         combo = new string[3] { "A", "AA", "" };

Assets/Scripts/Item/Items/ElectricShockRod.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 아이템명: 감전봉
+/// 번호: 52
+/// </summary>
+public class ElectricShockRod : Item {
+
+    public override void Declare()
+    {
+        id = 52; name = "감전봉";
+        quality = ItemQuality.Masterpiece;
+        skillNum = 2;
+        combo = new string[3] { "ABA", "CBABB", "" };
+        attachable = new bool[4] { false, false, true, true };
+        sprite = Resources.Load<Sprite>("Sprites/Items/electric shock rod");
+        highlight = Resources.Load<Sprite>("Sprites/Items/electric shock rod");
+        animation[0] = Resources.Load<AnimationClip>("Animations/electricShockRodAttack1");
+        animation[1] = Resources.Load<AnimationClip>("Animations/electricShockRodAttack2");
+        animation[2] = null;
+        sizeInventory = new Vector2(90, 160);
+        itemInfo = "몸이 타는 것 같은 수준으로 아프다. 명령을 내릴 때 효과적일 것 같다.";
+        comboName = new string[3] { "충전", "방전", "" };
+    }
+}

Assets/Scripts/Item/Items/ElectricShockRod.cs.meta

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

Assets/Scripts/Item/Items/ExplosionGloves.cs

@@ -9,7 +9,7 @@ public class ExplosionGloves : Item
 {
     public override void Declare()
     {
-        id = 21; name = "explosion gloves";
+        id = 21; name = "폭탄마의 장갑";
         quality = ItemQuality.Ordinary;
         skillNum = 2;
         combo = new string[3] { "CAC", "CA", "" };

Assets/Scripts/Item/Items/Morgenstern.cs

@@ -9,7 +9,7 @@ public class Morgenstern : Item
 {
     public override void Declare()
     {
-        id = 16; name = "Baculus";
+        id = 16; name = "모닝스타";
         quality = ItemQuality.Superior;
         skillNum = 2;
         combo = new string[3] { "BBCAA", "BBB", "" };