From 709f7cf9d3a764a1292a599aaa33e3a444a727cb Mon Sep 17 00:00:00 2001 From: Koha9 Date: Wed, 9 Aug 2023 01:11:25 +0900 Subject: [PATCH] =?UTF-8?q?V3.2.0=20=E6=B7=BB=E5=8A=A0InGameMessageBox=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9Playmode=E4=B8=AD=E5=B0=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加InGameMessageBox，可以在游戏中显示某些消息 修正可以在Enemy或者Agent身上生成Target或者Enemy的错误 --- Assets/ML-Agents/Timers/Play_timers.json | 2 +- Assets/ML-Agents/Timers/Train_timers.json | 2 +- Assets/MessageBoxController.cs | 31 + Assets/MessageBoxController.cs.meta | 11 + Assets/Prefeb/Message.prefab | 137 +++++ Assets/Prefeb/Message.prefab.meta | 7 + Assets/Scenes/Play.unity | 631 ++++++++++++++++++++- Assets/Scenes/Train.unity | 48 ++ Assets/Script/InGame/ParameterContainer.cs | 15 +- Assets/Script/Play/MouseInMap.cs | 79 ++- Assets/Script/Play/MousePreview.cs | 13 +- UserSettings/EditorUserSettings.asset | 8 +- UserSettings/Layouts/default-2021.dwlt | 355 +++++------- 13 files changed, 1094 insertions(+), 245 deletions(-) create mode 100644 Assets/MessageBoxController.cs create mode 100644 Assets/MessageBoxController.cs.meta create mode 100644 Assets/Prefeb/Message.prefab create mode 100644 Assets/Prefeb/Message.prefab.meta diff --git a/Assets/ML-Agents/Timers/Play_timers.json b/Assets/ML-Agents/Timers/Play_timers.json index ea60451..1cac798 100644 --- a/Assets/ML-Agents/Timers/Play_timers.json +++ b/Assets/ML-Agents/Timers/Play_timers.json @@ -1 +1 @@ -{"count":1,"self":126.74634239999999,"total":128.0847739,"children":{"InitializeActuators":{"count":2,"self":0.0009999,"total":0.0009999,"children":null},"InitializeSensors":{"count":2,"self":0.0010008,"total":0.0010008,"children":null},"AgentSendState":{"count":6178,"self":0.026903399999999997,"total":0.223186,"children":{"CollectObservations":{"count":6178,"self":0.1734102,"total":0.1734102,"children":null},"WriteActionMask":{"count":6178,"self":0.0093753,"total":0.0093753,"children":null},"RequestDecision":{"count":6178,"self":0.0134971,"total":0.0134971,"children":null}}},"DecideAction":{"count":6178,"self":0.0307529,"total":0.0307529,"children":null},"AgentAct":{"count":6178,"self":1.0819883,"total":1.0819883,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":7,"max":5501.69238,"min":-2529.91821,"runningAverage":1871.90051,"value":5501.69238,"weightedAverage":2216.80957}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1690539320","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 4b63fb8e-9776-4262-b4cb-28aa0e369085 -accessToken Pb-uYo6-TCqI_VYWW4hD7qruW991NK-uVlSKxlTMxiM00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1690539448"}} \ No newline at end of file +{"count":1,"self":17.432375999999998,"total":17.601931399999998,"children":{"InitializeActuators":{"count":2,"self":0.0014985999999999999,"total":0.0014985999999999999,"children":null},"InitializeSensors":{"count":2,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":649,"self":0.0039967,"total":0.027996999999999998,"children":{"CollectObservations":{"count":649,"self":0.0195028,"total":0.0195028,"children":null},"WriteActionMask":{"count":649,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"RequestDecision":{"count":649,"self":0.0034969999999999997,"total":0.0034969999999999997,"children":null}}},"DecideAction":{"count":649,"self":0.0049997999999999996,"total":0.0049997999999999996,"children":null},"AgentAct":{"count":649,"self":0.1315598,"total":0.1315598,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691511445","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 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken VfIHxMjB35w5fMmo90NJJ3FYRsNmtt785aeyJrUBNSY00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1691511463"}} \ 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 85eeee7..3733f0f 100644 --- a/Assets/ML-Agents/Timers/Train_timers.json +++ b/Assets/ML-Agents/Timers/Train_timers.json @@ -1 +1 @@ -{"count":1,"self":46.7315648,"total":50.4141415,"children":{"InitializeActuators":{"count":16,"self":0.0015007,"total":0.0015007,"children":null},"InitializeSensors":{"count":16,"self":0.0010012,"total":0.0010012,"children":null},"AgentSendState":{"count":2264,"self":0.027499899999999997,"total":0.3287168,"children":{"CollectObservations":{"count":18112,"self":0.27471819999999997,"total":0.27471819999999997,"children":null},"WriteActionMask":{"count":18112,"self":0.006502,"total":0.006502,"children":null},"RequestDecision":{"count":18112,"self":0.0199967,"total":0.0199967,"children":null}}},"DecideAction":{"count":2264,"self":0.031005099999999997,"total":0.031005099999999997,"children":null},"AgentAct":{"count":2264,"self":3.3168523999999997,"total":3.3168523,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":9,"max":4165.668,"min":-8465.8,"runningAverage":-6057.36963,"value":4165.668,"weightedAverage":-4592.56}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691479498","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 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken E3xJ9L_3Ig0NQueh48ufPYRNPf4J2JoRlbnS3gUcFR000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1691479548"}} \ No newline at end of file +{"count":1,"self":136.7215872,"total":147.4695117,"children":{"InitializeActuators":{"count":16,"self":0.0015004999999999999,"total":0.0015004999999999999,"children":null},"InitializeSensors":{"count":16,"self":0.0009987,"total":0.0009987,"children":null},"AgentSendState":{"count":7124,"self":0.096052,"total":1.0324202,"children":{"CollectObservations":{"count":56992,"self":0.86090769999999994,"total":0.86090769999999994,"children":null},"WriteActionMask":{"count":56992,"self":0.0154582,"total":0.0154582,"children":null},"RequestDecision":{"count":56992,"self":0.060002299999999995,"total":0.060002299999999995,"children":null}}},"DecideAction":{"count":7124,"self":0.11469789999999999,"total":0.11469789999999999,"children":null},"AgentAct":{"count":7124,"self":9.5978096,"total":9.5978094,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":32,"max":-814.3231,"min":-11971.2393,"runningAverage":-4576.09863,"value":-814.3231,"weightedAverage":-2660.61621}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691480553","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 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken E3xJ9L_3Ig0NQueh48ufPYRNPf4J2JoRlbnS3gUcFR000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1691480701"}} \ No newline at end of file diff --git a/Assets/MessageBoxController.cs b/Assets/MessageBoxController.cs new file mode 100644 index 0000000..0cb0913 --- /dev/null +++ b/Assets/MessageBoxController.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class MessageBoxController : MonoBehaviour +{ + public GameObject messagePanelObj; + public GameObject messageTextPrefab; + + [SerializeField] + private List messages = new List(); + + public void PushMessage(string text) + { + Message newMessage = new Message(); + newMessage.text = text; + + GameObject newText = Instantiate(messageTextPrefab, messagePanelObj.transform); + newMessage.textObject = newText.GetComponent(); + newMessage.textObject.text = newMessage.text; + + messages.Add(newMessage); + } + + [System.Serializable] + public class Message + { + public string text; + public TMPro.TextMeshProUGUI textObject; + } +} \ No newline at end of file diff --git a/Assets/MessageBoxController.cs.meta b/Assets/MessageBoxController.cs.meta new file mode 100644 index 0000000..cac1e67 --- /dev/null +++ b/Assets/MessageBoxController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0d0b754dfadef484bbd36745abf1d796 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefeb/Message.prefab b/Assets/Prefeb/Message.prefab new file mode 100644 index 0000000..90591a8 --- /dev/null +++ b/Assets/Prefeb/Message.prefab @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7800828413105135976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7890471635030294927} + - component: {fileID: 8689853706318896445} + - component: {fileID: 6514250983489383611} + m_Layer: 5 + m_Name: Message + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7890471635030294927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7800828413105135976} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -117.64585} + m_SizeDelta: {x: 614.9666, y: 10.9149} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8689853706318896445 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7800828413105135976} + m_CullTransparentMesh: 1 +--- !u!114 &6514250983489383611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7800828413105135976} + 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: New 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + 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} diff --git a/Assets/Prefeb/Message.prefab.meta b/Assets/Prefeb/Message.prefab.meta new file mode 100644 index 0000000..478e926 --- /dev/null +++ b/Assets/Prefeb/Message.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bdd79ceda95d4bd44a402c80049df6e8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index 835f6c4..508bf58 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -2856,6 +2856,84 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: +--- !u!1 &324069806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 324069807} + - component: {fileID: 324069809} + - component: {fileID: 324069808} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &324069807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 324069806} + 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: 1978965772} + m_RootOrder: 0 + 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.20216} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &324069808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 324069806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &324069809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 324069806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 7 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &351933738 GameObject: m_ObjectHideFlags: 0 @@ -4851,7 +4929,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22996 + m_Name: pb_Mesh60692 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5330,6 +5408,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 532615954} m_Mesh: {fileID: 287060331232230867, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} +--- !u!1 &538300381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 538300382} + - component: {fileID: 538300384} + - component: {fileID: 538300383} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &538300382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538300381} + 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: 1918489415} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &538300383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538300381} + 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: 10905, 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 &538300384 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538300381} + m_CullTransparentMesh: 1 --- !u!1 &539817912 GameObject: m_ObjectHideFlags: 1 @@ -5438,7 +5592,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24008 + m_Name: pb_Mesh61716 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8159,6 +8313,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794639596} m_CullTransparentMesh: 1 +--- !u!1 &808242909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808242910} + m_Layer: 5 + m_Name: MessageBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &808242910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808242909} + 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: 933183368} + m_Father: {fileID: 2082200189} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &822320913 GameObject: m_ObjectHideFlags: 0 @@ -8522,7 +8713,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22958 + m_Name: pb_Mesh60654 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9090,6 +9281,115 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 928036774} m_Mesh: {fileID: 1964926367440911766, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} +--- !u!1 &933183367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 933183368} + - component: {fileID: 933183371} + - component: {fileID: 933183370} + - component: {fileID: 933183369} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &933183368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933183367} + 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: 1978965772} + - {fileID: 1314966132} + m_Father: {fileID: 808242910} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -314.48853, y: 123.10107} + m_SizeDelta: {x: 628.9771, y: 246.2022} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &933183369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933183367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 324069807} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1978965772} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1314966133} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &933183370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933183367} + 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: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0.392} + 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: 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 &933183371 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933183367} + m_CullTransparentMesh: 1 --- !u!1 &942746279 GameObject: m_ObjectHideFlags: 0 @@ -9772,6 +10072,54 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1026481343} m_Mesh: {fileID: -1479511118752177815, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} +--- !u!1 &1044511425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1044511427} + - component: {fileID: 1044511426} + m_Layer: 0 + m_Name: StartSceneDataTransferDummy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1044511426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044511425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3} + m_Name: + m_EditorClassIdentifier: + gameMode: 1 + attackProb: 0 + gotoProb: 0 + defenceProb: 0 +--- !u!4 &1044511427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044511425} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1046425531 GameObject: m_ObjectHideFlags: 0 @@ -11257,6 +11605,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1307400466} m_CullTransparentMesh: 1 +--- !u!1 &1314966131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1314966132} + - component: {fileID: 1314966135} + - component: {fileID: 1314966134} + - component: {fileID: 1314966133} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1314966132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314966131} + 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: 1918489415} + m_Father: {fileID: 933183368} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 14.8297, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1314966133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314966131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 538300383} + m_HandleRect: {fileID: 538300382} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1314966134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314966131} + 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: 10907, 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 &1314966135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314966131} + m_CullTransparentMesh: 1 --- !u!1 &1352953080 GameObject: m_ObjectHideFlags: 0 @@ -17300,6 +17775,43 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1918489414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1918489415} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1918489415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1918489414} + 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: 538300382} + m_Father: {fileID: 1314966132} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1928735334 GameObject: m_ObjectHideFlags: 0 @@ -17772,7 +18284,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 586cc33424b6eb941a724f7235d76abe, type: 3} m_Name: m_EditorClassIdentifier: + targetDistanceThreshold: 6 + enemyDistanceThreshold: 1 playCamera: {fileID: 1586670226} + AgentObj: {fileID: 629870337} environmentObj: {fileID: 749443372} mousePreviewObj: {fileID: 1178079198} enemyContainerObj: {fileID: 891195334} @@ -18108,6 +18623,97 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 500, y: 300} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1978965771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1978965772} + - component: {fileID: 1978965775} + - component: {fileID: 1978965774} + - component: {fileID: 1978965773} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1978965772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978965771} + 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: 324069807} + m_Father: {fileID: 933183368} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1978965773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978965771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1978965774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978965771} + 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: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 + 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 &1978965775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978965771} + m_CullTransparentMesh: 1 --- !u!1 &1984237745 GameObject: m_ObjectHideFlags: 0 @@ -19101,6 +19707,7 @@ GameObject: - component: {fileID: 2082200186} - component: {fileID: 2082200185} - component: {fileID: 2082200190} + - component: {fileID: 2082200191} m_Layer: 5 m_Name: HUD m_TagString: Untagged @@ -19204,6 +19811,7 @@ RectTransform: - {fileID: 149218410} - {fileID: 427803070} - {fileID: 1185607142} + - {fileID: 808242910} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19231,6 +19839,21 @@ MonoBehaviour: setGotoButton: {fileID: 371362500} setFreeButton: {fileID: 1411671494} setStayButton: {fileID: 1413466580} +--- !u!114 &2082200191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2082200184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b754dfadef484bbd36745abf1d796, type: 3} + m_Name: + m_EditorClassIdentifier: + messagePanelObj: {fileID: 324069806} + messageTextPrefab: {fileID: 7800828413105135976, guid: bdd79ceda95d4bd44a402c80049df6e8, type: 3} + messages: [] --- !u!1 &2099230616 GameObject: m_ObjectHideFlags: 0 @@ -19455,7 +20078,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23034 + m_Name: pb_Mesh60730 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index ecf36a6..46ef4a6 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -60867,6 +60867,54 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2139943208} m_CullTransparentMesh: 1 +--- !u!1 &2141008728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141008730} + - component: {fileID: 2141008729} + m_Layer: 0 + m_Name: StartSceneDataTransferDummy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2141008729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141008728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3} + m_Name: + m_EditorClassIdentifier: + gameMode: 0 + attackProb: 0.3333333 + gotoProb: 0.33333334 + defenceProb: 0.33333334 +--- !u!4 &2141008730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141008728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2142017478 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/InGame/ParameterContainer.cs b/Assets/Script/InGame/ParameterContainer.cs index d836cc4..9b38fa6 100644 --- a/Assets/Script/InGame/ParameterContainer.cs +++ b/Assets/Script/InGame/ParameterContainer.cs @@ -149,19 +149,16 @@ private void Start() { // try get start scene data startSceneData = GameObject.Find("StartSceneDataTransfer").GetComponent(); - gameMode = startSceneData.gameMode; - attackProb = startSceneData.attackProb; - gotoProb = startSceneData.gotoProb; - defenceProb = startSceneData.defenceProb; } catch { - Debug.LogError("PrameterContainer:Run WithOut StartScreen!"); - gameMode = 0; - attackProb = 0.3333f; - gotoProb = 0.3333f; - defenceProb = 0.0f; + // if not found, find dummy StartSeneData + startSceneData = GameObject.Find("StartSceneDataTransferDummy").GetComponent(); } + gameMode = startSceneData.gameMode; + attackProb = startSceneData.attackProb; + gotoProb = startSceneData.gotoProb; + defenceProb = startSceneData.defenceProb; } private void Update() diff --git a/Assets/Script/Play/MouseInMap.cs b/Assets/Script/Play/MouseInMap.cs index bab8563..764dbb3 100644 --- a/Assets/Script/Play/MouseInMap.cs +++ b/Assets/Script/Play/MouseInMap.cs @@ -2,7 +2,11 @@ public class MouseInMap : MonoBehaviour { + public float targetDistanceThreshold = 6f; + public float enemyDistanceThreshold = 1f; + public Camera playCamera; + public GameObject AgentObj; public GameObject environmentObj; public GameObject mousePreviewObj; public GameObject enemyContainerObj; @@ -19,6 +23,7 @@ public class MouseInMap : MonoBehaviour private MousePreview mousePreviewCon; private EnemyContainer enemyCon; private SceneBlockContainer sceneBlockCon; + private MessageBoxController messageCon; private TargetUIController targetUICon; public enum MouseMode @@ -39,6 +44,7 @@ private void Start() enemyCon = enemyContainerObj.GetComponent(); sceneBlockCon = sceneBlockContainerObj.GetComponent(); targetUICon = HUDObj.GetComponent(); + messageCon = HUDObj.GetComponent(); } private void Update() @@ -55,21 +61,46 @@ private void Update() switch (mouseMode) { case MouseMode.AttackSet: - sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Attack, randBlockNum, nowHitPositionRelative); - sceneBlockCon.InitializeBlock(environmentObj); - targetCon.AttackModeChange(nowHitPositionRelative); - ChangeMouseModeTo(MouseMode.Default); + if (IsAgentorEnemyWithinDistance(targetDistanceThreshold)) + { + // if agent or enemy is nearby, do not create new block + messageCon.PushMessage("Agent or Enemy is too close!"); + } + else + { + // if agent or enemy is not nearby, create new block + sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Attack, randBlockNum, nowHitPositionRelative); + sceneBlockCon.InitializeBlock(environmentObj); + targetCon.AttackModeChange(nowHitPositionRelative); + ChangeMouseModeTo(MouseMode.Default); + } break; case MouseMode.GotoSet: - sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Go, randBlockNum, nowHitPositionRelative); - sceneBlockCon.InitializeBlock(environmentObj); - targetCon.GotoModeChange(nowHitPositionRelative); - ChangeMouseModeTo(MouseMode.Default); + if (IsAgentorEnemyWithinDistance(targetDistanceThreshold)) + { + // if agent or enemy is nearby, do not create new block + messageCon.PushMessage("Agent or Enemy is too close!"); + } + else + { + // if agent or enemy is not nearby, create new block + sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Go, randBlockNum, nowHitPositionRelative); + sceneBlockCon.InitializeBlock(environmentObj); + targetCon.GotoModeChange(nowHitPositionRelative); + ChangeMouseModeTo(MouseMode.Default); + } break; case MouseMode.EnemySet: - enemyCon.InitEnemyAtHere(new Vector3(nowHitPositionRelative.x, 1, nowHitPositionRelative.z)); + if (IsAgentorEnemyWithinDistance(enemyDistanceThreshold)) + { + messageCon.PushMessage("Agent or Enemy is too close!"); + } + else + { + enemyCon.InitEnemyAtHere(new Vector3(nowHitPositionRelative.x, 1, nowHitPositionRelative.z)); + } break; default: @@ -100,7 +131,7 @@ public void ChangeMouseModeTo(MouseMode thisMouseMode) case MouseMode.EnemySet: preSet = enemyCon.enemyPrefab; - mousePreviewCon.ChangePreviewTo(preSet); + mousePreviewCon.ChangePreviewTo(preSet,true); break; default: @@ -127,4 +158,32 @@ public Vector3 GetMouseOnMapPosition() return Vector3.zero; } } + + private bool IsAgentorEnemyWithinDistance(float distance) + { + // check all child object in enemyContainerObj + // if any child object is near by nowHitPosition in 10, return true + Vector3 playerPosition = Vector3.zero; + for (int i = 0; i < enemyContainerObj.transform.childCount; i++) + { + //set enemy Position's y as 0 + playerPosition = enemyContainerObj.transform.GetChild(i).position; + playerPosition.y = 0; + // check if enemy near by nowHitPositionRelative in distance, return true + if (Vector3.Distance(playerPosition, nowHitPosition) < distance) + { + return true; + } + } + // set agentObj position's y as 0 + playerPosition = AgentObj.transform.position; + playerPosition.y = 0; + // check if agentObj near by nowHitPositionRelative in distance, return true + if (Vector3.Distance(playerPosition, nowHitPosition) < distance) + { + return true; + } + // if no enemy or agent near by, return false + return false; + } } \ No newline at end of file diff --git a/Assets/Script/Play/MousePreview.cs b/Assets/Script/Play/MousePreview.cs index c04f076..3f22f10 100644 --- a/Assets/Script/Play/MousePreview.cs +++ b/Assets/Script/Play/MousePreview.cs @@ -2,11 +2,20 @@ public class MousePreview : MonoBehaviour { + private GameObject nowMousePreviewObj; // show mousePreviewObj in mouse position - public void ChangePreviewTo(GameObject mousePreviewObj) + public void ChangePreviewTo(GameObject mousePreviewObj, bool disableCollider = false) { + // change mouse preview object to mousePreviewObj + // delete all child object DeleteAllPreviewModele(); - Instantiate(mousePreviewObj, transform.position, Quaternion.identity, this.transform); + // create new mouse preview object + nowMousePreviewObj = Instantiate(mousePreviewObj, transform.position, Quaternion.identity, this.transform); + if (disableCollider) + { + // disable mousePreviewObj collider + nowMousePreviewObj.GetComponent().enabled = false; + } } public void UpdatePreviewPosition(Vector3 previewPos) diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 76a94ac..bbd5554 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,14 +9,14 @@ EditorUserSettings: value: 55090405535008090b5608764626074415151c79747c74602b7c1861e4b96c6c flags: 0 RecentlyUsedSceneGuid-1: - value: 5453565f53020f085f5d0e72157a0844454f4c2b757d7265757a4f64b7b4313c - flags: 0 - RecentlyUsedSceneGuid-2: value: 5703025650035e5d090f087148715d4443161e2c7e2c20357b281b31b0e43060 flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-2: value: 06570c0704040b0e5a575520137b5e44154f192e292d22367c2c4866b7b3376f flags: 0 + RecentlyUsedSceneGuid-3: + value: 5453565f53020f085f5d0e72157a0844454f4c2b757d7265757a4f64b7b4313c + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3ac0acb..8e2181b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %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: -1073 - y: 88 - width: 1080 - height: 663 - m_ShowMode: 0 - m_Title: Scene - m_RootView: {fileID: 4} - m_MinSize: {x: 200, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -38,67 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 62 - y: 43 - width: 1858 - height: 1037 + x: -209 + y: 156 + width: 1839 + height: 1021 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 12} + m_Title: Console + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 ---- !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: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1080 - height: 663 - m_MinSize: {x: 200, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - 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: 1080 - height: 663 - m_MinSize: {x: 200, y: 221} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 140 ---- !u!114 &5 + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -114,18 +40,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 717 - width: 1080 - height: 270 + y: 733 + width: 1089 + height: 238 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 18} - - {fileID: 17} + - {fileID: 15} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -138,19 +64,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 5} + - {fileID: 12} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1080 - height: 987 + width: 1089 + height: 971 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 91 ---- !u!114 &7 + controlID: 128 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -166,17 +92,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 470 - width: 317 - height: 517 + y: 462 + width: 345 + height: 509 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 22} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -189,19 +115,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 7} + - {fileID: 6} + - {fileID: 4} m_Position: serializedVersion: 2 - x: 1080 + x: 1089 y: 0 - width: 317 - height: 987 + width: 345 + height: 971 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 25 ---- !u!114 &9 + controlID: 16 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -218,16 +144,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 317 - height: 470 + width: 345 + height: 462 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 20} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -240,20 +166,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} + - {fileID: 3} + - {fileID: 5} - {fileID: 8} - - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1858 - height: 987 + width: 1839 + height: 971 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 17 ---- !u!114 &11 + controlID: 127 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -268,18 +194,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1397 + x: 1434 y: 0 - width: 461 - height: 987 + width: 405 + height: 971 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 19} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,22 +218,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - {fileID: 10} - - {fileID: 14} + - {fileID: 7} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1858 - height: 1037 + width: 1839 + height: 1021 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 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -324,12 +250,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1858 + width: 1839 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -345,12 +271,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1017 - width: 1858 + y: 1001 + width: 1839 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -360,23 +286,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1080 - height: 717 - m_MinSize: {x: 101, y: 121} + width: 1089 + height: 733 + m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 16} - m_Selected: 0 + - {fileID: 13} + - {fileID: 18} + m_Selected: 1 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -396,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 62 - y: 73 - width: 1079 - height: 696 + x: 73 + y: 81 + width: 1088 + height: 712 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -410,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1079, y: 675} + m_TargetSize: {x: 1088, y: 691} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -425,10 +352,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -539.5 - m_HBaseRangeMax: 539.5 - m_VBaseRangeMin: -337.5 - m_VBaseRangeMax: 337.5 + m_HBaseRangeMin: -544 + m_HBaseRangeMax: 544 + m_VBaseRangeMin: -345.5 + m_VBaseRangeMax: 345.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -437,7 +364,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -446,29 +373,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1079 - height: 675 + width: 1088 + height: 691 m_Scale: {x: 1, y: 1} - m_Translation: {x: 539.5, y: 337.5} + m_Translation: {x: 544, y: 345.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -539.5 - y: -337.5 - width: 1079 - height: 675 + x: -544 + y: -345.5 + width: 1088 + height: 691 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1079, y: 696} + m_LastWindowPixelSize: {x: 1088, y: 712} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -496,7 +423,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -516,10 +443,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 62 - y: 790 - width: 1079 - height: 249 + x: 0 + y: 752 + width: 1088 + height: 217 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -537,7 +464,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Script/InGame + - Assets/Prefeb m_Globs: [] m_OriginalText: m_ViewMode: 1 @@ -549,10 +476,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 139} - m_SelectedIDs: a2760000 - m_LastClickedID: 30370 - m_ExpandedIDs: 000000007476000076760000787600007a7600007c7600009c76000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 03ca9a3b + m_LastClickedID: 1000000003 + m_ExpandedIDs: 0000000046670000486700004a6700004c6700004e67000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -568,7 +495,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 2} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -580,7 +507,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007476000076760000787600007a7600007c760000 + m_ExpandedIDs: 0000000046670000486700004a6700004c6700004e670000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -607,7 +534,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300008a5c000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -624,7 +551,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 2} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -636,7 +563,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 355 ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -656,10 +583,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1459 - y: 73 - width: 460 - height: 966 + x: 1435 + y: 19 + width: 404 + height: 950 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -677,7 +604,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &20 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -697,10 +624,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1142 - y: 73 - width: 315 - height: 449 + x: 1 + y: 19 + width: 343 + height: 441 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -708,9 +635,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: b80c0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 32fbffff + m_ExpandedIDs: 9ee8fffff0e8ffff44eaffff94eaffffaeeaffff32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,7 +653,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 6} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -734,7 +661,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &21 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -754,10 +681,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1073 - y: 88 - width: 1080 - height: 642 + x: -209 + y: 186 + width: 1088 + height: 712 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -768,8 +695,8 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} - snapCorner: 3 + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 id: Tool Settings index: 0 layout: 1 @@ -987,14 +914,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.954848, y: -124.757774, z: -32.582333} + m_Target: {x: 609.64667, y: 251.45477, z: 0.45881873} speed: 2 - m_Value: {x: -3.954848, y: -124.757774, z: -32.582333} + m_Value: {x: 609.64667, y: 251.45477, z: 0.45881873} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1023,17 +950,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + 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} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + 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} @@ -1041,17 +968,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.5022141, y: -0.11378048, z: 0.06679058, w: 0.85455513} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.5022141, y: 0.11378048, z: -0.06679058, w: -0.85455513} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 79.56483 + m_Target: 475.65506 speed: 2 - m_Value: 79.56483 + m_Value: 475.65506 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1.0005 m_SpeedNormalized: 0.5 @@ -1072,7 +999,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &22 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1092,10 +1019,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1142 - y: 543 - width: 315 - height: 496 + x: 1 + y: 481 + width: 343 + height: 488 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default