Merge fixes completed

3 年前 · fab44b36
--- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &-9087997052744260399
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 309633228405838073}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 734bceb68e04a4c21a6980076a35f68e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _addItemEvent: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
 --- !u!114 &-2233620748688457335
 MonoBehaviour:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &8237582483159280860 stripped
+--- !u!4 &2973733550900446787 stripped
-  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &309633228405838073 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!4 &8916725356198928834 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1083073290189785667 stripped
+--- !u!4 &5944104996185666453 stripped
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!137 &2643181883930254223 stripped
-SkinnedMeshRenderer:
-  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!4 &9049048348530379419 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7479199366626129125 stripped
+--- !u!4 &928224351994020785 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6905220490405268265 stripped
-  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &489423445654532973 stripped
+--- !u!4 &2518796056843120514 stripped
-  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &8916725356198928834 stripped
+--- !u!4 &9121043209303941797 stripped
-  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8291487101514034000 stripped
+--- !u!4 &7646398735186508214 stripped
-  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5700738674217691736 stripped
+--- !u!4 &8237582483159280860 stripped
-  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8613994902604584134 stripped
+--- !u!4 &6251068571708505270 stripped
-  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4150588075678938521 stripped
+--- !u!4 &2680419760045213584 stripped
-  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5337852870612368657 stripped
+--- !u!4 &6924639228666418553 stripped
-  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2553538599320838613 stripped
+--- !u!4 &5337852870612368657 stripped
-  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6238229487294904517 stripped
+--- !u!4 &8746458819780820913 stripped
-  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &3509300304837266133 stripped
+--- !u!4 &5328577669981913599 stripped
-  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1693530112229282522 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!1 &309633228405838073 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2961255287932742051 stripped
+--- !u!4 &8291487101514034000 stripped
-  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4323982477642669181 stripped
+--- !u!4 &1083073290189785667 stripped
-  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7422665375057060625 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!137 &2643181883930254223 stripped
+SkinnedMeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5616668664904030341 stripped
+--- !u!4 &7479199366626129125 stripped
-  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8764961453140708844 stripped
+--- !u!4 &489423445654532973 stripped
-  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5352552595453864673 stripped
+--- !u!4 &675585260765626204 stripped
-  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8865730958858592416 stripped
+--- !u!4 &6856479198010907045 stripped
-  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &313519885195136893 stripped
+--- !u!4 &7103292230657876148 stripped
-  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1780510391696116336 stripped
+--- !u!4 &2669244628279071469 stripped
-  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &3597017886523096375 stripped
+--- !u!4 &8731736048503314800 stripped
-  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &996919128022108076 stripped
+--- !u!4 &8520217290748661238 stripped
-  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7980046698497209273 stripped
+--- !u!4 &722022415557853372 stripped
-  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &722022415557853372 stripped
+--- !u!4 &7980046698497209273 stripped
-  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8520217290748661238 stripped
+--- !u!4 &996919128022108076 stripped
-  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8731736048503314800 stripped
+--- !u!4 &3597017886523096375 stripped
-  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &2669244628279071469 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7103292230657876148 stripped
+--- !u!4 &1780510391696116336 stripped
-  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6856479198010907045 stripped
+--- !u!4 &313519885195136893 stripped
-  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &675585260765626204 stripped
+--- !u!4 &8865730958858592416 stripped
-  m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2973733550900446787 stripped
+--- !u!4 &5352552595453864673 stripped
-  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5328577669981913599 stripped
+--- !u!4 &8764961453140708844 stripped
-  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8746458819780820913 stripped
+--- !u!4 &5616668664904030341 stripped
-  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6924639228666418553 stripped
+--- !u!4 &7422665375057060625 stripped
-  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2680419760045213584 stripped
+--- !u!4 &4323982477642669181 stripped
-  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6251068571708505270 stripped
+--- !u!4 &2961255287932742051 stripped
-  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7646398735186508214 stripped
+--- !u!4 &1693530112229282522 stripped
-  m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &9121043209303941797 stripped
+--- !u!4 &3509300304837266133 stripped
-  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2518796056843120514 stripped
+--- !u!4 &6238229487294904517 stripped
-  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6905220490405268265 stripped
+--- !u!4 &2553538599320838613 stripped
-  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &928224351994020785 stripped
+--- !u!4 &4150588075678938521 stripped
-  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &9049048348530379419 stripped
+--- !u!4 &8613994902604584134 stripped
-  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5944104996185666453 stripped
+--- !u!4 &5700738674217691736 stripped
-  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3}
--- !u!4 &3583992150622067535 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db,
-    type: 3}
-  m_PrefabInstance: {fileID: 2293294246731547253}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 2293294246731547253}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3583992150622067535 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db,
    type: 3}
  m_PrefabInstance: {fileID: 2293294246731547253}
  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Managers/InventoryManager.prefab
+++ b/UOP1_Project/Assets/Prefabs/Managers/InventoryManager.prefab
  _equipItemEvent: {fileID: 11400000, guid: 0cef922101fd44b25a2d96f2972d5f50, type: 2}
  _rewardItemEvent: {fileID: 11400000, guid: ceeec59dc461abd4f91dac5b07084d24, type: 2}
  _giveItemEvent: {fileID: 11400000, guid: c54b320c4205f1c49b296b878daf2097, type: 2}
-  _addItemEvent: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
+  _addItemEvent: {fileID: 11400000, guid: f3027c4528b8e794f940a4696506f0c3, type: 2}
  _removeItemEvent: {fileID: 11400000, guid: 4ed6ade94b85c452094b0147619e8b49, type: 2}
--- a/UOP1_Project/Assets/Prefabs/UI/Ingredient
+++ b/UOP1_Project/Assets/Prefabs/UI/Ingredient
  m_Script: {fileID: 11500000, guid: 93dbe2b925cf041d1bab6ad1cc9ef1c0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  tabName: {fileID: 612172182935898210}
-  actionButton: {fileID: 6416758842641707247}
+  _tabName: {fileID: 612172182935898210}
+  _actionButton: {fileID: 6416758842641707247}
 --- !u!1 &7925690625871888603
 GameObject:
  m_ObjectHideFlags: 0
    m_TableEntryReference:
      m_KeyId: 0
      m_Key: 
+    m_FallbackState: 0
  m_FormatArguments: []
  m_UpdateString:
    m_PersistentCalls:
--- a/UOP1_Project/Assets/Prefabs/UI/IngredientForRecipe.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/IngredientForRecipe.prefab
  m_Script: {fileID: 11500000, guid: 5b02f588ec7814c3895df91b3ba439a5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  ingredientAmount: {fileID: 984266489814165861}
-  ingredientName: {fileID: 6795060505832379207}
-  checkMark: {fileID: 4328453168977905614}
+  _ingredientAmount: {fileID: 984266489814165861}
+  _ingredientName: {fileID: 6795060505832379207}
+  _checkMark: {fileID: 4328453168977905614}
 --- !u!1 &4328453168977905614
 GameObject:
  m_ObjectHideFlags: 0
    m_TableEntryReference:
      m_KeyId: 214189465600
      m_Key: 
+    m_FallbackState: 0
  m_FormatArguments: []
  m_UpdateString:
    m_PersistentCalls:
--- a/UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
  m_Script: {fileID: 11500000, guid: 119e513d415dc4333a7550d7500c1662, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _buttonActionText: {fileID: 0}
-  _buttonAction: {fileID: 0}
+  _buttonActionText: {fileID: 5854709384753378033}
+  _buttonAction: {fileID: 1575787593498220194}
 --- !u!1 &73908839017261390
 GameObject:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c, type: 3}
--- !u!224 &221919747404738548 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
-    type: 3}
-  m_PrefabInstance: {fileID: 4927264552654137991}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3277521686480019469 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 7574264689645128330, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
  m_Script: {fileID: 11500000, guid: 93dbe2b925cf041d1bab6ad1cc9ef1c0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!224 &221919747404738548 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
+    type: 3}
+  m_PrefabInstance: {fileID: 4927264552654137991}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5787777448482401271
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5871d3b5d4307434e9d7011de3208d9b, type: 3}
+--- !u!224 &2862475946869001685 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5787777448482401271}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8359101850598909048 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2617486611881742223, guid: 5871d3b5d4307434e9d7011de3208d9b,
  m_Script: {fileID: 11500000, guid: 5b02f588ec7814c3895df91b3ba439a5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!224 &2862475946869001685 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5787777448482401271}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5892389078988592090
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5871d3b5d4307434e9d7011de3208d9b, type: 3}
+--- !u!224 &2596136819320580840 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
+    type: 3}
+  m_PrefabInstance: {fileID: 6047361193769635018}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8628796571687994181 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2617486611881742223, guid: 5871d3b5d4307434e9d7011de3208d9b,
  m_Script: {fileID: 11500000, guid: 5b02f588ec7814c3895df91b3ba439a5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!224 &2596136819320580840 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
-    type: 3}
-  m_PrefabInstance: {fileID: 6047361193769635018}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6102880949503096602
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5871d3b5d4307434e9d7011de3208d9b, type: 3}
+--- !u!224 &2547374627354841400 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
+    type: 3}
+  m_PrefabInstance: {fileID: 6102880949503096602}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8134318787658528917 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2617486611881742223, guid: 5871d3b5d4307434e9d7011de3208d9b,
  m_Script: {fileID: 11500000, guid: 5b02f588ec7814c3895df91b3ba439a5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!224 &2547374627354841400 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
-    type: 3}
-  m_PrefabInstance: {fileID: 6102880949503096602}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9002994275147945670
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_RemovedComponents:
    - {fileID: 5074195970675175550, guid: b01383ebcda1049008a325f2ca7e6aca, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: b01383ebcda1049008a325f2ca7e6aca, type: 3}
+--- !u!114 &5854709384753378033 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
+    type: 3}
+  m_PrefabInstance: {fileID: 9125883717645895801}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1575787593498220194 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
+    type: 3}
+  m_PrefabInstance: {fileID: 9125883717645895801}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8947289629807390876 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 184241180236232933, guid: b01383ebcda1049008a325f2ca7e6aca,
--- a/UOP1_Project/Assets/Scenes/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Gameplay.unity
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 0
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children:
-  - {fileID: 1540519754}
+  - {fileID: 1540519754}
  - {fileID: 1172743537}
  m_Father: {fileID: 0}
  m_RootOrder: 5
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
  m_Modification:
    m_TransformParent: {fileID: 1869732381}
    m_Modifications:
-    - target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: _interactionItem
-      value: 
-      objectReference: {fileID: 6822594372875662428}
-    - target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: _listInteractions.Array.size
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: _listInteractions.Array.data[0]
-      value: 
-      objectReference: {fileID: 11400000, guid: 34232253270b147a4ac05a42a1882cd7,
-        type: 2}
-    - target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: _listInteractions.Array.data[1]
-      value: 
-      objectReference: {fileID: 11400000, guid: be11dea017adc4146bebe7603a32ac65,
-        type: 2}
-    - target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: _listInteractions.Array.data[2]
-      value: 
-      objectReference: {fileID: 11400000, guid: 5cbae6c9eb2234189b57465fc303296b,
-        type: 2}
    - target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
      propertyPath: m_Pivot.x
    - target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!114 &6822594372875662428 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1190722457586240764, guid: 1d09c349511c34e2d8b16f139aadb731,
-    type: 3}
-  m_PrefabInstance: {fileID: 6822594372875662426}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 349da538f36aa4586bea2dabc1823587, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
 --- !u!1001 &8313085415731550940
--- a/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
--- a/UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs
+++ b/UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs
 		}

 	}
-	public void OnTriggerEnter(Collider other)
-	{
-		if (other.tag == "Player")
-		{
-			if (other.gameObject.GetComponent<ItemPicker>())
-			{
-
-				other.gameObject.GetComponent<ItemPicker>().PickItem(_currentItem);
-
-			}
-
-		}
-	}
+	
 }
--- a/UOP1_Project/Assets/Scripts/Inventory/ItemPicker.cs
+++ b/UOP1_Project/Assets/Scripts/Inventory/ItemPicker.cs

 	public void PickItem(Item item)
 	{
+		Debug.Log("Pick Item"); 
 		if (_addItemEvent != null)
 			_addItemEvent.RaiseEvent(item);
 	}
--- a/UOP1_Project/Assets/Scripts/UI/UIManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIManager.cs

 	public void OpenUIDialogue(LocalizedString dialogueLine, ActorSO actor)
 	{
+		
 		dialogueController.SetDialogue(dialogueLine, actor);
 		dialogueController.gameObject.SetActive(true);
 	}