gav/real-shooter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update scripts

Browse Source
This commit is contained in:
Krazerleo
2022-04-25 16:23:25 +07:00
parent e1d0bbc1eb
commit 290f5515b7
13 changed files with 120 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/Scripts/Character/NPC.cs
View File

@ -3,7 +3,6 @@ using UnityEngine;
using Unity.MLAgents;
using Unity.MLAgents.Sensors;
using Unity.MLAgents.Actuators;
using System.Collections.Generic;
[RequireComponent(typeof(MovementController))]
public class NPC : Agent, ICharacter
@ -11,6 +10,7 @@ public class NPC : Agent, ICharacter
[HideInInspector]
public Character AgentCharacter;
public CharacterCondition Condition;
private FlagZone flagZone;
public NPC_BaseState NPC_State { get; private set; }
@ -47,29 +47,38 @@ public class NPC : Agent, ICharacter
public override void OnEpisodeBegin()
{
NPC_State = DirectState;
flagZone = GameObject.FindObjectOfType<FlagZone>();
}
public override void CollectObservations(VectorSensor sensor)
{
var candidates = moveController.getPointsCandidate();
sensor.AddObservation(Condition.HealthPoints);
sensor.AddObservation(Condition.ArmourPoints);
sensor.AddObservation(Condition.Ammunition);
sensor.AddObservation((int)NPC_State.State);
var candidates = moveController.getPointsCandidate();
sensor.AddObservation((!flagZone.isNotOccup).ToInt());
sensor.AddObservation(AgentCharacter.LastTimeHit);
sensor.AddObservation(Condition.GetHealthPointsInQuantile());
sensor.AddObservation(candidates.Count);
sensor.AddObservation(GameManager.IsEnemyNearby(gameObject.transform.position, AgentCharacter.Team));
foreach (var point in candidates)
{
Debug.Log((float)moveController.CurrentNavPoint.PointId);
bufferSensor.AppendObservation(new float[] {
//1 position in navpointId
(float)moveController.currentPosition.PointId,
(float)moveController.CurrentNavPoint.PointId,
//2 distance to flag
moveController.currentPosition.FlagDistance,
moveController.FlagDistance,
//3 death count in point
moveController.currentPosition.DeathAttr,
moveController.CurrentNavPoint.DeathAttr,
//4 flagEnemyDistance
GameManager.IsCloserToFlagFromNextNavPoint(point, transform.position)==true?1:0,
GameManager.IsCloserToFlagFromNextNavPoint(point, transform.position).ToInt(),
//5 EnemyVsNavPointDistance
GameManager.IsCloserToEnemyThanToNextNavPoint(point,transform.position, AgentCharacter.Team)==true?1:0
GameManager.IsCloserToEnemyThanToNextNavPoint(point,transform.position, AgentCharacter.Team).ToInt()
});
}
@ -103,7 +112,7 @@ public class NPC : Agent, ICharacter
if (Condition.HealthPoints < 0)
{
OnKilledEvent?.Invoke(this);
moveController.currentPosition.DeathAttr += 1;
moveController.CurrentNavPoint.DeathAttr += 1;
}
}