xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Added Navigation System. Added basic AI FSM #438

Merged
maverickdgg merged 9 commits from Navigation into main 2023-03-24 16:11:14 +08:00
Conversation 0 Commits 9 Files Changed 39 +19 -14
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78d30cb051 - Show all commits

3
Assets/Scenes/MainMenu.shade
View File

@ -530,7 +530,6 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.FadeInOnActive - Type: SHADE_Scripting.UI.FadeInOnActive
Enabled: true Enabled: true
alpha: 0
- EID: 19 - EID: 19
Name: Options Canvas Name: Options Canvas
IsActive: false IsActive: false
@ -1236,7 +1235,6 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.FadeInOnActive - Type: SHADE_Scripting.UI.FadeInOnActive
Enabled: true Enabled: true
alpha: 0
- EID: 46 - EID: 46
Name: Credits Canvas Name: Credits Canvas
IsActive: false IsActive: false
@ -1461,7 +1459,6 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.FadeInOnActive - Type: SHADE_Scripting.UI.FadeInOnActive
Enabled: true Enabled: true
alpha: 0
- EID: 441 - EID: 441
Name: Level Select Buttons Name: Level Select Buttons
IsActive: true IsActive: true

28
Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs
View File

@ -60,6 +60,14 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
{ {
alertCooldown = 0.0f; alertCooldown = 0.0f;
} }
RigidBody rigid = GetComponent<RigidBody>();
if(rigid)
{
rigid.AngularVelocity = Vector3.Zero;
}
} }
public bool ShouldTransitAlert() public bool ShouldTransitAlert()
@ -78,17 +86,17 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
public void RotateToPlayer() public void RotateToPlayer()
{ {
Transform playerTransform = player.GetComponent<Transform>(); //Transform playerTransform = player.GetComponent<Transform>();
//Rotate to face player. ////Rotate to face player.
Transform aiTransform = GetComponent<Transform>(); //Transform aiTransform = GetComponent<Transform>();
if(playerTransform && aiTransform) //if(playerTransform && aiTransform)
{ //{
Vector3 direction = playerTransform.GlobalPosition - aiTransform.GlobalPosition; // Vector3 direction = playerTransform.GlobalPosition - aiTransform.GlobalPosition;
Quaternion currentRotation = aiTransform.LocalRotation; // Quaternion currentRotation = aiTransform.LocalRotation;
Quaternion targetRotation = Quaternion.Euler(0.0f, MathF.Atan2(direction.x, direction.z), 0.0f); // Quaternion targetRotation = Quaternion.Euler(0.0f, MathF.Atan2(direction.x, direction.z), 0.0f);
aiTransform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, 5.0f * (float)Time.FixedDeltaTime); // aiTransform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, 5.0f * (float)Time.FixedDeltaTime);
} //}
} }

2
Assets/Scripts/Gameplay/AIBehaviour/AIRework/RotateToVelocity.cs
View File

@ -9,7 +9,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
{ {
public class RotateToVelocity : Script public class RotateToVelocity : Script
{ {
public float rotationPerSecond = 5.0f; public float rotationPerSecond = 2.0f;
protected override void update() protected override void update()
{ {