gemportal branch merge

playerinfo script and duplicate scene for testing
Merge branch 'staging' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into joonasp_Milestone2
2022-04-08 22:18:18 +03:00 · 2022-04-08 22:16:25 +03:00 · 2022-04-08 21:14:07 +03:00 · 2022-04-04 18:57:40 +03:00 · 2022-04-03 09:40:36 +03:00
23 changed files with 37331 additions and 326 deletions
--- a/Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
+++ b/Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Engine/Editor/Packages/URP_Support.unitypackage.meta
+++ b/Engine/Editor/Packages/URP_Support.unitypackage.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8bc88477f037e96478019bba8de301fd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- 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
--- a/Files/Scripts/Helar/Items/InventoryItem.cs
+++ b/Files/Scripts/Helar/Items/InventoryItem.cs
@@ -92,7 +92,7 @@ public class InventoryItem : MonoBehaviour
        if (Count == 0)
        {
            //Destroys this gameobject if the count is 0 or lower 
-            Destroy(this);
+            Destroy(gameObject);
            return true;
        }
        UpdateText();
@@ -101,6 +101,30 @@ public class InventoryItem : MonoBehaviour
        return true;
    }

+    public void PopItem()
+    {
+        GameObject item = Instantiate(_itemData.prefab, transform.position + transform.forward, Quaternion.identity);
+
+        item.transform.localScale = Vector3.one;
+        item.transform.name = _itemData.name;
+
+        var colliderComponent = item.GetComponent<Collider>();
+        if (colliderComponent != null) colliderComponent.enabled = true;
+
+        var rigidbodyComponent = item.GetComponent<Rigidbody>();
+        if (rigidbodyComponent != null)
+        {
+            rigidbodyComponent.isKinematic = false;
+            rigidbodyComponent.useGravity = true;
+        }
+
+        var xrGrabInteractableComponent = item.GetComponent<XRGrabInteractable>();
+        if (xrGrabInteractableComponent != null) xrGrabInteractableComponent.enabled = true;
+
+
+        ChangeCount(-1);
+    }
+
    public int GetItemid()
    {
        return _itemId;
--- a/Files/Scripts/Helar/Items/ItemData.cs
+++ b/Files/Scripts/Helar/Items/ItemData.cs
@@ -10,6 +10,7 @@ public class ItemData : MonoBehaviour
    public bool canStack;
    public string itemName;
    public string itemDescription;
+    public GameObject prefab;

    public override string ToString()
    {
--- a/Files/Scripts/JoonasP/EssenceNodeController.cs
+++ b/Files/Scripts/JoonasP/EssenceNodeController.cs
@@ -8,6 +8,7 @@ public class EssenceNodeController : MonoBehaviour
    [SerializeField]
    private AudioSource chime;

+    private Inventory playerInventory;

    public bool isTouched;
    private bool followPlayer = false;
@@ -21,6 +22,7 @@ public class EssenceNodeController : MonoBehaviour
    private void Awake()
    {
        nodeMaterial = GetComponent<Renderer>().material;
+        playerInventory = GameObject.Find("Inventory").GetComponent<Inventory>();
    }

    public void Touched()
@@ -58,6 +60,7 @@ public class EssenceNodeController : MonoBehaviour
    {
        yield return new WaitForSeconds(2f);
        //TODO: Update value in player inventory
+        playerInventory.AddItem(GetComponent<ItemData>());
        Destroy(gameObject);
    }

--- a/Files/Scripts/JoonasP/PlayerInfo.cs
+++ b/Files/Scripts/JoonasP/PlayerInfo.cs
@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerInfo : MonoBehaviour
+{
+    private int health;
+
+    private int essence_basic;
+    //Add elemental essences?
+
+    private void Awake()
+    {
+        health = 5;
+        essence_basic = 0;
+    }
+
+    public void AddHealth(int value)
+    {
+        health += value;
+        if (health <= 0)
+        {
+            Debug.Log("NO HEALTH REMAINING");
+        }
+    }
+
+    public void AddEssenceBasic(int value)
+    {
+        if (essence_basic + value < 0)
+        {
+            Debug.LogError("NOT ENOUGH ESSENCE");
+        }
+        else essence_basic += value;
+    }
+}
--- a/Files/Scripts/JoonasP/PlayerInfo.cs.meta
+++ b/Files/Scripts/JoonasP/PlayerInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 08f72f5d017837743b67d344a6a7ed52
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Helar/Item.prefab
+++ b/Assets/Resources/Helar/Item.prefab
@@ -178,7 +178,19 @@ MonoBehaviour:
      m_Calls: []
  m_Activated:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 719213140875167033}
+        m_TargetAssemblyTypeName: InventoryItem, Assembly-CSharp
+        m_MethodName: PopItem
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
  m_Deactivated:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Scenes/Homebase.unity
+++ b/Assets/Scenes/Homebase.unity
--- a/Assets/Scenes/JoonasP/Homebase_JoonasP.unity
+++ b/Assets/Scenes/JoonasP/Homebase_JoonasP.unity
--- a/Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
+++ b/Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: da52a93af762fab4ab9085821b0fb632
+guid: 6d5f257272c8a9840891d8745d7bc200
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/JoonasP/SampleScene.unity
+++ b/Assets/Scenes/JoonasP/SampleScene.unity
@@ -156,6 +156,53 @@ MonoBehaviour:
  rightDistance: 0.1
  maxUp: 0.2
  minDown: -0.2
+--- !u!1 &112254268
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 112254270}
+  - component: {fileID: 112254269}
+  m_Layer: 0
+  m_Name: Inventory
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &112254269
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 112254268}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 29f5f8aed8d641c3abc54850a6a876cc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  additionalSlots: []
+  itemContainerPrefab: {fileID: 4641253255217536251, guid: b609e3c6adb2d2b4196415d93e789ddd,
+    type: 3}
+--- !u!4 &112254270
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 112254268}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -8.05, y: 1.336, z: -12.369}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 16
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &407110722 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852,
@@ -500,6 +547,75 @@ Transform:
  m_Father: {fileID: 1578543176}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &559424723
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6.234
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.189
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -10.103
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775025, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_Name
+      value: Holster
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51, type: 3}
 --- !u!1 &599916901
 GameObject:
  m_ObjectHideFlags: 0
@@ -596,7 +712,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &629412354
 GameObject:
@@ -758,7 +874,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &705507993
 GameObject:
@@ -1029,7 +1145,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &913183357
 GameObject:
@@ -1236,155 +1352,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5b158b94c373d4b4f9e98cdb92789343, type: 3}
--- !u!1 &1342371949
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1342371954}
-  - component: {fileID: 1342371953}
-  - component: {fileID: 1342371952}
-  - component: {fileID: 1342371951}
-  - component: {fileID: 1342371955}
-  m_Layer: 0
-  m_Name: TestHolster
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!135 &1342371951
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1342371949}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1342371952
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1342371949}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 8aa659f864a2309459a789493298b561, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1342371953
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1342371949}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1342371954
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1342371949}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.885, y: 1.1443379, z: -10.004}
-  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1342371955
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1342371949}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_InteractionManager: {fileID: 1989791150}
-  m_InteractionLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_InteractionLayers:
-    m_Bits: 4294967295
-  m_AttachTransform: {fileID: 0}
-  m_KeepSelectedTargetValid: 1
-  m_StartingSelectedInteractable: {fileID: 0}
-  m_HoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ShowInteractableHoverMeshes: 1
-  m_InteractableHoverMeshMaterial: {fileID: 0}
-  m_InteractableCantHoverMeshMaterial: {fileID: 0}
-  m_SocketActive: 1
-  m_InteractableHoverScale: 1
-  m_RecycleDelayTime: 1
 --- !u!1 &1354843858
 GameObject:
  m_ObjectHideFlags: 0
@@ -1495,155 +1462,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1366746230
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1366746231}
-  - component: {fileID: 1366746236}
-  - component: {fileID: 1366746235}
-  - component: {fileID: 1366746234}
-  - component: {fileID: 1366746232}
-  m_Layer: 0
-  m_Name: TestHolster (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1366746231
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1366746230}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.109, y: 1.133, z: -10.044}
-  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1366746232
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1366746230}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_InteractionManager: {fileID: 1989791150}
-  m_InteractionLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_InteractionLayers:
-    m_Bits: 4294967295
-  m_AttachTransform: {fileID: 0}
-  m_KeepSelectedTargetValid: 1
-  m_StartingSelectedInteractable: {fileID: 0}
-  m_HoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ShowInteractableHoverMeshes: 1
-  m_InteractableHoverMeshMaterial: {fileID: 0}
-  m_InteractableCantHoverMeshMaterial: {fileID: 0}
-  m_SocketActive: 1
-  m_InteractableHoverScale: 1
-  m_RecycleDelayTime: 1
--- !u!135 &1366746234
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1366746230}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1366746235
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1366746230}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 8aa659f864a2309459a789493298b561, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1366746236
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1366746230}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1479875001
 GameObject:
  m_ObjectHideFlags: 0
