Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 62 additions & 7 deletions DarkPortal/Assets/C# scripts/Fight.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Animator>();
RandomFight();
}

// Update is called once per frame
void Update()
{
RandomMashine();
if (TriggetTest.fight)
StartCoroutine(RandomMashine());

}


Expand All @@ -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<PlayerController>().speed = 0;
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
58 changes: 2 additions & 56 deletions DarkPortal/Assets/PlayerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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>();
health.TakeHit(10);
}
}



private IEnumerator movementPlayer()
{
var horizontalMove = Input.GetAxis("Horizontal") * speed;
Expand All @@ -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");
}
}
2 changes: 1 addition & 1 deletion DarkPortal/Assets/Scenes/Game.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading