From 64e477d6c283b7b7e196d9ee514c47b080ee7e0a Mon Sep 17 00:00:00 2001 From: Koha9 Date: Thu, 29 Jun 2023 15:18:10 +0900 Subject: [PATCH] =?UTF-8?q?V3.1=20=E6=8E=A7=E5=88=B6=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 完成控制模式中UI，解决所有逻辑问题。控制模式于Unity中正常运行，可正常判断结束。 --- Assets/ML-Agents/Timers/Play_timers.json | 2 +- Assets/Scenes/Play.unity | 873 +++++++--------- Assets/Script/InGame/AgentWithGun.cs | 18 +- Assets/Script/InGame/EnvironmentUIControl.cs | 8 +- Assets/Script/InGame/ParameterContainer.cs | 3 +- Assets/Script/InGame/SceneBlock.cs | 3 +- Assets/Script/InGame/SceneBlockContainer.cs | 7 +- Assets/Script/InGame/TargetController.cs | 83 +- Assets/Script/InGame/WorldUIController.cs | 5 - Assets/Script/{ => Play}/MouseInMap.cs | 15 +- Assets/Script/{ => Play}/MouseInMap.cs.meta | 0 Assets/Script/{ => Play}/MousePreview.cs | 0 Assets/Script/{ => Play}/MousePreview.cs.meta | 0 .../{ => Play}/PlayGameModeController.cs | 0 .../{ => Play}/PlayGameModeController.cs.meta | 0 Assets/Script/Play/PlayerCamera.cs | 20 +- .../Script/{ => Play}/TargetUIController.cs | 23 +- .../{ => Play}/TargetUIController.cs.meta | 0 Assets/Script/{ => Play}/selectEffect.cs | 0 Assets/Script/{ => Play}/selectEffect.cs.meta | 0 Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- .../Layouts/CurrentMaximizeLayout.dwlt | 934 ++++++++++++++++++ UserSettings/Layouts/default-2021.dwlt | 162 +-- 24 files changed, 1502 insertions(+), 658 deletions(-) rename Assets/Script/{ => Play}/MouseInMap.cs (85%) rename Assets/Script/{ => Play}/MouseInMap.cs.meta (100%) rename Assets/Script/{ => Play}/MousePreview.cs (100%) rename Assets/Script/{ => Play}/MousePreview.cs.meta (100%) rename Assets/Script/{ => Play}/PlayGameModeController.cs (100%) rename Assets/Script/{ => Play}/PlayGameModeController.cs.meta (100%) rename Assets/Script/{ => Play}/TargetUIController.cs (77%) rename Assets/Script/{ => Play}/TargetUIController.cs.meta (100%) rename Assets/Script/{ => Play}/selectEffect.cs (100%) rename Assets/Script/{ => Play}/selectEffect.cs.meta (100%) create mode 100644 UserSettings/Layouts/CurrentMaximizeLayout.dwlt diff --git a/Assets/ML-Agents/Timers/Play_timers.json b/Assets/ML-Agents/Timers/Play_timers.json index 73cb175..e280617 100644 --- a/Assets/ML-Agents/Timers/Play_timers.json +++ b/Assets/ML-Agents/Timers/Play_timers.json @@ -1 +1 @@ -{"count":1,"self":125.68559359999999,"total":127.0390736,"children":{"InitializeActuators":{"count":2,"self":0.0010002,"total":0.0010002,"children":null},"InitializeSensors":{"count":2,"self":0.0005021,"total":0.0005021,"children":null},"AgentSendState":{"count":6113,"self":0.027592799999999997,"total":0.23222669999999998,"children":{"CollectObservations":{"count":6113,"self":0.1815569,"total":0.1815569,"children":null},"WriteActionMask":{"count":6113,"self":0.008039,"total":0.008039,"children":null},"RequestDecision":{"count":6113,"self":0.015038,"total":0.015038,"children":null}}},"DecideAction":{"count":6113,"self":0.028539099999999998,"total":0.028539099999999998,"children":null},"AgentAct":{"count":6113,"self":1.0907158,"total":1.0907158,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":4,"max":-3383.484,"min":-8498.57,"runningAverage":-4832.122,"value":-3835.63672,"weightedAverage":-5697.07031}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1681045338","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-UCUNI -hubSessionId fa309b90-d6ce-11ed-9045-4dbcec259de8 -accessToken fwCnFBjbqXUmAHgSbjU61dMBi2ynquSahIP-il_N8Nw00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1681045465"}} \ No newline at end of file +{"count":1,"self":32.1479424,"total":32.5224426,"children":{"InitializeActuators":{"count":2,"self":0.0015004999999999999,"total":0.0015004999999999999,"children":null},"InitializeSensors":{"count":2,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":1395,"self":0.0098739,"total":0.054415599999999995,"children":{"CollectObservations":{"count":1395,"self":0.040894599999999996,"total":0.040894599999999996,"children":null},"WriteActionMask":{"count":1395,"self":2.5399999999999997E-05,"total":2.5399999999999997E-05,"children":null},"RequestDecision":{"count":1395,"self":0.0036217,"total":0.0036217,"children":null}}},"DecideAction":{"count":1395,"self":0.0059974999999999994,"total":0.0059974999999999994,"children":null},"AgentAct":{"count":1395,"self":0.3105879,"total":0.3105879,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":1,"max":-497.4348,"min":-497.4348,"runningAverage":-497.4348,"value":-497.4348,"weightedAverage":-497.4348}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1688018681","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-UCUNI -hubSessionId f0cd9b14-9448-48b8-a171-832b56425f1a -accessToken 4Ih0Fmgn-qcBzV7BmmRSC3-07nfbMRhn-v5RdyzS41800ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1688018713"}} \ No newline at end of file diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index af47868..3e4e454 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -822,170 +822,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95675457} m_Mesh: {fileID: -6813842297940566337, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!43 &98340202 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23960 - 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 &99436128 GameObject: m_ObjectHideFlags: 0 @@ -3920,7 +3756,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 2031853104} + m_Mesh: {fileID: 2126002120} --- !u!33 &404485453 MeshFilter: m_ObjectHideFlags: 10 @@ -3928,7 +3764,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 404485450} - m_Mesh: {fileID: 2031853104} + m_Mesh: {fileID: 2126002120} --- !u!23 &404485454 MeshRenderer: m_ObjectHideFlags: 0 @@ -4182,8 +4018,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 2031853104} - m_VersionIndex: 3 + m_Mesh: {fileID: 2126002120} + m_VersionIndex: 6 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -5015,7 +4851,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22952 + m_Name: pb_Mesh22960 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8505,7 +8341,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22914 + m_Name: pb_Mesh22922 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10600,74 +10436,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156799888} m_CullTransparentMesh: 1 ---- !u!1 &1179425938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1179425940} - - component: {fileID: 1179425939} - m_Layer: 0 - m_Name: SceneBlockContainer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1179425939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179425938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94687c2b580b85d4a8ced43c8cfc7bf2, type: 3} - m_Name: - m_EditorClassIdentifier: - sceneSize: 10 - EnvironmentObj: {fileID: 749443372} - attackBlockPrefabs: - - {fileID: 771219355588494022, guid: 38e1219bc0e854642a1ec4d55715632c, type: 3} - - {fileID: 5210138614873161068, guid: bd97e077540d4884d8fccc315932005c, type: 3} - - {fileID: 8752325863341315885, guid: 1aa83139c6ee6c04ab9b7a3762261464, type: 3} - - {fileID: 8752325863341315885, guid: 206482bf2eb72204785f527037580652, type: 3} - - {fileID: 8752325863341315885, guid: 40aab8cc9ac73bc4da37dfa216825c07, type: 3} - - {fileID: 8752325863341315885, guid: fff85224f546e8f48a77dfae3f3148dd, type: 3} - goBlockPrefabs: - - {fileID: 4760142052363292896, guid: 5dab26d1f971ed948a3ed9b4d048361a, type: 3} - - {fileID: 509600926543488069, guid: 64ddc28c0a55a064fbf313a2e0e293b7, type: 3} - - {fileID: 8752325863341315885, guid: d0aa3ce7ca1016d42a15bc6a82ffe83d, type: 3} - - {fileID: 8752325863341315885, guid: 6c3150464c4b25843b9f2681b273564d, type: 3} - - {fileID: 8752325863341315885, guid: cd175e96739b76649a07f6819fcbf1d4, type: 3} - - {fileID: 8752325863341315885, guid: 05f792cae7000984ca3d477bc6b9dbed, type: 3} - - {fileID: 8409002079588485153, guid: 88d55a346dbe95747a7befb15157646a, type: 3} - - {fileID: 7344938646805724614, guid: f657e02eb087bb04f9b099f854d6f49b, type: 3} - - {fileID: 1421790864883206414, guid: 579210f2543099f4b9dcb386ed8f9e49, type: 3} - defencePrefabs: - - {fileID: 7279272556452961029, guid: e3e21135898c8784f846e870b1db56d3, type: 3} - - {fileID: 8846414053615828488, guid: 2f053dfedc7fd534d8ef4ed4015edecd, type: 3} - - {fileID: 3752399968333756393, guid: ab266ed339e7ab14f93d93b70ca3b843, type: 3} - thisBlock: {fileID: 0} ---- !u!4 &1179425940 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179425938} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -42, y: 0, z: -163} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1179942010 GameObject: m_ObjectHideFlags: 0 @@ -11399,7 +11167,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356284071} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} m_LocalPosition: {x: -6, y: 24, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -11407,7 +11175,7 @@ Transform: - {fileID: 1586670224} m_Father: {fileID: 0} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: 45, z: 0} --- !u!114 &1356284073 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11420,7 +11188,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2afdd3e39c405184380c3ffead15ea80, type: 3} m_Name: m_EditorClassIdentifier: - normalSpeed: 0.035 + normalSpeed: 0.0035 shiftSpeed: 0.06 zoomSpeed: -10 rotateSpeed: 0.1 @@ -12636,53 +12404,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502910337} m_CullTransparentMesh: 1 ---- !u!1 &1510004562 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1510004564} - - component: {fileID: 1510004563} - m_Layer: 0 - m_Name: EnemyContainer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1510004563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1510004562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0350ec966da42b44699fee7309a89ac7, type: 3} - m_Name: - m_EditorClassIdentifier: - enemyPrefab: {fileID: 8240453774489061354, guid: c044b8f18a5ed2f4eaabb8d40095018f, type: 3} - EnvironmentObj: {fileID: 749443372} - TargetControllerObj: {fileID: 1692325237} ---- !u!4 &1510004564 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1510004562} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -42, y: 0, z: -163} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1550524475 GameObject: m_ObjectHideFlags: 0 @@ -13082,14 +12803,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1586670223} - m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1356284072} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 45, y: 45, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!81 &1586670225 AudioListener: m_ObjectHideFlags: 0 @@ -15203,7 +14924,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 98340202} + m_Mesh: {fileID: 2136225666} --- !u!33 &1790388461 MeshFilter: m_ObjectHideFlags: 10 @@ -15211,7 +14932,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790388458} - m_Mesh: {fileID: 98340202} + m_Mesh: {fileID: 2136225666} --- !u!23 &1790388462 MeshRenderer: m_ObjectHideFlags: 0 @@ -15465,8 +15186,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 98340202} - m_VersionIndex: 3 + m_Mesh: {fileID: 2136225666} + m_VersionIndex: 6 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -17828,10 +17549,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playCamera: {fileID: 1586670226} + EnvironmentObj: {fileID: 749443372} selectEffect: {fileID: 6561472780860268583, guid: 66420aca630480743a18632a2ac888e9, type: 3} - PlayGameModeControllerObj: {fileID: 2006050842} - EnemyContainerObj: {fileID: 1510004562} - SceneBlockContainerObj: {fileID: 1179425938} + EnemyContainerObj: {fileID: 891195334} + SceneBlockContainerObj: {fileID: 1811162388} + TargetControllerObj: {fileID: 1692325237} HUDObj: {fileID: 2082200184} mouseMode: 0 --- !u!4 &1962276267 @@ -18496,68 +18218,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &2006050842 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2006050844} - - component: {fileID: 2006050843} - m_Layer: 0 - m_Name: GameModeController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2006050843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2006050842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77518fe48235bbe47bd3adde3630eb02, type: 3} - m_Name: - m_EditorClassIdentifier: - ParameterContainerObj: {fileID: 707336050} - EnemyContainerObj: {fileID: 1510004562} - AgentObj: {fileID: 629870337} - SceneBlockContainerObj: {fileID: 1179425938} - edgeUp: {fileID: 1352953080} - edgeDown: {fileID: 1571061029} - edgeLeft: {fileID: 1551793502} - edgeRight: {fileID: 1046425531} - edgeAgent_Enemy: {fileID: 704984377} - minEnemyAreaX: 0 - maxEnemyAreaX: 0 - minEnemyAreaZ: 0 - maxEnemyAreaZ: 0 - minAgentAreaX: 0 - maxAgentAreaX: 0 - minAgentAreaZ: 0 - maxAgentAreaZ: 0 - gameMode: 0 ---- !u!4 &2006050844 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2006050842} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 912.5634, y: 488.12024, z: -21.806702} - 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 &2022632339 GameObject: m_ObjectHideFlags: 0 @@ -18830,170 +18490,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023218731} m_CullTransparentMesh: 1 ---- !u!43 &2031853104 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22990 - 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 &2032658542 GameObject: m_ObjectHideFlags: 0 @@ -19515,8 +19011,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e5f471594a32c24194088f10d716a89, type: 3} m_Name: m_EditorClassIdentifier: - gameModeController: {fileID: 2006050842} + TargetControllerObj: {fileID: 1692325237} MouseSelectorObj: {fileID: 1962276265} + EnvironmentUIObj: {fileID: 156390936} setAttackButton: {fileID: 320729027} setGotoButton: {fileID: 371362500} setFreeButton: {fileID: 1411671494} @@ -19739,6 +19236,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2122553911} m_CullTransparentMesh: 1 +--- !u!43 &2126002120 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh22998 + 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 &2134501847 GameObject: m_ObjectHideFlags: 0 @@ -19819,6 +19480,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2134501847} m_CullTransparentMesh: 1 +--- !u!43 &2136225666 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh23980 + 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 &2139943208 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/InGame/AgentWithGun.cs b/Assets/Script/InGame/AgentWithGun.cs index 918d4a2..68f3176 100644 --- a/Assets/Script/InGame/AgentWithGun.cs +++ b/Assets/Script/InGame/AgentWithGun.cs @@ -81,7 +81,7 @@ public class AgentWithGun : Agent [System.NonSerialized] public int finishedState; - // start scene datas + // start scene datas 0=train 1=play private int gamemode; private void Start() @@ -96,7 +96,7 @@ private void Start() catch { Debug.LogError("Run WithOut StartScreen"); - gamemode = 0; + gamemode = 1; } // initialize scripts @@ -452,9 +452,19 @@ public override void OnEpisodeBegin() { Cursor.lockState = CursorLockMode.Locked; // hide and lock the mouse } - //thisAgentObj.name = thisAgentObj.GetInstanceID().ToString(); - targetCon.rollNewScene(); paramContainer.resetTimeBonusReward(); + //thisAgentObj.name = thisAgentObj.GetInstanceID().ToString(); + if (gamemode == 0) + { + // train mode + targetCon.rollNewScene(); + } + else + { + // play mode + targetCon.playInitialize(); + } + // give default Reward to Reward value will be used. if (hudController.chartOn) { diff --git a/Assets/Script/InGame/EnvironmentUIControl.cs b/Assets/Script/InGame/EnvironmentUIControl.cs index 6929370..9d32732 100644 --- a/Assets/Script/InGame/EnvironmentUIControl.cs +++ b/Assets/Script/InGame/EnvironmentUIControl.cs @@ -43,8 +43,8 @@ void Start() // Update is called once per frame void Update() { - int remainTime = Convert.ToInt32(targetController.startTime + paramContainer.timeLimit - Time.time); - remainTimeText.text = "RemainTime:" + remainTime.ToString(); + // int remainTime = Convert.ToInt32(targetController.startTime + paramContainer.timeLimit - Time.time); + remainTimeText.text = "RemainTime:" + Convert.ToInt32(targetController.leftTime).ToString(); if (resultActive && Time.time - overTime >= resultTimeout) { // while result is active and show time over timeOut @@ -150,6 +150,10 @@ public void updateTargetType(int targetInt) targetTypeText.text = "Free"; targetTypeText.color = Color.yellow; break; + case (int)SceneBlockContainer.Targets.Stay: + targetTypeText.text = "Stay"; + targetTypeText.color = Color.white; + break; default: targetTypeText.text = "TYPE ERROR"; targetTypeText.color = Color.red; diff --git a/Assets/Script/InGame/ParameterContainer.cs b/Assets/Script/InGame/ParameterContainer.cs index 7b03cbf..1627c2f 100644 --- a/Assets/Script/InGame/ParameterContainer.cs +++ b/Assets/Script/InGame/ParameterContainer.cs @@ -119,7 +119,8 @@ private void Start() private void Update() { - if (targetCon.targetTypeInt != (int)SceneBlockContainer.Targets.Free) + // get target distance and in area + if (targetCon.targetTypeInt is (int)SceneBlockContainer.Targets.Go or (int)SceneBlockContainer.Targets.Attack) { (agentDistance, agentInArea) = blockCont.getAgentTargetDistanceAndInside(agentObj.transform.position); // attack goto or defence target diff --git a/Assets/Script/InGame/SceneBlock.cs b/Assets/Script/InGame/SceneBlock.cs index f1ededf..5bb9d6a 100644 --- a/Assets/Script/InGame/SceneBlock.cs +++ b/Assets/Script/InGame/SceneBlock.cs @@ -49,6 +49,7 @@ void Update() { if (Time.time - intervalStart >= addPointInterval) { + // update belong ratio every addPointInterval scecond group1InareaNum = getInAreaNumber(group1Tag); group2InareaNum = getInAreaNumber(group2Tag); belongRatio = group1InareaNum - group2InareaNum; @@ -74,7 +75,7 @@ void Update() } } - //Initialize thi scene block should be excuted after enemy created + //Initialize this scene block should be excuted after enemy created public void initBlock(GameObject envObj) { //Buffer all Player or enemy obj int this environment to list diff --git a/Assets/Script/InGame/SceneBlockContainer.cs b/Assets/Script/InGame/SceneBlockContainer.cs index 55a5c1c..531e52b 100644 --- a/Assets/Script/InGame/SceneBlockContainer.cs +++ b/Assets/Script/InGame/SceneBlockContainer.cs @@ -5,7 +5,7 @@ public class SceneBlockContainer : MonoBehaviour { - public enum Targets { Free, Go, Attack, Defence, Num };// Num is use for get total target bumber + public enum Targets { Free, Go, Attack, Defence, Stay, Num };// Num is use for get total target bumber public float sceneSize = 10f; public GameObject EnvironmentObj; public GameObject[] attackBlockPrefabs = new GameObject[1]; @@ -74,5 +74,8 @@ public void destroyBlock() return thisBlock.getDist_inArea(agentPosition); } - + public void initializeBlock(GameObject envObj) + { + thisBlock.initBlock(envObj); + } } diff --git a/Assets/Script/InGame/TargetController.cs b/Assets/Script/InGame/TargetController.cs index af59856..b241eb1 100644 --- a/Assets/Script/InGame/TargetController.cs +++ b/Assets/Script/InGame/TargetController.cs @@ -63,6 +63,9 @@ public enum EndType { Win, Lose, Running, Num }; private WorldUIController worldUICon; private HUDController hudCon; private RaySensors raySensors; + private StartSeneData startSceneData; + // start scene datas 0=train 1=play + private int gamemode; // Start is called before the first frame update void Start() @@ -91,6 +94,19 @@ void Start() { Debug.LogError("target percentage wrong"); } + // initialize startSceneData & datas + // while GameObject StartSceneDataTransfer is exist + try + { + startSceneData = GameObject.Find("StartSceneDataTransfer").GetComponent(); + gamemode = startSceneData.gamemode; + } + // while GameObject StartSceneDataTransfer is not exist + catch + { + Debug.LogError("Run WithOut StartScreen"); + gamemode = 1; + } // initialize a simple fake onehot encoder. for (int i = 0; i < targetNum; i++) @@ -107,7 +123,17 @@ void Start() private void Update() { - leftTime = paramCon.timeLimit - Time.time + startTime; + // if gamemode is play, then time will keep paramCon.timeLimit + if (gamemode == 1) + { + leftTime = paramCon.timeLimit; + // print out time + Debug.Log("Playing Time: " + leftTime); + } + else + { + leftTime = paramCon.timeLimit - Time.time + startTime; + } } public void rollNewScene() @@ -250,7 +276,6 @@ public void moveAgentTo(Vector3 thisPosition) agentCharaCon.enabled = true; } - // check over and get rewards // 1 = success,2 = overtime,0 = notover public (int, float,float) checkOverAndRewards() @@ -297,12 +322,14 @@ public void moveAgentTo(Vector3 thisPosition) envUICon.updateTargetGauge(blockCont.thisBlock.firebasesBelong, blockCont.thisBlock.belongMaxPoint); if (blockCont.thisBlock.getInAreaNumber(group2Tag) <= 0 && targetEnemySpawnFinish) { + Debug.Log(blockCont.thisBlock.getInAreaNumber(group2Tag)); // win // let the area belongs to me and kill every enmy in this area. thisReward = 0; endReward = paramCon.attackWinReward; //thisReward = (paramCon.inAreaReward * inArea) + getSceneReward(nowDistance); endTypeInt = (int)EndType.Win; + targetEnemySpawnFinish = false; } else if (leftTime <= 0 && targetEnemySpawnFinish) { @@ -311,6 +338,7 @@ public void moveAgentTo(Vector3 thisPosition) endReward = paramCon.loseReward; //thisReward = (paramCon.inAreaReward * inArea) + getSceneReward(nowDistance); endTypeInt = (int)EndType.Lose; + targetEnemySpawnFinish = false; } else { @@ -349,17 +377,24 @@ public void moveAgentTo(Vector3 thisPosition) endTypeInt = (int)EndType.Running; } break; + case (int)SceneBlockContainer.Targets.Stay: + // Stay + // endless + thisReward = 0; + endReward = 0; + endTypeInt = (int)EndType.Running; + break; default: //free kill if (EnemyContainerObj.transform.childCount <= 0) { // win - //thisReward = paramCon.winReward + (paramCon.timeBonusPerSecReward * leftTime); + // thisReward = paramCon.winReward + (paramCon.timeBonusPerSecReward * leftTime); thisReward = 0; endReward = paramCon.freeWinReward; endTypeInt = (int)EndType.Win; } - else if (Time.time - startTime >= paramCon.timeLimit) + else if (leftTime <= 0) { // lose //thisReward = paramCon.loseReward; @@ -481,4 +516,44 @@ public int getInAreaState() return 0; } } + + // Play Mode method + // Initialize Play mode + public void playInitialize() + { + targetTypeInt = (int)SceneBlockContainer.Targets.Stay; + envUICon.updateTargetType(targetTypeInt); + moveAgentToSpwanArea(); + enemyCont.destroyAllEnemys(); + blockCont.destroyBlock(); + } + + // change to attack mode + public void attackModeChange() + { + targetTypeInt = (int)SceneBlockContainer.Targets.Attack; + envUICon.updateTargetType(targetTypeInt); + } + + // change to free mode + public void freeModeChange() + { + targetTypeInt = (int)SceneBlockContainer.Targets.Free; + envUICon.updateTargetType(targetTypeInt); + } + + // change to goto mode + public void gotoModeChange() + { + targetTypeInt = (int)SceneBlockContainer.Targets.Go; + envUICon.updateTargetType(targetTypeInt); + } + + // change to stay mode + public void stayModeChange() + { + targetTypeInt = (int)SceneBlockContainer.Targets.Stay; + envUICon.updateTargetType(targetTypeInt); + } + } diff --git a/Assets/Script/InGame/WorldUIController.cs b/Assets/Script/InGame/WorldUIController.cs index b6698f8..aa18bf5 100644 --- a/Assets/Script/InGame/WorldUIController.cs +++ b/Assets/Script/InGame/WorldUIController.cs @@ -27,11 +27,6 @@ void Start() } } - // Update is called once per frame - void Update() - { - - } public void updateChart(int targetType, int endType) { float winRatio = 0f; diff --git a/Assets/Script/MouseInMap.cs b/Assets/Script/Play/MouseInMap.cs similarity index 85% rename from Assets/Script/MouseInMap.cs rename to Assets/Script/Play/MouseInMap.cs index 7314f8a..ed42375 100644 --- a/Assets/Script/MouseInMap.cs +++ b/Assets/Script/Play/MouseInMap.cs @@ -6,10 +6,11 @@ public class MouseInMap : MonoBehaviour { public Camera playCamera; + public GameObject EnvironmentObj; public GameObject selectEffect; - public GameObject PlayGameModeControllerObj; public GameObject EnemyContainerObj; public GameObject SceneBlockContainerObj; + public GameObject TargetControllerObj; public GameObject HUDObj; private Vector3 mouseInMapPosition = Vector3.zero; @@ -17,7 +18,7 @@ public class MouseInMap : MonoBehaviour private LayerMask groundMask; private int randBlockNum; private GameObject preSet; - private PlayGameModeController gameModeCon; + private TargetController targetCon; private MousePreview mousePreviewCon; private EnemyContainer enemyCon; private SceneBlockContainer sceneBlockCon; @@ -35,7 +36,7 @@ public enum MouseMode private void Start() { groundMask = LayerMask.GetMask("Ground"); - gameModeCon = PlayGameModeControllerObj.GetComponent(); + targetCon = TargetControllerObj.GetComponent(); mousePreviewCon = this.GetComponent(); enemyCon = EnemyContainerObj.GetComponent(); sceneBlockCon = SceneBlockContainerObj.GetComponent(); @@ -46,7 +47,7 @@ void Update() { nowHitPosition = getMouseOnMapPosition(); // if mouse position in area, update mouseInMapPosition as nowHitPosition - if (nowHitPosition.x < gameModeCon.maxAgentAreaX && nowHitPosition.x > gameModeCon.minAgentAreaX && nowHitPosition.z < gameModeCon.maxEnemyAreaZ && nowHitPosition.z > gameModeCon.minAgentAreaZ) + if (nowHitPosition.x < targetCon.maxAgentAreaX && nowHitPosition.x > targetCon.minAgentAreaX && nowHitPosition.z < targetCon.maxEnemyAreaZ && nowHitPosition.z > targetCon.minAgentAreaZ) { mouseInMapPosition = nowHitPosition; mousePreviewCon.updatePreviewPosition(mouseInMapPosition); @@ -57,10 +58,14 @@ void Update() { case MouseMode.AttackSet: sceneBlockCon.createNewBlock(SceneBlockContainer.Targets.Attack, randBlockNum, mouseInMapPosition); + sceneBlockCon.initializeBlock(EnvironmentObj); + targetCon.attackModeChange(); changeMouseModeTo(MouseMode.Default); break; case MouseMode.GotoSet: sceneBlockCon.createNewBlock(SceneBlockContainer.Targets.Go, randBlockNum, mouseInMapPosition); + sceneBlockCon.initializeBlock(EnvironmentObj); + targetCon.gotoModeChange(); changeMouseModeTo(MouseMode.Default); break; case MouseMode.EnemySet: @@ -81,7 +86,7 @@ public void changeMouseModeTo(MouseMode thisMouseMode) case MouseMode.AttackSet: // random choose attack scene block type and set as preview randBlockNum = Random.Range(0, sceneBlockCon.attackBlockPrefabs.Length); - preSet = sceneBlockCon.goBlockPrefabs[randBlockNum]; + preSet = sceneBlockCon.attackBlockPrefabs[randBlockNum]; mousePreviewCon.changePreviewTo(preSet); break; case MouseMode.GotoSet: diff --git a/Assets/Script/MouseInMap.cs.meta b/Assets/Script/Play/MouseInMap.cs.meta similarity index 100% rename from Assets/Script/MouseInMap.cs.meta rename to Assets/Script/Play/MouseInMap.cs.meta diff --git a/Assets/Script/MousePreview.cs b/Assets/Script/Play/MousePreview.cs similarity index 100% rename from Assets/Script/MousePreview.cs rename to Assets/Script/Play/MousePreview.cs diff --git a/Assets/Script/MousePreview.cs.meta b/Assets/Script/Play/MousePreview.cs.meta similarity index 100% rename from Assets/Script/MousePreview.cs.meta rename to Assets/Script/Play/MousePreview.cs.meta diff --git a/Assets/Script/PlayGameModeController.cs b/Assets/Script/Play/PlayGameModeController.cs similarity index 100% rename from Assets/Script/PlayGameModeController.cs rename to Assets/Script/Play/PlayGameModeController.cs diff --git a/Assets/Script/PlayGameModeController.cs.meta b/Assets/Script/Play/PlayGameModeController.cs.meta similarity index 100% rename from Assets/Script/PlayGameModeController.cs.meta rename to Assets/Script/Play/PlayGameModeController.cs.meta diff --git a/Assets/Script/Play/PlayerCamera.cs b/Assets/Script/Play/PlayerCamera.cs index 1740c27..0d963e2 100644 --- a/Assets/Script/Play/PlayerCamera.cs +++ b/Assets/Script/Play/PlayerCamera.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -50,20 +50,6 @@ void Update() { scrollSp = minHeight - transform.position.y; } -/* if((transform.position.y <= maxHeight) && (scrollSp > 0)) - { - scrollSp = 0; - }else if((transform.position.y >= minHeight)&& (scrollSp < 0)) - { - scrollSp = 0; - } - if((transform.position.y + scrollSp) > maxHeight) - { - scrollSp = maxHeight - transform.position.y; - }else if((transform.position.y + scrollSp) < minHeight) - { - scrollSp = minHeight - transform.position.y; - }*/ Vector3 verticalMove = new Vector3(0,scrollSp,0); // vertical movement Vector3 lateralMove = hsp * transform.right; // lateral movement in global world ignore camera facing @@ -72,11 +58,8 @@ void Update() fowardMove = vsp * fowardMove.normalized; // normalize the vector Vector3 move = verticalMove + lateralMove + fowardMove; // total movement - transform.position += move; // move the camera - cameraRotation(); - } void cameraRotation() @@ -99,6 +82,5 @@ void cameraRotation() startMouseP = dragMouseP; } - } } diff --git a/Assets/Script/TargetUIController.cs b/Assets/Script/Play/TargetUIController.cs similarity index 77% rename from Assets/Script/TargetUIController.cs rename to Assets/Script/Play/TargetUIController.cs index e5208b2..ff058d0 100644 --- a/Assets/Script/TargetUIController.cs +++ b/Assets/Script/Play/TargetUIController.cs @@ -7,34 +7,37 @@ public class TargetUIController : MonoBehaviour { // Controller to control the UI of the target, // select target type, select prefeb to set or sth. - public GameObject gameModeController; + public GameObject TargetControllerObj; public GameObject MouseSelectorObj; + public GameObject EnvironmentUIObj; public Button setAttackButton; public Button setGotoButton; public Button setFreeButton; public Button setStayButton; - private PlayGameModeController gameModeCon; private MouseInMap mouseInMapCon; + private EnvironmentUIControl envUICon; + private TargetController targetCon; private void Start() { - gameModeCon = gameModeController.GetComponent(); + targetCon = TargetControllerObj.GetComponent(); mouseInMapCon = MouseSelectorObj.GetComponent(); + envUICon = EnvironmentUIObj.GetComponent(); } public void clearGamePressed() { // Clear all enemies and targets. set gamemode to Stay mode - gameModeCon.gameMode = PlayGameModeController.GameMode.Stay; + targetCon.stayModeChange(); mouseInMapCon.changeMouseModeTo(MouseInMap.MouseMode.Default); // disable setStayButton and enable other buttons setStayButton.interactable = false; setAttackButton.interactable = true; setGotoButton.interactable = true; setFreeButton.interactable = true; - gameModeCon.startInitialize(); + targetCon.playInitialize(); } public void setEnemyPressed() { @@ -50,7 +53,8 @@ public void setAttackPressed() } public void setFreePressed() { - mouseInMapCon.mouseMode = MouseInMap.MouseMode.Default; + mouseInMapCon.changeMouseModeTo(MouseInMap.MouseMode.Default); + targetCon.freeModeChange(); setStayButton.interactable = true; setAttackButton.interactable = true; setGotoButton.interactable = true; @@ -58,7 +62,12 @@ public void setFreePressed() } public void setStayPressed() { - + mouseInMapCon.changeMouseModeTo(MouseInMap.MouseMode.Default); + targetCon.stayModeChange(); + setStayButton.interactable = false; + setAttackButton.interactable = true; + setGotoButton.interactable = true; + setFreeButton.interactable = true; } public void UIButtonInteractable(PlayGameModeController.GameMode nowMode = PlayGameModeController.GameMode.Stay) diff --git a/Assets/Script/TargetUIController.cs.meta b/Assets/Script/Play/TargetUIController.cs.meta similarity index 100% rename from Assets/Script/TargetUIController.cs.meta rename to Assets/Script/Play/TargetUIController.cs.meta diff --git a/Assets/Script/selectEffect.cs b/Assets/Script/Play/selectEffect.cs similarity index 100% rename from Assets/Script/selectEffect.cs rename to Assets/Script/Play/selectEffect.cs diff --git a/Assets/Script/selectEffect.cs.meta b/Assets/Script/Play/selectEffect.cs.meta similarity index 100% rename from Assets/Script/selectEffect.cs.meta rename to Assets/Script/Play/selectEffect.cs.meta diff --git a/Packages/manifest.json b/Packages/manifest.json index c48f087..972a5cd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,7 +3,7 @@ "com.monitor1394.xcharts": "https://github.com/XCharts-Team/XCharts.git#3.0", "com.unity.collab-proxy": "1.17.6", "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", "com.unity.ml-agents": "2.0.1", "com.unity.probuilder": "5.0.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ad5fd15..8048d20 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -53,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt new file mode 100644 index 0000000..0f3a613 --- /dev/null +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -0,0 +1,934 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 9} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 987 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 134 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 73 + width: 1122 + height: 695 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: -1.9757904, y: 37.38048, z: -3.9826856} + speed: 2 + m_Value: {x: -1.9757904, y: 37.38048, z: -3.9826856} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0.3737313, y: 0.35359865, z: -0.1568066, w: 0.8430081} + speed: 2 + m_Value: {x: 0.37373912, y: 0.35360608, z: -0.1568099, w: 0.8430258} + m_Size: + m_Target: 11.369436 + speed: 2 + m_Value: 11.369436 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1.0005 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 6} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1123 + height: 987 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 135 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1123 + height: 716 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + - {fileID: 5} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 64 + y: 73 + width: 1087 + height: 695 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1087, y: 674} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -543.5 + m_HBaseRangeMax: 543.5 + m_VBaseRangeMin: -337 + m_VBaseRangeMax: 337 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1087 + height: 674 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 543.5, y: 337} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -543.5 + y: -337 + width: 1087 + height: 674 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1087, y: 695} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 716 + width: 1123 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 7} + m_Panes: + - {fileID: 7} + - {fileID: 8} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 789 + width: 1122 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Gridbox Prototype Materials + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Gridbox Prototype Materials + 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: 134} + m_SelectedIDs: ba690000 + m_LastClickedID: 27066 + m_ExpandedIDs: 00000000a4690000a6690000a8690000aa690000ac690000c669000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: Gridbox Prototype Materials + m_OriginalName: Gridbox Prototype Materials + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 27066 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 6} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000a4690000a6690000a8690000aa690000ac690000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: d85b0000 + m_LastClickedInstanceID: 23512 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c623000000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 6} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 355 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13953, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 800, y: 250} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Package Manager + m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 64 + y: 789 + width: 1087 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 1123 + y: 0 + width: 343 + height: 987 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 75 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 343 + height: 716 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 11} + m_Panes: + - {fileID: 11} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3043 + y: 73 + width: 341 + height: 695 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: d85b0000 + m_LastClickedID: 23512 + m_ExpandedIDs: 32fbffff9c5a0000025b0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 716 + width: 343 + height: 271 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3043 + y: 789 + width: 341 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1466 + y: 0 + width: 454 + height: 987 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3386 + y: 73 + width: 453 + height: 966 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 5dcc935..8d22c63 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 62 - y: 43 - width: 1858 + x: 346 + y: 218 + width: 1016 height: 1037 m_ShowMode: 4 - m_Title: Project + m_Title: Inspector m_RootView: {fileID: 9} - m_MinSize: {x: 875, y: 392} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -41,7 +41,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 716 - width: 1090 + width: 594 height: 271 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -70,12 +70,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1090 + width: 594 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 74 + controlID: 42 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,10 +93,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 716 - width: 332 + width: 182 height: 271 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -119,14 +119,14 @@ MonoBehaviour: - {fileID: 4} m_Position: serializedVersion: 2 - x: 1090 + x: 594 y: 0 - width: 332 + width: 182 height: 987 - m_MinSize: {x: 202, y: 342} - m_MaxSize: {x: 4002, y: 8042} + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 114 + controlID: 17 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,10 +144,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 332 + width: 182 height: 716 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -173,12 +173,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1858 + width: 1016 height: 987 - m_MinSize: {x: 402, y: 342} - m_MaxSize: {x: 20194, y: 16192} + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19 + controlID: 41 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -194,9 +194,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1422 + x: 776 y: 0 - width: 436 + width: 240 height: 987 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1858 + width: 1016 height: 1037 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -250,7 +250,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1858 + width: 1016 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -272,7 +272,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1017 - width: 1858 + width: 1016 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -293,10 +293,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1090 + width: 594 height: 716 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -323,9 +323,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 62 + x: 64 y: 73 - width: 1089 + width: 1085 height: 695 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -337,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1089, y: 674} + m_TargetSize: {x: 1085, y: 674} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,8 +352,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -544.5 - m_HBaseRangeMax: 544.5 + m_HBaseRangeMin: -542.5 + m_HBaseRangeMax: 542.5 m_VBaseRangeMin: -337 m_VBaseRangeMax: 337 m_HAllowExceedBaseRangeMin: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1089 + width: 1085 height: 674 m_Scale: {x: 1, y: 1} - m_Translation: {x: 544.5, y: 337} + m_Translation: {x: 542.5, y: 337} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -544.5 + x: -542.5 y: -337 - width: 1089 + width: 1085 height: 674 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1089, y: 695} + m_LastWindowPixelSize: {x: 1085, y: 695} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -443,9 +443,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 62 - y: 789 - width: 1089 + x: 0 + y: 735 + width: 593 height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -464,36 +464,36 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Script + - Assets/Script/InGame m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Script + - Assets/Script/InGame 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: 90} - m_SelectedIDs: cc690000 - m_LastClickedID: 27084 - m_ExpandedIDs: 00000000a8690000aa690000ac690000ae690000b0690000cc69000000ca9a3b + scrollPos: {x: 0, y: 138} + m_SelectedIDs: 186a0000 + m_LastClickedID: 27160 + m_ExpandedIDs: 00000000a4690000a6690000a8690000aa690000ac690000d8690000de69000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Prefeb + m_OriginalName: Prefeb m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 1000000003 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 2} m_SearchString: @@ -507,7 +507,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a8690000aa690000ac690000ae690000b0690000 + m_ExpandedIDs: 00000000a4690000a6690000a8690000aa690000ac690000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -538,15 +538,15 @@ MonoBehaviour: m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: MouseSelector - m_OriginalName: MouseSelector + m_Name: Attack-1Wall-0 + m_OriginalName: Attack-1Wall-0 m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 2656 + m_UserData: 24398 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -583,9 +583,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1484 - y: 73 - width: 435 + x: 1122 + y: 248 + width: 239 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -624,9 +624,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1152 - y: 73 - width: 330 + x: 940 + y: 248 + width: 180 height: 695 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -635,9 +635,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 32fbffff + m_SelectedIDs: ba5d0000 + m_LastClickedID: 23994 + m_ExpandedIDs: 86f0ffffdaf0ffff32fbffff025b0000145c0000905e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -681,9 +681,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 62 - y: 73 - width: 1089 + x: 346 + y: 248 + width: 593 height: 695 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -738,7 +738,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -919,9 +919,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 160.16556, y: -223.58987, z: 194.37906} + m_Target: {x: -1.9757904, y: 37.38048, z: -3.9826856} speed: 2 - m_Value: {x: 160.16556, y: -223.58987, z: 194.37906} + m_Value: {x: 66.24889, y: -54.049023, z: -29.673973} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -968,13 +968,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.37377584, y: 0.30120626, z: -0.12980841, w: 0.86757493} + m_Target: {x: 0.3737313, y: 0.35359865, z: -0.1568066, w: 0.8430081} speed: 2 - m_Value: {x: 0.37378144, y: 0.30121076, z: -0.12981035, w: 0.8675879} + m_Value: {x: -0.17065884, y: -0.79835737, z: 0.2657279, w: -0.51272774} m_Size: - m_Target: 200.99156 + m_Target: 5.2687497 speed: 2 - m_Value: 200.99156 + m_Value: 50.033897 m_Ortho: m_Target: 0 speed: 2 @@ -1019,9 +1019,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1152 - y: 789 - width: 330 + x: 1 + y: 735 + width: 180 height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: