From 37c193ba6a3b997a040639ef2df71dd68a25dde4 Mon Sep 17 00:00:00 2001 From: Koha9 Date: Tue, 9 Jan 2024 19:18:16 +0900 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PlayMode=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96camera=E4=BD=8D=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改PlayerCamera参数为private --- Assets/ML-Agents/Timers/Play_timers.json | 2 +- .../ML-Agents/Timers/StartScene_timers.json | 2 +- Assets/ML-Agents/Timers/Train_timers.json | 2 +- Assets/Scenes/Play.unity | 591 ++---------------- Assets/Scenes/Train.unity | 6 +- Assets/Script/GameScript/TargetController.cs | 13 + Assets/Script/PlayMode/PlayerCamera.cs | 25 +- UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 481 ++++++++------ 9 files changed, 356 insertions(+), 770 deletions(-) diff --git a/Assets/ML-Agents/Timers/Play_timers.json b/Assets/ML-Agents/Timers/Play_timers.json index f190e65..681115c 100644 --- a/Assets/ML-Agents/Timers/Play_timers.json +++ b/Assets/ML-Agents/Timers/Play_timers.json @@ -1 +1 @@ -{"count":1,"self":16.986511999999998,"total":17.543395699999998,"children":{"InitializeActuators":{"count":2,"self":0.0020003,"total":0.0020003,"children":null},"InitializeSensors":{"count":2,"self":0.0015007,"total":0.0015007,"children":null},"AgentSendState":{"count":607,"self":0.0065032,"total":0.4011771,"children":{"CollectObservations":{"count":607,"self":0.2939928,"total":0.2939928,"children":null},"WriteActionMask":{"count":607,"self":0.0020047,"total":0.0020047,"children":null},"RequestDecision":{"count":607,"self":0.0986764,"total":0.0986764,"children":null}}},"DecideAction":{"count":607,"self":0.0035009,"total":0.0035009,"children":null},"AgentAct":{"count":607,"self":0.14770529999999998,"total":0.14770529999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704393711","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1704393729"}} \ No newline at end of file +{"count":1,"self":13.296357599999999,"total":13.6899074,"children":{"InitializeActuators":{"count":2,"self":0.0015034999999999998,"total":0.0015034999999999998,"children":null},"InitializeSensors":{"count":2,"self":0.0010003,"total":0.0010003,"children":null},"AgentSendState":{"count":433,"self":0.0045045,"total":0.2859497,"children":{"CollectObservations":{"count":433,"self":0.2078226,"total":0.2078226,"children":null},"WriteActionMask":{"count":433,"self":0.0009994,"total":0.0009994,"children":null},"RequestDecision":{"count":433,"self":0.0726232,"total":0.0726232,"children":null}}},"DecideAction":{"count":433,"self":0.0019984,"total":0.0019984,"children":null},"AgentAct":{"count":433,"self":0.1020973,"total":0.1020973,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704690165","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-bbQe3pofOXaeruEXc-2O8 -hubSessionId fa8ba95e-3ad3-4e58-bbf6-617d74b7cdd4 -accessToken dLDx_lE1nZ6RAtxwNKiPge42G5i8CvH-Sv_7EIEhm2000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1704690179"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/StartScene_timers.json b/Assets/ML-Agents/Timers/StartScene_timers.json index 5a700bd..1a06852 100644 --- a/Assets/ML-Agents/Timers/StartScene_timers.json +++ b/Assets/ML-Agents/Timers/StartScene_timers.json @@ -1 +1 @@ -{"count":1,"self":156.4892288,"total":157.2185567,"children":{"InitializeActuators":{"count":2,"self":0.0005046,"total":0.0005046,"children":null},"InitializeSensors":{"count":2,"self":0.0009987,"total":0.0009987,"children":null},"AgentSendState":{"count":1164,"self":0.0035028,"total":0.5013793,"children":{"CollectObservations":{"count":1164,"self":0.4898497,"total":0.4898497,"children":null},"WriteActionMask":{"count":1164,"self":0.002506,"total":0.002506,"children":null},"RequestDecision":{"count":1164,"self":0.0055207999999999993,"total":0.0055207999999999993,"children":null}}},"DecideAction":{"count":1164,"self":0.0130961,"total":0.0130961,"children":null},"AgentAct":{"count":1164,"self":0.2133482,"total":0.2133482,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704391554","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1704391711"}} \ No newline at end of file +{"count":1,"self":103.5483392,"total":107.75784449999999,"children":{"InitializeActuators":{"count":12,"self":0.001004,"total":0.001004,"children":null},"InitializeSensors":{"count":12,"self":0,"total":0,"children":null},"AgentSendState":{"count":1424,"self":0.0280132,"total":2.6909213,"children":{"CollectObservations":{"count":8544,"self":2.640354,"total":2.640354,"children":null},"WriteActionMask":{"count":8544,"self":0.0060129,"total":0.0060129,"children":null},"RequestDecision":{"count":8544,"self":0.0165412,"total":0.0165412,"children":null}}},"DecideAction":{"count":1424,"self":0.0235409,"total":0.0235409,"children":null},"AgentAct":{"count":1424,"self":1.4940384,"total":1.4940384,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704689262","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-bbQe3pofOXaeruEXc-2O8 -hubSessionId fa8ba95e-3ad3-4e58-bbf6-617d74b7cdd4 -accessToken dLDx_lE1nZ6RAtxwNKiPge42G5i8CvH-Sv_7EIEhm2000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1704689369"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Train_timers.json b/Assets/ML-Agents/Timers/Train_timers.json index 131b6a1..1f7c29c 100644 --- a/Assets/ML-Agents/Timers/Train_timers.json +++ b/Assets/ML-Agents/Timers/Train_timers.json @@ -1 +1 @@ -{"count":1,"self":9.1472775999999989,"total":10.0439194,"children":{"InitializeActuators":{"count":12,"self":0.001999,"total":0.001999,"children":null},"InitializeSensors":{"count":12,"self":0.0010071,"total":0.0010071,"children":null},"AgentSendState":{"count":245,"self":0.0075105,"total":0.6516661,"children":{"CollectObservations":{"count":1470,"self":0.4542129,"total":0.4542129,"children":null},"WriteActionMask":{"count":1470,"self":0.0005002,"total":0.0005002,"children":null},"RequestDecision":{"count":1470,"self":0.18944249999999999,"total":0.18944249999999999,"children":null}}},"DecideAction":{"count":245,"self":0.0035275999999999997,"total":0.0035275999999999997,"children":null},"AgentAct":{"count":245,"self":0.2379422,"total":0.2379422,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704390607","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Koha9 -hubSessionId af25a057-d9c4-47b8-9bae-3105389fadde -accessToken UIvCq-lVM1hPlCtYFZFQzNGKUaVcinF6IfOIKvfW8PA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1704390617"}} \ No newline at end of file +{"count":1,"self":8.4565711999999991,"total":9.2154213,"children":{"InitializeActuators":{"count":12,"self":0.0009975,"total":0.0009975,"children":null},"InitializeSensors":{"count":12,"self":0.0010008999999999999,"total":0.0010008999999999999,"children":null},"AgentSendState":{"count":241,"self":0.0034963999999999998,"total":0.46725839999999996,"children":{"CollectObservations":{"count":1446,"self":0.460256,"total":0.460256,"children":null},"WriteActionMask":{"count":1446,"self":0.0010002,"total":0.0010002,"children":null},"RequestDecision":{"count":1446,"self":0.0025058,"total":0.0025058,"children":null}}},"DecideAction":{"count":241,"self":0.0050033,"total":0.0050033,"children":null},"AgentAct":{"count":241,"self":0.28359049999999997,"total":0.28359049999999997,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1704689378","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-bbQe3pofOXaeruEXc-2O8 -hubSessionId fa8ba95e-3ad3-4e58-bbf6-617d74b7cdd4 -accessToken dLDx_lE1nZ6RAtxwNKiPge42G5i8CvH-Sv_7EIEhm2000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1704689387"}} \ No newline at end of file diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index 3f9c490..09c723b 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -3303,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.20152} + m_AnchoredPosition: {x: 0.000030517578, y: -246.20215} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &324069808 @@ -4550,7 +4550,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2082200189} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4892,194 +4892,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 425126382} m_CullTransparentMesh: 1 ---- !u!1 &427803069 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 427803070} - - component: {fileID: 427803073} - - component: {fileID: 427803072} - - component: {fileID: 427803071} - m_Layer: 5 - m_Name: EnemyNum - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &427803070 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427803069} - 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: - - {fileID: 1144884390} - m_Father: {fileID: 2082200189} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 201, y: -42.5} - m_SizeDelta: {x: 95.11151, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &427803071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427803069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 427803072} - m_TextViewport: {fileID: 1144884390} - m_TextComponent: {fileID: 1644298921} - m_Placeholder: {fileID: 1047255652} - m_VerticalScrollbar: {fileID: 0} - m_VerticalScrollbarEventHandler: {fileID: 0} - m_LayoutGroup: {fileID: 0} - m_ScrollSensitivity: 1 - m_ContentType: 2 - m_InputType: 0 - m_AsteriskChar: 42 - m_KeyboardType: 4 - m_LineType: 0 - m_HideMobileInput: 0 - m_HideSoftKeyboard: 0 - m_CharacterValidation: 2 - m_RegexValue: - m_GlobalPointSize: 10 - m_CharacterLimit: 0 - m_OnEndEdit: - m_PersistentCalls: - m_Calls: [] - m_OnSubmit: - m_PersistentCalls: - m_Calls: [] - m_OnSelect: - m_PersistentCalls: - m_Calls: [] - m_OnDeselect: - m_PersistentCalls: - m_Calls: [] - m_OnTextSelection: - m_PersistentCalls: - m_Calls: [] - m_OnEndTextSelection: - m_PersistentCalls: - m_Calls: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200185} - m_TargetAssemblyTypeName: HUDController, Assembly-CSharp - m_MethodName: onEnemyNumTextChange - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - m_OnTouchScreenKeyboardStatusChanged: - m_PersistentCalls: - m_Calls: [] - m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 - m_ReadOnly: 0 - m_RichText: 1 - m_GlobalFontAsset: {fileID: 11400000, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2} - m_OnFocusSelectAll: 1 - m_ResetOnDeActivation: 1 - m_RestoreOriginalTextOnEscape: 1 - m_isRichTextEditingAllowed: 0 - m_LineLimit: 0 - m_InputValidator: {fileID: 0} ---- !u!114 &427803072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427803069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &427803073 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427803069} - m_CullTransparentMesh: 1 --- !u!1 &440411429 GameObject: m_ObjectHideFlags: 0 @@ -6428,7 +6240,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2082200189} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -7612,7 +7424,7 @@ RectTransform: - {fileID: 1411671493} - {fileID: 1413466579} m_Father: {fileID: 2082200189} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8957,7 +8769,7 @@ RectTransform: m_Children: - {fileID: 933183368} m_Father: {fileID: 2082200189} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -10883,162 +10695,6 @@ Transform: m_Father: {fileID: 749443373} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1047255649 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1047255650} - - component: {fileID: 1047255653} - - component: {fileID: 1047255652} - - component: {fileID: 1047255651} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1047255650 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047255649} - 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: 1144884390} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1047255651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047255649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1047255652 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047255649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Enter text... - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2} - m_sharedMaterial: {fileID: -4662725986004701985, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 2150773298 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 2 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 1 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1047255653 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1047255649} - m_CullTransparentMesh: 1 --- !u!1 &1052251813 GameObject: m_ObjectHideFlags: 0 @@ -11666,59 +11322,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1138584526} m_CullTransparentMesh: 1 ---- !u!1 &1144884389 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1144884390} - - component: {fileID: 1144884391} - m_Layer: 5 - m_Name: Text Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1144884390 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144884389} - 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: - - {fileID: 1047255650} - - {fileID: 1644298920} - m_Father: {fileID: 427803070} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1144884391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144884389} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: -8, y: -5, z: -8, w: -5} - m_Softness: {x: 0, y: 0} --- !u!850595691 &1145653675 LightingSettings: m_ObjectHideFlags: 0 @@ -12901,7 +12504,7 @@ MonoBehaviour: m_HandleRect: {fileID: 538300382} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.9999948 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -13080,7 +12683,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356284071} m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} - m_LocalPosition: {x: -40, y: 24, z: -9} + m_LocalPosition: {x: -40, y: 43.9, z: 21.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -13100,14 +12703,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2afdd3e39c405184380c3ffead15ea80, type: 3} m_Name: m_EditorClassIdentifier: - normalSpeed: 0.0035 - shiftSpeed: 0.06 - zoomSpeed: -10 - rotateSpeed: 0.1 - maxHeight: 40 - minHeight: 6 - startMouseP: {x: 0, y: 0} - dragMouseP: {x: 0, y: 0} --- !u!1 &1403501266 GameObject: m_ObjectHideFlags: 0 @@ -14866,6 +14461,7 @@ GameObject: - component: {fileID: 1586670226} - component: {fileID: 1586670225} - component: {fileID: 1586670227} + - component: {fileID: 1586670228} m_Layer: 0 m_Name: FreeCamera m_TagString: MainCamera @@ -14965,6 +14561,39 @@ MonoBehaviour: _enableSpeedAcceleration: 1 _speedAccelerationFactor: 1.5 _initPositonButton: 114 +--- !u!114 &1586670228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586670223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1586789151 GameObject: m_ObjectHideFlags: 1 @@ -15649,141 +15278,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1640192094} m_CullTransparentMesh: 1 ---- !u!1 &1644298919 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1644298920} - - component: {fileID: 1644298922} - - component: {fileID: 1644298921} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1644298920 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644298919} - 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: 1144884390} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1644298921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644298919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u200B" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2} - m_sharedMaterial: {fileID: -4662725986004701985, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 1 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1644298922 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644298919} - m_CullTransparentMesh: 1 --- !u!1 &1661638192 GameObject: m_ObjectHideFlags: 0 @@ -21444,7 +20938,7 @@ MonoBehaviour: chartOnToggleObj: {fileID: 269417898} saveModelButton: {fileID: 0} chartOnTimeOutInputObj: {fileID: 149218411} - enemyNumInputObj: {fileID: 427803071} + enemyNumInputObj: {fileID: 0} chartOnTimeOut: 60 enemyNum: 6 chartOnTimeOutDefault: 60 @@ -21523,7 +21017,6 @@ RectTransform: m_Children: - {fileID: 269417899} - {fileID: 149218410} - - {fileID: 427803070} - {fileID: 808242910} - {fileID: 405727031} - {fileID: 590670114} diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index 88711a7..238005a 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -32112,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.2022} + m_AnchoredPosition: {x: 0.000030517578, y: -246.20213} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1442113294 @@ -34773,7 +34773,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1586670223} m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} - m_LocalPosition: {x: -171, y: 182, z: -105} + m_LocalPosition: {x: -276.5, y: 182, z: -217.9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -44136,7 +44136,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1766662801} m_Direction: 2 m_Value: 0 - m_Size: 0.99999493 + m_Size: 0.99999565 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Script/GameScript/TargetController.cs b/Assets/Script/GameScript/TargetController.cs index bbab032..af1d59c 100644 --- a/Assets/Script/GameScript/TargetController.cs +++ b/Assets/Script/GameScript/TargetController.cs @@ -261,6 +261,19 @@ private void RandomSpawnSceneBlock(Targets targetType) sceneBlockCon.nowBlock.InitBlock(environmentObj); } + /// + /// Spawns a scene block at a specified position. + /// + /// The type of the target, determining the type of block to generate. + /// The level of the block, affecting its properties. + /// The number of the block, used to distinguish different blocks of the same level. + /// The position of the block in the scene. + /// + /// This method first destroys the current block in the scene, then creates a new block based on the provided parameters and initializes it. + /// 'sceneBlockCon' is responsible for managing the creation, destruction, and initialization of scene blocks. + /// 'commonParamCon' provides additional parameters required for block creation. + /// 'environmentObj' is used during the initialization process of the block. + /// private void SpawnSceneBlock(Targets targetType, int level,int blockNum, Vector3 blockPosition) { sceneBlockCon.DestroyBlock(); diff --git a/Assets/Script/PlayMode/PlayerCamera.cs b/Assets/Script/PlayMode/PlayerCamera.cs index 910ab4f..aafe2b5 100644 --- a/Assets/Script/PlayMode/PlayerCamera.cs +++ b/Assets/Script/PlayMode/PlayerCamera.cs @@ -4,22 +4,23 @@ public class PlayerCamera : MonoBehaviour { - public float normalSpeed = 0.0035f; - public float shiftSpeed = 0.06f; - public float zoomSpeed = -10.0f; - public float rotateSpeed = 0.1f; + private float normalSpeed = 0.0035f; + private float shiftSpeed = 0.06f; + private float zoomSpeed = -10.0f; + private float rotateSpeed = 0.1f; - public float maxHeight = 40f; - public float minHeight = 6f; + private float maxHeight = 40f; + private float minHeight = 6f; - public Vector2 startMouseP; - public Vector2 dragMouseP; + private Vector2 startMouseP; + private Vector2 dragMouseP; + private Vector3 defaultCamPosition; private float speed; // Start is called before the first frame update void Start() { - + defaultCamPosition = transform.position; } // Update is called once per frame @@ -37,6 +38,12 @@ void Update() zoomSpeed = 10.0f; } + // reset camera position + if (Input.GetKeyDown(KeyCode.R)) + { + transform.position = defaultCamPosition; + } + float hsp = transform.position.y * speed * Input.GetAxis("Horizontal"); // horizontal movement speed float vsp = transform.position.y * speed * Input.GetAxis("Vertical"); // vertical movement speed float scrollSp = Mathf.Log(transform.position.y) * -zoomSpeed * Input.GetAxis("Mouse ScrollWheel"); // scroll speed diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 3476c4f..3d09235 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,13 +9,13 @@ EditorUserSettings: value: 55090405535008090b5608764626074415151c79747c74602b7c1861e4b96c6c flags: 0 RecentlyUsedSceneGuid-1: - value: 06570c0704040b0e5a575520137b5e44154f192e292d22367c2c4866b7b3376f + value: 5703025650035e5d090f087148715d4443161e2c7e2c20357b281b31b0e43060 flags: 0 RecentlyUsedSceneGuid-2: value: 5453565f53020f085f5d0e72157a0844454f4c2b757d7265757a4f64b7b4313c flags: 0 RecentlyUsedSceneGuid-3: - value: 5703025650035e5d090f087148715d4443161e2c7e2c20357b281b31b0e43060 + value: 06570c0704040b0e5a575520137b5e44154f192e292d22367c2c4866b7b3376f flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0396f8b..d57d40b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,6 +1,30 @@ %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: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: -1015 + y: -63 + width: 963 + height: 708 + m_ShowMode: 0 + m_Title: Game + m_RootView: {fileID: 4} + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -14,17 +38,67 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 51 - y: 43 - width: 1856 - height: 1037 + x: 300 + y: 404 + width: 1175 + height: 749 m_ShowMode: 4 - m_Title: Scene - m_RootView: {fileID: 2} + m_Title: Package Manager + m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &2 +--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 963 + height: 708 + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !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: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 963 + height: 708 + m_MinSize: {x: 100, y: 121} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 139 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +111,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 6} + - {fileID: 8} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1856 - height: 1037 + width: 1175 + height: 749 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,12 +143,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1856 + width: 1175 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,89 +164,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1017 - width: 1856 + y: 729 + width: 1175 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 9} - - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1856 - height: 987 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 16 ---- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 8} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 833 - height: 987 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 141 ---- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 833 - height: 708 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 14} - - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -181,25 +177,24 @@ MonoBehaviour: 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_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 9} + - {fileID: 12} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 - y: 708 - width: 833 - height: 279 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + y: 30 + width: 1175 + height: 699 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 119 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -217,15 +212,93 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 833 + x: 0 y: 0 - width: 664 - height: 987 + width: 609 + height: 699 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 17 + controlID: 120 --- !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: 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: 609 + height: 501 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + 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: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PackageManagerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 501 + width: 609 + height: 198 + m_MinSize: {x: 801, y: 271} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 18} + - {fileID: 19} + m_Selected: 1 + m_LastSelected: 0 +--- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 13} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 609 + y: 0 + width: 336 + height: 699 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -242,16 +315,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 664 - height: 556 + width: 336 + height: 392 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 17} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -267,18 +340,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 556 - width: 664 - height: 431 + y: 392 + width: 336 + height: 307 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 18} - - {fileID: 19} + - {fileID: 21} + - {fileID: 22} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -293,18 +366,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1497 + x: 945 y: 0 - width: 359 - height: 987 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 20} + width: 230 + height: 699 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 20} + - {fileID: 23} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -324,10 +397,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 51 - y: 73 - width: 832 - height: 687 + x: 300 + y: 434 + width: 608 + height: 480 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -562,9 +635,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 420.52347, y: 196.64235, z: 178.41852} + m_Target: {x: -375.51465, y: 271.2252, z: -354.55728} speed: 2 - m_Value: {x: 420.52347, y: 196.64235, z: 178.41852} + m_Value: {x: -375.51465, y: 271.2252, z: -354.55728} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -611,13 +684,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.529 m_Rotation: - m_Target: {x: -0.22396095, y: -0.35765323, z: 0.088779315, w: -0.9022455} + m_Target: {x: -0.31611243, y: -0.22831854, z: 0.078667216, w: -0.9174724} speed: 2 - m_Value: {x: -0.22382718, y: -0.35900563, z: 0.089115016, w: -0.90170664} + m_Value: {x: -0.31611243, y: -0.22831854, z: 0.07866721, w: -0.9174724} m_Size: - m_Target: 302.69232 + m_Target: 12.124355 speed: 2 - m_Value: 289.6577 + m_Value: 12.124355 m_Ortho: m_Target: 0 speed: 2 @@ -642,7 +715,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &14 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -662,9 +735,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 51 - y: 73 - width: 832 + x: -1015 + y: -63 + width: 963 height: 687 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -676,7 +749,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 832, y: 666} + m_TargetSize: {x: 963, y: 666} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -691,8 +764,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -416 - m_HBaseRangeMax: 416 + m_HBaseRangeMin: -481.5 + m_HBaseRangeMax: 481.5 m_VBaseRangeMin: -333 m_VBaseRangeMax: 333 m_HAllowExceedBaseRangeMin: 1 @@ -703,7 +776,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -712,29 +785,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 832 + width: 963 height: 666 m_Scale: {x: 1, y: 1} - m_Translation: {x: 416, y: 333} + m_Translation: {x: 481.5, y: 333} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -416 + x: -481.5 y: -333 - width: 832 + width: 963 height: 666 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 832, y: 687} + m_LastWindowPixelSize: {x: 963, y: 687} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &15 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -754,10 +827,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 51 - y: 781 - width: 832 - height: 258 + x: 636 + y: 831 + width: 608 + height: 177 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -781,7 +854,7 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Shader + - Assets/Script/PlayMode m_LastFoldersGridSize: 16 m_LastProjectPath: C:\Users\UCUNI\OneDrive\Unity\ML-Agents\Aimbot-ParallelEnv m_LockTracker: @@ -790,23 +863,23 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 05ca9a3b m_LastClickedID: 1000000005 - m_ExpandedIDs: 00000000429400008094000000ca9a3b + m_ExpandedIDs: 000000004294000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Scenes - m_OriginalName: Scenes + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 1000000005 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -845,24 +918,24 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300008a5c000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Train - m_OriginalName: Train + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 38028 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -874,7 +947,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 355 ---- !u!114 &16 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -894,15 +967,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 64 - y: 780 - width: 1043 - height: 259 + x: 0 + y: 520 + width: 608 + height: 177 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &17 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -922,10 +995,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 884 - y: 73 - width: 662 - height: 535 + x: 1 + y: 19 + width: 334 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -933,25 +1006,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8a940000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 3062fdffaed4fdffa6e7fdffb8effdff5236feff7437feff6238feff2839feff203bfeff123dfeff144cfeff404efeff724ffeff9851feffca71feff2473feff6674feffd28cfeffa0a0feff30a6feff46a7feff28befeff10bffeff22c0feffe8c0feff9ec2feff88c4feff58c6feff6ec8feff34c9feff4acafeff96cefeff7ccffeff42d0feffb221ffff9422ffff6226ffffb62bffff9ee0ffff96e1ffff66e3ffff2ce4ffff22e5ffff5cf8ffff32fbffffe6ab0000921f01006c2a0100d67c01003a3e0300bc4e0300a4510300 + m_ExpandedIDs: 32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Agent - m_OriginalName: Agent + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 212422 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 13} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -959,7 +1032,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &18 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -979,15 +1052,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 884 - y: 629 - width: 662 - height: 410 + x: 1 + y: 411 + width: 334 + height: 286 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -999,7 +1072,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c262c1329a02fa49b5cb4c297106f3f, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 136, y: 30} + m_MinSize: {x: 129, y: 28} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: ProBuilder @@ -1015,7 +1088,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &20 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1035,10 +1108,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1548 - y: 73 - width: 358 - height: 966 + x: 946 + y: 19 + width: 229 + height: 678 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default