Merge branch 'dev' into fix/lerp_movement_after_teleportation

Assets/AvvyLand/Images/UI/ActionToolsImage/Delete1.png.meta → Assets/AvvyLand/Images/UI/ActionToolsImage/Remove.png.meta

 fileFormatVersion: 2
-guid: 738f262e9391f594e96407b79802bcfb
+guid: fa6bb87b18c476947b802e93097e29b4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -65,7 +65,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -77,7 +77,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -89,7 +89,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -101,7 +101,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Windows Store Apps
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -113,7 +113,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/AvvyLand/Images/UI/ActionToolsImage/BackBig.png.meta → Assets/AvvyLand/Images/UI/ActionToolsImage/Remove1.png.meta

 fileFormatVersion: 2
-guid: 0151a384019d352499ed3ff244612053
+guid: dca49be5161e43d4fb559fd31faa8544
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -65,7 +65,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -77,7 +77,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -89,7 +89,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -101,7 +101,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Windows Store Apps
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -113,7 +113,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 128
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/AvvyLand/Images/UI/ActionToolsImage/Delete.png.meta → Assets/AvvyLand/Images/UI/ActionToolsImage/ToolsBack.png.meta

 fileFormatVersion: 2
-guid: 0994be74241a44f4188d584fdf2cad5e
+guid: dc2b0d2f03651064ab60461034af0c40
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -65,7 +65,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -77,7 +77,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -89,7 +89,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -101,7 +101,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Windows Store Apps
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -113,7 +113,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 128
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/AvvyLand/Prefabs/CoreObjects/ViewsStorage.prefab

@@ -17,6 +17,7 @@ GameObject:
   - component: {fileID: 8707154253072738333}
   - component: {fileID: 889442052}
   - component: {fileID: 814988581}
+  - component: {fileID: 1439734586271540625}
   m_Layer: 0
   m_Name: ViewsStorage
   m_TagString: Untagged
@@ -51,7 +52,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   LoadManager: {fileID: 0}
-  DefaultSprite: {fileID: 21300000, guid: 92374d057829aa94cac80fcfe98a16a8, type: 3}
 --- !u!114 &5522853496431705182
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -139,3 +139,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 48fc4b868c7741cab10b03be222e4bf2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1439734586271540625
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4430402820681393025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c899e88ac3354fa5b17a0c4fc7786787, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/AvvyLand/Prefabs/GridList/WhiteDesign/BranePrefab.prefab

@@ -398,8 +398,8 @@ RectTransform:
   m_Father: {fileID: 9128558350241393476}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.042522583, y: 0.19830038}
-  m_AnchorMax: {x: 0.1755358, y: 0.8061951}
+  m_AnchorMin: {x: 0.053333335, y: 0.19600001}
+  m_AnchorMax: {x: 0.18683842, y: 0.8047805}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
@@ -468,7 +468,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_AspectMode: 1
+  m_AspectMode: 2
   m_AspectRatio: 1
 --- !u!1 &3817461470062525837
 GameObject:
@@ -793,8 +793,8 @@ RectTransform:
   m_Father: {fileID: 9128558350241393476}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.20817176, y: 0.46150246}
-  m_AnchorMax: {x: 0.828833, y: 0.7692602}
+  m_AnchorMin: {x: 0.21883842, y: 0.18373145}
+  m_AnchorMax: {x: 0.828833, y: 0.81700003}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
@@ -813,7 +813,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4617223643783747983}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
@@ -865,10 +865,10 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 25.2}
-  m_Pivot: {x: 0, y: 1}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1813213866242800744
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1001,11 +1001,11 @@ RectTransform:
   m_Father: {fileID: 9128558350241393476}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.08518925, y: 0}
+  m_AnchorMin: {x: 0.096, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2781331501340945654
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1215,7 +1215,7 @@ RectTransform:
   m_AnchorMin: {x: 0.84700006, y: 0.28511623}
   m_AnchorMax: {x: 0.9542416, y: 0.72814983}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -0.46087292, y: 0}
+  m_SizeDelta: {x: -0.026114106, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &7984711734510884641
 CanvasRenderer:
@@ -1326,6 +1326,8 @@ GameObject:
   - component: {fileID: 6127338668450965465}
   - component: {fileID: 7923644003516607419}
   - component: {fileID: 4852555634767929130}
+  - component: {fileID: 6327039433688048367}
+  - component: {fileID: 2111092034929548744}
   m_Layer: 5
   m_Name: BranePrefab
   m_TagString: Untagged
@@ -1460,6 +1462,46 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6327039433688048367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7751676220538579048}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2111092034929548744
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7751676220538579048}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AspectMode: 0
+  m_AspectRatio: 15.658537
 --- !u!1 &8195505296295540428
 GameObject:
   m_ObjectHideFlags: 0

Assets/AvvyLand/Prefabs/GridList/WhiteDesign/Branes.prefab

@@ -1446,7 +1446,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1583701007353639111}
   - component: {fileID: 7907826587703657118}
-  - component: {fileID: 132382397917200384}
+  - component: {fileID: 1384475054}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -1483,7 +1483,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2595623469179202655}
   m_CullTransparentMesh: 0
---- !u!114 &132382397917200384
+--- !u!114 &1384475054
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1492,7 +1492,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2595623469179202655}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Script: {fileID: 11500000, guid: 4ffe3823db72f5b40afd0a27b007808b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 7698320051903970063}
@@ -1506,13 +1506,20 @@ MonoBehaviour:
   m_Viewport: {fileID: 6667757342408860904}
   m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 0}
-  m_HorizontalScrollbarVisibility: 2
-  m_VerticalScrollbarVisibility: 2
-  m_HorizontalScrollbarSpacing: -3
-  m_VerticalScrollbarSpacing: -3
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  direction: 0
+  _adapter: {fileID: 581975955}
+  _instantiatedItemCount: 10
+  _itemBase: {fileID: 7751676220538579048, guid: 2aa097d574e2d5046b1c0137262bfb59,
+    type: 3}
+  _itemInterval: 0
+  _startOffset: 8
 --- !u!1 &3063021659307008900
 GameObject:
   m_ObjectHideFlags: 0
@@ -3997,7 +4004,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7698320051903970063}
-  - component: {fileID: 581975954}
   - component: {fileID: 581975955}
   - component: {fileID: 581975956}
   - component: {fileID: 518241525}
@@ -4028,25 +4034,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
---- !u!114 &581975954
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9202576753356664020}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4ffe3823db72f5b40afd0a27b007808b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _prefab: {fileID: 7751676220538579048, guid: 2aa097d574e2d5046b1c0137262bfb59, type: 3}
-  _scrollRect: {fileID: 132382397917200384}
-  _content: {fileID: 7698320051903970063}
-  _adapter: {fileID: 581975955}
-  _isVertical: 1
-  _itemGenerate: 10
-  _threshold: 300
 --- !u!114 &581975955
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4080,7 +4067,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9202576753356664020}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -4106,7 +4093,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9202576753356664020}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/CategoryPanel.prefab

@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 7087594348464554565}
   - component: {fileID: 3067060123945793232}
   - component: {fileID: 131152185397621045}
+  - component: {fileID: 5277037939177619217}
   m_Layer: 5
   m_Name: CategoryPanel
   m_TagString: Untagged
@@ -103,6 +104,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -153,6 +155,18 @@ MonoBehaviour:
   selectedImage: {fileID: 3192053419025707691}
   normal: {fileID: 11400000, guid: b7b41870aaa61f4419b9c2e2d35a7a06, type: 2}
   selected: {fileID: 11400000, guid: 4d772d4c036e4a645a4df9d83a88cde1, type: 2}
+--- !u!114 &5277037939177619217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2805156800333773468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f99152a97444c746a449e72f8950660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3231130836970985691
 GameObject:
   m_ObjectHideFlags: 0

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PanelBlock.prefab

@@ -107,6 +107,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -171,6 +172,9 @@ GameObject:
   - component: {fileID: 2386286495064330592}
   - component: {fileID: 3022772892302469160}
   - component: {fileID: 6201356566963680932}
+  - component: {fileID: 6635359763672947354}
+  - component: {fileID: 822493762242552631}
+  - component: {fileID: -3898349566079770384}
   m_Layer: 5
   m_Name: PanelBlock
   m_TagString: Untagged
@@ -193,10 +197,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.22884211, y: 0}
-  m_AnchorMax: {x: 0.22884211, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 210, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.49999997}
 --- !u!222 &3022772892302469160
 CanvasRenderer:
@@ -220,6 +224,58 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   lineElements:
   - {fileID: 2017069407817142938}
+--- !u!114 &6635359763672947354
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4652195901721739320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f99152a97444c746a449e72f8950660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &822493762242552631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4652195901721739320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &-3898349566079770384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4652195901721739320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &5049635658135753673
 GameObject:
   m_ObjectHideFlags: 0

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PanelItem.prefab

@@ -95,6 +95,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -625,6 +626,7 @@ GameObject:
   - component: {fileID: 8181973593789790332}
   - component: {fileID: 4539514565477586772}
   - component: {fileID: 7817583418845379695}
+  - component: {fileID: -7257734605587947157}
   m_Layer: 5
   m_Name: PanelItem
   m_TagString: Untagged
@@ -704,6 +706,18 @@ MonoBehaviour:
   - {fileID: 672796682542949161}
   - {fileID: 8612192984196160933}
   - {fileID: 4078124647079900635}
+--- !u!114 &-7257734605587947157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4848566223676195461}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f99152a97444c746a449e72f8950660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5138945440561950229
 GameObject:
   m_ObjectHideFlags: 0
@@ -949,6 +963,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1168,6 +1183,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PrefImageInfoDetails.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1809635662415385826
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5343778053419447332}
+  - component: {fileID: 5468065421885338116}
+  - component: {fileID: 3972098344084096108}
+  - component: {fileID: 2321251988886081411}
+  - component: {fileID: -8015242571340361599}
+  m_Layer: 5
+  m_Name: PrefImageInfoDetails
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5343778053419447332
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1809635662415385826}
+  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, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5468065421885338116
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1809635662415385826}
+  m_CullTransparentMesh: 1
+--- !u!114 &3972098344084096108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1809635662415385826}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  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
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2321251988886081411
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1809635662415385826}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AspectMode: 2
+  m_AspectRatio: 1
+--- !u!114 &-8015242571340361599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1809635662415385826}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f99152a97444c746a449e72f8950660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PrefImageInfoDetails.prefab.meta

+fileFormatVersion: 2
+guid: 38ba270f5030f684a8d29761f53c8d0a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/Name.prefab → Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PropertyElementPrefab.prefab

@@ -33,9 +33,9 @@ RectTransform:
   m_Father: {fileID: 86691425048311641}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.04716061, y: 0.56726485}
-  m_AnchorMax: {x: 0.04716061, y: 0.79132867}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 12, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4051338124729717135
@@ -165,7 +165,7 @@ GameObject:
   - component: {fileID: 6662422255756511334}
   - component: {fileID: 6690586142652877737}
   m_Layer: 5
-  m_Name: Text (TMP) (1)
+  m_Name: TextName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -185,11 +185,11 @@ RectTransform:
   m_Father: {fileID: 86691425048311641}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.04716061, y: 0.18180045}
-  m_AnchorMax: {x: 0.04716061, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 12, y: 0}
+  m_SizeDelta: {x: 351, y: 0}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &5436107148339810241
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -220,6 +220,12 @@ MonoBehaviour:
       m_Calls: []
   m_text: 'Name
 
+    99
+
+    hjkhkjh
+
+    jhklj
+
 '
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 4d772d4c036e4a645a4df9d83a88cde1, type: 2}
@@ -302,7 +308,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
 --- !u!1 &8616148455448892443
 GameObject:
@@ -316,8 +322,12 @@ GameObject:
   - component: {fileID: 2548949258191461494}
   - component: {fileID: 384623589505842518}
   - component: {fileID: 8400157615120270437}
+  - component: {fileID: 3103978642498582385}
+  - component: {fileID: 6776430936539229049}
+  - component: {fileID: 8303338720519966866}
+  - component: {fileID: -6447773642898619471}
   m_Layer: 5
-  m_Name: Name
+  m_Name: PropertyElementPrefab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -397,3 +407,69 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: {x: 12, y: 12, z: 12, w: 12}
+--- !u!114 &3103978642498582385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8616148455448892443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 12
+    m_Right: 12
+    m_Top: 12
+    m_Bottom: 12
+  m_ChildAlignment: 0
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6776430936539229049
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8616148455448892443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f99152a97444c746a449e72f8950660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8303338720519966866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8616148455448892443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &-6447773642898619471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8616148455448892443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfacc4ea79c241a4eb211b6f0ed9fcdc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _name: {fileID: 3935863398546584470}
+  _property: {fileID: 6662422255756511334}

Assets/AvvyLand/Prefabs/Inventory/WhiteInventoryPrefabs/PropertyPrefab.prefab.meta

+fileFormatVersion: 2
+guid: 07a9fb8f1b14834419bf6b24bd95ecb6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: