diff --git a/Assets/Explosion.cs b/Assets/Explosion.cs index e60fe50..6a01e76 100644 --- a/Assets/Explosion.cs +++ b/Assets/Explosion.cs @@ -17,8 +17,10 @@ public class Explosion : MonoBehaviour public GameObject NPC1_cell_door; public GameObject NPC2_cell_door; public TMP_Text lvl2_npc_dialogue; + public TMP_Text lvl2_npc_dialogue_2; public string[] dialogue_options = new string[5]; private string selected_dialogue; + private string selected_dialogue_2; public bool playerIsClose; private bool pointsAdded = false; @@ -45,8 +47,12 @@ void Update() NPC2_cell_door.SetActive(false); NPC1_dialogue_panel.SetActive(false); NPC2_dialogue_panel.SetActive(false); - selected_dialogue = dialogue_options[Random.Range(0, dialogue_options.Length)]; + int index = Random.Range(0, dialogue_options.Length); + int index_2 = (index + 1) % 5; + selected_dialogue = dialogue_options[index]; + selected_dialogue_2 = dialogue_options[index_2]; lvl2_npc_dialogue.text = selected_dialogue; + lvl2_npc_dialogue_2.text = selected_dialogue_2; if (!pointsAdded) { ScoreManager.instance.AdddPoints(-40, -40); diff --git a/Assets/KeyToOpemDoor.cs b/Assets/KeyToOpemDoor.cs index 48dce84..f41059f 100644 --- a/Assets/KeyToOpemDoor.cs +++ b/Assets/KeyToOpemDoor.cs @@ -14,8 +14,10 @@ public class KeyToOpemDoor : MonoBehaviour public TMP_Text npc1_dialogue; public TMP_Text npc2_dialogue; public TMP_Text lvl2_npc_dialogue; + public TMP_Text lvl2_npc_dialogue_2; public string[] dialogue_options = new string[5]; private string selected_dialogue; + private string selected_dialogue_2; public bool playerIsClose; private bool pointsAdded = false; @@ -37,8 +39,12 @@ void Update() NPC2_cell_door.SetActive(false); npc1_dialogue.text = "We're Free!"; npc2_dialogue.text = "We're Free!"; - selected_dialogue = dialogue_options[Random.Range(0, dialogue_options.Length)]; + int index = Random.Range(0, dialogue_options.Length); + int index_2 = (index + 1) % 5; + selected_dialogue = dialogue_options[index]; + selected_dialogue_2 = dialogue_options[index_2]; lvl2_npc_dialogue.text = selected_dialogue; + lvl2_npc_dialogue_2.text = selected_dialogue_2; if (!pointsAdded) { ScoreManager.instance.AdddPoints(15, 15); diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 40a0b62..ec16de9 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -478,6 +478,141 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a057178eb028e94fb93bf39262ea3e8, type: 3} +--- !u!1 &111848983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 111848984} + - component: {fileID: 111848986} + - component: {fileID: 111848985} + m_Layer: 5 + m_Name: DialgoueText_lvl12_NPC_decision + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &111848984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111848983} + 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: 2039963825} + 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: -613, y: 323} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &111848985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111848983} + 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: Placeholder text until decison has been made. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 100 + m_fontSizeBase: 100 + 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: 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: 171.73457, y: 82.63407, z: -1056.6566, w: -558.24005} + 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 &111848986 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111848983} + m_CullTransparentMesh: 1 --- !u!1 &165106702 GameObject: m_ObjectHideFlags: 0 @@ -2121,6 +2256,115 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &638845131 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5628018141983903104, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Name + value: NPC_Prisoner_Decision_2 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903104, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903104, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_RootOrder + value: 39 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.49 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalPosition.y + value: 30.94 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903106, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903116, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Size.x + value: 0.85596585 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903116, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Size.y + value: 1.3806353 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903116, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Offset.x + value: 0.13669693 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903116, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Offset.y + value: 0.5760298 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903116, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5628018141983903119, guid: ef67ba864d1ecc042b5f4cf48455c0a6, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef67ba864d1ecc042b5f4cf48455c0a6, type: 3} --- !u!1 &666850676 GameObject: m_ObjectHideFlags: 0 @@ -2442,7 +2686,7 @@ PrefabInstance: - target: {fileID: 5628018141983903104, guid: ef67ba864d1ecc042b5f4cf48455c0a6, type: 3} propertyPath: m_Name - value: NPC Prisoner 1 (1) + value: NPC_Prisoner_Decision_1 objectReference: {fileID: 0} - target: {fileID: 5628018141983903104, guid: ef67ba864d1ecc042b5f4cf48455c0a6, type: 3} @@ -3013,6 +3257,7 @@ MonoBehaviour: npc1_dialogue: {fileID: 1785733177} npc2_dialogue: {fileID: 1613724312} lvl2_npc_dialogue: {fileID: 1170865931} + lvl2_npc_dialogue_2: {fileID: 111848985} dialogue_options: - Please free us too! - You're a savior! @@ -12369,7 +12614,7 @@ GameObject: - component: {fileID: 1483102799} - component: {fileID: 1483102798} m_Layer: 5 - m_Name: DialoguePanel_lvl2_NPC_decision + m_Name: DialoguePanel_lvl2_NPC_decision_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13010,6 +13255,7 @@ MonoBehaviour: NPC1_cell_door: {fileID: 718623735} NPC2_cell_door: {fileID: 2140065954} lvl2_npc_dialogue: {fileID: 1170865931} + lvl2_npc_dialogue_2: {fileID: 111848985} dialogue_options: - You killed the other prisoners, stay away from us! - You're a murderer! @@ -13555,6 +13801,7 @@ RectTransform: - {fileID: 424252270} - {fileID: 1563829868} - {fileID: 1483102797} + - {fileID: 2039963825} m_Father: {fileID: 0} m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19888,6 +20135,83 @@ MonoBehaviour: speed: 1 defaultDirection: Right startWaitTime: 2 +--- !u!1 &2039963824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039963825} + - component: {fileID: 2039963827} + - component: {fileID: 2039963826} + m_Layer: 5 + m_Name: DialoguePanel_lvl2_NPC_decision_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2039963825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039963824} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.0029970447, y: 0.0028442175, z: 0.16793522} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 111848984} + m_Father: {fileID: 1807112022} + m_RootOrder: 6 + 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: 13.42, y: 42.62} + m_SizeDelta: {x: 1132.154, y: 538.4531} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2039963826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039963824} + 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: 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: 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 &2039963827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039963824} + m_CullTransparentMesh: 1 --- !u!224 &2091464831 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6110521548605388346, guid: 24189886e606348d4a960fb02506b955, diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index be4113f..faee80b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 10488 + controlID: 74 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1340 + width: 1338 height: 977 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 10489 + controlID: 75 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1340 + width: 1338 height: 694 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 10490 + controlID: 76 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,7 +187,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 278 + width: 303 height: 694 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -211,9 +211,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 278 + x: 303 y: 0 - width: 1062 + width: 1035 height: 694 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -233,24 +233,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 694 - width: 1340 + width: 1338 height: 283 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -266,12 +266,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1340 + x: 1338 y: 0 - width: 580 + width: 582 height: 977 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -298,9 +298,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1958 + x: 1983 y: 83 - width: 1060 + width: 1033 height: 673 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -314,7 +314,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1060, y: 652} + m_TargetSize: {x: 1033, y: 652} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -329,8 +329,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -530 - m_HBaseRangeMax: 530 + m_HBaseRangeMin: -516.5 + m_HBaseRangeMax: 516.5 m_VBaseRangeMin: -326 m_VBaseRangeMax: 326 m_HAllowExceedBaseRangeMin: 1 @@ -350,23 +350,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1060 + width: 1033 height: 652 m_Scale: {x: 1, y: 1} - m_Translation: {x: 530, y: 326} + m_Translation: {x: 516.5, y: 326} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -530 + x: -516.5 y: -326 - width: 1060 + width: 1033 height: 652 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1060, y: 673} + m_LastWindowPixelSize: {x: 1033, y: 673} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -395,7 +395,7 @@ MonoBehaviour: serializedVersion: 2 x: 1680 y: 83 - width: 277 + width: 302 height: 673 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -403,10 +403,10 @@ MonoBehaviour: m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 164} - m_SelectedIDs: fef6ffff - m_LastClickedID: -2306 - m_ExpandedIDs: 3aeaffff2af6ffff2cfbffffac5f000000600000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 621d0000 + m_LastClickedID: 0 + m_ExpandedIDs: 58f2ffff2cfbffffc85e0000ac5f000000600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -451,9 +451,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1958 + x: 1983 y: 83 - width: 1060 + width: 1033 height: 673 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -711,9 +711,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.59952015, y: 26.54132, z: -0.15575743} + m_Target: {x: -4.215907, y: 23.930368, z: 0.4531364} speed: 2 - m_Value: {x: -0.59952015, y: 26.54132, z: -0.15575743} + m_Value: {x: -4.2165403, y: 23.92901, z: 0.45305276} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -764,9 +764,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 13.380003 + m_Target: 5.567557 speed: 2 - m_Value: 13.380003 + m_Value: 5.575921 m_Ortho: m_Target: 1 speed: 2 @@ -814,7 +814,7 @@ MonoBehaviour: serializedVersion: 2 x: 1680 y: 777 - width: 1339 + width: 1337 height: 262 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -876,7 +876,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f0620000f2620000f4620000f6620000f8620000fa620000fc62000000ca9a3b + m_ExpandedIDs: 00000000f0620000f2620000f4620000f6620000f8620000fa620000fc620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -901,8 +901,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 00600000 - m_LastClickedInstanceID: 24576 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000ac92000032840000000000008a6100001a62000024620000 m_RenameOverlay: @@ -955,7 +955,7 @@ MonoBehaviour: serializedVersion: 2 x: 1680 y: 777 - width: 1339 + width: 1337 height: 262 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -992,7 +992,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -2306 + m_LastSelectedObjectID: 24576 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1014,9 +1014,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3020 + x: 3018 y: 83 - width: 579 + width: 581 height: 956 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: