diff --git a/Assets/ML-Agents/Timers/Play_timers.json b/Assets/ML-Agents/Timers/Play_timers.json index a352e12..f190e65 100644 --- a/Assets/ML-Agents/Timers/Play_timers.json +++ b/Assets/ML-Agents/Timers/Play_timers.json @@ -1 +1 @@ -{"count":1,"self":37.9889472,"total":39.023077799999996,"children":{"InitializeActuators":{"count":2,"self":0.0015018,"total":0.0015018,"children":null},"InitializeSensors":{"count":2,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"AgentSendState":{"count":1687,"self":0.0150586,"total":0.5907354,"children":{"CollectObservations":{"count":1687,"self":0.0797692,"total":0.0797692,"children":null},"WriteActionMask":{"count":1687,"self":0.0030843999999999997,"total":0.0030843999999999997,"children":null},"RequestDecision":{"count":1687,"self":0.49282319999999996,"total":0.49282319999999996,"children":null}}},"DecideAction":{"count":1687,"self":0.0135447,"total":0.0135447,"children":null},"AgentAct":{"count":1687,"self":0.42734659999999997,"total":0.42734659999999997,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":1,"max":-2445.63965,"min":-2445.63965,"runningAverage":-2445.63965,"value":-2445.63965,"weightedAverage":-2445.63965}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1703975981","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-DCdlO2Cen1HBnuMk-PngQ -hubSessionId 0c43c1fc-cbb5-493c-917c-268bb9f763ac -accessToken oH33AMMXsHSxS_kgYl5oWSBhB4gjrdFpyQqpsEitl9o00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1703976020"}} \ No newline at end of file +{"count":1,"self":16.986511999999998,"total":17.543395699999998,"children":{"InitializeActuators":{"count":2,"self":0.0020003,"total":0.0020003,"children":null},"InitializeSensors":{"count":2,"self":0.0015007,"total":0.0015007,"children":null},"AgentSendState":{"count":607,"self":0.0065032,"total":0.4011771,"children":{"CollectObservations":{"count":607,"self":0.2939928,"total":0.2939928,"children":null},"WriteActionMask":{"count":607,"self":0.0020047,"total":0.0020047,"children":null},"RequestDecision":{"count":607,"self":0.0986764,"total":0.0986764,"children":null}}},"DecideAction":{"count":607,"self":0.0035009,"total":0.0035009,"children":null},"AgentAct":{"count":607,"self":0.14770529999999998,"total":0.14770529999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704393711","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1704393729"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/StartScene_timers.json b/Assets/ML-Agents/Timers/StartScene_timers.json index 56db25f..5a700bd 100644 --- a/Assets/ML-Agents/Timers/StartScene_timers.json +++ b/Assets/ML-Agents/Timers/StartScene_timers.json @@ -1 +1 @@ -{"count":1,"self":102.1098624,"total":102.21653599999999,"children":{"InitializeActuators":{"count":2,"self":0.0010015,"total":0.0010015,"children":null},"InitializeSensors":{"count":2,"self":0.0014971,"total":0.0014971,"children":null},"AgentSendState":{"count":383,"self":0.0035099999999999997,"total":0.0150215,"children":{"CollectObservations":{"count":383,"self":0.0090049999999999991,"total":0.0090049999999999991,"children":null},"WriteActionMask":{"count":383,"self":0.0005009,"total":0.0005009,"children":null},"RequestDecision":{"count":383,"self":0.0020055999999999997,"total":0.0020055999999999997,"children":null}}},"DecideAction":{"count":383,"self":0.0015799,"total":0.0015799,"children":null},"AgentAct":{"count":383,"self":0.0875719,"total":0.0875719,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1703877610","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-DCdlO2Cen1HBnuMk-PngQ -hubSessionId 0c43c1fc-cbb5-493c-917c-268bb9f763ac -accessToken oH33AMMXsHSxS_kgYl5oWSBhB4gjrdFpyQqpsEitl9o00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1703877712"}} \ No newline at end of file +{"count":1,"self":156.4892288,"total":157.2185567,"children":{"InitializeActuators":{"count":2,"self":0.0005046,"total":0.0005046,"children":null},"InitializeSensors":{"count":2,"self":0.0009987,"total":0.0009987,"children":null},"AgentSendState":{"count":1164,"self":0.0035028,"total":0.5013793,"children":{"CollectObservations":{"count":1164,"self":0.4898497,"total":0.4898497,"children":null},"WriteActionMask":{"count":1164,"self":0.002506,"total":0.002506,"children":null},"RequestDecision":{"count":1164,"self":0.0055207999999999993,"total":0.0055207999999999993,"children":null}}},"DecideAction":{"count":1164,"self":0.0130961,"total":0.0130961,"children":null},"AgentAct":{"count":1164,"self":0.2133482,"total":0.2133482,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704391554","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1704391711"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Train_timers.json b/Assets/ML-Agents/Timers/Train_timers.json index d6266e8..131b6a1 100644 --- a/Assets/ML-Agents/Timers/Train_timers.json +++ b/Assets/ML-Agents/Timers/Train_timers.json @@ -1 +1 @@ -{"count":1,"self":14.0473248,"total":14.6998947,"children":{"InitializeActuators":{"count":12,"self":0.0010011,"total":0.0010011,"children":null},"InitializeSensors":{"count":12,"self":0.00099739999999999985,"total":0.00099739999999999985,"children":null},"AgentSendState":{"count":521,"self":0.0040127,"total":0.0661283,"children":{"CollectObservations":{"count":3126,"self":0.0551018,"total":0.0551018,"children":null},"WriteActionMask":{"count":3126,"self":0.0005002,"total":0.0005002,"children":null},"RequestDecision":{"count":3126,"self":0.0065136,"total":0.0065136,"children":null}}},"DecideAction":{"count":521,"self":0.0095329,"total":0.0095329,"children":null},"AgentAct":{"count":521,"self":0.5749103,"total":0.5749103,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1703877312","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-DCdlO2Cen1HBnuMk-PngQ -hubSessionId 0c43c1fc-cbb5-493c-917c-268bb9f763ac -accessToken oH33AMMXsHSxS_kgYl5oWSBhB4gjrdFpyQqpsEitl9o00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1703877326"}} \ No newline at end of file +{"count":1,"self":9.1472775999999989,"total":10.0439194,"children":{"InitializeActuators":{"count":12,"self":0.001999,"total":0.001999,"children":null},"InitializeSensors":{"count":12,"self":0.0010071,"total":0.0010071,"children":null},"AgentSendState":{"count":245,"self":0.0075105,"total":0.6516661,"children":{"CollectObservations":{"count":1470,"self":0.4542129,"total":0.4542129,"children":null},"WriteActionMask":{"count":1470,"self":0.0005002,"total":0.0005002,"children":null},"RequestDecision":{"count":1470,"self":0.18944249999999999,"total":0.18944249999999999,"children":null}}},"DecideAction":{"count":245,"self":0.0035275999999999997,"total":0.0035275999999999997,"children":null},"AgentAct":{"count":245,"self":0.2379422,"total":0.2379422,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704390607","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1704390617"}} \ No newline at end of file diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index fc84301..3f9c490 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -511,7 +511,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33610 + m_Name: pb_Mesh217888 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1761,6 +1761,7 @@ MonoBehaviour: timeLimit: 30 lockCameraX: 0 lockCameraY: 1 + oneHotRayTag: 0 spawnAgentInAllMap: 1 spinRecordMax: 40 spinPenaltyThreshold: 10 @@ -1805,7 +1806,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &223227756 GameObject: @@ -2382,7 +2383,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33596 + m_Name: pb_Mesh217874 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3302,7 +3303,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: -246.2022} + m_AnchoredPosition: {x: 0.000030517578, y: -246.20152} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &324069808 @@ -5481,7 +5482,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33538 + m_Name: pb_Mesh217816 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7134,7 +7135,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -7269,7 +7270,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &629870347 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8555,7 +8555,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749443372} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -30, y: 0, z: 0} + m_LocalPosition: {x: -30, y: 0, z: 30} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9250,7 +9250,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33590 + m_Name: pb_Mesh217868 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9491,7 +9491,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32042 + m_Name: pb_Mesh216328 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10850,58 +10850,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1026481343} m_Mesh: {fileID: -1479511118752177815, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!1 &1044511425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1044511427} - - component: {fileID: 1044511426} - m_Layer: 0 - m_Name: StartSceneDataTransferDummy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1044511426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044511425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3} - m_Name: - m_EditorClassIdentifier: - gameMode: 1 - scenePrefabSet: {fileID: 11400000, guid: 6ebbd27eb466c4a41bd2584c1b9c2e1f, type: 2} - attackProb: 0 - attackLevelProbs: [] - gotoProb: 0 - gotoLevelProbs: [] - defenceProb: 0 - defenceLevelProbs: [] ---- !u!4 &1044511427 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044511425} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1046425531 GameObject: m_ObjectHideFlags: 0 @@ -11398,6 +11346,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1055009278} m_CullTransparentMesh: 1 +--- !u!43 &1066015458 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh217086 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: -0.000000059604645, z: 0} + m_Extent: {x: 0.5, y: 1, z: 3} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 000000bf010080bf0000404000000000000000000000803f000080bf0000000000000000000080bf0000803f000000000000003f010080bf0000404000000000000000000000803f000080bf0000000000000000000080bf0000000000000000000000bf0000803f0000404000000000000000000000803f000080bf0000000000000000000080bf0000803f000000400000003f0000803f0000404000000000000000000000803f000080bf0000000000000000000080bf00000000000000400000003f010080bf000040400000803f000000000000000000000000000000000000803f000080bf0000c040000000000000003f010080bf000040c00000803f000000000000000000000000000000000000803f000080bf00000000000000000000003f0000803f000040400000803f000000000000000000000000000000000000803f000080bf0000c040000000400000003f0000803f000040c00000803f000000000000000000000000000000000000803f000080bf00000000000000400000003f010080bf000040c00000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf010080bf000040c00000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f0000803f000040c00000000000000000000080bf0000803f0000000000000000000080bf0000803f00000040000000bf0000803f000040c00000000000000000000080bf0000803f0000000000000000000080bf0000000000000040000000bf010080bf000040c0000080bf00000000000000000000000000000000000080bf000080bf0000c04000000000000000bf010080bf00004040000080bf00000000000000000000000000000000000080bf000080bf0000000000000000000000bf0000803f000040c0000080bf00000000000000000000000000000000000080bf000080bf0000c04000000040000000bf0000803f00004040000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000bf0000803f00004040000000000000803f000000000000803f0000000000000000000080bf000000000000c0400000003f0000803f00004040000000000000803f000000000000803f0000000000000000000080bf0000803f0000c040000000bf0000803f000040c0000000000000803f000000000000803f0000000000000000000080bf00000000000000000000003f0000803f000040c0000000000000803f000000000000803f0000000000000000000080bf0000803f00000000000000bf010080bf000040c000000000000080bf00000000000080bf0000000000000000000080bf0000803f000000000000003f010080bf000040c000000000000080bf00000000000080bf0000000000000000000080bf0000000000000000000000bf010080bf0000404000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000c0400000003f010080bf0000404000000000000080bf00000000000080bf0000000000000000000080bf000000000000c040 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: -0.000000059604645, z: 0} + m_Extent: {x: 0.5, y: 1, z: 3} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1083253429 GameObject: m_ObjectHideFlags: 0 @@ -12162,7 +12274,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1630952254} + m_Mesh: {fileID: 1066015458} --- !u!33 &1238261069 MeshFilter: m_ObjectHideFlags: 10 @@ -12170,7 +12282,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238261067} - m_Mesh: {fileID: 1630952254} + m_Mesh: {fileID: 1066015458} --- !u!23 &1238261070 MeshRenderer: m_ObjectHideFlags: 0 @@ -12451,8 +12563,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 1630952254} - m_VersionIndex: 2509 + m_Mesh: {fileID: 1066015458} + m_VersionIndex: 2512 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -12789,7 +12901,7 @@ MonoBehaviour: m_HandleRect: {fileID: 538300382} m_Direction: 2 m_Value: 0 - m_Size: 0.99999 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -14211,7 +14323,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32088 + m_Name: pb_Mesh216374 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14974,7 +15086,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33510 + m_Name: pb_Mesh217788 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15210,170 +15322,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625186569} m_CullTransparentMesh: 1 ---- !u!43 &1630952254 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32804 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: -0.000000059604645, z: 0} - m_Extent: {x: 0.5, y: 1, z: 3} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 000000bf010080bf0000404000000000000000000000803f000080bf0000000000000000000080bf0000803f000000000000003f010080bf0000404000000000000000000000803f000080bf0000000000000000000080bf0000000000000000000000bf0000803f0000404000000000000000000000803f000080bf0000000000000000000080bf0000803f000000400000003f0000803f0000404000000000000000000000803f000080bf0000000000000000000080bf00000000000000400000003f010080bf000040400000803f000000000000000000000000000000000000803f000080bf0000c040000000000000003f010080bf000040c00000803f000000000000000000000000000000000000803f000080bf00000000000000000000003f0000803f000040400000803f000000000000000000000000000000000000803f000080bf0000c040000000400000003f0000803f000040c00000803f000000000000000000000000000000000000803f000080bf00000000000000400000003f010080bf000040c00000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf010080bf000040c00000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f0000803f000040c00000000000000000000080bf0000803f0000000000000000000080bf0000803f00000040000000bf0000803f000040c00000000000000000000080bf0000803f0000000000000000000080bf0000000000000040000000bf010080bf000040c0000080bf00000000000000000000000000000000000080bf000080bf0000c04000000000000000bf010080bf00004040000080bf00000000000000000000000000000000000080bf000080bf0000000000000000000000bf0000803f000040c0000080bf00000000000000000000000000000000000080bf000080bf0000c04000000040000000bf0000803f00004040000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000bf0000803f00004040000000000000803f000000000000803f0000000000000000000080bf000000000000c0400000003f0000803f00004040000000000000803f000000000000803f0000000000000000000080bf0000803f0000c040000000bf0000803f000040c0000000000000803f000000000000803f0000000000000000000080bf00000000000000000000003f0000803f000040c0000000000000803f000000000000803f0000000000000000000080bf0000803f00000000000000bf010080bf000040c000000000000080bf00000000000080bf0000000000000000000080bf0000803f000000000000003f010080bf000040c000000000000080bf00000000000080bf0000000000000000000080bf0000000000000000000000bf010080bf0000404000000000000080bf00000000000080bf0000000000000000000080bf0000803f0000c0400000003f010080bf0000404000000000000080bf00000000000080bf0000000000000000000080bf000000000000c040 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: -0.000000059604645, z: 0} - m_Extent: {x: 0.5, y: 1, z: 3} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1633112520 GameObject: m_ObjectHideFlags: 0 @@ -16076,13 +16024,6 @@ MonoBehaviour: attackProb: 0.1 gotoProb: 0.1 defenceProb: 0.1 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -16166,170 +16107,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695161701} m_CullTransparentMesh: 1 ---- !u!43 &1706016292 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33210 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 5, y: 1, z: -0.5} - m_Extent: {x: 5, y: 1, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000000000000803f000080bf0000000000000000000080bf000020c10000000000000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf000000000000004000002041000000400000000000000000000000000000803f000080bf0000000000000000000080bf000020c1000000400000204100000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000204100000000000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000000000204100000040000000000000803f000000000000000000000000000000000000803f000080bf00000000000000400000204100000040000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000400000204100000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000000000000000000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000204100000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000400000000000000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000400000000000000000000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000040000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000040000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000020410000004000000000000000000000803f000000000000803f0000000000000000000080bf00002041000000000000000000000040000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000204100000040000080bf000000000000803f000000000000803f0000000000000000000080bf00002041000080bf0000000000000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf0000204100000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf000020c1000080bf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000020c100000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 5, y: 1, z: -0.5} - m_Extent: {x: 5, y: 1, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1707839903 GameObject: m_ObjectHideFlags: 0 @@ -17413,7 +17190,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1706016292} + m_Mesh: {fileID: 2058292417} --- !u!33 &1790388461 MeshFilter: m_ObjectHideFlags: 10 @@ -17421,7 +17198,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790388458} - m_Mesh: {fileID: 1706016292} + m_Mesh: {fileID: 2058292417} --- !u!23 &1790388462 MeshRenderer: m_ObjectHideFlags: 0 @@ -17675,8 +17452,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 1706016292} - m_VersionIndex: 12 + m_Mesh: {fileID: 2058292417} + m_VersionIndex: 15 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -21245,6 +21022,170 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037469698} m_Mesh: {fileID: 1558708428209142139, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} +--- !u!43 &2058292417 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh217488 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 5, y: 1, z: -0.5} + m_Extent: {x: 5, y: 1, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000000000000803f000080bf0000000000000000000080bf000020c10000000000000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf000000000000004000002041000000400000000000000000000000000000803f000080bf0000000000000000000080bf000020c1000000400000204100000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000204100000000000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000000000204100000040000000000000803f000000000000000000000000000000000000803f000080bf00000000000000400000204100000040000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000400000204100000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000000000000000000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000204100000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000400000000000000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000400000000000000000000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000040000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000040000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000020410000004000000000000000000000803f000000000000803f0000000000000000000080bf00002041000000000000000000000040000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000204100000040000080bf000000000000803f000000000000803f0000000000000000000080bf00002041000080bf0000000000000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf0000204100000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf000020c1000080bf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000020c100000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 5, y: 1, z: -0.5} + m_Extent: {x: 5, y: 1, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &2063799365 GameObject: m_ObjectHideFlags: 0 @@ -21617,7 +21558,6 @@ MonoBehaviour: setGotoButton: {fileID: 371362500} setFreeButton: {fileID: 1411671494} setStayButton: {fileID: 1413466580} - primaryButtonNumber: 6 gotoLevelPanel: {fileID: 405727030} attackLevelPanel: {fileID: 590670113} levelPanelAnimeTime: 0.15 @@ -21888,7 +21828,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32128 + m_Name: pb_Mesh216414 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scenes/StartScene.unity b/Assets/Scenes/StartScene.unity index 7923b07..6ee7d4a 100644 --- a/Assets/Scenes/StartScene.unity +++ b/Assets/Scenes/StartScene.unity @@ -1798,6 +1798,7 @@ MonoBehaviour: timeLimit: 30 lockCameraX: 0 lockCameraY: 1 + oneHotRayTag: 1 spawnAgentInAllMap: 1 spinRecordMax: 40 spinPenaltyThreshold: 10 @@ -1837,7 +1838,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968918527} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 462, y: 315.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index 9b49d75..88711a7 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -1395,13 +1395,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -4138,7 +4131,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -4177,7 +4170,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &192308372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14904,7 +14896,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -15039,7 +15031,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &629870347 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21417,13 +21408,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -22378,7 +22362,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -22417,7 +22401,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &924596974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24529,7 +24512,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -24568,7 +24551,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &1005666050 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32130,7 +32112,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: -246.20215} + m_AnchoredPosition: {x: 0.000030517578, y: -246.2022} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1442113294 @@ -34716,6 +34698,7 @@ MonoBehaviour: timeLimit: 30 lockCameraX: 0 lockCameraY: 1 + oneHotRayTag: 1 spawnAgentInAllMap: 1 spinRecordMax: 40 spinPenaltyThreshold: 10 @@ -34760,7 +34743,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1586670223 GameObject: @@ -37106,13 +37089,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -39452,7 +39428,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -39491,7 +39467,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &1778428788 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44161,7 +44136,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1766662801} m_Direction: 2 m_Value: 0 - m_Size: 0.9999929 + m_Size: 0.99999493 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -44444,13 +44419,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -45108,7 +45076,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 70 + VectorObservationSize: 89 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 1 @@ -45147,7 +45115,6 @@ MonoBehaviour: sideChannelObj: {fileID: 1866094461} worldUIControllerObj: {fileID: 1052251813} hudObj: {fileID: 2082200184} - oneHotRayTag: 1 --- !u!114 &1960660769 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46041,13 +46008,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -46516,13 +46476,6 @@ MonoBehaviour: attackProb: 0.375 gotoProb: 0.392 defenceProb: 0 - targetState: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 inArea: 0 targetPosition: {x: 0, y: 0, z: 0} targetEnemySpawnFinish: 0 @@ -49199,65 +49152,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2139943208} m_CullTransparentMesh: 1 ---- !u!1 &2141008728 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2141008730} - - component: {fileID: 2141008729} - m_Layer: 0 - m_Name: StartSceneDataTransferDummy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2141008729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2141008728} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3} - m_Name: - m_EditorClassIdentifier: - gameMode: 0 - scenePrefabSet: {fileID: 11400000, guid: 6ebbd27eb466c4a41bd2584c1b9c2e1f, type: 2} - attackProb: 0 - attackLevelProbs: - - 1 - gotoProb: 1 - gotoLevelProbs: - - 0 - - 0 - - 0.3 - - 0.3 - - 0.3 - - 0.1 - defenceProb: 0 - defenceLevelProbs: [] ---- !u!4 &2141008730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2141008728} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2143203446 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/GameScript/CommonParameterContainer.cs b/Assets/Script/GameScript/CommonParameterContainer.cs index 7a6eeef..8e473c8 100644 --- a/Assets/Script/GameScript/CommonParameterContainer.cs +++ b/Assets/Script/GameScript/CommonParameterContainer.cs @@ -12,7 +12,7 @@ public class CommonParameterContainer : Singleton public int timeLimit = 30; public bool lockCameraX = false; public bool lockCameraY = true; - public bool oneHotRayTag = false; + public bool oneHotRayTag = true; 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 4d1444d..106f609 100644 --- a/Assets/Script/GameScript/MLAgentsCustomController.cs +++ b/Assets/Script/GameScript/MLAgentsCustomController.cs @@ -30,12 +30,11 @@ public class MLAgentsCustomController : Agent private RewardFunction rewardFunction; // observation - private float[] myObserve = new float[4]; + private float[] myObserve = new float[5]; private float[] rayTagResult; private float[] rayTagResultOnehot; private float[] rayDisResult; - private float[] targetStates; private float remainTime; private float inFireBaseState; @@ -71,7 +70,7 @@ public override void OnEpisodeBegin() { Debug.Log("MLAgentCustomController.OnEpisodeBegin: play mode start"); // play mode - targetController.PlayInitialize(); + targetController.PlayModeInitialize(); // reset target UI targetUIController.ClearGamePressed(); } @@ -92,6 +91,7 @@ public override void CollectObservations(VectorSensor sensor) myObserve[1] = transform.localPosition.y / raySensors.viewDistance; myObserve[2] = transform.localPosition.z / raySensors.viewDistance; myObserve[3] = transform.eulerAngles.y / 360f;**/ + float obsNum = 0f; float angleInRadians = transform.eulerAngles.y * Mathf.Deg2Rad; myObserve[0] = transform.localPosition.x; myObserve[1] = transform.localPosition.y; @@ -101,28 +101,35 @@ public override void CollectObservations(VectorSensor sensor) rayTagResult = raySensors.rayTagResult;// 探测用RayTag类型结果 float[](raySensorNum,1) rayTagResultOnehot = raySensors.rayTagResultOneHot; // 探测用RayTagonehot结果 List[](raySensorNum*Tags,1) rayDisResult = raySensors.rayDisResult; // 探测用RayDis距离结果 float[](raySensorNum,1) - targetStates = targetController.targetState; // (6) targettype, target x,y,z, firebasesAreaDiameter remainTime = targetController.leftTime; inFireBaseState = targetController.GetInAreaState(); agentController.UpdateGunState(); //float[] focusEnemyObserve = RaySensors.focusEnemyInfo;// 最近的Enemy情报 float[](3,1) MinEnemyIndex,x,z //sensor.AddObservation(allEnemyNum); // 敌人数量 int - sensor.AddObservation(targetStates);// (5) targettype, target x,y,z, firebasesAreaDiameter + sensor.AddObservation(targetController.targetState);// (5) targettype, target x,y,z, firebasesAreaDiameter sensor.AddObservation(inFireBaseState); // (1) sensor.AddObservation(remainTime); // (1) sensor.AddObservation(agentController.gunReadyToggle); // (1) save gun is ready? - sensor.AddObservation(myObserve); // (4)自机位置xyz+朝向 float[](4,1) + sensor.AddObservation(myObserve); // (5)自机位置xyz+朝向 float[](5,1) + // count observation number + obsNum = targetController.targetState.Length+1+1+1+myObserve.Length; + Debug.Log(obsNum); if (commonParamCon.oneHotRayTag) { sensor.AddObservation(rayTagResultOnehot); // 探测用RayTag结果 float[](raySensorNum,1) + obsNum += rayTagResultOnehot.Length; } else { sensor.AddObservation(rayTagResult); + obsNum += rayTagResult.Length; } + Debug.Log(obsNum); sensor.AddObservation(rayDisResult); // 探测用RayDis距离结果 float[](raySensorNum,1) - envUIController.UpdateStateText(targetStates, inFireBaseState, remainTime, agentController.gunReadyToggle, myObserve, rayTagResultOnehot, rayDisResult); + obsNum += rayDisResult.Length; + envUIController.UpdateStateText(targetController.targetState, inFireBaseState, remainTime, agentController.gunReadyToggle, myObserve, rayTagResultOnehot, rayDisResult); + Debug.Log(obsNum); /*foreach(float aaa in rayDisResult) { Debug.Log(aaa); diff --git a/Assets/Script/GameScript/SceneBlock.cs b/Assets/Script/GameScript/SceneBlock.cs index 4122544..5180bec 100644 --- a/Assets/Script/GameScript/SceneBlock.cs +++ b/Assets/Script/GameScript/SceneBlock.cs @@ -109,7 +109,7 @@ public void InitBlock(GameObject envObj) // Debug.Log("SceneBlock.Start: enemyContainerObj not found, get it by name"); enemyContainerObj = transform.Find("EnemyContainer").gameObject; } - firebasesAreaPosition = transform.position + fireBasesAreaObj.transform.position; + firebasesAreaPosition = fireBasesAreaObj.transform.position; firebasesAreaScale = fireBasesAreaObj.transform.localScale.x; firebasesAreaDiameter = firebasesAreaScale * blockSize; firebasesBelong = -belongMaxPoint; diff --git a/Assets/Script/GameScript/TargetController.cs b/Assets/Script/GameScript/TargetController.cs index c448274..bbab032 100644 --- a/Assets/Script/GameScript/TargetController.cs +++ b/Assets/Script/GameScript/TargetController.cs @@ -38,7 +38,7 @@ public class TargetController : MonoBehaviour [System.NonSerialized] public Targets targetType; [System.NonSerialized] public int gotoLevelNum; [System.NonSerialized] public int attackLevelNum; - public float[] targetState = new float[5]; + [System.NonSerialized] public float[] targetState = new float[5]; public enum EndType { Win, Lose, Running, Num }; @@ -234,8 +234,6 @@ public void MoveAgentTo(Vector3 position) #endregion Agent Move Method - #region Random SceneBlock Spawn Method - /// /// Randomly spawns a scene block based on the target type. /// 根据目标类型随机生成场景块。 @@ -263,7 +261,12 @@ private void RandomSpawnSceneBlock(Targets targetType) sceneBlockCon.nowBlock.InitBlock(environmentObj); } - #endregion Random SceneBlock Spawn Method + private void SpawnSceneBlock(Targets targetType, int level,int blockNum, Vector3 blockPosition) + { + sceneBlockCon.DestroyBlock(); + sceneBlockCon.CreateNewBlock(targetType, level, blockNum, blockPosition, commonParamCon.group1Tag, commonParamCon.group2Tag); + sceneBlockCon.InitializeBlock(environmentObj); + } #region Play Mode Method @@ -279,7 +282,7 @@ private void RandomSpawnSceneBlock(Targets targetType) /// 该方法用于初始化游戏播放模式，包括设置目标类型、更新目标状态、更新UI显示、 /// 将代理移动到生成区域、销毁所有敌人和场景块。 /// - public void PlayInitialize() + public void PlayModeInitialize() { targetType = Targets.Stay; UpdateTargetStates(); @@ -289,35 +292,29 @@ public void PlayInitialize() sceneBlockCon.DestroyBlock(); } - // change to attack mode - public void AttackModeChange(Vector3 targetPosition) + /// + /// Changes the target type in play mode and updates the game environment accordingly. + /// + /// The new target type to be set. + /// Spawn position for scene blocks. + /// Level parameter for spawning scene blocks. + /// Number of blocks to spawn. + /// + /// This method updates the target type to the specified new target. If a spawn position is provided, it spawns scene blocks at that position + /// with the specified level and block number. The target states are then updated based on the new setup. The UI is also refreshed to reflect the new target type. + /// + public void PlayTargetChange(Targets newTargetType, Vector3? spawnPosition = null, int level = 0, int blockNum = 0) { - targetType = Targets.Attack; - UpdateTargetStates(targetPosition); - envUICon.UpdateTargetType(targetType); - } - - // change to free mode - public void FreeModeChange() - { - targetType = (int)Targets.Free; - UpdateTargetStates(); - envUICon.UpdateTargetType(targetType); - } - - // change to goto mode - public void GotoModeChange(Vector3 targetPosition) - { - targetType = Targets.Go; - UpdateTargetStates(targetPosition); - envUICon.UpdateTargetType(targetType); - } - - // change to stay mode - public void StayModeChange() - { - targetType = Targets.Stay; - UpdateTargetStates(); + targetType = newTargetType; + if(spawnPosition.HasValue) + { + SpawnSceneBlock(targetType, level, blockNum, spawnPosition.Value); + UpdateTargetStates(spawnPosition.Value); + } + else + { + UpdateTargetStates(); + } envUICon.UpdateTargetType(targetType); } @@ -344,9 +341,11 @@ private void UpdateTargetStates(Vector3? targetPosition = null) } else { - targetState[1] = this.targetPosition.x; - targetState[2] = this.targetPosition.y; - targetState[3] = this.targetPosition.z; + Vector3 fireBasePosition = sceneBlockCon.nowBlock.firebasesAreaPosition; + Vector3 convertedPosition = fireBasePosition - this.transform.position; + targetState[1] = convertedPosition.x; + targetState[2] = convertedPosition.y; + targetState[3] = convertedPosition.z; targetState[4] = sceneBlockCon.nowBlock.firebasesAreaDiameter; } } diff --git a/Assets/Script/PlayMode/MouseInMap.cs b/Assets/Script/PlayMode/MouseInMap.cs index 674e4e2..f89f2ff 100644 --- a/Assets/Script/PlayMode/MouseInMap.cs +++ b/Assets/Script/PlayMode/MouseInMap.cs @@ -87,9 +87,7 @@ private void Update() else { // if agent or enemy is not nearby, create new block - sceneBlockCon.CreateNewBlock(Targets.Attack, blockLevel, blockNum, nowHitPositionRelative); - sceneBlockCon.InitializeBlock(environmentObj); - targetCon.AttackModeChange(nowHitPositionRelative); + targetCon.PlayTargetChange(Targets.Attack, nowHitPositionRelative, blockLevel, blockNum); ChangeMouseMode(MouseMode.Default); } break; @@ -104,9 +102,7 @@ private void Update() else { // if agent or enemy is not nearby, create new block - sceneBlockCon.CreateNewBlock(Targets.Go, blockLevel, blockNum, nowHitPositionRelative); - sceneBlockCon.InitializeBlock(environmentObj); - targetCon.GotoModeChange(nowHitPositionRelative); + targetCon.PlayTargetChange(Targets.Go, nowHitPositionRelative, blockLevel, blockNum); ChangeMouseMode(MouseMode.Default); } break; diff --git a/Assets/Script/UI/EnvironmentUIControl.cs b/Assets/Script/UI/EnvironmentUIControl.cs index a61ab27..51d7c79 100644 --- a/Assets/Script/UI/EnvironmentUIControl.cs +++ b/Assets/Script/UI/EnvironmentUIControl.cs @@ -190,8 +190,6 @@ public void UpdateStateText(float[] targetStates, float inAreaState, float remai stateBuilder.Append(targetStates[3]); stateBuilder.Append("\r\nTargetDiameter:"); stateBuilder.Append(targetStates[4]); - stateBuilder.Append("\r\nTargetBelongRatio:"); - stateBuilder.Append(targetStates[5]); stateBuilder.Append("\r\nInArea:"); stateBuilder.Append(inAreaState); stateBuilder.Append("\r\nRemainTime:"); @@ -199,9 +197,10 @@ public void UpdateStateText(float[] targetStates, float inAreaState, float remai stateBuilder.Append("\r\nGunReady:"); stateBuilder.Append(gunReadyToggle); stateBuilder.Append("\r\nMyPosition:"); - stateBuilder.Append(myObserve[0]).Append(myObserve[1]).Append(myObserve[2]); + stateBuilder.Append(myObserve[0]+"_").Append(myObserve[1]+"_").Append(myObserve[2]); stateBuilder.Append("\r\nMyRotation:"); - stateBuilder.Append(myObserve[3]); + stateBuilder.Append(myObserve[3]+"_").Append(myObserve[4]); + stateText.text = stateBuilder.ToString(); } diff --git a/Assets/Script/UI/StartUIManager.cs b/Assets/Script/UI/StartUIManager.cs index 34ba084..4dd824d 100644 --- a/Assets/Script/UI/StartUIManager.cs +++ b/Assets/Script/UI/StartUIManager.cs @@ -35,8 +35,12 @@ private void Update() waitTimeTextObj.text = ((int)Math.Round(leftTime)).ToString(); if (leftTime <= 1) { - // if time limit is over, load Train Scene - sceneLoader.LoadGameScene(SceneLoader.SceneType.Train); + // if time limit is over, end game + # if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; + #else + StopGame(); + #endif } } @@ -95,4 +99,11 @@ private void ApplicateProbabilityToData() } } } + + private void StopGame() + { + // stop game,end program + Debug.Log("Game End"); + Application.Quit(); + } } \ No newline at end of file diff --git a/Assets/Script/UI/TargetUIController.cs b/Assets/Script/UI/TargetUIController.cs index 57d7c18..bee4d22 100644 --- a/Assets/Script/UI/TargetUIController.cs +++ b/Assets/Script/UI/TargetUIController.cs @@ -22,7 +22,6 @@ public class TargetUIController : MonoBehaviour [SerializeField] private Button setGotoButton; [SerializeField] private Button setFreeButton; [SerializeField] private Button setStayButton; - [SerializeField] private int primaryButtonNumber = 6; [Header("LevelPanel")] [SerializeField] private GameObject gotoLevelPanel; @@ -92,7 +91,7 @@ public void LevelButtonPressed(PrimaryButtonType primaryButtonType, int level = public void ClearGamePressed() { // Clear all enemies and targets. set gamemode to Stay mode - targetCon.StayModeChange(); + targetCon.PlayTargetChange(Targets.Stay); mouseInMapCon.ChangeMouseMode(MouseInMap.MouseMode.Default); // disable setStayButton and enable other buttons buttonColorChanger.ChangeInteractableColor(clearGameButton, true); @@ -101,14 +100,14 @@ public void ClearGamePressed() buttonColorChanger.ChangeInteractableColor(setGotoButton, true); buttonColorChanger.ChangeInteractableColor(setFreeButton, true); buttonColorChanger.ChangeInteractableColor(setStayButton, false); - targetCon.PlayInitialize(); + targetCon.PlayModeInitialize(); } // Set Free Button Pressed, change Target mode to free mode public void SetFreePressed() { mouseInMapCon.ChangeMouseMode(MouseInMap.MouseMode.Default); - targetCon.FreeModeChange(); + targetCon.PlayTargetChange(Targets.Free); buttonColorChanger.ChangeInteractableColor(setStayButton, true); buttonColorChanger.ChangeInteractableColor(setAttackButton, true); buttonColorChanger.ChangeInteractableColor(setGotoButton, true); @@ -119,7 +118,7 @@ public void SetFreePressed() public void SetStayPressed() { mouseInMapCon.ChangeMouseMode(MouseInMap.MouseMode.Default); - targetCon.StayModeChange(); + targetCon.PlayTargetChange(Targets.Stay); buttonColorChanger.ChangeInteractableColor(setStayButton, false); buttonColorChanger.ChangeInteractableColor(setAttackButton, true); buttonColorChanger.ChangeInteractableColor(setGotoButton, true); diff --git a/README.md b/README.md index 06541a9..dc7b495 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ Python侧则使用[mlagents-envs 0.30.0](https://pypi.org/project/mlagents-envs/ | Num | Observation | Size | State Space | Description | |------|-------------|------|-------------|---------------------------------------------------------------------| | 7 | GunState | 1 | 0,1 | 描述Agent武器是否处于可使用状态。0=False，1=True | -| 8 | Agent坐标 | 3 | 0~47 | 描述Agent的连续空间坐标，取值范围为0到47之间的连续值 | -| 9~10 | Agent朝向 | 2 | -1~1 | 通过计算Agent GameObject旋转角度的余弦和正弦以描述Agent的正面朝向。 | +| 8~10 | Agent坐标 | 3 | 0~47 | 描述Agent的连续空间坐标，取值范围为0到47之间的连续值 | +| 11~12 | Agent朝向 | 2 | -1~1 | 通过计算Agent GameObject旋转角度的余弦和正弦以描述Agent的正面朝向。 | ### RaycastState（射线探测状态） `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中进行调整。 射线分布方式 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d983ba2..3476c4f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 06570c0704040b0e5a575520137b5e44154f192e292d22367c2c4866b7b3376f flags: 0 RecentlyUsedSceneGuid-2: - value: 5703025650035e5d090f087148715d4443161e2c7e2c20357b281b31b0e43060 + value: 5453565f53020f085f5d0e72157a0844454f4c2b757d7265757a4f64b7b4313c flags: 0 RecentlyUsedSceneGuid-3: - value: 5453565f53020f085f5d0e72157a0844454f4c2b757d7265757a4f64b7b4313c + value: 5703025650035e5d090f087148715d4443161e2c7e2c20357b281b31b0e43060 flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 76e1027..0396f8b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -230 - y: 320 - width: 1920 + x: 51 + y: 43 + width: 1856 height: 1037 m_ShowMode: 4 - m_Title: Inspector + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,7 +44,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1856 height: 1037 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1856 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -91,7 +91,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1017 - width: 1920 + width: 1856 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -115,12 +115,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 + width: 1856 height: 987 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 102 + controlID: 16 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1080 + width: 833 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 103 + controlID: 141 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,8 +163,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1080 - height: 707 + width: 833 + height: 708 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -189,9 +189,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 707 - width: 1080 - height: 280 + y: 708 + width: 833 + height: 279 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -217,14 +217,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 1080 + x: 833 y: 0 - width: 473 + width: 664 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 16 + controlID: 17 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -242,7 +242,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 473 + width: 664 height: 556 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -268,7 +268,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 556 - width: 473 + width: 664 height: 431 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -293,12 +293,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1553 + x: 1497 y: 0 - width: 367 + width: 359 height: 987 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -324,10 +324,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -230 - y: 350 - width: 1079 - height: 686 + x: 51 + y: 73 + width: 832 + height: 687 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -562,9 +562,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -14.506892, y: 1.7234917, z: -131.04033} + m_Target: {x: 420.52347, y: 196.64235, z: 178.41852} speed: 2 - m_Value: {x: -14.506892, y: 1.7234917, z: -131.04033} + m_Value: {x: 420.52347, y: 196.64235, z: 178.41852} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -611,13 +611,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.529 m_Rotation: - m_Target: {x: -0.71379465, y: 0.056885682, z: -0.058373097, w: -0.6955967} + m_Target: {x: -0.22396095, y: -0.35765323, z: 0.088779315, w: -0.9022455} speed: 2 - m_Value: {x: -0.71379465, y: 0.056885682, z: -0.058373097, w: -0.6955967} + m_Value: {x: -0.22382718, y: -0.35900563, z: 0.089115016, w: -0.90170664} m_Size: - m_Target: 18.774706 + m_Target: 302.69232 speed: 2 - m_Value: 18.774706 + m_Value: 289.6577 m_Ortho: m_Target: 0 speed: 2 @@ -662,10 +662,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 + x: 51 y: 73 - width: 1079 - height: 686 + width: 832 + height: 687 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -676,7 +676,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1079, y: 665} + m_TargetSize: {x: 832, y: 666} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -691,10 +691,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -539.5 - m_HBaseRangeMax: 539.5 - m_VBaseRangeMin: -332.5 - m_VBaseRangeMax: 332.5 + m_HBaseRangeMin: -416 + m_HBaseRangeMax: 416 + m_VBaseRangeMin: -333 + m_VBaseRangeMax: 333 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -712,23 +712,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1079 - height: 665 + width: 832 + height: 666 m_Scale: {x: 1, y: 1} - m_Translation: {x: 539.5, y: 332.5} + m_Translation: {x: 416, y: 333} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -539.5 - y: -332.5 - width: 1079 - height: 665 + x: -416 + y: -333 + width: 832 + height: 666 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1079, y: 686} + m_LastWindowPixelSize: {x: 832, y: 687} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -754,10 +754,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 726 - width: 1079 - height: 259 + x: 51 + y: 781 + width: 832 + height: 258 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -775,36 +775,36 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Script/GameScript/SideChannel + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Script/GameScript/SideChannel + - Assets/Shader m_LastFoldersGridSize: 16 m_LastProjectPath: C:\Users\UCUNI\OneDrive\Unity\ML-Agents\Aimbot-ParallelEnv m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 234} - m_SelectedIDs: 84940000 - m_LastClickedID: 38020 - m_ExpandedIDs: 00000000409400007c9400008694000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 05ca9a3b + m_LastClickedID: 1000000005 + m_ExpandedIDs: 00000000429400008094000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Scenes + m_OriginalName: Scenes m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 1000000005 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -818,7 +818,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040940000 + m_ExpandedIDs: 0000000042940000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -845,22 +845,22 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300008a5c000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Train + m_OriginalName: Train m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 38028 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 8} m_CreateAssetUtility: @@ -922,9 +922,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1 - y: 19 - width: 471 + x: 884 + y: 73 + width: 662 height: 535 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -933,23 +933,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 8a940000 m_LastClickedID: 0 - m_ExpandedIDs: 32fbffff + m_ExpandedIDs: 3062fdffaed4fdffa6e7fdffb8effdff5236feff7437feff6238feff2839feff203bfeff123dfeff144cfeff404efeff724ffeff9851feffca71feff2473feff6674feffd28cfeffa0a0feff30a6feff46a7feff28befeff10bffeff22c0feffe8c0feff9ec2feff88c4feff58c6feff6ec8feff34c9feff4acafeff96cefeff7ccffeff42d0feffb221ffff9422ffff6226ffffb62bffff9ee0ffff96e1ffff66e3ffff2ce4ffff22e5ffff5cf8ffff32fbffffe6ab0000921f01006c2a0100d67c01003a3e0300bc4e0300a4510300 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Agent + m_OriginalName: Agent m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 212422 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 10} m_SearchString: @@ -979,9 +979,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1 - y: 575 - width: 471 + x: 884 + y: 629 + width: 662 height: 410 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -999,7 +999,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c262c1329a02fa49b5cb4c297106f3f, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 129, y: 28} + m_MinSize: {x: 136, y: 30} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: ProBuilder @@ -1035,9 +1035,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1554 - y: 19 - width: 366 + x: 1548 + y: 73 + width: 358 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: