From bf7029be328316f8315dbbc4463ec6e6d4cb1528 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 14 Sep 2023 14:09:46 -0400 Subject: [PATCH] fixed random things --- Assets/Prefabs/Target.prefab | 2 +- Assets/Scenes/NatureScene.unity | 44 ++++++++++++++++++++++----------- Assets/Scripts/ArrowSpawner.cs | 4 ++- Assets/Scripts/BowDebugger.cs | 5 ++-- Assets/Scripts/PullString.cs | 8 +++--- 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/Assets/Prefabs/Target.prefab b/Assets/Prefabs/Target.prefab index b51eaef..c1dc781 100644 --- a/Assets/Prefabs/Target.prefab +++ b/Assets/Prefabs/Target.prefab @@ -101,7 +101,7 @@ CapsuleCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 + m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Scenes/NatureScene.unity b/Assets/Scenes/NatureScene.unity index 62d8f48..730684b 100644 --- a/Assets/Scenes/NatureScene.unity +++ b/Assets/Scenes/NatureScene.unity @@ -615,6 +615,10 @@ PrefabInstance: propertyPath: m_Name value: Tree_04 objectReference: {fileID: 0} + - target: {fileID: 5942433330446073732, guid: f0c16f0ea935ea64297ca1d4d55d9746, type: 3} + propertyPath: m_LODs.Array.data[1].screenRelativeHeight + value: 0.0055446276 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1511,7 +1515,7 @@ Transform: m_GameObject: {fileID: 129418382} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.08} + m_LocalPosition: {x: 0.34, y: 0, z: -0.08} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2384,6 +2388,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5096517541735811467, guid: c60edd51c065ceb46b345849a03bc106, type: 3} + propertyPath: m_LODs.Array.data[1].screenRelativeHeight + value: 0.00045941176 + objectReference: {fileID: 0} - target: {fileID: 6941765000743290380, guid: c60edd51c065ceb46b345849a03bc106, type: 3} propertyPath: m_Name value: Tree_03 (3) @@ -9961,7 +9969,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1847768278983476760, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalPosition.x @@ -9977,27 +9985,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalRotation.w - value: -0.24970774 + value: -0.4320856 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalRotation.x - value: 0.079932086 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalRotation.y - value: -0.9190777 + value: 0.90183264 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalRotation.z - value: -0.2941991 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -35.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -210.4 + value: 231.2 objectReference: {fileID: 0} - target: {fileID: 5024733077653106566, guid: d020e8a44de3efd458bb849ecdb210d5, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -11701,6 +11709,10 @@ PrefabInstance: propertyPath: m_Name value: Tree_04 (6) objectReference: {fileID: 0} + - target: {fileID: 5942433330446073732, guid: f0c16f0ea935ea64297ca1d4d55d9746, type: 3} + propertyPath: m_LODs.Array.data[1].screenRelativeHeight + value: 0.0019087236 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13175,7 +13187,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2079483091 Transform: m_ObjectHideFlags: 0 @@ -13692,6 +13704,10 @@ PrefabInstance: propertyPath: debugCube value: objectReference: {fileID: 709881062} + - target: {fileID: 4324286136567874797, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} + propertyPath: arrowNotch + value: + objectReference: {fileID: 129418382} - target: {fileID: 4642036980616804171, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -13778,7 +13794,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalPosition.x - value: 1.53 + value: 6.69 objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalPosition.y @@ -13786,11 +13802,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalPosition.z - value: -3.34 + value: 10.28 objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.88502836 objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalRotation.x @@ -13798,7 +13814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.46553722 objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalRotation.z @@ -13810,7 +13826,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 55.49 objectReference: {fileID: 0} - target: {fileID: 5587657699232216974, guid: 2e0ac17f260ba744aa450dd79334386a, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/Scripts/ArrowSpawner.cs b/Assets/Scripts/ArrowSpawner.cs index e003ac7..714efe6 100644 --- a/Assets/Scripts/ArrowSpawner.cs +++ b/Assets/Scripts/ArrowSpawner.cs @@ -54,7 +54,7 @@ public void UpdateArrow(float pullDistance) { if(isArrowReady== true) { - currentArrow.transform.localPosition = new Vector3(0, 0, 0 + pullDistance); //TODO Adjust this for arrow alignment to string + currentArrow.transform.localPosition = new Vector3(0 + (pullDistance/3), 0, 0); //TODO Adjust this for arrow alignment to string } } @@ -71,6 +71,8 @@ private IEnumerator DelayedSpawn() currentArrow = Instantiate(arrow, this.gameObject.transform); currentArrow.transform.position = new Vector3(arrowNotch.transform.position.x, arrowNotch.transform.position.y, arrowNotch.transform.position.z - 0.22f); currentArrow.transform.rotation = arrowNotch.transform.rotation; + + currentArrow.transform.SetParent(arrowNotch.transform, true); Debug.Log("Arrow is ready"); currentArrow.transform.position = arrowNotch.transform.position; } diff --git a/Assets/Scripts/BowDebugger.cs b/Assets/Scripts/BowDebugger.cs index 2ffc7ec..99d0fc5 100644 --- a/Assets/Scripts/BowDebugger.cs +++ b/Assets/Scripts/BowDebugger.cs @@ -49,9 +49,10 @@ void Update() if(Keyboard.current.bKey.isPressed && bKeyPressed == false) { bKeyPressed = true; - pullString.pullDistance = 1; + pullString.pullDistance += 0.1f; pullString.UpdateString(); - + StartCoroutine("KeyDelay"); + } } diff --git a/Assets/Scripts/PullString.cs b/Assets/Scripts/PullString.cs index 58e943e..821b8d5 100644 --- a/Assets/Scripts/PullString.cs +++ b/Assets/Scripts/PullString.cs @@ -92,12 +92,14 @@ public float CalculatePull(Vector3 pullPosition) public void UpdateString() { - Vector3 linePosition = Vector3.right * Mathf.Lerp(startPoint.transform.localPosition.x, endPoint.transform.localPosition.x, pullDistance); - debugCube.ChangeText2(pullDistance.ToString()); + Vector3 linePosition = Vector3.right * Mathf.Lerp(startPoint.transform.localPosition.x, endPoint.transform.localPosition.x, pullDistance) + new Vector3(0,0, -0.1f); + debugCube.ChangeText2(linePosition.x.ToString()); lineRenderer.SetPosition(1, linePosition); + //arrowNotch.transform.position = Vector3.left * (arrowNotch.transform.position.x - linePosition.x); - //arrowSpawner.UpdateArrow(pullDistance); + + //arrowSpawner.UpdateArrow(linePosition.x); }