Observation多处修复

Observation显示UI修正对应新的Rotation
修正targetState长度错误,优化TargetController的Play模式
修改TargetPosition坐标从TargetBlock坐标为Firebases坐标
修改45s超时动作从加载train scene为退出游戏
This commit is contained in:
2024-01-05 03:46:52 +09:00
parent 481794dcc3
commit 173aff5137
17 changed files with 529 additions and 683 deletions
+1 -1
View File
@@ -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"}}
{"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"}}
@@ -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"}}
{"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"}}
+1 -1
View File
@@ -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"}}
{"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"}}
+350 -410
View File
@@ -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
+2 -1
View File
@@ -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: []
+10 -116
View File
@@ -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
@@ -12,7 +12,7 @@ public class CommonParameterContainer : Singleton<CommonParameterContainer>
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;
@@ -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 class MLAgentsCustomController : Agent
{
Debug.Log("MLAgentCustomController.OnEpisodeBegin: play mode start");
// play mode
targetController.PlayInitialize();
targetController.PlayModeInitialize();
// reset target UI
targetUIController.ClearGamePressed();
}
@@ -92,6 +91,7 @@ public class MLAgentsCustomController : Agent
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 class MLAgentsCustomController : Agent
rayTagResult = raySensors.rayTagResult;// 探测用RayTag类型结果 float[](raySensorNum,1)
rayTagResultOnehot = raySensors.rayTagResultOneHot; // 探测用RayTagonehot结果 List<int>[](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);
+1 -1
View File
@@ -109,7 +109,7 @@ public class SceneBlock : MonoBehaviour
// 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;
+35 -36
View File
@@ -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 class TargetController : MonoBehaviour
#endregion Agent Move Method
#region Random SceneBlock Spawn Method
/// <summary>
/// Randomly spawns a scene block based on the target type.
/// 根据目标类型随机生成场景块。
@@ -263,7 +261,12 @@ public class TargetController : MonoBehaviour
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 @@ public class TargetController : MonoBehaviour
/// 该方法用于初始化游戏播放模式,包括设置目标类型、更新目标状态、更新UI显示、
/// 将代理移动到生成区域、销毁所有敌人和场景块。
/// </remarks>
public void PlayInitialize()
public void PlayModeInitialize()
{
targetType = Targets.Stay;
UpdateTargetStates();
@@ -289,35 +292,29 @@ public class TargetController : MonoBehaviour
sceneBlockCon.DestroyBlock();
}
// change to attack mode
public void AttackModeChange(Vector3 targetPosition)
/// <summary>
/// Changes the target type in play mode and updates the game environment accordingly.
/// </summary>
/// <param name="newTargetType">The new target type to be set.</param>
/// <param name="spawnPosition">Spawn position for scene blocks.</param>
/// <param name="level">Level parameter for spawning scene blocks.</param>
/// <param name="blockNum">Number of blocks to spawn.</param>
/// <remarks>
/// 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.
/// </remarks>
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 @@ public class TargetController : MonoBehaviour
}
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;
}
}
+2 -6
View File
@@ -87,9 +87,7 @@ public class MouseInMap : MonoBehaviour
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 @@ public class MouseInMap : MonoBehaviour
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;
+3 -4
View File
@@ -190,8 +190,6 @@ public class EnvironmentUIControl : MonoBehaviour
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 class EnvironmentUIControl : MonoBehaviour
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();
}
+13 -2
View File
@@ -35,8 +35,12 @@ public class StartUIManager : MonoBehaviour
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 @@ public class StartUIManager : MonoBehaviour
}
}
}
private void StopGame()
{
// stop game,end program
Debug.Log("Game End");
Application.Quit();
}
}
+4 -5
View File
@@ -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 class TargetUIController : MonoBehaviour
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 class TargetUIController : MonoBehaviour
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 class TargetUIController : MonoBehaviour
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);