Merge branch 'item'

fb16227f · 18류지석 · 1a5766ca · 89782746 · fb16227f · fb16227f
Commit fb16227f authored Feb 22, 2019 by 18류지석
32 changed files
--- a/Assets/Prefabs/Characters/Player.prefab
+++ b/Assets/Prefabs/Characters/Player.prefab
@@ -361,6 +361,9 @@ MonoBehaviour:
  vanishLayer:
    serializedVersion: 2
    m_Bits: 0
+  stopLayer:
+    serializedVersion: 2
+    m_Bits: 0
  attackCombo: 
 --- !u!114 &114574072693989902
 MonoBehaviour:
@@ -399,8 +402,6 @@ MonoBehaviour:
  playingSkill: 0
  originComboTime: 1
  comboTime: 1
-  time: {fileID: 0}
-  combo: {fileID: 0}
  comboArray: 
  StartTime: 0
  anim: {fileID: 95992411616135034}
@@ -409,6 +410,7 @@ MonoBehaviour:
  - {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
  - {fileID: 7400000, guid: b7ca0c87c2a73cb4e939b4d06abd4217, type: 2}
  - {fileID: 7400000, guid: 9133e696bcae7294c86f6702b20b4ae7, type: 2}
+  comboUI: {fileID: 0}
 --- !u!114 &114906702720267008
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -455,7 +457,7 @@ SpriteRenderer:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: -2078941185
-  m_SortingLayer: 6
+  m_SortingLayer: 8
  m_SortingOrder: 0
  m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}

--- a/Assets/Prefabs/LifeStoneManager.prefab
+++ b/Assets/Prefabs/LifeStoneManager.prefab
@@ -69,6 +69,7 @@ MonoBehaviour:
  vibrationVariable: 0.1
  droppedLifeStonePrefab: {fileID: 1149595688849768, guid: 8255a117a93935941b32b4aed9b299a0,
    type: 2}
+  lifeStoneUI: {fileID: 0}
  frameBorder: 0.2
  popoutStrengthMultiplier: 9
  popoutTime: 0.1
--- a/Assets/Prefabs/TetrisMap/TestTools.prefab
+++ b/Assets/Prefabs/TetrisMap/TestTools.prefab
@@ -149,23 +149,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1192259543566692
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 224718253185442684}
-  - component: {fileID: 222728410615879860}
-  - component: {fileID: 114201015544643294}
-  m_Layer: 5
-  m_Name: comboString
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1202151931231562
 GameObject:
  m_ObjectHideFlags: 1
@@ -412,23 +395,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1476757860294118
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 224363839195006936}
-  - component: {fileID: 222534792739815650}
-  - component: {fileID: 114177053965581520}
-  m_Layer: 5
-  m_Name: comboTime
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1515372648492700
 GameObject:
  m_ObjectHideFlags: 1
@@ -1261,39 +1227,6 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: Destroy Number
--- !u!114 &114177053965581520
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1476757860294118}
-  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.19607843, g: 0.19607843, b: 0.19607843, 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: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
 --- !u!114 &114196760162585638
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -1441,41 +1374,6 @@ MonoBehaviour:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
--- !u!114 &114201015544643294
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1192259543566692}
-  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.19607843, g: 0.19607843, b: 0.19607843, 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: 40
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 'test
-'
 --- !u!114 &114213890665286158
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -3565,13 +3463,6 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1931804548930462}
  m_CullTransparentMesh: 0
--- !u!222 &222534792739815650
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1476757860294118}
-  m_CullTransparentMesh: 0
 --- !u!222 &222557486963309136
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -3628,13 +3519,6 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1080262509988266}
  m_CullTransparentMesh: 0
--- !u!222 &222728410615879860
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1192259543566692}
-  m_CullTransparentMesh: 0
 --- !u!222 &222776509415662164
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -4026,24 +3910,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
--- !u!224 &224363839195006936
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1476757860294118}
-  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: 224395958577644168}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1391.8002, y: -65}
-  m_SizeDelta: {x: 447.59998, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224388504707880396
 RectTransform:
  m_ObjectHideFlags: 1
@@ -4078,8 +3944,6 @@ RectTransform:
  - {fileID: 224071041299093070}
  - {fileID: 224804297962416264}
  - {fileID: 224008356030171754}
-  - {fileID: 224718253185442684}
-  - {fileID: 224363839195006936}
  m_Father: {fileID: 4884929250924374}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4442,24 +4306,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224718253185442684
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1192259543566692}
-  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: 224395958577644168}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1391, y: -122.100006}
-  m_SizeDelta: {x: 449.2, y: 84.20001}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224719946011532306
 RectTransform:
  m_ObjectHideFlags: 1

--- a/Assets/Prefabs/UI/In-Game UI/CharPrefab.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/CharPrefab.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1095428380981576}
+  m_IsPrefabAsset: 1
+--- !u!1 &1095428380981576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224950667710839896}
+  - component: {fileID: 222825601916116362}
+  - component: {fileID: 114195692063160650}
+  m_Layer: 5
+  m_Name: CharPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114195692063160650
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1095428380981576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222825601916116362
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1095428380981576}
+  m_CullTransparentMesh: 0
+--- !u!224 &224950667710839896
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1095428380981576}
+  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: 0}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Prefabs/UI/In-Game UI/CharPrefab.prefab.meta
+++ b/Assets/Prefabs/UI/In-Game UI/CharPrefab.prefab.meta
+fileFormatVersion: 2
+guid: 56ca0b4beca882947a7267a94985352b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/UI/In-Game UI/ComboUI.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/ComboUI.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1379113144309236}
+  m_IsPrefabAsset: 1
+--- !u!1 &1379113144309236
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224473505326681690}
+  - component: {fileID: 114835525296742934}
+  m_Layer: 5
+  m_Name: ComboUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1573367569156034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224686579988098898}
+  m_Layer: 5
+  m_Name: CharUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1688191540496162
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224756934921147816}
+  - component: {fileID: 222456733401175092}
+  - component: {fileID: 114480143646333180}
+  m_Layer: 5
+  m_Name: TimeUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114480143646333180
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688191540496162}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114835525296742934
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379113144309236}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0296171c22d97e64baf3fa3893e42f81, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  charUI: {fileID: 1573367569156034}
+  timeUI: {fileID: 1688191540496162}
+  charPrefab: {fileID: 1095428380981576, guid: 56ca0b4beca882947a7267a94985352b, type: 2}
+  normalCombo:
+  - {fileID: 21300000, guid: 0f9aa2df06e79a64d8981a956eb12226, type: 3}
+  - {fileID: 21300000, guid: 8a73c5ced4d09b74f89078836b9bd890, type: 3}
+  - {fileID: 21300000, guid: eff9d90dcca182243875912722e0cec7, type: 3}
+  charSpaceR: 0.4
+--- !u!222 &222456733401175092
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688191540496162}
+  m_CullTransparentMesh: 0
+--- !u!224 &224473505326681690
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379113144309236}
+  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:
+  - {fileID: 224686579988098898}
+  - {fileID: 224756934921147816}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  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: 0, y: 429}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224686579988098898
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1573367569156034}
+  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: 224473505326681690}
+  m_RootOrder: 0
+  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: 0, y: -1}
+  m_SizeDelta: {x: 100, y: 58}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224756934921147816
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1688191540496162}
+  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: 224473505326681690}
+  m_RootOrder: 1
+  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: 0, y: 45.5}
+  m_SizeDelta: {x: 100, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Prefabs/UI/In-Game UI/ComboUI.prefab.meta
+++ b/Assets/Prefabs/UI/In-Game UI/ComboUI.prefab.meta
+fileFormatVersion: 2
+guid: 51507e73c8b2b094e8299991dfe7fe46
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1081757543633484}
+  m_IsPrefabAsset: 1
+--- !u!1 &1002451349708372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224248237637206000}
+  - component: {fileID: 222341054388860192}
+  - component: {fileID: 114113770585380878}
+  m_Layer: 5
+  m_Name: Info
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1081757543633484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224145562866540604}
+  - component: {fileID: 222113396232554248}
+  - component: {fileID: 114896825415534854}
+  m_Layer: 5
+  m_Name: AddonInfo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1111831459704252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224048950548207416}
+  - component: {fileID: 222130850358267834}
+  - component: {fileID: 114549510406693004}
+  m_Layer: 5
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1379401480617648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224196055372618916}
+  - component: {fileID: 222335990524814540}
+  - component: {fileID: 114900435719581162}
+  - component: {fileID: 114583230027247736}
+  m_Layer: 5
+  m_Name: AddonPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1391617268199904
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224961256756947158}
+  - component: {fileID: 222813614730842076}
+  - component: {fileID: 114302061797922366}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1595906019341418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224985488888190702}
+  - component: {fileID: 222541078709676750}
+  - component: {fileID: 114918159589205128}
+  m_Layer: 5
+  m_Name: Quality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1672634368312032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224478924432546072}
+  - component: {fileID: 222443693495735924}
+  - component: {fileID: 114045702127089742}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114045702127089742
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1672634368312032}
+  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 &114113770585380878
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002451349708372}
+  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 &114302061797922366
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1391617268199904}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114549510406693004
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1111831459704252}
+  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 &114583230027247736
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379401480617648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a124b15eafc6d1847979588fabbb0756, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  num: 0
+--- !u!114 &114896825415534854
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1081757543633484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300010, guid: 838b723a0221f5e48a7f4d3997f18520, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114900435719581162
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379401480617648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114918159589205128
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595906019341418}
+  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: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &222113396232554248
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1081757543633484}
+  m_CullTransparentMesh: 0
+--- !u!222 &222130850358267834
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1111831459704252}
+  m_CullTransparentMesh: 0
+--- !u!222 &222335990524814540
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379401480617648}
+  m_CullTransparentMesh: 0
+--- !u!222 &222341054388860192
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002451349708372}
+  m_CullTransparentMesh: 0
+--- !u!222 &222443693495735924
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1672634368312032}
+  m_CullTransparentMesh: 0
+--- !u!222 &222541078709676750
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595906019341418}
+  m_CullTransparentMesh: 0
+--- !u!222 &222813614730842076
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1391617268199904}
+  m_CullTransparentMesh: 0
+--- !u!224 &224048950548207416
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1111831459704252}
+  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: 224145562866540604}
+  m_RootOrder: 2
+  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: 50}
+  m_SizeDelta: {x: 321.1, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224145562866540604
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1081757543633484}
+  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:
+  - {fileID: 224196055372618916}
+  - {fileID: 224985488888190702}
+  - {fileID: 224048950548207416}
+  - {fileID: 224478924432546072}
+  - {fileID: 224248237637206000}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  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: 140, y: 149.5}
+  m_SizeDelta: {x: 500, y: 285}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224196055372618916
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1379401480617648}
+  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:
+  - {fileID: 224961256756947158}
+  m_Father: {fileID: 224145562866540604}
+  m_RootOrder: 0
+  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: -175, y: 68}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224248237637206000
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002451349708372}
+  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: 224145562866540604}
+  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 &224478924432546072
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1672634368312032}
+  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: 224145562866540604}
+  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 &224961256756947158
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1391617268199904}
+  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: 224196055372618916}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224985488888190702
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595906019341418}
+  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: 224145562866540604}
+  m_RootOrder: 1
+  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: 100}
+  m_SizeDelta: {x: 100, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab.meta
+++ b/Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab.meta
+fileFormatVersion: 2
+guid: b14e5a385d9465448931ccf15d2518e9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
+++ b/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
@@ -45,6 +62,23 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1 &1034608804808008
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224526451003921282}
+  - component: {fileID: 222277154500884434}
+  - component: {fileID: 114532030946388812}
+  m_Layer: 5
+  m_Name: AddonProp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1054435946521640
 GameObject:
  m_ObjectHideFlags: 1
@@ -56,7 +90,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,40 +198,40 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1125633288512872
+--- !u!1 &1125411684357136
 GameObject:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224599194736108168}
+  - component: {fileID: 224965162862329216}
-  - component: {fileID: 222715602428211726}
+  - component: {fileID: 222706300458699176}
-  - component: {fileID: 114549675512655100}
+  - component: {fileID: 114512550949938678}
  m_Layer: 5
-  m_Name: AddonMatter
+  m_Name: Description
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
--- !u!1 &1148612521133766
+--- !u!1 &1125633288512872
 GameObject:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224986284003676062}
+  - component: {fileID: 224599194736108168}
-  - component: {fileID: 222913034616128346}
+  - component: {fileID: 222715602428211726}
-  - component: {fileID: 114506526845253800}
+  - component: {fileID: 114549675512655100}
  m_Layer: 5
-  m_Name: Name
+  m_Name: AddonMatter
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1156867173052978
 GameObject:
  m_ObjectHideFlags: 1
@@ -266,6 +300,23 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1 &1197711932237690
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224578587190871296}
+  - component: {fileID: 222858540225287660}
+  - component: {fileID: 114370923873129904}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1232736465002834
 GameObject:
  m_ObjectHideFlags: 1
@@ -277,7 +328,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
@@ -453,23 +504,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1366511498548578
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 224198027914676356}
-  - component: {fileID: 222008130912942478}
-  - component: {fileID: 114508134077357998}
-  m_Layer: 5
-  m_Name: Quality
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1377385887690366
 GameObject:
  m_ObjectHideFlags: 1
@@ -555,23 +589,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1415037836102326
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 224025842062708722}
-  - component: {fileID: 222954607474597530}
-  - component: {fileID: 114762831278616470}
-  m_Layer: 5
-  m_Name: Description
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1461339799780066
 GameObject:
  m_ObjectHideFlags: 1
@@ -606,42 +623,42 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1560605499280558
+--- !u!1 &1514825023214090
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224158395360498114}
+  - component: {fileID: 224089928543874960}
-  - component: {fileID: 223008133952041092}
+  - component: {fileID: 222287369663776452}
-  - component: {fileID: 114273593274811402}
+  - component: {fileID: 114813829858370262}
-  - component: {fileID: 114133791479992866}
-  - component: {fileID: 114905380279556738}
  m_Layer: 5
-  m_Name: InventoryCanvas
+  m_Name: Description
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1576628563966918
+--- !u!1 &1560605499280558
 GameObject:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224618072368546468}
+  - component: {fileID: 224158395360498114}
-  - component: {fileID: 222947900834263464}
+  - component: {fileID: 223008133952041092}
-  - component: {fileID: 114515661564662424}
+  - component: {fileID: 114273593274811402}
+  - component: {fileID: 114133791479992866}
+  - component: {fileID: 114905380279556738}
  m_Layer: 5
-  m_Name: AddonPorp
+  m_Name: InventoryCanvas
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1585479734924542
 GameObject:
  m_ObjectHideFlags: 1
@@ -795,6 +812,23 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 0
+--- !u!1 &1734269134764246
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224148683467624068}
+  - component: {fileID: 222176327066856600}
+  - component: {fileID: 114211615479410814}
+  m_Layer: 5
+  m_Name: Quality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1740846474753968
 GameObject:
  m_ObjectHideFlags: 1
@@ -897,6 +931,23 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1 &1800326140410628
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224481963077628250}
+  - component: {fileID: 222932207311268118}
+  - component: {fileID: 114187204514180790}
+  m_Layer: 5
+  m_Name: AddonCell
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1833089949129776
 GameObject:
  m_ObjectHideFlags: 1
@@ -931,35 +982,52 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 0
--- !u!1 &1890868960096556
+--- !u!1 &1905318406077552
 GameObject:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224962187461313488}
+  - component: {fileID: 224161093930525842}
-  - component: {fileID: 222017053921420750}
+  - component: {fileID: 222974339910655962}
-  - component: {fileID: 114422644802281134}
+  - component: {fileID: 114176978316575516}
  m_Layer: 5
-  m_Name: AddonCell
+  m_Name: Quality
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1905318406077552
+--- !u!1 &1916219744466350
 GameObject:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 224161093930525842}
+  - component: {fileID: 224834756417368066}
-  - component: {fileID: 222974339910655962}
+  - component: {fileID: 222091069898545152}
-  - component: {fileID: 114176978316575516}
+  - component: {fileID: 114862242431215730}
  m_Layer: 5
-  m_Name: Quality
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1916862452006764
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224203139156957262}
+  - component: {fileID: 222797332736393246}
+  - component: {fileID: 114469254793821058}
+  m_Layer: 5
+  m_Name: Info
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -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
@@ -1430,6 +1498,33 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
+--- !u!114 &114187204514180790
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1800326140410628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114193849830047298
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -1484,6 +1579,72 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
+--- !u!114 &114211615479410814
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1734269134764246}
+  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: 10
+    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 &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
@@ -1874,6 +2035,39 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
+--- !u!114 &114370923873129904
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1197711932237690}
+  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 &114373264830000810
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -1955,12 +2149,12 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
--- !u!114 &114422644802281134
+--- !u!114 &114465938237025114
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1890868960096556}
+  m_GameObject: {fileID: 1406138768132466}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -1974,7 +2168,7 @@ MonoBehaviour:
      m_Calls: []
    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300006, guid: c448ed0a4ef1fc24a95611d602eca458, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -1982,33 +2176,39 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
--- !u!114 &114465938237025114
+--- !u!114 &114469254793821058
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1406138768132466}
+  m_GameObject: {fileID: 1916862452006764}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  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_Sprite: {fileID: 21300006, guid: c448ed0a4ef1fc24a95611d602eca458, type: 3}
+  m_FontData:
-  m_Type: 0
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-  m_PreserveAspect: 0
+    m_FontSize: 30
-  m_FillCenter: 1
+    m_FontStyle: 0
-  m_FillMethod: 4
+    m_BestFit: 0
-  m_FillAmount: 1
+    m_MinSize: 3
-  m_FillClockwise: 1
+    m_MaxSize: 40
-  m_FillOrigin: 0
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114476609054798542
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -2069,12 +2269,12 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
--- !u!114 &114506526845253800
+--- !u!114 &114512550949938678
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1148612521133766}
+  m_GameObject: {fileID: 1125411684357136}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2102,45 +2302,12 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
--- !u!114 &114508134077357998
+--- !u!114 &114532030946388812
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1366511498548578}
+  m_GameObject: {fileID: 1034608804808008}
-  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: 10
-    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
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1576628563966918}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2423,12 +2590,12 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
--- !u!114 &114762831278616470
+--- !u!114 &114806896438471400
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1415037836102326}
+  m_GameObject: {fileID: 1054435946521640}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2456,12 +2623,39 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
--- !u!114 &114806896438471400
+--- !u!114 &114811665028178390
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1632247131797760}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300002, guid: 726417bbac5d59e4ca46df0c81e62fa8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  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: 1054435946521640}
+  m_GameObject: {fileID: 1514825023214090}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -2489,33 +2683,6 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 
--- !u!114 &114811665028178390
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1632247131797760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300002, guid: 726417bbac5d59e4ca46df0c81e62fa8, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114829223577490432
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -2663,6 +2830,39 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
+--- !u!114 &114862242431215730
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1916219744466350}
+  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 &114881707483037664
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -2772,7 +2972,7 @@ MonoBehaviour:
  - {fileID: 21300038, guid: 838b723a0221f5e48a7f4d3997f18520, type: 3}
  - {fileID: 21300052, guid: 838b723a0221f5e48a7f4d3997f18520, type: 3}
  infoAddonsFrame:
-  - {fileID: 1576628563966918}
+  - {fileID: 1034608804808008}
  - {fileID: 1125633288512872}
  - {fileID: 1390634681153328}
  - {fileID: 1162136602119166}
@@ -2789,6 +2989,8 @@ MonoBehaviour:
  - {fileID: 1839893307059716}
  - {fileID: 1625608071671492}
  pixelBetweenChar: 15
+  addonInfoPrefab: {fileID: 1081757543633484, guid: b14e5a385d9465448931ccf15d2518e9,
+    type: 2}
  selectedItem: -1
 --- !u!114 &114936216491604280
 MonoBehaviour:
@@ -2878,13 +3080,6 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1054435946521640}
  m_CullTransparentMesh: 0
--- !u!222 &222008130912942478
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1366511498548578}
-  m_CullTransparentMesh: 0
 --- !u!222 &222013459506795848
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -2892,19 +3087,19 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1390634681153328}
  m_CullTransparentMesh: 0
--- !u!222 &222017053921420750
+--- !u!222 &222034947372531916
 CanvasRenderer:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1890868960096556}
+  m_GameObject: {fileID: 1253765269442250}
  m_CullTransparentMesh: 0
--- !u!222 &222034947372531916
+--- !u!222 &222091069898545152
 CanvasRenderer:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1253765269442250}
+  m_GameObject: {fileID: 1916219744466350}
  m_CullTransparentMesh: 0
 --- !u!222 &222101980230127394
 CanvasRenderer:
@@ -2948,6 +3143,13 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1156867173052978}
  m_CullTransparentMesh: 0
+--- !u!222 &222176327066856600
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1734269134764246}
+  m_CullTransparentMesh: 0
 --- !u!222 &222203867731084472
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -2962,6 +3164,20 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1776251997144528}
  m_CullTransparentMesh: 0
+--- !u!222 &222277154500884434
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1034608804808008}
+  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 +3346,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
@@ -3172,6 +3395,13 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1796439452095776}
  m_CullTransparentMesh: 0
+--- !u!222 &222797332736393246
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1916862452006764}
+  m_CullTransparentMesh: 0
 --- !u!222 &222829177295805814
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -3193,6 +3423,13 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1330369641439116}
  m_CullTransparentMesh: 0
+--- !u!222 &222858540225287660
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1197711932237690}
+  m_CullTransparentMesh: 0
 --- !u!222 &222881811434949598
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -3214,13 +3451,6 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1261123751673968}
  m_CullTransparentMesh: 0
--- !u!222 &222913034616128346
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1148612521133766}
-  m_CullTransparentMesh: 0
 --- !u!222 &222929782868359540
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -3228,12 +3458,12 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1233694008493474}
  m_CullTransparentMesh: 0
--- !u!222 &222947900834263464
+--- !u!222 &222932207311268118
 CanvasRenderer:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1576628563966918}
+  m_GameObject: {fileID: 1800326140410628}
  m_CullTransparentMesh: 0
 --- !u!222 &222951131180645372
 CanvasRenderer:
@@ -3242,12 +3472,12 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1290477757873968}
  m_CullTransparentMesh: 0
--- !u!222 &222954607474597530
+--- !u!222 &222959522593680230
 CanvasRenderer:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1415037836102326}
+  m_GameObject: {fileID: 1004051359923830}
  m_CullTransparentMesh: 0
 --- !u!222 &222974339910655962
 CanvasRenderer:
@@ -3358,24 +3588,6 @@ RectTransform:
  m_AnchoredPosition: {x: -762.69995, y: -120}
  m_SizeDelta: {x: 617.05, y: 100}
  m_Pivot: {x: 0, y: 0.5}
--- !u!224 &224025842062708722
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1415037836102326}
-  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224073559880629636
 RectTransform:
  m_ObjectHideFlags: 1
@@ -3428,9 +3640,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 +3672,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_AnchoredPosition: {x: -36, y: -17.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_SizeDelta: {x: 406, y: 68}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224137214707512560
 RectTransform:
@@ -3494,6 +3724,24 @@ RectTransform:
  m_AnchoredPosition: {x: -175, y: 68}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224148683467624068
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1734269134764246}
+  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: 224526451003921282}
+  m_RootOrder: 1
+  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: 100}
+  m_SizeDelta: {x: 100, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224157090093153636
 RectTransform:
  m_ObjectHideFlags: 1
@@ -3568,26 +3816,26 @@ 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
+--- !u!224 &224203139156957262
 RectTransform:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1366511498548578}
+  m_GameObject: {fileID: 1916862452006764}
  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_Father: {fileID: 224526451003921282}
-  m_RootOrder: 1
+  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: -43, y: 91.5}
+  m_AnchoredPosition: {x: -36, y: -17.5}
-  m_SizeDelta: {x: 100, y: 50}
+  m_SizeDelta: {x: 406, y: 68}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224216406053780268
 RectTransform:
@@ -3602,6 +3850,7 @@ RectTransform:
  - {fileID: 224447395369926638}
  - {fileID: 224083122370743694}
  - {fileID: 224429664558353378}
+  - {fileID: 224965162862329216}
  - {fileID: 224128321665305960}
  m_Father: {fileID: 224358157952434602}
  m_RootOrder: 10
@@ -3626,7 +3875,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 +3932,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
@@ -3755,7 +4022,7 @@ RectTransform:
  - {fileID: 224015295540900420}
  - {fileID: 224520992116938538}
  - {fileID: 224441728605704258}
-  - {fileID: 224618072368546468}
+  - {fileID: 224526451003921282}
  - {fileID: 224599194736108168}
  - {fileID: 224216406053780268}
  - {fileID: 224561095018798596}
@@ -3805,7 +4072,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 +4089,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 +4175,30 @@ 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: -36, y: -17.5}
+  m_SizeDelta: {x: 406, y: 68}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224481963077628250
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1800326140410628}
+  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: 224526451003921282}
+  m_RootOrder: 0
  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_AnchoredPosition: {x: -175, y: 68}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224487573599250656
 RectTransform:
@@ -3969,6 +4254,29 @@ RectTransform:
  m_AnchoredPosition: {x: 140, y: -150.5}
  m_SizeDelta: {x: 500, y: 285}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224526451003921282
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1034608804808008}
+  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:
+  - {fileID: 224481963077628250}
+  - {fileID: 224148683467624068}
+  - {fileID: 224834756417368066}
+  - {fileID: 224578587190871296}
+  - {fileID: 224203139156957262}
+  m_Father: {fileID: 224358157952434602}
+  m_RootOrder: 8
+  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: 140, y: 149.5}
+  m_SizeDelta: {x: 500, y: 285}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224542162195928868
 RectTransform:
  m_ObjectHideFlags: 1
@@ -4018,6 +4326,7 @@ RectTransform:
  - {fileID: 224234749847798032}
  - {fileID: 224161093930525842}
  - {fileID: 224230215658644044}
+  - {fileID: 224089928543874960}
  - {fileID: 224472498755576056}
  m_Father: {fileID: 224358157952434602}
  m_RootOrder: 11
@@ -4038,55 +4347,52 @@ 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_AnchoredPosition: {x: -36, y: -17.5}
-  m_SizeDelta: {x: 406, y: 114.5}
+  m_SizeDelta: {x: 406, y: 68}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224599194736108168
+--- !u!224 &224578587190871296
 RectTransform:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1125633288512872}
+  m_GameObject: {fileID: 1197711932237690}
  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_Children: []
-  - {fileID: 224145557615908318}
+  m_Father: {fileID: 224526451003921282}
-  - {fileID: 224851807554590988}
+  m_RootOrder: 3
-  - {fileID: 224774393181463022}
-  - {fileID: 224566355955157224}
-  m_Father: {fileID: 224358157952434602}
-  m_RootOrder: 9
  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: 655, y: 149.5}
+  m_AnchoredPosition: {x: -36, y: -90}
-  m_SizeDelta: {x: 500, y: 285}
+  m_SizeDelta: {x: 406, y: 70}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224618072368546468
+--- !u!224 &224599194736108168
 RectTransform:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1576628563966918}
+  m_GameObject: {fileID: 1125633288512872}
  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:
-  - {fileID: 224962187461313488}
+  - {fileID: 224145557615908318}
-  - {fileID: 224198027914676356}
+  - {fileID: 224851807554590988}
-  - {fileID: 224986284003676062}
+  - {fileID: 224774393181463022}
-  - {fileID: 224025842062708722}
+  - {fileID: 224255082055272874}
+  - {fileID: 224566355955157224}
  m_Father: {fileID: 224358157952434602}
-  m_RootOrder: 8
+  m_RootOrder: 9
  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: 140, y: 149.5}
+  m_AnchoredPosition: {x: 655, y: 149.5}
  m_SizeDelta: {x: 500, y: 285}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224658038727328780
@@ -4230,7 +4536,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
@@ -4290,6 +4596,24 @@ RectTransform:
  m_AnchoredPosition: {x: -675, y: 122.7}
  m_SizeDelta: {x: 507.3, y: 103.3}
  m_Pivot: {x: 0, y: 0.5}
+--- !u!224 &224834756417368066
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1916219744466350}
+  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: 224526451003921282}
+  m_RootOrder: 2
+  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: 50}
+  m_SizeDelta: {x: 321.1, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224851807554590988
 RectTransform:
  m_ObjectHideFlags: 1
@@ -4305,7 +4629,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
@@ -4407,39 +4731,21 @@ RectTransform:
  m_AnchoredPosition: {x: -460, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224962187461313488
+--- !u!224 &224965162862329216
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1890868960096556}
-  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: 0
-  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: -175, y: 68}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224986284003676062
 RectTransform:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1148612521133766}
+  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: 224618072368546468}
+  m_Father: {fileID: 224216406053780268}
-  m_RootOrder: 2
+  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: 67.6, y: 25}
+  m_AnchoredPosition: {x: -36, y: -90}
-  m_SizeDelta: {x: 321.1, y: 50}
+  m_SizeDelta: {x: 406, y: 70}
  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Resources/Prefabs/Projectiles/bow_arrow.prefab
+++ b/Assets/Resources/Prefabs/Projectiles/bow_arrow.prefab
@@ -114,7 +114,10 @@ MonoBehaviour:
    m_Bits: 65536
  vanishLayer:
    serializedVersion: 2
-    m_Bits: 65792
+    m_Bits: 65536
+  stopLayer:
+    serializedVersion: 2
+    m_Bits: 256
  attackCombo: 
 --- !u!114 &114988624070961888
 MonoBehaviour:

--- a/Assets/Scripts/Characters/AttackProperty.cs
+++ b/Assets/Scripts/Characters/AttackProperty.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
-public class AttackProperty : MonoBehaviour{
+public class AttackProperty : MonoBehaviour {
    public float damage = 0;
    public float knockBackMultiplier = 1f;
    public float[] debuffTime = new float[(int)EnemyDebuffCase.END_POINTER];
@@ -11,6 +11,7 @@ public class AttackProperty : MonoBehaviour{
    InventoryManager inventoryManager;
    public LayerMask enemyLayer;
    public LayerMask vanishLayer;
+    public LayerMask stopLayer;
    public string attackCombo;
    private void Awake()
@@ -26,13 +27,13 @@ public class AttackProperty : MonoBehaviour{
    private void OnTriggerEnter2D(Collider2D collision)
    {
        Bounds tmpBounds = new Bounds();
        if ((enemyLayer == (enemyLayer | 1 << collision.gameObject.layer)) && !collision.transform.GetChild(0).GetComponent<Enemy>().Invisible)
        {
            PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffTime);
            Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>();
            foreach (Item tmpItem in inventoryManager.itemList)
                for (int i = 0; i < tmpItem.skillNum; i++)
                {
@@ -44,7 +45,7 @@ public class AttackProperty : MonoBehaviour{
                }
            collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack);
            //make effect
            foreach (Collider2D col in GetComponents<Collider2D>())
                if (col.isActiveAndEnabled)
@@ -54,9 +55,21 @@ public class AttackProperty : MonoBehaviour{
                effectManager.StartEffect(0, tmpBounds, collision.bounds);
        }
-        if(projectileType == 1 && (vanishLayer == (vanishLayer | 1 << collision.gameObject.layer)))
+        if (projectileType == 1 && (vanishLayer == (vanishLayer | 1 << collision.gameObject.layer)))
        {
            Destroy(gameObject);
        }
+        if (projectileType == 1 && (stopLayer == (stopLayer | 1 << collision.gameObject.layer)))
+        {
+            GetComponent<Rigidbody2D>().velocity = Vector2.zero;
+            GetComponent<Collider2D>().enabled = false;
+            StartCoroutine(WaitVanish(10f));
+        }
+    }
+    IEnumerator WaitVanish(float time)
+    {
+        yield return new WaitForSeconds(time);
+        Destroy(gameObject);
    }
 }
--- a/Assets/Scripts/Characters/PlayerAttack.cs
+++ b/Assets/Scripts/Characters/PlayerAttack.cs
@@ -9,12 +9,12 @@ public class PlayerAttack : MonoBehaviour {
    private bool comboEndDelay = true;
    public float originComboTime;
    public float comboTime;
-    public Text time, combo;
    public string comboArray;
    public float StartTime;
    public Animator anim;
    public AnimatorOverrideController aoc;
    public AnimationClip[] normalAttack = new AnimationClip[3];
+    public ComboUI comboUI;
    InventoryManager inventoryManager;
    LifeStoneManager lifeStoneManager;
@@ -65,36 +65,18 @@ public class PlayerAttack : MonoBehaviour {
    public void SetComboText()
    {
-        string conString = "";
+        comboUI.SetCombo(comboArray);
-        if (comboArray.Equals(""))
-        {
-            combo.text = "";
-            return;
-        }
-        conString += comboArray[0];
-        for (int i = 1; i < comboArray.Length; i++)
-            conString += " " + comboArray[i];
-        combo.text = conString;
    }
    public void SetTimeText(float fullTime, float currentTime)
    {
        if (comboTimeOn)
        {
-            for (int i = 0; i < 20; i++)
+            comboUI.SetTime(currentTime, fullTime);
-            {
-                if (currentTime / fullTime < (i + 1) * 0.05f)
-                {
-                    string str = "";
-                    for (int j = 0; j < i + 1; j++) str += "-";
-                    time.text = str;
-                    break;
-                }
-            }
        }
        else
        {
-            time.text = "";
+            comboUI.SetTime();
        }
    }
    IEnumerator ComboEndDelay()
@@ -115,8 +97,13 @@ public class PlayerAttack : MonoBehaviour {
    }
    IEnumerator ComboTextReset()
    {
-        yield return new WaitForSeconds(1.5f);
+        for(float timer = 0f; timer < 1.5f; timer += Time.deltaTime)
-        SetComboText();
+        {
+            yield return null;
+            if (playingSkill) break;
+        }
+        if(comboArray.Equals("") && !playingSkill)
+            SetComboText();
    }
    IEnumerator SkillEndCoroutine()
    {

--- a/Assets/Scripts/Item/Addon.cs
+++ b/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)
    {

--- a/Assets/Scripts/Item/AddonDrag.cs
+++ b/Assets/Scripts/Item/AddonDrag.cs
@@ -3,14 +3,17 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
-public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerClickHandler
+public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler
 {
    public int num;
    InventoryUI ui;
    InventoryManager manager;
    Transform addonGroup, discardBin;
+    bool pointerOn;
    void Start()
    {
+        pointerOn = false;
        ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
        manager = InventoryManager.Instance;
        addonGroup = ui.gameObject.transform.Find("AddonGroup");
@@ -18,63 +21,104 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
    }
    public void OnBeginDrag(PointerEventData eventData)
    {
-        transform.SetAsLastSibling();
+        pointerOn = false;
+        if (eventData.button == PointerEventData.InputButton.Left)
+            transform.SetAsLastSibling();
    }
    public void OnDrag(PointerEventData eventData)
    {
-        transform.position = Input.mousePosition;
+        if (eventData.button == PointerEventData.InputButton.Left)
+            transform.position = Input.mousePosition;
    }
    public void OnEndDrag(PointerEventData eventData)
    {
-        if (CheckBetween(Input.mousePosition, discardBin.position, discardBin.GetComponent<RectTransform>().sizeDelta))
+        if (eventData.button == PointerEventData.InputButton.Left)
        {
+            if (CheckBetween(Input.mousePosition, discardBin.position, discardBin.GetComponent<RectTransform>().sizeDelta))
+            {
+                if (num < 9)
+                    manager.DiscardAddon(num);
+                else
+                    manager.DiscardAddon(ui.selectedItem, (AddonType)(num - 9));
+                manager.SetOnPosition();
+                return;
+            }
            if (num < 9)
-                manager.DiscardAddon(num);
+            {
+                int type = (int)manager.addonList[num].type;
+                if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
+                {
+                    if (CheckBetween(Input.mousePosition, ui.infoAddonsFrame[type].transform.position, ui.infoAddonsFrame[type].GetComponent<RectTransform>().sizeDelta))
+                    {
+                        if (manager.itemList[ui.selectedItem].addons[type] != null) manager.DetachAddon(ui.selectedItem, (AddonType)type);
+                        manager.AttachAddon(ui.selectedItem, num);
+                    }
+                }
+            }
            else
-                manager.DiscardAddon(ui.selectedItem, (AddonType)(num - 9));
+            {
+                if (CheckBetween(Input.mousePosition, addonGroup.position, addonGroup.GetComponent<RectTransform>().sizeDelta))
+                    manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
+            }
            manager.SetOnPosition();
-            return;
        }
-        if (num < 9)
+    }
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        if (eventData.button == PointerEventData.InputButton.Right)
        {
-            int type = (int)manager.addonList[num].type;
+            if (num < 9)
-            if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
            {
-                if (CheckBetween(Input.mousePosition, ui.infoAddonsFrame[type].transform.position, ui.infoAddonsFrame[type].GetComponent<RectTransform>().sizeDelta))
+                int type = (int)manager.addonList[num].type;
+                if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
                {
-                    if (manager.itemList[ui.selectedItem].addons[type] != null) manager.DetachAddon(ui.selectedItem, (AddonType)type);
+                    if (manager.itemList[ui.selectedItem].addons[type] != null)
+                        manager.DetachAddon(ui.selectedItem, (AddonType)type);
                    manager.AttachAddon(ui.selectedItem, num);
                }
            }
-        }
+            else
-        else
-        {
-            if (CheckBetween(Input.mousePosition, addonGroup.position, addonGroup.GetComponent<RectTransform>().sizeDelta))
                manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
+            manager.SetOnPosition();
        }
-        manager.SetOnPosition();
    }
-    public void OnPointerClick(PointerEventData eventData)
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        pointerOn = true;
+        StartCoroutine(AddonInfoReveal());
+    }
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        pointerOn = false;
+    }
+    IEnumerator AddonInfoReveal()
    {
        if (num < 9)
        {
-            int type = (int)manager.addonList[num].type;
+            for (float timer = 0; timer < 0.5f; timer += Time.deltaTime)
-            if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
+            {
+                yield return null;
+                if (!pointerOn) yield break;
+            }
+            ui.SetAddonInfo(num);
+            while (pointerOn)
            {
-                if (manager.itemList[ui.selectedItem].addons[type] != null)
+                yield return null;
-                    manager.DetachAddon(ui.selectedItem, (AddonType)type);
-                manager.AttachAddon(ui.selectedItem, num);
            }
+            ui.SetAddonInfo();
        }
-        else
-            manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
-        manager.SetOnPosition();
    }
    bool CheckBetween(Vector3 mouse, Vector3 center, Vector2 size)
    {
        return Mathf.Abs(mouse.x - center.x) <= size.x / 2f && Mathf.Abs(mouse.y - center.y) <= size.y / 2f;
    }
 }
--- a/Assets/Scripts/Item/Addons/CoollyPride.cs
+++ b/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)

--- a/Assets/Scripts/Item/Addons/GlowingHerb.cs
+++ b/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)

--- a/Assets/Scripts/Item/Addons/Gluttony.cs
+++ b/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)
    {

--- a/Assets/Scripts/Item/Addons/ParchmentPiece.cs
+++ b/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)
    {

--- a/Assets/Scripts/Item/InventoryManager.cs
+++ b/Assets/Scripts/Item/InventoryManager.cs
@@ -145,6 +145,11 @@ public class InventoryManager : Singleton<InventoryManager> {
    {
        GameObject tmpItem = Instantiate(droppedPrefab);
        tmpItem.GetComponent<DroppedItem>().Init((Item)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
+        for (int i = 0; i < 4; i++)
+            if (itemPool[i].Contains(str))
+                itemPool[i].Remove(str);
        tmpItem.transform.SetParent(MapManager.currentRoom.roomInGame.transform);
        PopoutGenerator(tmpItem, popoutStrength);
    }
@@ -183,6 +188,11 @@ public class InventoryManager : Singleton<InventoryManager> {
    {
        GameObject tmpItem = Instantiate(droppedPrefab);
        tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
+        for (int i = 0; i < 4; i++)
+            if (addonPool[i].Contains(str))
+                addonPool[i].Remove(str);
        tmpItem.transform.SetParent(MapManager.currentRoom.roomInGame.transform);
        PopoutGenerator(tmpItem, popoutStrength);
    }

--- a/Assets/Scripts/Item/InventoryUI.cs
+++ b/Assets/Scripts/Item/InventoryUI.cs
@@ -32,12 +32,18 @@ public class InventoryUI : MonoBehaviour {
    public GameObject[] comboCharPrefab;
    public GameObject[] comboNameFrame;
    public float pixelBetweenChar;
+    public GameObject addonInfoPrefab;
    GameObject[,] comboChars = new GameObject[3, 8];
    GameObject[] infoAddons;
+    GameObject addonInfo;
    public int selectedItem = -1;
    string[] qualityString = new string[4] { "습작", "범작", "수작", "걸작" };
+    InventoryManager inventoryManager;
 	void Awake () {
+        inventoryManager = InventoryManager.Instance;
        items = new GameObject[9];
        addons = new GameObject[9];
        infoAddons = new GameObject[4];
@@ -71,7 +77,38 @@ public class InventoryUI : MonoBehaviour {
        }
        infoSpace.transform.Find("Frame").gameObject.SetActive(false);
+        addonInfo = Instantiate(addonInfoPrefab, transform);
+        addonInfo.SetActive(false);
+    }
+    public void SetAddonInfo()
+    {
+        addonInfo.SetActive(false);
    }
+    public void SetAddonInfo(int addonNum)
+    {
+        if (addons[addonNum].activeSelf)
+        {
+            addonInfo.SetActive(true);
+            addonInfo.transform.position = addonCell[addonNum].transform.position + new Vector3(0, 200, 0);
+            addonInfo.transform.position += new Vector3(-addonInfo.transform.position.x + Mathf.Min(addonInfo.transform.position.x, 1650), 0, 0);
+            Addon currentAddon = inventoryManager.addonList[addonNum];
+            GameObject tmpObj = addonInfo.transform.Find("AddonPrefab").gameObject;
+            tmpObj.GetComponent<Image>().sprite = addonFrameQuality[(int)currentAddon.type * 4 + (int)currentAddon.quality];
+            tmpObj.transform.Find("Sprite").gameObject.GetComponent<Image>().sprite = currentAddon.sprite;
+            tmpObj.transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = currentAddon.sizeInventory;
+            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("Info").GetComponent<Text>().text = currentAddon.addonInfo;
+        }
+    }
    public void SetOnPosition(List<Item> itemList, List<Addon> addonList)
    {
        for(int i=0; i<itemList.Count; i++)
@@ -151,6 +188,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;
                }

--- a/Assets/Scripts/Item/Items/Baculus.cs
+++ b/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] { "기도", "징벌", "" };
    }
 }
--- a/Assets/Scripts/Item/Items/Bow.cs
+++ b/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");

--- a/Assets/Scripts/Item/Items/Dagger.cs
+++ b/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", "" };

--- a/Assets/Scripts/Item/Items/ElectricShockRod.cs
+++ b/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] { "충전", "방전", "" };
+    }
+}
--- a/Assets/Scripts/Item/Items/ElectricShockRod.cs.meta
+++ b/Assets/Scripts/Item/Items/ElectricShockRod.cs.meta
+fileFormatVersion: 2
+guid: bb06bbbb186c681479b2784047d9df19
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Item/Items/ExplosionGloves.cs
+++ b/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", "" };

--- a/Assets/Scripts/Item/Items/Morgenstern.cs
+++ b/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", "" };

--- a/Assets/Scripts/UI/In-game UI/ComboUI.cs
+++ b/Assets/Scripts/UI/In-game UI/ComboUI.cs
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class ComboUI : MonoBehaviour {
+    public GameObject charUI;
+    public GameObject timeUI;
+    public GameObject charPrefab;
+    public Sprite[] normalCombo = new Sprite[3];
+    public float charSpaceR;
+    float timeUILength;
+    float charSpace;
+    GameObject[] charObj;
+    string currentCombo;
+	void Awake () {
+        RectTransform rtt = timeUI.GetComponent<RectTransform>();
+        timeUILength = rtt.sizeDelta.x;
+        rtt.sizeDelta = new Vector2(0, rtt.sizeDelta.y);
+        charObj = new GameObject[8];
+        for (int i = 0; i < 8; i++)
+        {
+            charObj[i] = Instantiate(charPrefab, charUI.transform);
+            charObj[i].SetActive(false);
+        }
+        currentCombo = "";
+        charSpace = charUI.GetComponent<RectTransform>().sizeDelta.y * charSpaceR;
+    }
+    public void SetCombo(string combo)
+    {
+        for(int i=0; i<8; i++)
+        {
+            if(combo.Length <= i && currentCombo.Length <= i)
+            {
+                break;
+            }
+            else if(combo.Length <= i)
+            {
+                charObj[i].SetActive(false);
+            }
+            else
+            {
+                Sprite currentSprite = normalCombo[combo[i] - 'A'];
+                charObj[i].SetActive(true);
+                charObj[i].GetComponent<Image>().sprite = currentSprite;
+                charObj[i].GetComponent<RectTransform>().sizeDelta = new Vector2(
+                    currentSprite.bounds.extents.x / currentSprite.bounds.extents.y * charUI.GetComponent<RectTransform>().sizeDelta.y,
+                    charUI.GetComponent<RectTransform>().sizeDelta.y);
+                charObj[i].transform.localPosition = new Vector3((i==0) ? 0 : charObj[i-1].transform.localPosition.x + charObj[i-1].GetComponent<RectTransform>().sizeDelta.x / 2f + charObj[i].GetComponent<RectTransform>().sizeDelta.x / 2f + charSpace, 0, 0);
+            }
+        }
+        if (combo.Length > 0)
+        {
+            Vector3 shift = new Vector3((charObj[0].transform.position.x - charObj[combo.Length - 1].transform.position.x)/2f, 0, 0);
+            for (int i = 0; i < 8; i++)
+            {
+                if (charObj[i].activeSelf)
+                {
+                    charObj[i].transform.localPosition = charObj[i].transform.localPosition + shift;
+                    charObj[i].transform.localScale = new Vector3((i == combo.Length - 1) ? 1.3f : 1, (i == combo.Length - 1) ? 1.3f : 1, 1);
+                }
+            }
+            StartCoroutine(EmphasizeCoroutine(combo.Length - 1));
+        }
+        currentCombo = combo;
+    }
+    IEnumerator EmphasizeCoroutine(int n)
+    {
+        for (float timer = 0f; timer < 0.5f; timer += Time.deltaTime)
+        {
+            charObj[n].transform.localScale = new Vector3(-2.5f * Mathf.Pow(timer * 2 - 0.45f,2f) + 1.75625f, -2.5f * Mathf.Pow(timer * 2 - 0.45f, 2f) + 1.75625f, 1);
+            yield return null;
+        }
+        charObj[n].transform.localScale = new Vector3(1, 1, 1);
+    }
+    public void SetTime()
+    {
+        RectTransform rtt = timeUI.GetComponent<RectTransform>();
+        rtt.sizeDelta = new Vector2(0, rtt.sizeDelta.y);
+    }
+    public void SetTime(float currentTime, float fullTime)
+    {
+        RectTransform rtt = timeUI.GetComponent<RectTransform>();
+        rtt.sizeDelta = new Vector2(timeUILength * (currentTime / fullTime), rtt.sizeDelta.y);
+    }
+}
--- a/Assets/Scripts/UI/In-game UI/ComboUI.cs.meta
+++ b/Assets/Scripts/UI/In-game UI/ComboUI.cs.meta
+fileFormatVersion: 2
+guid: 0296171c22d97e64baf3fa3893e42f81
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
+++ b/Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
@@ -55,13 +55,15 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 	public GameObject droppedLifeStonePrefab;
+    public GameObject lifeStoneUI;
    public float frameBorder;
    public float popoutStrengthMultiplier;
    public float popoutTime;
    void Start () {
-        transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
+        lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
        frameSuper.GetComponent<LifeStoneFrame>().Init(frameSuper.transform, standardImage, lifeStoneRowNum, lifeStoneSize, sprites, frameBorder);
        lifeStoneArray = new int[50, 3];
 		lifeStoneUnit = new GameObject[50, 3];
@@ -430,7 +432,21 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 			}
 		}
 		StartCoroutine(DestroyInPhase(candArray));
+        StartCoroutine(HitRedEffect(num));
 	}
+    IEnumerator HitRedEffect(int damage)
+    {
+        float startTime = Time.time, endTime = startTime + 0.3f;
+        SpriteRenderer sprt = GameObject.Find("Player").GetComponent<SpriteRenderer>();
+        sprt.color = new Color(1, 0, 0);
+        while(Time.time < endTime)
+        {
+            sprt.color = new Color(1, 1 - (endTime - Time.time) / (endTime - startTime), 1 - (endTime - Time.time) / (endTime - startTime));
+            yield return null;
+        }
+        sprt.color = new Color(1, 1, 1);
+    }
    /// <summary>
    /// make term among lifestone destroy
@@ -574,10 +590,10 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 		while(vibration > lifeStoneSize * 0.005f)
 		{
 			Vector2 tmpVector = Random.insideUnitCircle;
-			transform.position = new Vector3(lifeStoneLocation.x + tmpVector.x * vibration * 0.3f, lifeStoneLocation.y + tmpVector.y * vibration, 0);
+			lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x + tmpVector.x * vibration * 0.3f, lifeStoneLocation.y + tmpVector.y * vibration, 0);
 			vibration *= 0.8f;
 			yield return null;
 		}
-		transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
+        lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
 	}		
 }
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -51,6 +51,12 @@ TagManager:
  - name: UI
    uniqueID: 4254909397
    locked: 0
+  - name: ItemHighlight
+    uniqueID: 996861525
+    locked: 0
+  - name: Item
+    uniqueID: 2145601713
+    locked: 0
  - name: Wall
    uniqueID: 3278214247
    locked: 0
@@ -69,12 +75,6 @@ TagManager:
  - name: Spike
    uniqueID: 3612720217
    locked: 0
-  - name: ItemHighlight
-    uniqueID: 996861525
-    locked: 0
-  - name: Item
-    uniqueID: 2145601713
-    locked: 0
  - name: Door
    uniqueID: 343148499
    locked: 0