CYT
/
FireDrillSystem_BeiHai_HANCC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整被困人员引导寻路，设置寻路点是判断能不能到达，寻路时给被困人员赋值楼层信息

develop
曹衍涛 3 years ago
parent
d0d13d07a8
commit
f9649f242e
6 changed files with 137 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Assets/Resources/ClonePrefabs/DisasterPrefabs/TrappedPerson.prefab
  2. 54
      Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedMoveFree.cs
  3. 14
      Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedPathFind.cs
  4. 46
      Assets/Scripts/Common/InputSystem/InputManager/InputManager.cs
  5. 4
      Assets/Scripts/Common/NetworkSystem/NetWorkSync/PATHFIND_SYNC.cs
  6. 50
      Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs

16
Assets/Resources/ClonePrefabs/DisasterPrefabs/TrappedPerson.prefab
Unescape View File

@ -1047,16 +1047,16 @@ NavMeshAgent:
m_GameObject: {fileID: 1827870700707724} m_GameObject: {fileID: 1827870700707724}
m_Enabled: 1 m_Enabled: 1
m_AgentTypeID: 0 m_AgentTypeID: 0
m_Radius: 0.5 m_Radius: 0.1
m_Speed: 2.5 m_Speed: 2.5
m_Acceleration: 8 m_Acceleration: 80
avoidancePriority: 50 avoidancePriority: 50
m_AngularSpeed: 120 m_AngularSpeed: 400
m_StoppingDistance: 1.5 m_StoppingDistance: 0.5
m_AutoTraverseOffMeshLink: 1 m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1 m_AutoBraking: 1
m_AutoRepath: 1 m_AutoRepath: 1
m_Height: 2 m_Height: 1.5
m_BaseOffset: 0 m_BaseOffset: 0
m_WalkableMask: 4294967295 m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4 m_ObstacleAvoidanceType: 4
@ -1254,13 +1254,13 @@ CharacterController:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Height: 2 m_Height: 1.89
m_Radius: 0.3 m_Radius: 0.26
m_SlopeLimit: 45 m_SlopeLimit: 45
m_StepOffset: 0.3 m_StepOffset: 0.3
m_SkinWidth: 0.08 m_SkinWidth: 0.08
m_MinMoveDistance: 0.001 m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 1, z: 0} m_Center: {x: 0, y: 0.92, z: 0}
--- !u!114 &2594175076028504782 --- !u!114 &2594175076028504782
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

54
Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedMoveFree.cs
Unescape View File

@ -626,21 +626,23 @@ public class TrappedMoveFree : MonoBehaviour
return; return;
} }
Guidance = true; Guidance = true;
for (int i = 0; i < guidPoint.Count - 1; i++) //一处距离进的两个点
{ //for (int i = 0; i < guidPoint.Count - 1; i++)
for (int k = guidPoint.Count - 2; k > i; k--) //{
{ // for (int k = guidPoint.Count - 2; k > i; k--)
float distance = Vector3.Distance(guidPoint[i], guidPoint[k]);//计算两点的距离 // {
if (distance < 5) // float distance = Vector3.Distance(guidPoint[i], guidPoint[k]);//计算两点的距离
{ // if (distance < 5)
for (int j = k; j > i; j--) // {
{ // for (int j = k; j > i; j--)
guidPoint.RemoveAt(j); // {
} // guidPoint.RemoveAt(j);
break; // }
} // break;
} // }
} // }
//}
TargetPosition = guidPoint[0]; TargetPosition = guidPoint[0];
SaveFrirmanUserId = fireman.GetComponent<BaseGameObjInfo>().UserID; SaveFrirmanUserId = fireman.GetComponent<BaseGameObjInfo>().UserID;
//引导同步 //引导同步
@ -667,7 +669,25 @@ public class TrappedMoveFree : MonoBehaviour
} }
} }
public bool HasPath( List<Vector3> guidPoint)
{
bool has=true;
guidPoint.Insert(0,transform.position);
for (int i = 0; i < guidPoint.Count - 1; i++)
{
for (int k = guidPoint.Count - 2; k > i; k--)
{
List<Vector3> corners = new List<Vector3>();
var haspath = GetComponent<TrappedPathFind>().SetPathCorners(guidPoint[i], guidPoint[k], corners);
if (!haspath)
{
has = false;
}
}
}
return has;
}
IEnumerator checkguide() IEnumerator checkguide()
{ {
while (Guidance && !OverMoveOrGuidance) while (Guidance && !OverMoveOrGuidance)
@ -943,7 +963,7 @@ public class TrappedMoveFree : MonoBehaviour
TrappedPathFindingCommand.Instance.Execute(GetComponent<BaseGameObjInfo>().gameObjID, arg); TrappedPathFindingCommand.Instance.Execute(GetComponent<BaseGameObjInfo>().gameObjID, arg);
} }
} }
if (Vector3.Distance(transform.position, guidPoint[0]) < 2) if (Vector3.Distance(transform.position, guidPoint[0]) < 0.6f)
{ {
Guidance = false; Guidance = false;
movestate = MoveState.IDLE; movestate = MoveState.IDLE;

14
Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedPathFind.cs
Unescape View File

@ -165,7 +165,7 @@ public class TrappedPathFind : MonoBehaviour
} }
} }
} }
bool setPathCorners(Vector3 sourcePosition, Vector3 targetPosition, List<Vector3> corners) public bool setPathCorners(Vector3 sourcePosition, Vector3 targetPosition, List<Vector3> corners)
{ {
NavMeshPath NavMeshPath = new NavMeshPath(); NavMeshPath NavMeshPath = new NavMeshPath();
NavMesh.CalculatePath(sourcePosition, targetPosition, filter, NavMeshPath); NavMesh.CalculatePath(sourcePosition, targetPosition, filter, NavMeshPath);
@ -257,9 +257,9 @@ public class TrappedPathFind : MonoBehaviour
} }
private void setFloorMessage() private void setFloorMessage()
{ {
//设置寻路对象楼层属性 //璁剧疆瀵昏矾瀵硅薄妤煎眰灞炴€?
Vector3 adPos2 = transform.position; Vector3 adPos2 = transform.position;
Ray ray = new Ray(adPos2, -Vector3.up); Ray ray = new Ray(adPos2 + Vector3.up, Vector3.down);
RaycastHit hit = new RaycastHit(); RaycastHit hit = new RaycastHit();
if (Physics.Raycast(ray, out hit, 1000, LayerMask.GetMask("SoldierRoad", "CarRoad"))) if (Physics.Raycast(ray, out hit, 1000, LayerMask.GetMask("SoldierRoad", "CarRoad")))
{ {
@ -274,6 +274,12 @@ public class TrappedPathFind : MonoBehaviour
} }
} }
} }
/// <summary>
/// 判断当前位置到目标点是否能到达
/// </summary>
/// <param name="endpoint"></param>
/// <param name="corners"></param>
/// <returns></returns>
public List<Vector3> GetPathCornert(Vector3 endpoint, List<Vector3> corners) public List<Vector3> GetPathCornert(Vector3 endpoint, List<Vector3> corners)
{ {
List<Vector3> gocornert = new List<Vector3>(); List<Vector3> gocornert = new List<Vector3>();
@ -291,7 +297,7 @@ public class TrappedPathFind : MonoBehaviour
/// <param name="destinationPos">终点位置</param> /// <param name="destinationPos">终点位置</param>
/// <param name="corners">可寻路路径拐角点集合</param> /// <param name="corners">可寻路路径拐角点集合</param>
/// <returns>返回是否有可寻路路径</returns> /// <returns>返回是否有可寻路路径</returns>
private bool SetPathCorners(Vector3 startingPos, Vector3 destinationPos, List<Vector3> corners) public bool SetPathCorners(Vector3 startingPos, Vector3 destinationPos, List<Vector3> corners)
{ {
NavMesh.CalculatePath(startingPos, destinationPos, filter, path); NavMesh.CalculatePath(startingPos, destinationPos, filter, path);
Vector3[] tempCorners = new Vector3[path.corners.Length]; Vector3[] tempCorners = new Vector3[path.corners.Length];

46
Assets/Scripts/Common/InputSystem/InputManager/InputManager.cs
Unescape View File

@ -1636,9 +1636,49 @@ public class InputManager : MonoBehaviour
{ {
if (!GuidanceList.Contains(hit.point)) if (!GuidanceList.Contains(hit.point))
{ {
GuidanceList.Add(hit.point); if(SelectedObjs.selectedCharacters[0].GetComponent<FiremanMoveTrapped>().GuidanceTrapped!=null)
GameObject hitpart = Instantiate(pointer,hit.point,Quaternion.identity); {
hitpart.transform.parent = p_Hitpoint; List<Vector3> corn = new List<Vector3>();
//添加第一个点，判断被困人员当前位置能不能到达点击的点
if (GuidanceList.Count == 0)
{
bool can= SelectedObjs.selectedCharacters[0].GetComponent<FiremanMoveTrapped>().
GuidanceTrapped.GetComponent<TrappedPathFind>()
.setPathCorners(SelectedObjs.selectedCharacters[0].GetComponent<FiremanMoveTrapped>().
GuidanceTrapped.transform.position, hitpoint.point, corn);
if (can)
{
GuidanceList.Add(hit.point);
GameObject hitpart = Instantiate(pointer, hit.point, Quaternion.identity);
hitpart.transform.parent = p_Hitpoint;
}
else
{
LoadPromptWin.Instance.LoadTextPromptWindow("被困人员不能从上一个引导点到达该点", 2f);
}
}
//后续添加其他点
else
{
bool can = SelectedObjs.selectedCharacters[0].GetComponent<FiremanMoveTrapped>().
GuidanceTrapped.GetComponent<TrappedPathFind>()
.setPathCorners(GuidanceList[GuidanceList.Count - 1], hitpoint.point, corn);
if (can)
{
GuidanceList.Add(hit.point);
GameObject hitpart = Instantiate(pointer, hit.point, Quaternion.identity);
hitpart.transform.parent = p_Hitpoint;
}
else
{
LoadPromptWin.Instance.LoadTextPromptWindow("被困人员不能从上一个引导点到达该点", 2f);
}
}
}
} }
} }
} }

4
Assets/Scripts/Common/NetworkSystem/NetWorkSync/PATHFIND_SYNC.cs
Unescape View File

@ -158,7 +158,7 @@ public class PATHFIND_SYNC : NetworkMessageBehaviour
{ {
//setFloorMessage(); //setFloorMessage();
} }
if (objinfo.gameObjType == CloneObjType.fireman) if (objinfo.gameObjType == CloneObjType.fireman|| objinfo.gameObjType==CloneObjType.trappedPerson)
{ {
setFloorMessage(); setFloorMessage();
@ -169,7 +169,7 @@ public class PATHFIND_SYNC : NetworkMessageBehaviour
} }
if (i == corners.Count) if (i == corners.Count)
{ {
if (objinfo.gameObjType == CloneObjType.fireman) if (objinfo.gameObjType == CloneObjType.fireman || objinfo.gameObjType == CloneObjType.trappedPerson)
{ {
setFloorMessage(); setFloorMessage();

50
Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs
Unescape View File

@ -623,21 +623,45 @@ public class FireManSkillPanelController : MonoBehaviour
if (InputManager.GuidanceList.Count > 0 && if (InputManager.GuidanceList.Count > 0 &&
(Mathf.Abs(guidendpos.x - safepos.x) < 10 && Mathf.Abs(guidendpos.z - safepos.z) < 10)) (Mathf.Abs(guidendpos.x - safepos.x) < 10 && Mathf.Abs(guidendpos.z - safepos.z) < 10))
{ {
//引导命令 //if (SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped.GetComponent<TrappedMoveFree>().HasPath(InputManager.GuidanceList))
GuideLodeCmdArgs arg = new GuideLodeCmdArgs();
arg.pathpointList = InputManager.GuidanceList;
arg.FireManID = SelectFireMan.GetComponent<BaseGameObjInfo>().gameObjID;
arg.TrappedID = SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped.GetComponent<BaseGameObjInfo>().gameObjID;
TrappedMoveFollowGuidePointCommand.Instance.Execute(SelectFireMan.GetComponent<BaseGameObjInfo>().gameObjID, arg);
InputManager.skill = false;
InputManager.IsGuidance = false;
InputManager.GuidanceList.Clear();
for (int i = 0; i < p_Hitpoint.childCount; i++)
{ {
Destroy(p_Hitpoint.GetChild(i).gameObject); //引导命令
GuideLodeCmdArgs arg = new GuideLodeCmdArgs();
arg.pathpointList = InputManager.GuidanceList;
arg.FireManID = SelectFireMan.GetComponent<BaseGameObjInfo>().gameObjID;
arg.TrappedID = SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped.GetComponent<BaseGameObjInfo>().gameObjID;
TrappedMoveFollowGuidePointCommand.Instance.Execute(SelectFireMan.GetComponent<BaseGameObjInfo>().gameObjID, arg);
InputManager.skill = false;
InputManager.IsGuidance = false;
InputManager.GuidanceList.Clear();
for (int i = 0; i < p_Hitpoint.childCount; i++)
{
Destroy(p_Hitpoint.GetChild(i).gameObject);
}
SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped = null;
SelectFireMan.GetComponent<FireManControl>().workType = FireManSkills.None;
} }
SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped = null; //else
SelectFireMan.GetComponent<FireManControl>().workType = FireManSkills.None; //{
// InputManager.GuidanceList.Clear();
// for (int i = 0; i < p_Hitpoint.childCount; i++)
// {
// Destroy(p_Hitpoint.GetChild(i).gameObject);
// }
// LoadPromptWin.Instance.LoadTextPromptWindow("不能将伤员引导至安全区，请重新规划路线", 3f);
// InputManager.skill = false;
// SelectFireMan.GetComponent<FireManControl>().workType = FireManSkills.None;
// InputManager.GuidanceList.Clear();
// InputManager.IsGuidance = false;
// if (SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped != null)
// {
// //SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped.GetComponent<TrappedMoveFree>().Guidance = false;
// SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped.GetComponent<TrappedMoveFree>().CancelGuidance();
// SelectFireMan.GetComponent<FiremanMoveTrapped>().GuidanceTrapped = null;
// }
// SelectFireMan.GetComponent<FireManControl>().workType = FireManSkills.None;
//}
} }
else else

Write Preview
Loading…
Cancel
Save