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

merge fixes and icebolt tweaks

Browse Source
This commit is contained in:
joonasp
2022-04-14 17:56:04 +03:00
parent be8b9a987d
commit 5bf99356ff
16 changed files with 1490 additions and 36926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4834,7 +4834,6 @@ GameObject:
- component: {fileID: 3928666337405863709}
- component: {fileID: 824121554007831541}
- component: {fileID: 3271421586109646936}
- component: {fileID: 6090694805862981561}
- component: {fileID: 6268334591715512481}
- component: {fileID: 7195648623186244198}
m_Layer: 10
@@ -4901,19 +4900,6 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!135 &6090694805862981561
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
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!33 &6268334591715512481
MeshFilter:
m_ObjectHideFlags: 0

100
Assets/Project Files/Prefabs/JoonasP/shield_spell.prefab Normal file
View File

@@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3917053023338471789
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4402262400481754071}
- component: {fileID: 772404450966566002}
- component: {fileID: 3268723311598239928}
- component: {fileID: 5154885136569341264}
m_Layer: 0
m_Name: shield_spell
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4402262400481754071
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3917053023338471789}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: 26.388, y: 4.077, z: 49.415}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180}
--- !u!33 &772404450966566002
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3917053023338471789}
m_Mesh: {fileID: -462981019419857548, guid: 61bc520e906d62948ad0190bdafa7e0b, type: 3}
--- !u!23 &3268723311598239928
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3917053023338471789}
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: 76a090587dfffcc44b9f65fc50885f0e, 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!64 &5154885136569341264
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3917053023338471789}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -462981019419857548, guid: 61bc520e906d62948ad0190bdafa7e0b, type: 3}

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

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

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

@@ -23,16 +23,12 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning(action);
/* todo: playerinfo doesnt have these methods?
if (player.GetComponent<PlayerInfo>().GetRightHand() != null)
{
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
}
else holdingWand = false;
*/
switch (action)
{

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

@@ -4,15 +4,23 @@ using UnityEngine;
public class PlayerInfo : MonoBehaviour
{
public static PlayerInfo Instance;
private int health;
private int essence_basic;
//Add elemental essences?
private GameObject rightHandHeld;
private GameObject leftHandHeld;
private void Awake()
{
Instance = this;
health = 5;
essence_basic = 0;
rightHandHeld = null;
leftHandHeld = null;
}
public void AddHealth(int value)
@@ -28,8 +36,31 @@ public class PlayerInfo : MonoBehaviour
{
if (essence_basic + value < 0)
{
Debug.LogError("NOT ENOUGH ESSENCE");
Debug.Log("NOT ENOUGH ESSENCE");
}
else essence_basic += value;
}
public void AddLeftHand(GameObject obj)
{
leftHandHeld = obj;
}
public void AddRightHand(GameObject obj)
{
rightHandHeld = obj;
}
public void RemoveLeftHand()
{
leftHandHeld = null;
}
public void RemoveRightHand()
{
rightHandHeld = null;
}
public GameObject GetRightHand() { return rightHandHeld; }
public GameObject GetLeftHand() { return leftHandHeld; }
}