helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

essence add to playerinfo

Browse Source
This commit is contained in:
joonasp
2022-04-11 18:27:18 +03:00
parent f7734432cc
commit f032bb323a
17 changed files with 1002 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Project Files/Prefabs/Arlo/Log.prefab
View File

@@ -17,7 +17,7 @@ GameObject:
- component: {fileID: 1264022012566418942}
- component: {fileID: 759522315152862422}
- component: {fileID: 7019801789685915322}
m_Layer: 0
m_Layer: 10
m_Name: Log
m_TagString: Throwable
m_Icon: {fileID: 0}

56
Assets/Project Files/Prefabs/JonasB/IceBolt.prefab
View File

@@ -4835,6 +4835,8 @@ GameObject:
- component: {fileID: 824121554007831541}
- component: {fileID: 3271421586109646936}
- component: {fileID: 6090694805862981561}
- component: {fileID: 6268334591715512481}
- component: {fileID: 7195648623186244198}
m_Layer: 10
m_Name: IceBolt
m_TagString: IceBolt
@@ -4897,7 +4899,7 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!135 &6090694805862981561
SphereCollider:
@@ -4910,8 +4912,58 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &6268334591715512481
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7195648623186244198
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
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: bd0bb729cb6159b4ab21c5f62cad24ee, type: 3}
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!1 &4403856838497526616
GameObject:
m_ObjectHideFlags: 0

105
Assets/Project Files/Prefabs/JoonasP/EssenceWell.prefab Normal file
View File

@@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8183020133482818824
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8183020133482637934}
- component: {fileID: 8183020133483952674}
- component: {fileID: 8183020133484680894}
- component: {fileID: 8183020133918107436}
m_Layer: 0
m_Name: EssenceWell
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8183020133482637934
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_LocalRotation: {x: 0.000000115202326, y: 0.7071068, z: 0.7071068, w: -0.000000115202326}
m_LocalPosition: {x: -10.25, y: 1.47, z: -12.115}
m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8183020133483952674
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_Mesh: {fileID: 4300122, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
--- !u!23 &8183020133484680894
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
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: b27fa8aa11d99d440bab56b1de24981f, 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!114 &8183020133918107436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
m_Name:
m_EditorClassIdentifier:
node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
numberOfNodes: 5
spawnDelay: 1
despawnTime: 2
rightDistance: 0.1
maxUp: 0.2
minDown: -0.2

7
Assets/Project Files/Prefabs/JoonasP/EssenceWell.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c52ee40e56d869645af73fd6f39c1323
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Project Files/Scripts/JonasB/ActionGestureInteraction.cs
View File

@@ -28,6 +28,7 @@ public class ActionGestureInteraction : MonoBehaviour
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
}
else holdingWand = false;
switch (action)
{
@@ -56,7 +57,8 @@ public class ActionGestureInteraction : MonoBehaviour
case "Circle":
if (holdingWand)
{
Debug.LogWarning("WAND CIRCLE");
Debug.LogWarning("Arcing fireball");
}
else
{
@@ -98,7 +100,7 @@ public class ActionGestureInteraction : MonoBehaviour
}
} */
}
void EnableDisablePortal(GameObject portal)
void MinigameEnable(GameObject portal)
{
// Did the raycast catch a portal in front of us?
if (portal != null)
@@ -125,7 +127,7 @@ public class ActionGestureInteraction : MonoBehaviour
}
}
GameObject FindPortalInFront()
GameObject FindMinigame()
{
Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
RaycastHit hit;

2
Assets/Project Files/Scripts/JonasB/PortalTeleporter.cs
View File

@@ -49,7 +49,7 @@ public class PortalTeleporter : MonoBehaviour
Debug.Log(_enabled);
if (_portalCanBeUsed && !_justUsed && _enabled)
{
if (other.name.StartsWith("Holster") || other.tag.Contains(""))
if (other.name.StartsWith("Holster") || other.tag.Contains("Holster"))
{
Debug.Log("holster");
}

12
Assets/Project Files/Scripts/JoonasP/EssenceNodeController.cs
View File

@@ -11,7 +11,10 @@ public class EssenceNodeController : MonoBehaviour
public bool isTouched;
private bool followPlayer = false;
private Transform player;
private Transform playerCamera;
[SerializeField]
private PlayerInfo playerInfo;
private float timer;
private Material nodeMaterial;
@@ -21,6 +24,7 @@ public class EssenceNodeController : MonoBehaviour
private void Awake()
{
nodeMaterial = GetComponent<Renderer>().material;
playerInfo = PlayerInfo.Instance;
}
public void Touched()
@@ -37,7 +41,7 @@ public class EssenceNodeController : MonoBehaviour
public void FollowPlayer()
{
followPlayer = true;
player = GameObject.FindGameObjectWithTag("MainCamera").transform;
playerCamera = GameObject.FindGameObjectWithTag("MainCamera").transform;
StartCoroutine(Collect());
}
@@ -56,8 +60,8 @@ public class EssenceNodeController : MonoBehaviour
IEnumerator Collect()
{
playerInfo.AddEssenceBasic(1);
yield return new WaitForSeconds(2f);
//TODO: Update value in player inventory
Destroy(gameObject);
}
@@ -76,7 +80,7 @@ public class EssenceNodeController : MonoBehaviour
if (followPlayer)
{
transform.position = Vector3.Lerp(transform.position, new Vector3(player.position.x,player.position.y - 0.5f, player.position.z), Time.deltaTime);
transform.position = Vector3.Lerp(transform.position, new Vector3(playerCamera.position.x, playerCamera.position.y - 0.5f, playerCamera.position.z), Time.deltaTime);
}
}

3
Assets/Project Files/Scripts/JoonasP/PlayerInfo.cs
View File

@@ -4,6 +4,8 @@ using UnityEngine;
public class PlayerInfo : MonoBehaviour
{
public static PlayerInfo Instance;
private int health;
private int essence_basic;
@@ -13,6 +15,7 @@ public class PlayerInfo : MonoBehaviour
private void Awake()
{
Instance = this;
health = 5;
essence_basic = 0;
rightHandHeld = null;