From 142c0e44b5c023138869c3fb8af7794120dc9dc0 Mon Sep 17 00:00:00 2001 From: Koha9 Date: Sun, 31 Dec 2023 09:16:18 +0900 Subject: [PATCH] =?UTF-8?q?Readme=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Readme针对上一个commit进行修正，Onehot编码控制从MLAgentsCustomController转到CommonParameterContainer。 --- Assets/Script/GameScript/CommonParameterContainer.cs | 1 + Assets/Script/GameScript/MLAgentsCustomController.cs | 5 +---- README.md | 11 ++++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Assets/Script/GameScript/CommonParameterContainer.cs b/Assets/Script/GameScript/CommonParameterContainer.cs index 3769f78..7a6eeef 100644 --- a/Assets/Script/GameScript/CommonParameterContainer.cs +++ b/Assets/Script/GameScript/CommonParameterContainer.cs @@ -12,6 +12,7 @@ public class CommonParameterContainer : Singleton public int timeLimit = 30; public bool lockCameraX = false; public bool lockCameraY = true; + public bool oneHotRayTag = false; public bool spawnAgentInAllMap = true; public int spinRecordMax = 40; public float spinPenaltyThreshold = 10; diff --git a/Assets/Script/GameScript/MLAgentsCustomController.cs b/Assets/Script/GameScript/MLAgentsCustomController.cs index 63d37fa..2755fa3 100644 --- a/Assets/Script/GameScript/MLAgentsCustomController.cs +++ b/Assets/Script/GameScript/MLAgentsCustomController.cs @@ -14,9 +14,6 @@ public class MLAgentsCustomController : Agent [SerializeField] private GameObject worldUIControllerObj; [SerializeField] private GameObject hudObj; - [Header("Env")] - public bool oneHotRayTag = true; - // script private AgentController agentController; @@ -114,7 +111,7 @@ public override void CollectObservations(VectorSensor sensor) sensor.AddObservation(remainTime); // (1) sensor.AddObservation(agentController.gunReadyToggle); // (1) save gun is ready? sensor.AddObservation(myObserve); // (4)自机位置xyz+朝向 float[](4,1) - if (oneHotRayTag) + if (commonParamCon.oneHotRayTag) { sensor.AddObservation(rayTagResultOnehot); // 探测用RayTag结果 float[](raySensorNum,1) } diff --git a/README.md b/README.md index 6a392a9..ca5a5ba 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,13 @@ Python侧则使用[mlagents-envs 0.30.0](https://pypi.org/project/mlagents-envs/ | 8 | Agent坐标 | 3 | 0~47 | 描述Agent的连续空间坐标，取值范围为0到47之间的连续值 | | 9 | Agent朝向 | 1 | 0~10 | 描述Agent的正面朝向，取值范围为0到10，映射到0~360度的旋转（每增加1代表增加36度） | ### RaycastState（射线探测状态） -`RaycastState`记录了视野内发射的射线探测到的结果及其距离、由[`RaySensors`](https://koha9.asuscomm.com/yurugit/Koha9/Aimbot-ParallelEnv/src/branch/main/Assets/Script/GameScript/RaySensors.cs)类管理。它实现了射线的非均匀分布，默认视野中间15%的区域射线分布更密集，两侧则较为稀疏，默认中间密集部分共射出5条，两侧稀疏部分各7条共每个射线可探测的对象最远距离为100个单位，超过探测距离则返回0。其中视野中间区域的覆盖范围，区域内RayCast数量以及可探测距离均可以在每个`Agent`GameObject的Inspector中进行调整。 +`RaycastState`记录了视野内发射的射线探测到的Object的Tag及其距离、其中Tag可以通过Label Encoding和OneHot Encoding两种方式来记录，默认使用Label Encoding，可以在Object`CommonParameterContainer`中进行调整。`RaycastState`由[`RaySensors`](https://koha9.asuscomm.com/yurugit/Koha9/Aimbot-ParallelEnv/src/branch/main/Assets/Script/GameScript/RaySensors.cs)类管理。它实现了射线的非均匀分布，默认视野中间15%的区域射线分布更密集，两侧则较为稀疏，默认中间密集部分共射出5条，两侧稀疏部分各7条。每个射线可探测的对象最远距离为100个单位，超过探测距离则返回0。其中视野中间区域的覆盖范围，区域内RayCast数量以及可探测距离均可以在每个`Agent`GameObject的Inspector中进行调整。 射线分布方式 -| Num | Observation | Size | State Space | Description | -|-----------------------|-------------|--------------------|---------------|----------------------------------------------------------------------------------| -| 10~n+10 | TagType | n | 0, 1, 2 | 描述Raycast所探测到物体的Tag，1=Wall，2=Enemy，0=Nothing | -| n+11~2*n+11 | Distance | n | 0~MaxDistance | 描述Raycast所探测到物体的距离，取值范围在0~MaxDistance | +| Num | Observation | Size | State Space | Description | +|------------------------------------------------------------------|-----------------|--------------------|---------------|----------------------------------------------------------------------------------| +| 10~Raynum+10 | TagType(Label) | Number of Raycasts | 0, 1, 2 | 描述Raycast所探测到物体的Tag, 0=Wall, 1=Enemy, 2=Player, -1=Nothing | +| 10~Raynum * 3+10 | TagType(Onehot) | Raynum * 3 | 0, 1 | 描述Raycast所探测到物体的Tag, 使用Onehot编码记录 | +| Raynum+11~2* Raynum+11(Label),
3* Raynum+11~4* Raynum+11(OneHot) | Distance | Number of Raycasts | 0~MaxDistance | 描述Raycast所探测到物体的距离，取值范围在0~MaxDistance，其中MaxDistance默认为100 | *注：n为每个Agent的RayCast数量，MaxDistance为每个Agent的RayCast最大探测距离*