@@ -1760,7 +1578,7 @@ PrefabInstance:
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
@@ -1866,7 +1684,7 @@ Transform:
  m_Children:
  - {fileID: 508810528}
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1578543177
 MonoBehaviour:
@@ -1988,6 +1806,75 @@ ParticleSystem:
    type: 3}
  m_PrefabInstance: {fileID: 953161746}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1638002948
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6.541
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.183
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -10.075
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775024, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1015801306266775025, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51,
+        type: 3}
+      propertyPath: m_Name
+      value: Holster (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fe14b264b0f9cdf4cb9b3b8da9d57a51, type: 3}
 --- !u!1 &1651537451
 GameObject:
  m_ObjectHideFlags: 0
@@ -2032,7 +1919,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1694198627
 PrefabInstance:
@@ -2047,7 +1934,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
      propertyPath: m_RootOrder
-      value: 14
+      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
      propertyPath: m_LocalScale.x
@@ -2157,7 +2044,7 @@ PrefabInstance:
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
@@ -2460,7 +2347,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2057955796 stripped
 GameObject:
--- a/Assets/SkyProfile-457889269655148736.asset
+++ b/Assets/SkyProfile-457889269655148736.asset
@@ -90,19 +90,32 @@ Material:
    - _HorizonCloudSize: 4.91
    - _HorizonCloudStartPosition: -0.1
    - _HorizonCloudStep: 25
+<<<<<<< HEAD
+    - _HorizonExponent: 3.7146542
+    - _HorizonStep: 500
+    - _HorizonThickness: 1
+    - _MoonGlow: 0
+    - _MoonLightIntensity: 0.0000058246696
+=======
    - _HorizonExponent: 3.4805284
    - _HorizonStep: 500
    - _HorizonThickness: 1
    - _MoonGlow: 0
    - _MoonLightIntensity: 0.000000031173318
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
    - _MoonSize: 0
    - _MoonSoftEdge: 0
    - _OverheadCloudAltitude: 1000
    - _OverheadCloudAnimationSpeed: 50
    - _OverheadCloudFlowDirectionX: 1
    - _OverheadCloudFlowDirectionZ: 1
+<<<<<<< HEAD
+    - _OverheadCloudRemapMax: 1.2231352
+    - _OverheadCloudRemapMin: 0.20684233
+=======
    - _OverheadCloudRemapMax: 1.1112865
    - _OverheadCloudRemapMin: 0.13994561
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
    - _OverheadCloudSize: 10
    - _OverheadCloudStep: 2
    - _StarsDensity0: 0.4
@@ -121,12 +134,31 @@ Material:
    - _StarsTwinkle1: 6
    - _StarsTwinkle2: 2
    - _SunGlow: 0.45
+<<<<<<< HEAD
+    - _SunLightIntensity: 0.38252082
+=======
    - _SunLightIntensity: 0.2670978
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
    - _SunSize: 0.1
    - _SunSoftEdge: 0.5
    m_Colors:
    - _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
    - _FogColor: {r: 0, g: 0, b: 0, a: 0}
+<<<<<<< HEAD
+    - _GroundColor: {r: 0.42508656, g: 0.40805677, b: 0.44104263, a: 1}
+    - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
+    - _HorizonColor: {r: 0.8990203, g: 0.87222093, b: 0.77996165, a: 1}
+    - _MoonColor: {r: 1, g: 1, b: 1, a: 0}
+    - _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
+    - _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
+    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.98546386}
+    - _SkyColor: {r: 0.23304974, g: 0.42586115, b: 0.67070246, a: 1}
+    - _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
+    - _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
+    - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
+    - _SunColor: {r: 0.9716981, g: 0.924923, b: 0.8476991, a: 1}
+    - _SunDirection: {r: 0, g: -0.46185654, b: 0.88695467, a: 0}
+=======
    - _GroundColor: {r: 0.41449818, g: 0.39506137, b: 0.43270952, a: 1}
    - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
    - _HorizonColor: {r: 0.9036482, g: 0.8581607, b: 0.75300163, a: 1}
@@ -140,6 +172,7 @@ Material:
    - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
    - _SunColor: {r: 0.97335076, g: 0.9293781, b: 0.8568232, a: 1}
    - _SunDirection: {r: 0, g: -0.32017863, b: 0.9473572, a: 0}
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
    - _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
  m_BuildTextureStacks: []
 --- !u!114 &11400000
--- a/Assets/_TerrainData/TerrainData_521113671563848736.asset
+++ b/Assets/_TerrainData/TerrainData_521113671563848736.asset
--- a/Assets/_TerrainData/TerrainData_699485723238748736.asset
+++ b/Assets/_TerrainData/TerrainData_699485723238748736.asset
--- a/Assets/_TerrainData/TerrainData_869121471408748736.asset
+++ b/Assets/_TerrainData/TerrainData_869121471408748736.asset
--- a/Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
@@ -27,17 +27,29 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
+<<<<<<< HEAD
+        m_Texture: {fileID: -4654689040985271397, guid: b6bbea2e1167a7346822545139402874,
+=======
        m_Texture: {fileID: -8382209597607994568, guid: b6bbea2e1167a7346822545139402874,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
+<<<<<<< HEAD
+        m_Texture: {fileID: 2844727453665291070, guid: b6bbea2e1167a7346822545139402874,
+=======
        m_Texture: {fileID: -5418273104343767497, guid: b6bbea2e1167a7346822545139402874,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
+<<<<<<< HEAD
+        m_Texture: {fileID: 4259349063529903109, guid: b6bbea2e1167a7346822545139402874,
+=======
        m_Texture: {fileID: 4448014153531656217, guid: b6bbea2e1167a7346822545139402874,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
--- a/Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
@@ -40,17 +40,29 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
+<<<<<<< HEAD
+        m_Texture: {fileID: 6814411336743759160, guid: 726ce83d589353742be6b48ff467fc48,
+=======
        m_Texture: {fileID: -3679002471302179906, guid: 726ce83d589353742be6b48ff467fc48,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
+<<<<<<< HEAD
+        m_Texture: {fileID: 9222750968982691349, guid: 726ce83d589353742be6b48ff467fc48,
+=======
        m_Texture: {fileID: 5517573790230051661, guid: 726ce83d589353742be6b48ff467fc48,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
+<<<<<<< HEAD
+        m_Texture: {fileID: 3896593589085943192, guid: 726ce83d589353742be6b48ff467fc48,
+=======
        m_Texture: {fileID: -2372503177267332067, guid: 726ce83d589353742be6b48ff467fc48,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
--- a/Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
@@ -40,17 +40,29 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
+<<<<<<< HEAD
+        m_Texture: {fileID: 7347968026426540258, guid: 7f589c682d367b442b8cf75918f5aa55,
+=======
        m_Texture: {fileID: -7655403243227739187, guid: 7f589c682d367b442b8cf75918f5aa55,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
+<<<<<<< HEAD
+        m_Texture: {fileID: -1762372347208809787, guid: 7f589c682d367b442b8cf75918f5aa55,
+=======
        m_Texture: {fileID: 5273791656863379916, guid: 7f589c682d367b442b8cf75918f5aa55,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
+<<<<<<< HEAD
+        m_Texture: {fileID: -1736210976181236159, guid: 7f589c682d367b442b8cf75918f5aa55,
+=======
        m_Texture: {fileID: 2126150020230490587, guid: 7f589c682d367b442b8cf75918f5aa55,
+>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,7 +6,7 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 0
-    path: Assets/Scenes/DO_NOT_TOUCH.unity
+    path: Assets/SimpleNaturePack/Scenes/DO_NOT_TOUCH.unity
    guid: 9fc0d4010bbf28b4594072e72b8655ab
  - enabled: 1
    path: Assets/Scenes/JoonasP/SampleScene.unity
Author	SHA1	Message	Date
joonasp	09e7e26cbb	gemportal branch merge	2022-04-08 22:18:18 +03:00
joonasp	037432c393	playerinfo script and duplicate scene for testing	2022-04-08 22:16:25 +03:00
joonasp	9eaa6517c3	Merge branch 'staging' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into joonasp_Milestone2	2022-04-08 21:14:07 +03:00
joonasp	c13d671975	Inventory and minigame tweaks	2022-04-04 18:57:40 +03:00
joonasp	e671f77c77	item stack pop item, minigame additem method	2022-04-03 09:40:36 +03:00