From a12f88ba6a2d0ec1ec757c30ea997c00acfd5896 Mon Sep 17 00:00:00 2001 From: SKOLX Date: Thu, 25 Apr 2024 23:44:04 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=20=D1=84=D0=B0=D0=B9=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DarkPortal/Assets/C# scripts/Fight.cs | 69 ++++++++- .../Images/Knight/Animation/Idle_0.controller | 2 +- DarkPortal/Assets/PlayerController.cs | 58 +------ DarkPortal/Assets/Scenes/Game.unity | 2 +- .../UserSettings/Layouts/default-2022.dwlt | 144 +++++++++--------- 5 files changed, 138 insertions(+), 137 deletions(-) diff --git a/DarkPortal/Assets/C# scripts/Fight.cs b/DarkPortal/Assets/C# scripts/Fight.cs index 238ed969..11a7db75 100644 --- a/DarkPortal/Assets/C# scripts/Fight.cs +++ b/DarkPortal/Assets/C# scripts/Fight.cs @@ -13,22 +13,27 @@ enum EntityForFight } public class Fight : MonoBehaviour { - public GameObject mob; public GameObject player; + private bool facingRight; private bool isPlayerTurn = true; + + private Animator animator; // Start is called before the first frame update void Start() { + animator = player.GetComponent(); RandomFight(); } // Update is called once per frame void Update() { - RandomMashine(); + if (TriggetTest.fight) + StartCoroutine(RandomMashine()); + } @@ -39,20 +44,70 @@ private void RandomFight() } - private void RandomMashine() + private IEnumerator RandomMashine() { if (isPlayerTurn) { - // Логика действий игрока Debug.Log("Ход игрока"); + if (Input.GetKeyDown(KeyCode.Z)) + { + StartCoroutine(Attack()); + + yield return StartCoroutine(Attack()); + + isPlayerTurn = !isPlayerTurn; + } } else { - // Логика действий противника + if (Input.GetKeyDown(KeyCode.X)) + { + // Атака Моба + isPlayerTurn = !isPlayerTurn; + } Debug.Log("Ход противника"); + } + } + + + IEnumerator Attack() + { + var geolocationNow = player.transform.position.x; + var moveSpeed = 30f; // Скорость движения + + animator.SetTrigger("runForAttack1"); + while (player.transform.position.x < geolocationNow + 70) + { + player.transform.position += new Vector3(moveSpeed * Time.deltaTime, 0, 0); + yield return null; } - isPlayerTurn = !isPlayerTurn; // Переключение хода + animator.SetTrigger("attack1"); + yield return new WaitForSeconds(1f); + + animator.SetTrigger("runForAttack1"); + + while (player.transform.position.x > geolocationNow) + { + player.transform.position -= new Vector3(moveSpeed * Time.deltaTime, 0, 0); + yield return null; + } + + animator.SetTrigger("default"); + } + + + + public void OnButtonClick() + { + StartCoroutine(Attack()); + } + + private void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag("Player")) + { + player.GetComponent().speed = 0; + } } - } diff --git a/DarkPortal/Assets/Images/Knight/Animation/Idle_0.controller b/DarkPortal/Assets/Images/Knight/Animation/Idle_0.controller index 64c6990a..9dea6d9f 100644 --- a/DarkPortal/Assets/Images/Knight/Animation/Idle_0.controller +++ b/DarkPortal/Assets/Images/Knight/Animation/Idle_0.controller @@ -405,7 +405,7 @@ AnimatorStateMachine: m_Position: {x: 400, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: 747127529605747167} - m_Position: {x: 600, y: 150, z: 0} + m_Position: {x: 580, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 6769263951143269717} diff --git a/DarkPortal/Assets/PlayerController.cs b/DarkPortal/Assets/PlayerController.cs index 9a3dcb87..41c69575 100644 --- a/DarkPortal/Assets/PlayerController.cs +++ b/DarkPortal/Assets/PlayerController.cs @@ -8,7 +8,6 @@ public class PlayerController : MonoBehaviour private Rigidbody2D rb; private SpriteRenderer sr; public Animator Animator; - private bool facingRight = true; private float moveInput; private int hp; private int dexterity; @@ -28,18 +27,14 @@ void FixedUpdate() private void CallEvent() { - if (Input.GetKeyDown(KeyCode.Z)) - { - StartCoroutine(Attack()); - } - if (Input.GetKeyDown(KeyCode.L)) { var health = gameObject.GetComponent(); health.TakeHit(10); } } - + + private IEnumerator movementPlayer() { var horizontalMove = Input.GetAxis("Horizontal") * speed; @@ -65,53 +60,4 @@ private IEnumerator movementPlayer() yield return new WaitForSeconds(1f); } } - - public void OnButtonClick() - { - StartCoroutine(Attack()); - } - - private void OnTriggerEnter2D(Collider2D other) - { - if (other.CompareTag("Fight")) - { - speed = 0; - } - } - - void FlipForFight() - { - facingRight = !facingRight; - var Scalar = transform.localScale; - Scalar.x *= -1; - transform.localScale = Scalar; - } - - IEnumerator Attack() - { - var geolocationNow = transform.position.x; - var moveSpeed = 50f; // Скорость движения - - Animator.SetTrigger("runForAttack1"); - while (transform.position.x < geolocationNow + 70) - { - transform.position += new Vector3(moveSpeed * Time.deltaTime, 0, 0); - yield return null; - } - - Animator.SetTrigger("attack1"); - yield return new WaitForSeconds(1f); - FlipForFight(); - - Animator.SetTrigger("runForAttack1"); - - while (transform.position.x > geolocationNow) - { - transform.position -= new Vector3(moveSpeed * Time.deltaTime, 0, 0); - yield return null; - } - - FlipForFight(); - Animator.SetTrigger("default"); - } } diff --git a/DarkPortal/Assets/Scenes/Game.unity b/DarkPortal/Assets/Scenes/Game.unity index fb29f7fe..aa766c56 100644 --- a/DarkPortal/Assets/Scenes/Game.unity +++ b/DarkPortal/Assets/Scenes/Game.unity @@ -2649,7 +2649,7 @@ Canvas: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1407398961} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} diff --git a/DarkPortal/UserSettings/Layouts/default-2022.dwlt b/DarkPortal/UserSettings/Layouts/default-2022.dwlt index b26e3d9e..1db5f33a 100644 --- a/DarkPortal/UserSettings/Layouts/default-2022.dwlt +++ b/DarkPortal/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1600 height: 918 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 7} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -47,7 +47,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 92 + controlID: 44 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -72,7 +72,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 93 + controlID: 45 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -88,19 +88,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 992.5 + x: 897 y: 0 - width: 607.5 + width: 703 height: 868 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} - {fileID: 13} - {fileID: 17} m_Selected: 2 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -118,7 +118,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 242.5 + width: 219.5 height: 594.5 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} @@ -144,7 +144,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 594.5 - width: 992.5 + width: 897 height: 273.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -245,12 +245,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 992.5 + width: 897 height: 868 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 45 + controlID: 46 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -270,12 +270,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 992.5 + width: 897 height: 594.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 46 + controlID: 47 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -286,23 +286,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 242.5 + x: 219.5 y: 0 - width: 750 + width: 677.5 height: 594.5 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 21} m_Panes: - {fileID: 19} - {fileID: 21} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -323,9 +323,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 992.5 + x: 897 y: 72 - width: 606.5 + width: 702 height: 847 m_SerializedDataModeController: m_DataMode: 0 @@ -343,14 +343,14 @@ MonoBehaviour: - {fileID: 923725569678524397, guid: a2001e2ea9df9f244b53647a1c416734, type: 2} - {fileID: -1001653460733967460, guid: 91c4367b88ad5f842b414279ac68acd6, type: 2} m_ValueSerializationHelper: - - e00: 1.9887273 + - e00: 0.3349666 e01: 0 e02: 0 - e03: -10.397278 + e03: 244.22734 e10: 0 - e11: 1.9887273 + e11: 0.3349666 e12: 0 - e13: 517.0691 + e13: 243.81769 e20: 0 e21: 0 e22: 1 @@ -443,7 +443,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -36822 + m_LastSelectedObjectID: 29256 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -464,9 +464,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 992.5 + x: 897 y: 72 - width: 606.5 + width: 702 height: 847 m_SerializedDataModeController: m_DataMode: 0 @@ -489,7 +489,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Images/Knight + - Assets/C# scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -497,16 +497,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Images/Knight + - Assets/C# scripts m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\dbuta\Documents\SharpGame\DarkPortal m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: b0740000 - m_LastClickedID: 29872 - m_ExpandedIDs: 00000000d47200006474000000ca9a3bffffff7f + m_SelectedIDs: d8740000 + m_LastClickedID: 29912 + m_ExpandedIDs: 00000000c474000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -534,7 +534,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d4720000 + m_ExpandedIDs: 00000000c4740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -559,8 +559,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 90adffff - m_LastClickedInstanceID: -21104 + m_SelectedInstanceIDs: 48720000 + m_LastClickedInstanceID: 29256 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: 286a00009a690000607000007870000000000000d272000040730000ee70000020770000aa740000 m_RenameOverlay: @@ -589,7 +589,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 160 + m_DirectoriesAreaWidth: 163.5 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -612,7 +612,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 666.5 - width: 991.5 + width: 896 height: 252.5 m_SerializedDataModeController: m_DataMode: 0 @@ -649,10 +649,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 60740000 - m_LastClickedID: 29792 - m_ExpandedIDs: 00000000d47200006474000070740000b0740000b87f000000ca9a3bffffff7f + scrollPos: {x: 0, y: 60} + m_SelectedIDs: d8740000 + m_LastClickedID: 29912 + m_ExpandedIDs: 00000000c474000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -680,7 +680,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d4720000 + m_ExpandedIDs: 00000000c4740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -756,9 +756,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 992.5 + x: 897 y: 72 - width: 606.5 + width: 702 height: 847 m_SerializedDataModeController: m_DataMode: 0 @@ -805,7 +805,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 72 - width: 241.5 + width: 218.5 height: 573.5 m_SerializedDataModeController: m_DataMode: 0 @@ -820,23 +820,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c44a0000 - m_LastClickedID: 0 - m_ExpandedIDs: fafaffff3e710000547100008a710000bc710000ce710000e2710000 + m_SelectedIDs: 48720000 + m_LastClickedID: 29256 + m_ExpandedIDs: e8faffff30720000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Player - m_OriginalName: Player + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 29154 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -866,9 +866,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 242.5 + x: 219.5 y: 72 - width: 748 + width: 675.5 height: 573.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1254,9 +1254,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1041.4731, y: 524.23395, z: -9.052893} + m_Target: {x: 76.894295, y: 27.822527, z: -1.1490896} speed: 2 - m_Value: {x: 1041.4731, y: 524.23395, z: -9.052893} + m_Value: {x: 76.894295, y: 27.822527, z: -1.1490896} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1306,9 +1306,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 915.29175 + m_Target: 250.37042 speed: 2 - m_Value: 915.29175 + m_Value: 250.37042 m_Ortho: m_Target: 1 speed: 2 @@ -1387,9 +1387,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 242.5 + x: 219.5 y: 72 - width: 748 + width: 675.5 height: 573.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1445,23 +1445,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 748 + width: 675.5 height: 552.5 - m_Scale: {x: 0.77916664, y: 0.77916664} - m_Translation: {x: 374, y: 276.25} + m_Scale: {x: 1.1509535, y: 1.1509535} + m_Translation: {x: 337.60403, y: 241.74254} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -480.00003 - y: -354.54547 - width: 960.00006 - height: 709.09094 + x: -293.3255 + y: -210.03674 + width: 586.90466 + height: 480.03674 m_MinimalGUI: 1 - m_defaultScale: 0.77916664 - m_LastWindowPixelSize: {x: 1496, y: 1147} + m_defaultScale: 0.7036458 + m_LastWindowPixelSize: {x: 1351, y: 1147} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000