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

Merge branch 'main' into Navigation

This commit is contained in:
maverickdgg 2023-03-25 17:20:49 +08:00
parent 4a149508c9 ce24a1efb0
commit 2d9b7f3a5d
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using static PlayerController;
namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
{ {
@ -18,6 +19,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
if (transform) if (transform)
{ {
transform.GlobalPosition = aiTransform.GlobalPosition; transform.GlobalPosition = aiTransform.GlobalPosition;
transform.GlobalEulerAngles = aiTransform.GlobalEulerAngles;
} }
} }
@ -29,6 +31,10 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
HomeOwnerAI ai = aiGO.GetScript<HomeOwnerAI>(); HomeOwnerAI ai = aiGO.GetScript<HomeOwnerAI>();
if (pc) if (pc)
{ {
pc.currentState = RaccoonStates.CAUGHT;
if (pc.stateMachine && !pc.stateMachine.IsState(typeof(PlayerCaughtState)))
pc.stateMachine.SetState(typeof(PlayerCaughtState));
pc.GotCaught(); pc.GotCaught();
if (ai) if (ai)
ai.Reset(); ai.Reset();

3
Assets/Scripts/Gameplay/Player/SC_PlayerController.cs
View File

@ -510,7 +510,8 @@ public class PlayerController : Script
currentState = RaccoonStates.IDLE; currentState = RaccoonStates.IDLE;
if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState))) if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState)))
stateMachine.SetState(typeof(PlayerIdleState)); stateMachine.SetState(typeof(PlayerIdleState));
tranform.LocalPosition = respawnPoint.GetComponent<Transform>().LocalPosition;
tranform.GlobalPosition = respawnPoint.GetComponent<Transform>().GlobalPosition;
GameManager.Instance.RacoonCaught(); GameManager.Instance.RacoonCaught();