merge joonasp joonasty

2022-04-11 18:56:51 +03:00
parent cd1633af54
commit ec2dd764d4
11 changed files with 36526 additions and 348 deletions
--- a/Files/Prefabs/Helar/Mushroom_01.prefab
+++ b/Files/Prefabs/Helar/Mushroom_01.prefab
@@ -248,3 +248,4 @@ MonoBehaviour:
  canStack: 1
  itemName: Red Mushroom
  itemDescription: 
+  prefab: {fileID: 4385080170328260021}
--- a/Files/Prefabs/Helar/Mushroom_02.prefab
+++ b/Files/Prefabs/Helar/Mushroom_02.prefab
@@ -248,3 +248,4 @@ MonoBehaviour:
  canStack: 1
  itemName: Brown Mushroom
  itemDescription: 
+  prefab: {fileID: 5440707293445505367}
--- a/Files/Prefabs/JoonasP/EssenceNode.prefab
+++ b/Files/Prefabs/JoonasP/EssenceNode.prefab
@@ -15,6 +15,7 @@ GameObject:
  - component: {fileID: 364742329878811599}
  - component: {fileID: 3113279289267004298}
  - component: {fileID: 965315076614651339}
+  - component: {fileID: 4869442126406565975}
  m_Layer: 10
  m_Name: EssenceNode
  m_TagString: Untagged
@@ -301,6 +302,23 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+--- !u!114 &4869442126406565975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3467985268477833302}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 10
+  canStack: 1
+  itemName: Magic essence
+  itemDescription: 
+  prefab: {fileID: 3467985268477833302}
 --- !u!1 &5463776654730074005
 GameObject:
  m_ObjectHideFlags: 0