chlorospingus/RatStabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts from main menu

Browse Source
This commit is contained in:
Chlorospingus
2024-10-26 21:25:03 -07:00
parent ab3d8bddeb
commit ca280d700e
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scenes/SampleScene.unity
View File

@@ -325,11 +325,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3} - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
propertyPath: swingDistance propertyPath: swingDistance
<<<<<<< HEAD
value: 3 value: 3
======= objectReference: {fileID: 0}
value: 2 - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
>>>>>>> main propertyPath: swingRangeDeg
value: 21.98
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3} - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
propertyPath: distanceIndicator propertyPath: distanceIndicator

12
Assets/Scripts C#/Teo.cs
View File

@@ -57,24 +57,14 @@ public class Teo : MonoBehaviour
Ratbot ratbot = hit.GetComponent<Ratbot>(); Ratbot ratbot = hit.GetComponent<Ratbot>();
// If ratbot exists and is within swing range, damage it. // If ratbot exists and is within swing range, damage it.
// Calculate absolute difference between angles of ratbot and cursor // Calculate absolute difference between angles of ratbot and cursor
<<<<<<< HEAD:Assets/C# Scripts/Teo.cs
if (ratbot == null || Mathf.Abs(Mathf.Atan2( if (ratbot == null || Mathf.Abs(Mathf.Atan2(
hit.transform.position.y - transform.position.y, hit.transform.position.y - transform.position.y,
hit.transform.position.x - transform.position.x hit.transform.position.x - transform.position.x
=======
/* if (ratbot == null || Mathf.Abs(Mathf.Atan2(
ratbot.transform.position.y - transform.position.y,
ratbot.transform.position.x - transform.position.x
>>>>>>> main:Assets/Scripts C#/Teo.cs
) - Mathf.Atan2( ) - Mathf.Atan2(
Input.mousePosition.y - Screen.height/2, Input.mousePosition.y - Screen.height/2,
Input.mousePosition.x - Screen.width/2 Input.mousePosition.x - Screen.width/2
)) > swingRangeDeg * Mathf.Deg2Rad )) > swingRangeDeg * Mathf.Deg2Rad
) */ ) continue;
if (ratbot == null) {
continue;
}
ratbot.Damage(damageStrength); ratbot.Damage(damageStrength);
} }
} }