From 5440c56426c3beaf985157fd66cec91c19fb2ad5 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 00:11:01 -0400 Subject: [PATCH 01/13] Fixed throwing minions without direction --- Assets/Prefabs/Vampire.prefab | 4 ++++ Assets/Scripts/GameFlowManager.cs | 2 ++ Assets/Scripts/MinionThrower.cs | 20 ++++++++++++++------ Assets/Scripts/PlayerStats.cs | 3 +++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/Vampire.prefab b/Assets/Prefabs/Vampire.prefab index 8d6c6b2..649b204 100644 --- a/Assets/Prefabs/Vampire.prefab +++ b/Assets/Prefabs/Vampire.prefab @@ -69,6 +69,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d475633c5bc498fac5a9e5ead64da55, type: 3} m_Name: m_EditorClassIdentifier: + arena: {fileID: 0} gameFlowManager: {fileID: 0} k__BackingField: 100 healthBar: {fileID: 0} @@ -84,6 +85,7 @@ MonoBehaviour: deadColor: {r: 1, g: 0, b: 0, a: 1} emptyColor: {r: 1, g: 0, b: 0, a: 1} playerStats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2} + playerMovement: {fileID: 0} --- !u!114 &1967503440015794769 MonoBehaviour: m_ObjectHideFlags: 0 @@ -96,7 +98,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 56c3e06ea5db48a40a7f55e72291cb0d, type: 3} m_Name: m_EditorClassIdentifier: + arena: {fileID: 0} gameFlowManager: {fileID: 0} + playerStats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2} minionPrefabs: - {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} aimArrow: {fileID: 5124059627794595469} diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs index 6acfff4..4f6ed1f 100644 --- a/Assets/Scripts/GameFlowManager.cs +++ b/Assets/Scripts/GameFlowManager.cs @@ -53,6 +53,8 @@ public class GameFlowManager : MonoBehaviour { if (CurrentState is StartFlowState) { startPrompt.SetActive(false); SwitchState(new GameplayFlowState(this)); + } else if (CurrentState is GameplayFlowState) { + SwitchState(new PauseMenuFlowState(this)); } } diff --git a/Assets/Scripts/MinionThrower.cs b/Assets/Scripts/MinionThrower.cs index cce0b3e..ca9bfb9 100644 --- a/Assets/Scripts/MinionThrower.cs +++ b/Assets/Scripts/MinionThrower.cs @@ -8,12 +8,14 @@ public class MinionThrower : MonoBehaviour { Arena arena = null!; [SerializeField] [Required] GameFlowManager gameFlowManager = null!; + [SerializeField] [Required] + PlayerStats playerStats = null!; public Entity[] minionPrefabs; public GameObject aimArrow; bool isInThrowMode; - Vector2 throwDirection = Vector2.right; + Vector2 throwDirection; MinionBar minionBar; VampireEntity vampireEntity; PlayerMovement movement; @@ -47,7 +49,7 @@ public class MinionThrower : MonoBehaviour { if (context.performed) { isInThrowMode = true; aimArrow.SetActive(true); - } else if (context.canceled) { + } else if (context.canceled && throwDirection.magnitude >= playerStats.MinJoystickValueForThrowing) { PerformThrow(); isInThrowMode = false; aimArrow.SetActive(false); @@ -58,7 +60,10 @@ public class MinionThrower : MonoBehaviour { if (!gameFlowManager.CanDoAction) return; - throwDirection = context.ReadValue().normalized; + throwDirection = context.ReadValue(); + if (throwDirection.sqrMagnitude > 1f) + throwDirection.Normalize(); + if (vampireEntity.playerMovement.facingRight) { aimArrow.transform.rotation = Quaternion.FromToRotation(Vector2.right, throwDirection); } else { @@ -84,13 +89,16 @@ public class MinionThrower : MonoBehaviour { var newMinion = Instantiate(minionBar.GetCurrentMinion().gameObject, arena.minionParent) .GetComponent(); newMinion.arena = arena; - newMinion.transform.position = transform.position + new Vector3(throwDirection.x, throwDirection.y, 0f) * 1f; - newMinion.direction = throwDirection; + if (throwDirection == Vector2.zero) + Debug.LogWarning("Throwing with a null throwDirection."); + Vector2 normalizedDirection = throwDirection.normalized; + newMinion.transform.position = transform.position + (Vector3)normalizedDirection; + newMinion.direction = normalizedDirection; newMinion.gameFlowManager = vampireEntity.gameFlowManager; if (movement.GetSafeZoneIfImmobile() is { } safeZone) { newMinion.thrownFromSafeZone = true; - newMinion.thrownTargetPosition = safeZone.GetOutsidePosition(throwDirection); + newMinion.thrownTargetPosition = safeZone.GetOutsidePosition(normalizedDirection); } } diff --git a/Assets/Scripts/PlayerStats.cs b/Assets/Scripts/PlayerStats.cs index 6729398..82c69b0 100644 --- a/Assets/Scripts/PlayerStats.cs +++ b/Assets/Scripts/PlayerStats.cs @@ -10,4 +10,7 @@ public class PlayerStats : ScriptableObject { [field: SerializeField] [Min(0f)] public float bloodLossRate = 1f; + + [field: SerializeField] [field: Range(0f, 1f)] + public float MinJoystickValueForThrowing { get; private set; } = .4f; } \ No newline at end of file From 543ae0599b5c06cd8d44d69c9d92556296b29e5b Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 00:21:51 -0400 Subject: [PATCH 02/13] Added start button to pause game --- Assets/Scripts/AIEntity.cs | 8 ++++++++ Assets/Scripts/GameFlowManager.cs | 26 +++++++++++++++++++------- Assets/Scripts/PlayerMovement.cs | 4 ++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/AIEntity.cs b/Assets/Scripts/AIEntity.cs index 0c4080a..04eca61 100644 --- a/Assets/Scripts/AIEntity.cs +++ b/Assets/Scripts/AIEntity.cs @@ -18,12 +18,20 @@ public class AIEntity : Entity override protected void Update() { base.Update(); + + if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.TimeStop) + return; + if (currentState.UpdateState() is {} newState) SwitchState(newState); } override protected void FixedUpdate() { base.FixedUpdate(); + + if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.TimeStop) + return; + if (currentState.FixedUpdateState() is {} newState) SwitchState(newState); } diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs index 4f6ed1f..9c342c9 100644 --- a/Assets/Scripts/GameFlowManager.cs +++ b/Assets/Scripts/GameFlowManager.cs @@ -11,7 +11,8 @@ public class GameFlowManager : MonoBehaviour { public enum PauseLevel { NotPaused, PreventActions, - WorldFreeze, + NothingMoves, + TimeStop, } [field: SerializeField] @@ -39,7 +40,7 @@ public class GameFlowManager : MonoBehaviour { void SetPauseLevel(PauseLevel value) { pauseLevel = value; - Time.timeScale = value >= PauseLevel.WorldFreeze ? 0f : 1f; + Time.timeScale = value >= PauseLevel.TimeStop ? 0f : 1f; } public void GameOver() => SwitchState(new DeadFlowState(this)); @@ -50,11 +51,17 @@ public class GameFlowManager : MonoBehaviour { if (!ctx.WasPressedThisFrame(ref lastStartButton)) return; - if (CurrentState is StartFlowState) { - startPrompt.SetActive(false); - SwitchState(new GameplayFlowState(this)); - } else if (CurrentState is GameplayFlowState) { - SwitchState(new PauseMenuFlowState(this)); + switch (CurrentState) { + case StartFlowState _: + startPrompt.SetActive(false); + SwitchState(new GameplayFlowState(this)); + break; + case GameplayFlowState _: + SwitchState(new PauseMenuFlowState(this)); + break; + case PauseMenuFlowState _: + SwitchState(new GameplayFlowState(this)); + break; } } @@ -119,6 +126,11 @@ public class GameFlowManager : MonoBehaviour { public PauseMenuFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {} public override void EnterState() { + base.EnterState(); + gameFlowManager.SetPauseLevel(PauseLevel.TimeStop); + } + + public override void LeaveState() { base.EnterState(); gameFlowManager.SetPauseLevel(PauseLevel.NotPaused); } diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index c6d91cf..96078e7 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -43,7 +43,7 @@ public class PlayerMovement : MonoBehaviour { } void Update() { - if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.WorldFreeze) + if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.TimeStop) return; if (currentState.UpdateState() is {} newState) @@ -51,7 +51,7 @@ public class PlayerMovement : MonoBehaviour { } void FixedUpdate() { - if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.WorldFreeze) + if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.TimeStop) return; if (safeZone != null && IsInSafeZone) { From 93f6b72212b4503ec2bf2ecf3a12c0e513ac4e9e Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 13:21:15 -0400 Subject: [PATCH 03/13] Pause menu! --- Assets/PauseVolumeProfile.asset | 78 ++ Assets/PauseVolumeProfile.asset.meta | 8 + Assets/Prefabs/MainMenu.prefab | 954 +++++++++++++++++++++ Assets/Prefabs/MainMenu.prefab.meta | 7 + Assets/Prefabs/SceneStuff.prefab | 2 +- Assets/Scenes/JasonScene.unity | 413 +++++++-- Assets/Scenes/JasonScene.unity.meta | 2 +- Assets/Scenes/Main Menu.unity | 986 +++------------------- Assets/Scripts/GameFlowManager.cs | 48 +- Assets/Scripts/MainMenuManager.cs | 39 +- ProjectSettings/EditorBuildSettings.asset | 3 - 11 files changed, 1561 insertions(+), 979 deletions(-) create mode 100644 Assets/PauseVolumeProfile.asset create mode 100644 Assets/PauseVolumeProfile.asset.meta create mode 100644 Assets/Prefabs/MainMenu.prefab create mode 100644 Assets/Prefabs/MainMenu.prefab.meta diff --git a/Assets/PauseVolumeProfile.asset b/Assets/PauseVolumeProfile.asset new file mode 100644 index 0000000..295f632 --- /dev/null +++ b/Assets/PauseVolumeProfile.asset @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: PauseVolumeProfile + m_EditorClassIdentifier: + components: + - {fileID: 5554065589894378749} +--- !u!114 &5554065589894378749 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 1 + m_Value: 10 + min: 0 + gaussianEnd: + m_OverrideState: 1 + m_Value: 30 + min: 0 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1.263 + min: 0.5 + max: 1.5 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 0 + m_Value: 0.1 + min: 0.1 + aperture: + m_OverrideState: 1 + m_Value: 4.5 + min: 1 + max: 32 + focalLength: + m_OverrideState: 1 + m_Value: 200 + min: 1 + max: 300 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + min: 3 + max: 9 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 + min: -180 + max: 180 diff --git a/Assets/PauseVolumeProfile.asset.meta b/Assets/PauseVolumeProfile.asset.meta new file mode 100644 index 0000000..be344f0 --- /dev/null +++ b/Assets/PauseVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19d4201eb56e2de4582bf8a0a32b484a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MainMenu.prefab b/Assets/Prefabs/MainMenu.prefab new file mode 100644 index 0000000..a2379ba --- /dev/null +++ b/Assets/Prefabs/MainMenu.prefab @@ -0,0 +1,954 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4394421820717285782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421820717285783} + - component: {fileID: 4394421820717285770} + - component: {fileID: 4394421820717285769} + - component: {fileID: 4394421820717285768} + m_Layer: 5 + m_Name: Quit Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421820717285783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820717285782} + 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_Children: + - {fileID: 4394421821208592027} + m_Father: {fileID: 4394421820928219484} + m_RootOrder: 4 + 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: -50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4394421820717285770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820717285782} + m_CullTransparentMesh: 1 +--- !u!114 &4394421820717285769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820717285782} + 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!114 &4394421820717285768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820717285782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} + m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} + m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} + m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 4394421820717285769} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: QuitGame + 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: 2 +--- !u!1 &4394421820928219480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421820928219484} + - component: {fileID: 1568061621804763920} + - component: {fileID: 4394421820928219483} + - component: {fileID: 4394421820928219482} + - component: {fileID: 4394421820928219481} + m_Layer: 5 + m_Name: MainMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421820928219484 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820928219480} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 4394421822525805405} + - {fileID: 4394421822421386399} + - {fileID: 4394421821813469863} + - {fileID: 4394421821957890210} + - {fileID: 4394421820717285783} + - {fileID: 9052363376224837333} + m_Father: {fileID: 0} + 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: 0} +--- !u!114 &1568061621804763920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820928219480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8560765ad764680488938e0b0912b914, type: 3} + m_Name: + m_EditorClassIdentifier: + titleLable: {fileID: 4394421822421386384} + titleOptions: + - The Count's Last Feast + - Vampire Arena + - Out of Blood + startButton: {fileID: 4394421821813469848} +--- !u!223 &4394421820928219483 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820928219480} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &4394421820928219482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820928219480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 854, y: 480} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &4394421820928219481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421820928219480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &4394421821208592026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421821208592027} + - component: {fileID: 4394421821208592029} + - component: {fileID: 4394421821208592028} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421821208592027 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821208592026} + 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_Children: [] + m_Father: {fileID: 4394421820717285783} + 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!222 &4394421821208592029 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821208592026} + m_CullTransparentMesh: 1 +--- !u!114 &4394421821208592028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821208592026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Quit Game +--- !u!1 &4394421821306863488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421821306863489} + - component: {fileID: 4394421821306863491} + - component: {fileID: 4394421821306863490} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421821306863489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821306863488} + 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_Children: [] + m_Father: {fileID: 4394421821813469863} + 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!222 &4394421821306863491 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821306863488} + m_CullTransparentMesh: 1 +--- !u!114 &4394421821306863490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821306863488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Start +--- !u!1 &4394421821813469862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421821813469863} + - component: {fileID: 4394421821813469850} + - component: {fileID: 4394421821813469849} + - component: {fileID: 4394421821813469848} + m_Layer: 5 + m_Name: Start Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421821813469863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821813469862} + 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_Children: + - {fileID: 4394421821306863489} + m_Father: {fileID: 4394421820928219484} + m_RootOrder: 2 + 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: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4394421821813469850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821813469862} + m_CullTransparentMesh: 1 +--- !u!114 &4394421821813469849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821813469862} + 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!114 &4394421821813469848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821813469862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} + m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} + m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} + m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 4394421821813469849} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: GoToScene + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &4394421821957890209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421821957890210} + - component: {fileID: 4394421821957890213} + - component: {fileID: 4394421821957890212} + - component: {fileID: 4394421821957890211} + m_Layer: 5 + m_Name: Options + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4394421821957890210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821957890209} + 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_Children: + - {fileID: 4394421822321619687} + m_Father: {fileID: 4394421820928219484} + m_RootOrder: 3 + 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: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4394421821957890213 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821957890209} + m_CullTransparentMesh: 1 +--- !u!114 &4394421821957890212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821957890209} + 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!114 &4394421821957890211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421821957890209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} + m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} + m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} + m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 4394421821957890212} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4394421822321619686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421822321619687} + - component: {fileID: 4394421822321619673} + - component: {fileID: 4394421822321619672} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421822321619687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822321619686} + 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_Children: [] + m_Father: {fileID: 4394421821957890210} + 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!222 &4394421822321619673 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822321619686} + m_CullTransparentMesh: 1 +--- !u!114 &4394421822321619672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822321619686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!1 &4394421822421386398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421822421386399} + - component: {fileID: 4394421822421386385} + - component: {fileID: 4394421822421386384} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394421822421386399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822421386398} + 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_Children: [] + m_Father: {fileID: 4394421820928219484} + m_RootOrder: 1 + 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: 150} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4394421822421386385 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822421386398} + m_CullTransparentMesh: 1 +--- !u!114 &4394421822421386384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822421386398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '[Insert Title] + +' +--- !u!1 &4394421822525805404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394421822525805405} + - component: {fileID: 4394421822525805407} + - component: {fileID: 4394421822525805406} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4394421822525805405 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822525805404} + 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_Children: [] + m_Father: {fileID: 4394421820928219484} + 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!222 &4394421822525805407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822525805404} + m_CullTransparentMesh: 1 +--- !u!114 &4394421822525805406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394421822525805404} + 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, g: 0, b: 0, 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: 0} + 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!1 &9154125589810721893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9052363376224837333} + - component: {fileID: 5296173155622552634} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9052363376224837333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9154125589810721893} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -400.00003, y: -225.09909, z: -10.568032} + m_LocalScale: {x: 1.0568032, y: 1.0568032, z: 1.0568032} + m_Children: [] + m_Father: {fileID: 4394421820928219484} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5296173155622552634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9154125589810721893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 19d4201eb56e2de4582bf8a0a32b484a, type: 2} diff --git a/Assets/Prefabs/MainMenu.prefab.meta b/Assets/Prefabs/MainMenu.prefab.meta new file mode 100644 index 0000000..9139d3c --- /dev/null +++ b/Assets/Prefabs/MainMenu.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7671830e57aa4bd4cab63b8399c6f825 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SceneStuff.prefab b/Assets/Prefabs/SceneStuff.prefab index 3f6f9c5..e024983 100644 --- a/Assets/Prefabs/SceneStuff.prefab +++ b/Assets/Prefabs/SceneStuff.prefab @@ -394,7 +394,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 diff --git a/Assets/Scenes/JasonScene.unity b/Assets/Scenes/JasonScene.unity index 439fa60..f964c1c 100644 --- a/Assets/Scenes/JasonScene.unity +++ b/Assets/Scenes/JasonScene.unity @@ -123,6 +123,111 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &16588931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 16588932} + m_Layer: 0 + m_Name: Graveyard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &16588932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 16588931} + 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_Children: [] + m_Father: {fileID: 486965742} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &95779352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 95779355} + - component: {fileID: 95779354} + - component: {fileID: 95779353} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &95779353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 95779352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 +--- !u!114 &95779354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 95779352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &95779355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 95779352} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &330576709 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} @@ -134,36 +239,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 56c3e06ea5db48a40a7f55e72291cb0d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &615088692 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!114 &397851252 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 615088693} - m_Layer: 0 - m_Name: Gladiators - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &615088693 + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &448105178 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 1878107874060227344, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} +--- !u!4 &486965742 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 615088692} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &647315810 PrefabInstance: m_ObjectHideFlags: 0 @@ -171,6 +267,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1651771266304158935, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: weight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} propertyPath: m_Follow value: @@ -227,6 +327,30 @@ PrefabInstance: propertyPath: m_Name value: SceneStuff objectReference: {fileID: 0} + - target: {fileID: 8365024802335227867, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_Antialiasing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8365024802335227867, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_RenderPostProcessing + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: orthographic size + value: 10.5 + objectReference: {fileID: 0} + - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} --- !u!4 &720678398 stripped @@ -245,36 +369,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &851716833 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 851716834} - m_Layer: 0 - m_Name: Minions - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &851716834 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 851716833} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1359990804 PrefabInstance: m_ObjectHideFlags: 0 @@ -285,15 +379,23 @@ PrefabInstance: - target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: k__BackingField value: - objectReference: {fileID: 1621960505} + objectReference: {fileID: 16588932} - target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: k__BackingField value: - objectReference: {fileID: 851716834} + objectReference: {fileID: 1639072960} - target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: k__BackingField value: - objectReference: {fileID: 615088693} + objectReference: {fileID: 1563885829} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: UICanvas + value: + objectReference: {fileID: 448105178} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: mainMenu + value: + objectReference: {fileID: 1860550172} - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: gameTimer value: @@ -304,7 +406,7 @@ PrefabInstance: objectReference: {fileID: 1551362088} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_LocalPosition.x @@ -363,6 +465,119 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1405886140 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Name + value: MainMenu + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1359990806} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToStartFlowState + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: GameFlowManager, Assembly-CSharp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} --- !u!114 &1464970062 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} @@ -505,7 +720,7 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} m_PrefabInstance: {fileID: 647315810} m_PrefabAsset: {fileID: 0} ---- !u!1 &1621960504 +--- !u!1 &1563885828 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -513,37 +728,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1621960505} + - component: {fileID: 1563885829} m_Layer: 0 - m_Name: Graveyard + m_Name: Gladiator Parent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1621960505 +--- !u!4 &1563885829 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621960504} + m_GameObject: {fileID: 1563885828} 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 486965742} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1692771147 stripped +--- !u!1 &1639072959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1639072960} + m_Layer: 0 + m_Name: Minion Parent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1639072960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639072959} + 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_Children: [] + m_Father: {fileID: 486965742} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1860550172 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - m_PrefabInstance: {fileID: 1359990804} + m_CorrespondingSourceObject: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + m_PrefabInstance: {fileID: 1405886140} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3} + m_Script: {fileID: 11500000, guid: 8560765ad764680488938e0b0912b914, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &1942557562 @@ -719,7 +964,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_LocalPosition.x @@ -768,15 +1013,27 @@ PrefabInstance: - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: arena value: - objectReference: {fileID: 1692771147} - - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: minionParent - value: - objectReference: {fileID: 851716834} + objectReference: {fileID: 397851252} - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: objectReference: {fileID: 1359990806} + - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: minionPrefabs.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: minionPrefabs.Array.data[0] + value: + objectReference: {fileID: 2674681564269481473, guid: 6385a50f8549b2141a1daf3577c54d0a, type: 3} + - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: minionPrefabs.Array.data[1] + value: + objectReference: {fileID: 4435383994544937624, guid: d6075d2fe32cab14082dfc6d5f5ebc59, type: 3} + - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: arena + value: + objectReference: {fileID: 397851252} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: healthBar value: diff --git a/Assets/Scenes/JasonScene.unity.meta b/Assets/Scenes/JasonScene.unity.meta index 7f48c30..44abd7d 100644 --- a/Assets/Scenes/JasonScene.unity.meta +++ b/Assets/Scenes/JasonScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f81c8dca006ae164792c46bced318c31 +guid: c6d62cd589be6e2499e5bc46065557f7 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index add6c36..3e34524 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -123,260 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &281722334 +--- !u!1 &281722334 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4394421821813469862, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + m_PrefabInstance: {fileID: 4394421822085402488} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 281722335} - - component: {fileID: 281722338} - - component: {fileID: 281722337} - - component: {fileID: 281722336} - m_Layer: 5 - m_Name: Start Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &281722335 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281722334} - 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_Children: - - {fileID: 1989701881} - m_Father: {fileID: 1594283556} - m_RootOrder: 2 - 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: 50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &281722336 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281722334} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} - m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} - m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 281722337} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 607983280} - m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp - m_MethodName: GoToScene - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 1 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &281722337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281722334} - 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 &281722338 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281722334} - m_CullTransparentMesh: 1 ---- !u!1 &430338009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 430338010} - - component: {fileID: 430338013} - - component: {fileID: 430338012} - - component: {fileID: 430338011} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &430338010 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430338009} - 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_Children: - - {fileID: 840203679} - m_Father: {fileID: 1594283556} - m_RootOrder: 3 - 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: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &430338011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430338009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} - m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} - m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 430338012} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &430338012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430338009} - 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 &430338013 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430338009} - m_CullTransparentMesh: 1 --- !u!1 &607983279 GameObject: m_ObjectHideFlags: 0 @@ -420,318 +171,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &840203678 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 840203679} - - component: {fileID: 840203681} - - component: {fileID: 840203680} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &840203679 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840203678} - 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_Children: [] - m_Father: {fileID: 430338010} - 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 &840203680 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840203678} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Button ---- !u!222 &840203681 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840203678} - m_CullTransparentMesh: 1 ---- !u!1 &872860646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 872860647} - - component: {fileID: 872860649} - - component: {fileID: 872860648} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &872860647 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872860646} - 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_Children: [] - m_Father: {fileID: 1594283556} - m_RootOrder: 1 - 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: 150} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &872860648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872860646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: The very title ---- !u!222 &872860649 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872860646} - m_CullTransparentMesh: 1 ---- !u!1 &1044388900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1044388901} - - component: {fileID: 1044388903} - - component: {fileID: 1044388902} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1044388901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044388900} - 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_Children: [] - m_Father: {fileID: 1594283556} - 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 &1044388902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044388900} - 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, g: 0, b: 0, 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: 0} - 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 &1044388903 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044388900} - m_CullTransparentMesh: 1 ---- !u!1 &1291645410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1291645411} - - component: {fileID: 1291645413} - - component: {fileID: 1291645412} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1291645411 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1291645410} - 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_Children: [] - m_Father: {fileID: 1404325615} - 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 &1291645412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1291645410} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Quit Game ---- !u!222 &1291645413 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1291645410} - m_CullTransparentMesh: 1 --- !u!1 &1307199602 GameObject: m_ObjectHideFlags: 0 @@ -815,243 +254,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1404325614 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1404325615} - - component: {fileID: 1404325618} - - component: {fileID: 1404325617} - - component: {fileID: 1404325616} - m_Layer: 5 - m_Name: Quit Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1404325615 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1404325614} - 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_Children: - - {fileID: 1291645411} - m_Father: {fileID: 1594283556} - m_RootOrder: 4 - 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: -50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1404325616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1404325614} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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.8773585, g: 0.8773585, b: 0.8773585, a: 1} - m_PressedColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} - m_SelectedColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - m_DisabledColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, 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: 1404325617} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 607983280} - m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp - m_MethodName: QuitGame - 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: 2 ---- !u!114 &1404325617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1404325614} - 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 &1404325618 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1404325614} - m_CullTransparentMesh: 1 ---- !u!1 &1594283552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1594283556} - - component: {fileID: 1594283555} - - component: {fileID: 1594283554} - - component: {fileID: 1594283553} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1594283553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594283552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1594283554 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594283552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1594283555 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594283552} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1594283556 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594283552} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1044388901} - - {fileID: 872860647} - - {fileID: 281722335} - - {fileID: 430338010} - - {fileID: 1404325615} - m_Father: {fileID: 0} - m_RootOrder: 2 - 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: 0} --- !u!1 &1985129789 GameObject: m_ObjectHideFlags: 0 @@ -1127,82 +329,108 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1989701880 -GameObject: +--- !u!1001 &4394421822085402488 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1989701881} - - component: {fileID: 1989701883} - - component: {fileID: 1989701882} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1989701881 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989701880} - 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_Children: [] - m_Father: {fileID: 281722335} - 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 &1989701882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989701880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Start ---- !u!222 &1989701883 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989701880} - m_CullTransparentMesh: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4394421820717285768, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 607983280} + - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Name + value: Canvas + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 607983280} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs index 9c342c9..01f26f6 100644 --- a/Assets/Scripts/GameFlowManager.cs +++ b/Assets/Scripts/GameFlowManager.cs @@ -7,6 +7,10 @@ using UnityEngine.SceneManagement; public class GameFlowManager : MonoBehaviour { [SerializeField] [Required] GameTimer gameTimer = null!; + [SerializeField] [Required] + MainMenuManager mainMenu = null!; + [SerializeField] [Required] + Canvas UICanvas = null!; public enum PauseLevel { NotPaused, @@ -28,10 +32,7 @@ public class GameFlowManager : MonoBehaviour { #region Unity Messages void Awake() { - CurrentState = new StartFlowState(this); - if (startPrompt != null) { - startPrompt.SetActive(true); - } + CurrentState = new StartMenuFlowState(this); } void Start() => CurrentState.EnterState(); @@ -45,6 +46,11 @@ public class GameFlowManager : MonoBehaviour { public void GameOver() => SwitchState(new DeadFlowState(this)); + /// + /// For calling from main menu button + /// + public void ToStartFlowState() => SwitchState(new StartFlowState(this)); + #region Inputs public void OnStart(InputAction.CallbackContext ctx) { @@ -53,7 +59,6 @@ public class GameFlowManager : MonoBehaviour { switch (CurrentState) { case StartFlowState _: - startPrompt.SetActive(false); SwitchState(new GameplayFlowState(this)); break; case GameplayFlowState _: @@ -91,18 +96,37 @@ public class GameFlowManager : MonoBehaviour { } } + class StartMenuFlowState : GameFlowState { + public StartMenuFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {} + + public override void EnterState() { + base.EnterState(); + + gameFlowManager.mainMenu.gameObject.SetActive(true); + gameFlowManager.mainMenu.SetMenuMode(MainMenuManager.MenuMode.MainMenu); + gameFlowManager.UICanvas.gameObject.SetActive(false); + } + + public override void LeaveState() { + base.LeaveState(); + + gameFlowManager.mainMenu.ResetMenuState(); + gameFlowManager.mainMenu.gameObject.SetActive(false); + gameFlowManager.UICanvas.gameObject.SetActive(true); + } + } + class StartFlowState : GameFlowState { public StartFlowState(GameFlowManager gameFlowManager) : base(gameFlowManager) {} public override void EnterState() { base.EnterState(); - + + gameFlowManager.startPrompt.SetActive(true); gameFlowManager.SetPauseLevel(PauseLevel.PreventActions); } - public override void LeaveState() { - Debug.Log("Let the games begin!!"); - } + public override void LeaveState() => gameFlowManager.startPrompt.SetActive(false); } class GameplayFlowState : GameFlowState { @@ -127,11 +151,17 @@ public class GameFlowManager : MonoBehaviour { public override void EnterState() { base.EnterState(); + + gameFlowManager.mainMenu.gameObject.SetActive(true); + gameFlowManager.mainMenu.SetMenuMode(MainMenuManager.MenuMode.PauseMenu); gameFlowManager.SetPauseLevel(PauseLevel.TimeStop); } public override void LeaveState() { base.EnterState(); + + gameFlowManager.mainMenu.ResetMenuState(); + gameFlowManager.mainMenu.gameObject.SetActive(false); gameFlowManager.SetPauseLevel(PauseLevel.NotPaused); } } diff --git a/Assets/Scripts/MainMenuManager.cs b/Assets/Scripts/MainMenuManager.cs index 3cc7895..1b112a7 100644 --- a/Assets/Scripts/MainMenuManager.cs +++ b/Assets/Scripts/MainMenuManager.cs @@ -1,16 +1,39 @@ -using System.Collections; -using System.Collections.Generic; +using NaughtyAttributes; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class MainMenuManager : MonoBehaviour { + public enum MenuMode { + MainMenu, + PauseMenu, + } + + [SerializeField] [Required] + Text titleLable; + [SerializeField] string[] titleOptions; + [SerializeField] [Required] + Button startButton; + MenuMode mode; - public void GoToScene(int sceneNb) { - SceneManager.LoadScene(sceneNb); - } + void Awake() => mode = MenuMode.MainMenu; - public void QuitGame() { - Application.Quit(0); - } + void Start() { + if (titleOptions.Length > 0) + titleLable.text = titleOptions[Random.Range(0, titleOptions.Length)]; + } + public void SetMenuMode(MenuMode mode) { + this.mode = mode; + + startButton.gameObject.SetActive(mode == MenuMode.MainMenu); + } + + public void ResetMenuState() { + //TODO Reset selected button + } + + public void GoToScene(int sceneNb) => SceneManager.LoadScene(sceneNb); + + public void QuitGame() => Application.Quit(0); } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 13481ea..82ab0f5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,6 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/Main Menu.unity - guid: 68bb79cf26688ab46a0c4c582d1cb315 - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 2cda990e2423bbf4892e6590ba056729 From 6a81231cc9e752955e153ff7b8ea631ab43e9eed Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 13:32:49 -0400 Subject: [PATCH 04/13] Integrated SampleScene --- Assets/Prefabs/SceneStuff.prefab | 76 ++++++++++++++++ Assets/Scenes/SampleScene.unity | 143 +++++++++++++++++++++++++++++- Assets/Scripts/GameFlowManager.cs | 2 +- 3 files changed, 217 insertions(+), 4 deletions(-) diff --git a/Assets/Prefabs/SceneStuff.prefab b/Assets/Prefabs/SceneStuff.prefab index 0058de2..08f966c 100644 --- a/Assets/Prefabs/SceneStuff.prefab +++ b/Assets/Prefabs/SceneStuff.prefab @@ -132,6 +132,81 @@ PolygonCollider2D: - {x: 1, y: 1} - {x: 1, y: -1} - {x: -1, y: -1} +--- !u!1 &195694613804049071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2678552953295986148} + - component: {fileID: 1599369357879094150} + - component: {fileID: 5612306470325036634} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2678552953295986148 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195694613804049071} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8365024801698166081} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1599369357879094150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195694613804049071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!114 &5612306470325036634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195694613804049071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!1 &3328484984159178892 GameObject: m_ObjectHideFlags: 0 @@ -435,6 +510,7 @@ Transform: - {fileID: 8365024802607593188} - {fileID: 461246139} - {fileID: 1005651898} + - {fileID: 2678552953295986148} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 94da984..a328283 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -219,6 +219,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!223 &851326008 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 1878107874060227344, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} +--- !u!114 &931097994 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + m_PrefabInstance: {fileID: 1896701250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8560765ad764680488938e0b0912b914, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &938365833 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2632752448933966535, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} @@ -252,6 +268,14 @@ PrefabInstance: propertyPath: endTxt value: objectReference: {fileID: 938365833} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: UICanvas + value: + objectReference: {fileID: 851326008} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: mainMenu + value: + objectReference: {fileID: 931097994} - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: startTxt value: @@ -262,7 +286,7 @@ PrefabInstance: objectReference: {fileID: 836972483} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_LocalPosition.x @@ -353,7 +377,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_AnchorMax.x @@ -453,6 +477,119 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} m_PrefabInstance: {fileID: 647315810} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1896701250 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Name + value: MainMenu + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1359990806} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToStartFlowState + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: GameFlowManager, Assembly-CSharp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} --- !u!1001 &1942557562 PrefabInstance: m_ObjectHideFlags: 0 @@ -486,7 +623,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs index 37840ff..cfdf213 100644 --- a/Assets/Scripts/GameFlowManager.cs +++ b/Assets/Scripts/GameFlowManager.cs @@ -174,7 +174,7 @@ public class GameFlowManager : MonoBehaviour { return null; } - public override void LeaveState() => gameFlowManager.startTxt.transform.parent.gameObject.SetActive(true); + public override void LeaveState() => gameFlowManager.startTxt.transform.parent.gameObject.SetActive(false); } class GameplayFlowState : GameFlowState { From fb0ddc76eaeddec773b26acda7e38994fb9792c6 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 13:36:08 -0400 Subject: [PATCH 05/13] Forgot to hook up quit game --- Assets/Prefabs/MainMenu.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Prefabs/MainMenu.prefab b/Assets/Prefabs/MainMenu.prefab index a2379ba..36961aa 100644 --- a/Assets/Prefabs/MainMenu.prefab +++ b/Assets/Prefabs/MainMenu.prefab @@ -121,7 +121,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1568061621804763920} m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp m_MethodName: QuitGame m_Mode: 1 From c2f414ac034dcdec50e0d9bacb5ed33858ef7b35 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 13:49:44 -0400 Subject: [PATCH 06/13] Fixed minion cooldown starting half way in build --- Assets/Scripts/MinionThrower.cs | 1 + Assets/Scripts/UI/MinionBar.cs | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Assets/Scripts/MinionThrower.cs b/Assets/Scripts/MinionThrower.cs index ca9bfb9..d79f265 100644 --- a/Assets/Scripts/MinionThrower.cs +++ b/Assets/Scripts/MinionThrower.cs @@ -33,6 +33,7 @@ public class MinionThrower : MonoBehaviour { foreach (Entity minion in minionPrefabs) { minionBar.AddMinionType(minion); } + minionBar.UpdateReload(0f); } void FixedUpdate() { diff --git a/Assets/Scripts/UI/MinionBar.cs b/Assets/Scripts/UI/MinionBar.cs index 7f1b4c4..bb5c96e 100644 --- a/Assets/Scripts/UI/MinionBar.cs +++ b/Assets/Scripts/UI/MinionBar.cs @@ -16,10 +16,6 @@ public class MinionBar : MonoBehaviour { minionIcons = new List(); } - void Start() { - UpdateReload(0f); - } - public void ChangeSelectedIcon(InputAction.CallbackContext context) { float floatDelta = context.ReadValue(); From cfbde817a6c749904bb7e8db279fff3a9d4ae065 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 14:19:16 -0400 Subject: [PATCH 07/13] Sped up cam zoom and started when entering safe zone --- Assets/Prefabs/SceneStuff.prefab | 2 +- Assets/Scenes/SampleScene.unity | 4 ---- Assets/Scripts/PlayerMovement.cs | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/SceneStuff.prefab b/Assets/Prefabs/SceneStuff.prefab index 08f966c..b9256de 100644 --- a/Assets/Prefabs/SceneStuff.prefab +++ b/Assets/Prefabs/SceneStuff.prefab @@ -652,7 +652,7 @@ MonoBehaviour: m_BlendUpdateMethod: 0 m_DefaultBlend: m_Style: 1 - m_Time: 2 + m_Time: 1 m_CustomCurve: serializedVersion: 2 m_Curve: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a328283..3980bdb 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -197,10 +197,6 @@ PrefabInstance: propertyPath: m_Name value: SceneStuff objectReference: {fileID: 0} - - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} - propertyPath: orthographic size - value: 10.5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} --- !u!4 &720678398 stripped diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 266ed16..6925826 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -218,7 +218,8 @@ public class PlayerMovement : MonoBehaviour { public override void EnterState() { base.EnterState(); - + + playerMovement.globalCamera.SetActive(true); playerMovement.rb.SetEnabled(false); } From e015e467e912092e9b65459db87653ff9971bdd2 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 14:19:32 -0400 Subject: [PATCH 08/13] Replaced circle collider by flat capsule --- Assets/Prefabs/Vampire.prefab | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/Prefabs/Vampire.prefab b/Assets/Prefabs/Vampire.prefab index 3e3215f..7737c13 100644 --- a/Assets/Prefabs/Vampire.prefab +++ b/Assets/Prefabs/Vampire.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 7967951869135974023} - component: {fileID: 1214567908930553477} - component: {fileID: 945832017} - - component: {fileID: 945832018} + - component: {fileID: 7270464587938865433} m_Layer: 0 m_Name: Vampire m_TagString: Untagged @@ -337,8 +337,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!58 &945832018 -CircleCollider2D: +--- !u!70 &7270464587938865433 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -350,9 +350,9 @@ CircleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 + m_Offset: {x: 0, y: -0.25} + m_Size: {x: 1.25, y: 0.5} + m_Direction: 1 --- !u!1 &5124059627794595469 GameObject: m_ObjectHideFlags: 0 @@ -409,8 +409,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5933636161494595212} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 1, y: 0.3, z: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1.2, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 1214567908930553594} m_RootOrder: 3 @@ -492,7 +492,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6851233285413272648} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1214567908930553594} From 65216fd6df385dddcfb79a11eacf264649d69cf0 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Sun, 3 Apr 2022 14:57:57 -0400 Subject: [PATCH 09/13] AI goes around safezone --- Assets/Prefabs/Arena.prefab | 12 +- Assets/Scenes/SampleScene.unity | 52 +- Assets/Scenes/SoulahaScene.unity | 667 +++++++------------------- Assets/Scenes/SoulahaScene.unity.meta | 2 +- Assets/Scripts/AIEntity.cs | 43 +- Assets/Scripts/AIStats.cs | 1 + Assets/Scripts/Arena.cs | 4 + Assets/Scripts/SafeZone.cs | 4 + ProjectSettings/TagManager.asset | 2 +- 9 files changed, 267 insertions(+), 520 deletions(-) diff --git a/Assets/Prefabs/Arena.prefab b/Assets/Prefabs/Arena.prefab index 73b33d1..56f3bf2 100644 --- a/Assets/Prefabs/Arena.prefab +++ b/Assets/Prefabs/Arena.prefab @@ -60490,7 +60490,7 @@ GameObject: m_Component: - component: {fileID: 5600268923404240777} - component: {fileID: 8141121476733255092} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZoneTop 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -60572,7 +60572,7 @@ GameObject: m_Component: - component: {fileID: 3634272314743084365} - component: {fileID: 5328717968954431824} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZoneTop (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -60814,7 +60814,7 @@ GameObject: - component: {fileID: 1578908696495753955} - component: {fileID: 4164153230343464235} - component: {fileID: 775469634} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZone m_TagString: Untagged m_Icon: {fileID: 0} @@ -60907,7 +60907,7 @@ GameObject: m_Component: - component: {fileID: 9196727423754814334} - component: {fileID: 9196727423754814333} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZoneTop m_TagString: Untagged m_Icon: {fileID: 0} @@ -61579,7 +61579,7 @@ GameObject: m_Component: - component: {fileID: 9196727424937918672} - component: {fileID: 9196727424937918679} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZoneBorder m_TagString: Untagged m_Icon: {fileID: 0} @@ -62288,7 +62288,7 @@ GameObject: m_Component: - component: {fileID: 9196727425507413742} - component: {fileID: 9196727425507413741} - m_Layer: 0 + m_Layer: 6 m_Name: SafeZoneMoat m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 94da984..c564603 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -123,7 +123,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &397851252 stripped +--- !u!114 &171858601 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &171858602 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} m_PrefabInstance: {fileID: 1359990804} @@ -151,7 +162,7 @@ PrefabInstance: objectReference: {fileID: 720678398} - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} propertyPath: m_LocalPosition.x @@ -262,7 +273,7 @@ PrefabInstance: objectReference: {fileID: 836972483} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_LocalPosition.x @@ -310,17 +321,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} ---- !u!114 &1359990806 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - m_PrefabInstance: {fileID: 1359990804} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1464970062 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} @@ -353,7 +353,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_AnchorMax.x @@ -467,11 +467,19 @@ PrefabInstance: - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1359990806} + objectReference: {fileID: 171858601} - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1359990806} + objectReference: {fileID: 171858601} + - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnStart + objectReference: {fileID: 0} + - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnAccept + objectReference: {fileID: 0} - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: globalCamera value: @@ -479,7 +487,7 @@ PrefabInstance: - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: - objectReference: {fileID: 1359990806} + objectReference: {fileID: 171858601} - target: {fileID: 1214567908930553593, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_Name value: Vampire @@ -531,15 +539,15 @@ PrefabInstance: - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: arena value: - objectReference: {fileID: 397851252} + objectReference: {fileID: 171858602} - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: - objectReference: {fileID: 1359990806} + objectReference: {fileID: 171858601} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: arena value: - objectReference: {fileID: 397851252} + objectReference: {fileID: 171858602} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: healthBar value: @@ -547,6 +555,6 @@ PrefabInstance: - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: - objectReference: {fileID: 1359990806} + objectReference: {fileID: 171858601} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} diff --git a/Assets/Scenes/SoulahaScene.unity b/Assets/Scenes/SoulahaScene.unity index 43c61fa..f77a3a8 100644 --- a/Assets/Scenes/SoulahaScene.unity +++ b/Assets/Scenes/SoulahaScene.unity @@ -123,128 +123,33 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &343469760 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.x - value: -10.64 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.y - value: 5.28 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_Name - value: Monster (4) - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} ---- !u!1001 &378773076 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.x - value: 11.100103 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.y - value: -3.5810318 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_Name - value: Monster (2) - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} +--- !u!114 &171858601 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &171858602 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &523033548 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 793317230, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + m_PrefabInstance: {fileID: 1359990804} + m_PrefabAsset: {fileID: 0} --- !u!1001 &647315810 PrefabInstance: m_ObjectHideFlags: 0 @@ -262,7 +167,7 @@ PrefabInstance: objectReference: {fileID: 720678398} - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} propertyPath: m_LocalPosition.x @@ -308,6 +213,10 @@ PrefabInstance: propertyPath: m_Name value: SceneStuff objectReference: {fileID: 0} + - target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: orthographic size + value: 10.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} --- !u!4 &720678398 stripped @@ -315,128 +224,39 @@ Transform: m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} m_PrefabInstance: {fileID: 1942557562} m_PrefabAsset: {fileID: 0} ---- !u!1001 &804014058 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.x - value: 11.39 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.y - value: 4.18 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_Name - value: Monster (1) - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} ---- !u!1001 &992672924 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 197677485360569561, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_Name - value: Gladiator - objectReference: {fileID: 0} - - target: {fileID: 197677485360569561, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalPosition.x - value: -11.143952 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalPosition.y - value: 4.567781 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalPosition.z - value: -0.43858913 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 197677485360569565, guid: b25a487d193f24049b6a791adf592b2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b25a487d193f24049b6a791adf592b2e, type: 3} +--- !u!114 &836972483 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 344214379, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &938365833 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2632752448933966535, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1202184212 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8306990693830195191, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1359990804 PrefabInstance: m_ObjectHideFlags: 0 @@ -446,15 +266,23 @@ PrefabInstance: m_Modifications: - target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1023856483233579224, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: endTxt + value: + objectReference: {fileID: 938365833} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: startTxt + value: + objectReference: {fileID: 1202184212} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: gameTimer + value: + objectReference: {fileID: 836972483} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_LocalPosition.x @@ -500,10 +328,6 @@ PrefabInstance: propertyPath: m_Name value: Arena objectReference: {fileID: 0} - - target: {fileID: 9196727425507610131, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} --- !u!114 &1464970062 stripped @@ -517,6 +341,79 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aadb67b8f73573a44b31b015f38561ee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1494024404 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523033548} + m_Modifications: + - target: {fileID: 742580145080285188, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 742580145080285188, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalPosition.x + value: 7.9565434 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalPosition.y + value: -0.95659375 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2004725698506461419, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: arena + value: + objectReference: {fileID: 171858602} + - target: {fileID: 2004725698506461419, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: gameFlowManager + value: + objectReference: {fileID: 171858601} + - target: {fileID: 2004725698506461420, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} + propertyPath: m_Name + value: Knight Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} --- !u!1001 &1551362086 PrefabInstance: m_ObjectHideFlags: 0 @@ -538,7 +435,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_RootOrder - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1878107874060227351, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} propertyPath: m_AnchorMax.x @@ -633,128 +530,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 81a29b049c6380f4abb3c18ed121efcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1622867918 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.x - value: -11 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.y - value: -3.29 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_Name - value: Monster (3) - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} ---- !u!1001 &1826994674 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.x - value: 11.100103 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.y - value: -3.5810318 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_Name - value: Monster - objectReference: {fileID: 0} - - target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3} +--- !u!1 &1557338110 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + m_PrefabInstance: {fileID: 647315810} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1942557562 PrefabInstance: m_ObjectHideFlags: 0 @@ -762,62 +542,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.size - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_ActionId - value: d0405457-c534-4103-a0b6-cf113432b467 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_ActionId - value: 01a06960-a379-49e3-9d58-9b7c8effcb3d - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_ActionId - value: 65aa4e67-f805-47b9-adc0-444ca0e0bec8 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[16].m_ActionId - value: 5017bbb1-a56a-40c6-add6-2360873a6945 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_ActionName - value: Player/SwitchMinion[/Keyboard/q,/Keyboard/e,/XInputControllerWindows/leftShoulder,/XInputControllerWindows/rightShoulder] - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_ActionName - value: Player/Start[/Keyboard/enter] - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_ActionName - value: Player/Accept[/Keyboard/enter] - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[16].m_ActionName - value: Player/Throw[/Keyboard/r] - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -825,27 +549,11 @@ PrefabInstance: - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 171858601} - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ChangeSelectedIcon - objectReference: {fileID: 0} + objectReference: {fileID: 171858601} - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnStart @@ -854,34 +562,14 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnAccept objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MinionBar, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: GameFlowManager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: GameFlowManager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} + - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: globalCamera + value: + objectReference: {fileID: 1557338110} - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: - objectReference: {fileID: 0} + objectReference: {fileID: 171858601} - target: {fileID: 1214567908930553593, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_Name value: Vampire @@ -930,10 +618,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1214567908930553595, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: m_SortingOrder - value: 0 - objectReference: {fileID: 0} + - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: arena + value: + objectReference: {fileID: 171858602} + - target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: gameFlowManager + value: + objectReference: {fileID: 171858601} + - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: arena + value: + objectReference: {fileID: 171858602} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: healthBar value: @@ -941,11 +637,6 @@ PrefabInstance: - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: - objectReference: {fileID: 0} - - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - propertyPath: k__BackingField - value: 100 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7731321959366517533, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + objectReference: {fileID: 171858601} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} diff --git a/Assets/Scenes/SoulahaScene.unity.meta b/Assets/Scenes/SoulahaScene.unity.meta index 21d3535..3dedd8f 100644 --- a/Assets/Scenes/SoulahaScene.unity.meta +++ b/Assets/Scenes/SoulahaScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4fd48f933083f384982d5dcf93b6541c +guid: f53a63f5eab25e742b3cbb1d8f46b3fc DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/AIEntity.cs b/Assets/Scripts/AIEntity.cs index 3c75bca..a3a8916 100644 --- a/Assets/Scripts/AIEntity.cs +++ b/Assets/Scripts/AIEntity.cs @@ -1,5 +1,6 @@ #nullable enable using UnityEngine; +using System.Collections; using UnityEngine.Serialization; public class AIEntity : Entity { @@ -9,11 +10,15 @@ public class AIEntity : Entity { BaseState currentState = null!; public EntityFlag enemies { get; protected set; } public bool facingRight { get; private set; } = true; + protected Vector3 moatExtents; + protected bool isAvoiding = false; override protected void Start() { base.Start(); currentState = CreateInitialState(); currentState.EnterState(); + moatExtents = arena.GetMoatExtents(); + //StartCoroutine(StuckCheck()); } override protected void Update() { @@ -42,6 +47,16 @@ public class AIEntity : Entity { newState.EnterState(); } + IEnumerator StuckCheck(){ + yield return new WaitForSeconds(Random.Range(0f,AIStats.stuckCheckTime)); + while (true) + { + if(!isAvoiding) + AvoidObstacle(); + yield return new WaitForSeconds(AIStats.stuckCheckTime); + } + } + protected virtual BaseState CreateInitialState() => new FindTargetState(this); //Looks into enemy name list to see if the other is targetable @@ -91,6 +106,27 @@ public class AIEntity : Entity { renderer.color = new Color(diffColor.r, diffColor.g, diffColor.b, renderer.color.a); } } + + public void AvoidObstacle(){ + Physics2D.queriesHitTriggers = false; + RaycastHit2D hit = Physics2D.Raycast(transform.position, direction, attackRange, (1 << LayerMask.NameToLayer("Safezone")));//Layer 6 is safeZone + Physics2D.queriesHitTriggers = true; + if(!(hit.collider is null)){ //We have hit the safe zone + Debug.Log("hit"); + isAvoiding = true; + Vector3 avoidDir = Vector3.zero; + //Between top and bottom + if(transform.position.y > -moatExtents.y && transform.position.y < moatExtents.y){ + avoidDir.y = Mathf.Sign(direction.y) *1.5f; + + }else if(transform.position.x > -moatExtents.x && transform.position.x < moatExtents.x){//Between left and right + avoidDir.x = Mathf.Sign(direction.x) *1.5f; + } + direction += avoidDir; + }else{ + isAvoiding = false; + } + } protected abstract class BaseStateAI : BaseState{ protected AIEntity entity; @@ -126,10 +162,12 @@ public class AIEntity : Entity { } public override BaseState? FixedUpdateState() { - entity.direction = Vector3.RotateTowards(entity.direction, (entity.target.position - entity.transform.position), entity.rotSpeed * Time.fixedDeltaTime, 0.0f); + entity.direction = Vector3.RotateTowards(entity.direction, (entity.target.position - entity.transform.position), entity.rotSpeed * Time.fixedDeltaTime, 0.0f).normalized; if (entity.IsTargetable(entity.target.GetComponent())) { if (!entity.IsInAttackRange()) { + entity.AvoidObstacle(); entity.rb.MovePosition(entity.transform.position + entity.direction * entity.movementSpeed * Time.fixedDeltaTime); + // entity.animator.Play("Running"); } else { return new AttackState(entity); @@ -185,8 +223,9 @@ public class AIEntity : Entity { // entity.animator.Play("Idle"); return null; } - entity.direction = Vector3.RotateTowards(entity.direction, (roamPosition - entity.transform.position), entity.rotSpeed * Time.fixedDeltaTime, 0.0f); + entity.direction = Vector3.RotateTowards(entity.direction, (roamPosition - entity.transform.position), entity.rotSpeed * Time.fixedDeltaTime, 0.0f).normalized; if (Vector2.Distance(entity.transform.position, roamPosition) >= entity.attackRange) { + entity.AvoidObstacle(); entity.rb.MovePosition(entity.transform.position + entity.direction * entity.movementSpeed * Time.fixedDeltaTime); } else { roamPosition = entity.AIStats.getRandomRoamPositon(); diff --git a/Assets/Scripts/AIStats.cs b/Assets/Scripts/AIStats.cs index 2b3959c..eae8797 100644 --- a/Assets/Scripts/AIStats.cs +++ b/Assets/Scripts/AIStats.cs @@ -4,6 +4,7 @@ using UnityEngine; public class AIStats : ScriptableObject { [field: Min(0f)]public float closeEnough = 1f; [field: Min(0f)]public float decayTime = 5f; + [field: Min(0f)]public float stuckCheckTime = 3f; public Vector3[] roamPositions = null!; diff --git a/Assets/Scripts/Arena.cs b/Assets/Scripts/Arena.cs index 07bc709..f75403f 100644 --- a/Assets/Scripts/Arena.cs +++ b/Assets/Scripts/Arena.cs @@ -66,6 +66,10 @@ public class Arena : MonoBehaviour { } + public Vector3 GetMoatExtents(){ + return safeZone.GetMoatExtents(); + } + #if UNITY_EDITOR void OnDrawGizmosSelected() { Gizmos.color = Color.blue; diff --git a/Assets/Scripts/SafeZone.cs b/Assets/Scripts/SafeZone.cs index 610b61a..7870b56 100644 --- a/Assets/Scripts/SafeZone.cs +++ b/Assets/Scripts/SafeZone.cs @@ -12,6 +12,10 @@ public class SafeZone : MonoBehaviour { return transform.position + (moatCollider.bounds.extents.x + Stats.JumpOffset) * (Vector3)direction; } + public Vector3 GetMoatExtents(){ + return moatCollider.bounds.extents; + } + private void OnTriggerStay2D(Collider2D other) { if(!(other.GetComponent() is null)){ Vector3 diff = (other.transform.position - transform.position); diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index fcb1929..02df679 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - - Water - UI - - + - Safezone - - - From 4b96196b692d1827ec1a8e8eadf71977e5ec1da1 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 15:19:06 -0400 Subject: [PATCH 10/13] Added GameFlowState change update to kill velocity --- Assets/Scripts/Entity.cs | 8 ++++++++ Assets/Scripts/GameFlowManager.cs | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index 8c24ae3..f0c2422 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -54,6 +54,7 @@ public class Entity : MonoBehaviour { protected virtual void Start() { if (direction == Vector3.zero && !(this is VampireEntity)) Debug.LogWarning("Entity had null direction."); + gameFlowManager.stateChanged += OnGameFlowStateChanged; attackTimer = attackCooldown; initialHealth = Health; @@ -66,6 +67,8 @@ public class Entity : MonoBehaviour { protected virtual void FixedUpdate() {} + protected void OnDestroy() => gameFlowManager.stateChanged -= OnGameFlowStateChanged; + protected virtual void Attack() { } @@ -156,4 +159,9 @@ public class Entity : MonoBehaviour { public void DisableHalo() { halo.SetActive(false); } + + void OnGameFlowStateChanged(BaseState newState) { + if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.NothingMoves) + rb.velocity = Vector2.zero; + } } diff --git a/Assets/Scripts/GameFlowManager.cs b/Assets/Scripts/GameFlowManager.cs index cfdf213..82557a6 100644 --- a/Assets/Scripts/GameFlowManager.cs +++ b/Assets/Scripts/GameFlowManager.cs @@ -1,4 +1,5 @@ #nullable enable +using System; using NaughtyAttributes; using UnityEngine; using UnityEngine.InputSystem; @@ -37,6 +38,8 @@ public class GameFlowManager : MonoBehaviour { [field: SerializeField] TMP_Text startTxt; [field: SerializeField] TMP_Text endTxt; + public event Action stateChanged; + #region Unity Messages void Awake() { @@ -129,9 +132,10 @@ public class GameFlowManager : MonoBehaviour { CurrentState.LeaveState(); CurrentState = newState; newState.EnterState(); + stateChanged?.Invoke(newState); } - abstract class GameFlowState : BaseState { + public abstract class GameFlowState : BaseState { readonly protected GameFlowManager gameFlowManager; protected GameFlowState(GameFlowManager gameFlowManager) { From 417bcd9485b042f8a1f93ce67606737758fc1e47 Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 15:19:35 -0400 Subject: [PATCH 11/13] Check IsTargetable in FindTarget --- Assets/Scripts/AIEntity.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/AIEntity.cs b/Assets/Scripts/AIEntity.cs index 686e4f8..4c267b0 100644 --- a/Assets/Scripts/AIEntity.cs +++ b/Assets/Scripts/AIEntity.cs @@ -171,12 +171,17 @@ public class AIEntity : Entity { float lastDist = float.MaxValue; Transform chosenEntity = null!; foreach (Transform other in entityParent) {// Find the closest entity - float distance = Vector2.Distance(other.position, entity.transform.position); - if (distance < lastDist) { - lastDist = distance; - chosenEntity = other; - if (lastDist <= entity.AIStats.closeEnough) break; - } + if (other.GetComponent() is {} otherEntity) { + if (entity.IsTargetable(otherEntity)) { + float distance = Vector2.Distance(other.position, entity.transform.position); + if (distance < lastDist) { + lastDist = distance; + chosenEntity = other; + if (lastDist <= entity.AIStats.closeEnough) + break; + } + } + } } if (chosenEntity != null) { From e470d5e9180052b25013b1568f4de3ebc75f229c Mon Sep 17 00:00:00 2001 From: Jason Durand 01 Date: Sun, 3 Apr 2022 15:19:45 -0400 Subject: [PATCH 12/13] Add minion icon on selector bar --- Assets/Prefabs/Minion Icon.prefab | 6 +++--- Assets/Scripts/UI/MinionBar.cs | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Assets/Prefabs/Minion Icon.prefab b/Assets/Prefabs/Minion Icon.prefab index 120ee85..f001afc 100644 --- a/Assets/Prefabs/Minion Icon.prefab +++ b/Assets/Prefabs/Minion Icon.prefab @@ -114,7 +114,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.5019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -158,7 +158,7 @@ RectTransform: m_GameObject: {fileID: 1979632679604795357} 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_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] m_Father: {fileID: 1979632678310270258} m_RootOrder: 1 @@ -166,7 +166,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1979632679604795352 CanvasRenderer: diff --git a/Assets/Scripts/UI/MinionBar.cs b/Assets/Scripts/UI/MinionBar.cs index bb5c96e..0d899de 100644 --- a/Assets/Scripts/UI/MinionBar.cs +++ b/Assets/Scripts/UI/MinionBar.cs @@ -41,9 +41,11 @@ public class MinionBar : MonoBehaviour { public void AddMinionType(Entity newMinionPrefab) { minionTypes.Add(newMinionPrefab); - MinionIcon newIcon = Instantiate(minionIconPrefab, transform).GetComponent(); + MinionIcon newIcon = Instantiate(minionIconPrefab, transform) + .GetComponent(); minionIcons.Add(newIcon); - // minionIcons[i].icon = minionTypes.icon; // TODO + newIcon.icon.sprite = newMinionPrefab.renderer.sprite; + newIcon.icon.preserveAspect = true; newIcon.indexInMinionList = minionIcons.Count; if (currentIndex == minionIcons.Count - 1) { newIcon.Select(); From e2ef01755a260b9770b0a7298eb7200d59385674 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Sun, 3 Apr 2022 15:26:26 -0400 Subject: [PATCH 13/13] Health bar different color for monster/gladiator --- Assets/Prefabs/Health Bar Canvas.prefab | 2 +- Assets/Prefabs/Monster.prefab | 12 ++ Assets/Scenes/SoulahaScene.unity | 213 ++++++++++++++---------- Assets/Scenes/SoulahaScene.unity.meta | 2 +- 4 files changed, 142 insertions(+), 87 deletions(-) diff --git a/Assets/Prefabs/Health Bar Canvas.prefab b/Assets/Prefabs/Health Bar Canvas.prefab index 7378fc2..b95b3e3 100644 --- a/Assets/Prefabs/Health Bar Canvas.prefab +++ b/Assets/Prefabs/Health Bar Canvas.prefab @@ -233,7 +233,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6603774, g: 0.14017446, b: 0.14017446, a: 1} + m_Color: {r: 0.2284176, g: 0.5566038, b: 0.27934304, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Prefabs/Monster.prefab b/Assets/Prefabs/Monster.prefab index 75cd605..de5b60e 100644 --- a/Assets/Prefabs/Monster.prefab +++ b/Assets/Prefabs/Monster.prefab @@ -428,6 +428,18 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2962150095172694673, guid: d1d8f8326b5490848a9400aa9bd6b2f4, type: 3} + propertyPath: m_Color.b + value: 0.14017446 + objectReference: {fileID: 0} + - target: {fileID: 2962150095172694673, guid: d1d8f8326b5490848a9400aa9bd6b2f4, type: 3} + propertyPath: m_Color.g + value: 0.14017446 + objectReference: {fileID: 0} + - target: {fileID: 2962150095172694673, guid: d1d8f8326b5490848a9400aa9bd6b2f4, type: 3} + propertyPath: m_Color.r + value: 0.6603774 + objectReference: {fileID: 0} - target: {fileID: 2962150095602046905, guid: d1d8f8326b5490848a9400aa9bd6b2f4, type: 3} propertyPath: m_IsActive value: 1 diff --git a/Assets/Scenes/SoulahaScene.unity b/Assets/Scenes/SoulahaScene.unity index f77a3a8..eb6d8d1 100644 --- a/Assets/Scenes/SoulahaScene.unity +++ b/Assets/Scenes/SoulahaScene.unity @@ -140,16 +140,11 @@ MonoBehaviour: m_PrefabInstance: {fileID: 1359990804} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &523033548 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 793317230, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - m_PrefabInstance: {fileID: 1359990804} - m_PrefabAsset: {fileID: 0} --- !u!1001 &647315810 PrefabInstance: m_ObjectHideFlags: 0 @@ -235,6 +230,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!223 &851326008 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 1878107874060227344, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} +--- !u!114 &931097994 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + m_PrefabInstance: {fileID: 1896701250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8560765ad764680488938e0b0912b914, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &938365833 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2632752448933966535, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} @@ -264,14 +275,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: endTxt value: objectReference: {fileID: 938365833} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: UICanvas + value: + objectReference: {fileID: 851326008} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: mainMenu + value: + objectReference: {fileID: 931097994} - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: startTxt value: @@ -282,7 +297,7 @@ PrefabInstance: objectReference: {fileID: 836972483} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_RootOrder - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: m_LocalPosition.x @@ -341,79 +356,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aadb67b8f73573a44b31b015f38561ee, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1494024404 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 523033548} - m_Modifications: - - target: {fileID: 742580145080285188, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 742580145080285188, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalPosition.x - value: 7.9565434 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalPosition.y - value: -0.95659375 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461416, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2004725698506461419, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: arena - value: - objectReference: {fileID: 171858602} - - target: {fileID: 2004725698506461419, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: gameFlowManager - value: - objectReference: {fileID: 171858601} - - target: {fileID: 2004725698506461420, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} - propertyPath: m_Name - value: Knight Variant - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f75821098c495cb43a0bff5d9ef0a671, type: 3} --- !u!1001 &1551362086 PrefabInstance: m_ObjectHideFlags: 0 @@ -535,6 +477,107 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} m_PrefabInstance: {fileID: 647315810} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1896701250 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Name + value: MainMenu + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421820928219484, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 171858601} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3} --- !u!1001 &1942557562 PrefabInstance: m_ObjectHideFlags: 0 @@ -576,7 +619,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/SoulahaScene.unity.meta b/Assets/Scenes/SoulahaScene.unity.meta index 3dedd8f..6a70b89 100644 --- a/Assets/Scenes/SoulahaScene.unity.meta +++ b/Assets/Scenes/SoulahaScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f53a63f5eab25e742b3cbb1d8f46b3fc +guid: 9145057a34a60964eb8cc79037227889 DefaultImporter: externalObjects: {} userData: