Merged

2022-05-19 16:51:35 +05:30
parent b83b8dda29 865816764d
commit a1c6216e1f
45 changed files with 259142 additions and 10 deletions
--- a/Assets/Game/Scenes/GameScene/GameScene.unity
+++ b/Assets/Game/Scenes/GameScene/GameScene.unity
@@ -46651,7 +46651,17 @@ MonoBehaviour:
  coinsTxt: {fileID: 7548028370160062038}
  gemsTxt: {fileID: 7548028370765915785}
  inventoryParent: {fileID: 7548028370540024263}
-  emptySlotImage: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3}
+  emptySlotImage: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3}
+  yourReqPopup: {fileID: 540058088}
+  coinsInput: {fileID: 0}
+  gemsInput: {fileID: 0}
+  oxygenInput: {fileID: 0}
+  metalInput: {fileID: 0}
+  coinsAmount: 0
+  gemsAmount: 0
+  oxygenAmount: 0
+  metalAmount: 0
+  selectedItemImg: {fileID: 0}
 --- !u!4 &375084964 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 4627310524903758, guid: d194838adb73ce841a9e1626c9d51744, type: 3}
@@ -96967,6 +96977,18 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 1
        m_CallState: 2
+      - m_Target: {fileID: 374839933}
+        m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp
+        m_MethodName: Refresh
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!1 &820676544
 GameObject:
  m_ObjectHideFlags: 0
@@ -207480,7 +207502,7 @@ MonoBehaviour:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: 5a30c37041d1b4791acf7fc0629950f3, type: 3}
  m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
  m_FillCenter: 1
  m_FillMethod: 4
  m_FillAmount: 1
@@ -215965,7 +215987,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.00018310547, y: -85}
+  m_AnchoredPosition: {x: 0.00012207031, y: -85}
  m_SizeDelta: {x: 1920, y: 65.05449}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1840047502
--- a/Assets/Game/Scenes/GameScene/GameScene.unity.orig
+++ b/Assets/Game/Scenes/GameScene/GameScene.unity.orig
--- a/Assets/Game/Scenes/GameScene/GameScene.unity.orig.meta
+++ b/Assets/Game/Scenes/GameScene/GameScene.unity.orig.meta
@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: f7c303ff2b548ed11b2cf1d10a7b2187
-folderAsset: yes
+guid: 0eedbe6cbb1bb3e4fa1a4d0787e6de5c
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Game/ScriptableObjects/BuildingData.meta
+++ b/Assets/Game/ScriptableObjects/BuildingData.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f0b47dea2cdff1a7f8ceb414b9011549
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/Generic
+++ b/Assets/Game/ScriptableObjects/BuildingData/Generic
@@ -1,24 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: Generic Building
-  m_EditorClassIdentifier: 
-  buildingName: Generic Building
-  levels:
-  - level: 1
-    stats: []
-    price: 1000
-    xpGain: 2000
-  description: This is just a Generic Building
-  collectable: 0
-  resourceType: 0
-  productinoRates: []
--- a/Assets/Game/ScriptableObjects/BuildingData/Generic
+++ b/Assets/Game/ScriptableObjects/BuildingData/Generic
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 049b5ae28348bbbe9ade489466ecf9a8
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/Hall.asset
+++ b/Assets/Game/ScriptableObjects/BuildingData/Hall.asset
@@ -1,40 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: Hall
-  m_EditorClassIdentifier: 
-  buildingName: Hall
-  levels:
-  - level: 1
-    stats:
-    - name: Stat 1
-      value: 120
-    - name: Power
-      value: 2
-    - name: Energy
-      value: 50
-    price: 10000
-    xpGain: 120
-  - level: 2
-    stats:
-    - name: Stat 1
-      value: 200
-    - name: Power
-      value: 30
-    - name: Energy
-      value: 500
-    price: 15000
-    xpGain: 5000
-  description: This is the Hall (Main Hall)
-  collectable: 0
-  resourceType: 0
-  productinoRates: []
--- a/Assets/Game/ScriptableObjects/BuildingData/Hall.asset.meta
+++ b/Assets/Game/ScriptableObjects/BuildingData/Hall.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b8064a67361de4c648b86f3642bb0317
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset
+++ b/Assets/Game/ScriptableObjects/BuildingData/Mine.asset
@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: Mine
-  m_EditorClassIdentifier: 
-  buildingName: Rocket Repair
-  levels:
-  - level: 1
-    stats:
-    - name: Production rate
-      value: 10%
-    price: 8500
-    xpGain: 2000
-  description: This is a Rocket Repair
-  collectable: 0
-  resourceType: 0
-  productinoRates: []
--- a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset.meta
+++ b/Assets/Game/ScriptableObjects/BuildingData/Mine.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bdcfae8248ea0e27fa898d27a47a42a0
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset
+++ b/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset
@@ -1,29 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: MoonMineral
-  m_EditorClassIdentifier: 
-  buildingName: Moon Minerals Mine
-  levels:
-  - level: 1
-    stats:
-    - name: Minerals
-      value: 5
-    - name: Power
-      value: 10
-    price: 7900
-    xpGain: 2500
-  description: This is a Moon Minerals Mine
-  collectable: 1
-  resourceType: 0
-  productinoRates:
-  - 0.1
--- a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset.meta
+++ b/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3f0a72c466f9c377ead12bf642749171
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset
+++ b/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset
@@ -1,29 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: O2Mine
-  m_EditorClassIdentifier: 
-  buildingName: Oxygen Mine
-  levels:
-  - level: 1
-    stats:
-    - name: Oxygen
-      value: 10
-    - name: Power
-      value: 2
-    price: 20000
-    xpGain: 2000
-  description: This is an Oxygen Mine
-  collectable: 1
-  resourceType: 1
-  productinoRates:
-  - 0.1
--- a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset.meta
+++ b/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a238dc5ab1ae2deaaaaf77548375bd68
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/BuildingData/Research
+++ b/Assets/Game/ScriptableObjects/BuildingData/Research
@@ -1,40 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
-  m_Name: Research Facility
-  m_EditorClassIdentifier: 
-  buildingName: Research Lab
-  levels:
-  - level: 1
-    stats:
-    - name: Power
-      value: 250
-    - name: Speed
-      value: 50
-    - name: Something else
-      value: 40 %
-    price: 12500
-    xpGain: 2000
-  - level: 2
-    stats:
-    - name: Power
-      value: 600
-    - name: Speed
-      value: 90
-    - name: Something else
-      value: 80 %
-    price: 22500
-    xpGain: 5000
-  description: This is a Research Lab
-  collectable: 0
-  resourceType: 0
-  productinoRates: []
--- a/Assets/Game/ScriptableObjects/BuildingData/Research
+++ b/Assets/Game/ScriptableObjects/BuildingData/Research
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a6aea54cb5f332beba1de43509d49476
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 09a17d240042ff6ee976be8d5060c65c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Arrow
-  m_EditorClassIdentifier: 
-  itemName: Archery
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 396f810a35b0f4d69921cb0178c6abc2, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28c564ccfbcc00842abde5a3372837c0
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Bomb
-  m_EditorClassIdentifier: 
-  itemName: Kaboom
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 0723bcb5e655f4b35a4e61b7580dbf49, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a32889c2f83b50249acd1d3c5798a7d1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Flash.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Flash.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Flash
-  m_EditorClassIdentifier: 
-  itemName: The Flash
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 41cc64edcb10c48819942e5030958271, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Flash.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Flash.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c74ba2deade45774980cb66a99df5994
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Hammer
-  m_EditorClassIdentifier: 
-  itemName: Ultra Strength
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 65151df02ab2843209acfba781081b3c, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e7898cef11af6fa46b5ff61133d98099
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Potion.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Potion.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Potion
-  m_EditorClassIdentifier: 
-  itemName: Chemist
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 5a30c37041d1b4791acf7fc0629950f3, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Potion.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Potion.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c81b886f2da0f214694d448b54dd04fe
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Scroll
-  m_EditorClassIdentifier: 
-  itemName: Scroll of truth
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: bc901fd38568e4fceb64f8a8b16895a4, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c4582148c36f26749963309c2e5895cf
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Sheid
-  m_EditorClassIdentifier: 
-  itemName: Shield
-  price: 2000
-  gems: 100
-  stat: 200
-  image: {fileID: 21300000, guid: 0f799ebe641bd4ad0b435cd651cb9624, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3eb367b6826412d45a57f322c66105e2
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Sword.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Sword.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Sword
-  m_EditorClassIdentifier: 
-  itemName: Sword
-  price: 1500
-  gems: 100
-  stat: 250
-  image: {fileID: 21300000, guid: a5d3452713f994eb387824f6cd81c0e6, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Sword.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Sword.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 66571867f116eab9fb41097354bdad1b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/Timer.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/Timer.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Timer
-  m_EditorClassIdentifier: 
-  itemName: Speed
-  price: 2000
-  gems: 100
-  stat: 200
-  image: {fileID: 21300000, guid: a295426d82a054b559db3d3baa2c6d38, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/Timer.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/Timer.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 930846808cf7a514da1e3380491a99fe
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/ScriptableObjects/ShopItems/key.asset
+++ b/Assets/Game/ScriptableObjects/ShopItems/key.asset
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3}
-  m_Name: Key
-  m_EditorClassIdentifier: 
-  itemName: Secrets
-  price: 2500
-  gems: 250
-  stat: 1000
-  image: {fileID: 21300000, guid: 46934fe2643844b618e85e0448a465b6, type: 3}
--- a/Assets/Game/ScriptableObjects/ShopItems/key.asset.meta
+++ b/Assets/Game/ScriptableObjects/ShopItems/key.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d4716858ff4337c4293d7eb4893b3a70
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/Scripts/InventoryItem.cs
+++ b/Assets/Game/Scripts/InventoryItem.cs
@@ -15,15 +15,31 @@ public class InventoryItem : ScriptableObject


 [System.Serializable]
-public class InventoryEntry{
+public class InventoryEntry
+{
    public string Item;
    public int Count;
-    public InventoryEntry(string item, int count){
+    public InventoryEntry(string item, int count)
+    {
        Item = item;
        Count = count;
    }
 }

-public static class Inventory{
-   
+public static class Inventory
+{
+    public static InventoryItem GetInventoryItem(string itemName)
+    {
+        Object[] shopItems = Resources.LoadAll("ScriptableObjects/ShopItems");
+        Debug.Log("Searching thru " + shopItems.Length + " SOs");
+        foreach (Object itemObj in shopItems)
+        {
+            InventoryItem item = itemObj as InventoryItem;
+            if (item.itemName == itemName)
+            {
+                return item;
+            }
+        }
+        return null;
+    }
 }
--- a/Assets/Game/Scripts/SellMenu.cs
+++ b/Assets/Game/Scripts/SellMenu.cs
@@ -24,6 +24,7 @@ public class SellMenu : MonoBehaviour
    public int gemsAmount;
    public int oxygenAmount;
    public int metalAmount;
+    public Image selectedItemImg;
    void Start()
    {
        Refresh();
@@ -50,9 +51,17 @@ public class SellMenu : MonoBehaviour

        for(int i =0; i < inventorySlots.Length; i++){
            if(i < DBmanager.Inventory.Count){
-                inventorySlots[i].GetComponent<Image>().sprite =emptySlotImage;
+                InventoryItem itemData = Inventory.GetInventoryItem(DBmanager.Inventory[i].Item);
+                if(itemData==null){
+                    Debug.LogError("Couldn't find data for " + DBmanager.Inventory[i].Item);
+                }
+                inventorySlots[i].transform.GetChild(0).GetComponent<Image>().sprite = itemData.image;
+                inventorySlots[i].interactable=true;
+                inventorySlots[i].onClick.RemoveAllListeners();
+                inventorySlots[i].onClick.AddListener(()=>{selectInventoryItem(itemData);});
            }else{
-                inventorySlots[i].GetComponent<Image>().sprite = emptySlotImage;
+                inventorySlots[i].transform.GetChild(0).GetComponent<Image>().sprite = emptySlotImage;
+                inventorySlots[i].interactable=false;
            }
        }
    }
@@ -72,4 +81,7 @@ public class SellMenu : MonoBehaviour
       // selected
        Refresh();
    }
+    public void selectInventoryItem(InventoryItem item){
+        selectedItemImg.sprite = item.image;
+    }
 }