shield spell, ice bolt adjustments, training dummys

This commit is contained in:
joonasp 2022-04-18 11:29:26 +03:00
parent 5bf99356ff
commit ad1a931c41
12 changed files with 1060 additions and 765 deletions

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 4402262400481754071}
- component: {fileID: 772404450966566002}
- component: {fileID: 3268723311598239928}
- component: {fileID: 5154885136569341264}
- component: {fileID: 7564575873016353892}
m_Layer: 0
m_Name: shield_spell
m_TagString: Untagged
@ -84,8 +84,8 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &5154885136569341264
MeshCollider:
--- !u!65 &7564575873016353892
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -94,7 +94,6 @@ MeshCollider:
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}
serializedVersion: 2
m_Size: {x: 3.8, y: 0.3, z: 2.0000007}
m_Center: {x: 0, y: -0.0046907673, z: 0.000000001118366}

View File

@ -43,17 +43,21 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning("WOODCUTTING ACTION");
}
return;
break;
case "VerticalLine":
if (holdingWand)
{
Debug.LogWarning("WAND VERTICAL");
Vector3 spawnPoint = transform.position + playerCamera.transform.forward;
spawnPoint = new Vector3(spawnPoint.x, spawnPoint.y + 1, spawnPoint.z);
Instantiate(objects[1], spawnPoint, Quaternion.Euler(-90,playerCamera.transform.eulerAngles.y-180,180));
}
else
{
Debug.LogWarning("VERTICAL");
}
return;
break;
case "Circle":
if (holdingWand)
{
@ -64,7 +68,7 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning("CIRCLE");
}
return;
break;
case "Triangle":
if (holdingWand)
{
@ -74,7 +78,7 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning("WOODCUTTING ACTION");
}
return;
break;
}
/*if (action == "Portal")
@ -163,6 +167,6 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning("INSTANTIATE BOLT");
var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
projectileObj.GetComponent<Rigidbody>().velocity = (playerCamera.transform.forward).normalized * projectileSpeed;
}
}

View File

@ -12,29 +12,39 @@ public class Projectile : MonoBehaviour
// Will always be destroyed after 10 seconds.
Destroy(gameObject, 10);
oldEulerAngles = transform.rotation.eulerAngles;
//oldEulerAngles = transform.rotation.eulerAngles;
}
private void Update()
{
if (oldEulerAngles != transform.rotation.eulerAngles)
/*if (oldEulerAngles != transform.rotation.eulerAngles)
{
Destroy(gameObject);
}
*/
}
private void onCollisionEnter(Collider other)
private void OnCollisionEnter(Collision collision)
{
Debug.LogWarning(collision.gameObject.name);
if (collision.gameObject.tag != "IceBolt" && collision.gameObject.tag != "Player" && !collided)
{
collided = true;
if (collision.gameObject.name == "Dummy") Destroy(collision.gameObject); //REPLACE WITH ENEMY TAG CHECK
Destroy(gameObject);
}
}
private void OnTriggerEnter(Collider other)
{
Debug.LogWarning(other.gameObject.name);
if (other.gameObject.tag != "IceBolt" && other.gameObject.tag != "Player" && !collided)
{
collided = true;
Destroy(gameObject);
}
}
private void onTriggerEnter(Collider other)
{
if (other.gameObject.tag != "IceBolt" && other.gameObject.tag != "Player" && !collided)
else if (other.gameObject.name == "Dummy")
{
collided = true;
Destroy(other.gameObject);
Destroy(gameObject);
}
}

File diff suppressed because one or more lines are too long

View File

@ -90,19 +90,19 @@ Material:
- _HorizonCloudSize: 4.91
- _HorizonCloudStartPosition: -0.1
- _HorizonCloudStep: 25
- _HorizonExponent: 3.4589782
- _HorizonExponent: 3.6162338
- _HorizonStep: 500
- _HorizonThickness: 1
- _MoonGlow: 0
- _MoonLightIntensity: 0.0000015348196
- _MoonLightIntensity: 0.000002310815
- _MoonSize: 0
- _MoonSoftEdge: 0
- _OverheadCloudAltitude: 1000
- _OverheadCloudAnimationSpeed: 50
- _OverheadCloudFlowDirectionX: 1
- _OverheadCloudFlowDirectionZ: 1
- _OverheadCloudRemapMax: 1.1018893
- _OverheadCloudRemapMin: 0.13329326
- _OverheadCloudRemapMax: 1.1742301
- _OverheadCloudRemapMin: 0.1797546
- _OverheadCloudSize: 10
- _OverheadCloudStep: 2
- _StarsDensity0: 0.4
@ -121,25 +121,25 @@ Material:
- _StarsTwinkle1: 6
- _StarsTwinkle2: 2
- _SunGlow: 0.45
- _SunLightIntensity: 0.25629184
- _SunLightIntensity: 0.33437574
- _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}
- _GroundColor: {r: 0.4134524, g: 0.39377788, b: 0.43188646, a: 1}
- _GroundColor: {r: 0.4207744, g: 0.40276432, b: 0.43764892, a: 1}
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
- _HorizonColor: {r: 0.90410525, g: 0.856772, b: 0.75033885, a: 1}
- _HorizonColor: {r: 0.9009051, g: 0.86649483, b: 0.76898205, 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.96884954}
- _SkyColor: {r: 0.21153876, g: 0.3702592, b: 0.6066941, a: 1}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9793058}
- _SkyColor: {r: 0.22507675, g: 0.40525243, b: 0.64697796, 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.9735647, g: 0.92994505, b: 0.8579726, a: 1}
- _SunDirection: {r: 0, g: -0.30571675, b: 0.9521225, a: 0}
- _SunColor: {r: 0.9720668, g: 0.92597556, b: 0.849925, a: 1}
- _SunDirection: {r: 0, g: -0.40529454, b: 0.9141862, a: 0}
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -27,17 +27,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -1989707927698212272, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -2430253072367125096, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 7937926164014354006, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -4517534967829155026, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 1824847980210742918, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -4940288674371839809, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: 8107136639599825324, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 1175007390464812036, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 3516647102606722172, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 86684429434073738, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 4906480472719197437, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 8645063956259432296, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -9047105083863647604, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -548112332708788945, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 3290042660671939480, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 409657408211097386, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: -1827338606171078033, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 5101013413748717113, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

View File

@ -731,7 +731,7 @@ PlayerSettings:
PS4: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
PS5: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
Stadia: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2;GRIFFIN_URP;POSEIDON;POSEIDON_URP;JUPITER;GRIFFIN;TEXTURE_GRAPH;TG_SEARCHER;GRIFFIN_2021
WebGL: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
Windows Store Apps: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
XboxOne: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2