Skip to content

Дз 1.3 Аушев Хасан #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haseaushev-svg wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Дз 1.3 Аушев Хасан #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2fade68
Update BotController.cs
haseaushev-svg Aug 15, 2026
99cbe43
commit
Aug 15, 2026
948f57d
Update BotController.cs
haseaushev-svg Aug 15, 2026
7f41174
how are u Mira?
haseaushev-svg Aug 15, 2026
4194a68
Gan
Aug 16, 2026
f0bf102
Merge branch 'main' of https://github.com/haseaushev-svg/CSharpMainPr…
Aug 16, 2026
b0a2580
r
Aug 16, 2026
a4fc143
Misforts
Aug 16, 2026
37d0cd9
Дз 1.4
Sep 7, 2026
5d9c2da
Misforts
Aug 16, 2026
ea4b363
Merge branch 'Gandi1' of https://github.com/haseaushev-svg/CSharpMain…
Sep 7, 2026
3897d0c
Дз 1.3
Sep 8, 2026
cc93f8b
дз 1.3
Sep 8, 2026
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
Binary file added .vs/CSharpMainProject/CopilotIndices/18.9.1306.19527/SemanticSymbols.db
View file
Open in desktop
Binary file not shown.
Binary file added .vs/CSharpMainProject/FileContentIndex/a01f1b7c-eec9-4a94-87d9-4d6e282dfe06.vsidx
View file
Open in desktop
Binary file not shown.
Binary file added .vs/CSharpMainProject/v18/.suo
View file
Open in desktop
Binary file not shown.
37 changes: 37 additions & 0 deletions .vs/CSharpMainProject/v18/DocumentLayout.backup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|solutionrelative:Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAAgAAAAAAAAAAAAQwBwAAAAiAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-09-06T23:30:56.597Z",
"EditorCaption": ""
}
]
}
]
}
]
}
54 changes: 54 additions & 0 deletions .vs/CSharpMainProject/v18/DocumentLayout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\",
"Documents": [
{
"AbsoluteMoniker": "D:2:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|c:\\users\\daye\\desktop\\fork\\csharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:2:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:1:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|c:\\users\\daye\\desktop\\fork\\csharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:1:0:{30E4A36B-DBC1-3EB5-7C27-41F2EDC2C301}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAAYAAAAAAAAAAAAAAA0AAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-09-06T23:30:56.597Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Daye\\Desktop\\Fork\\CSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-09-08T08:39:52.973Z",
"EditorCaption": ""
}
]
}
]
}
]
}
4 changes: 2 additions & 2 deletions Assets/Scripts/Controller/BotController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
using Model.Config;
using UnityEngine;
using Utilities;
//hello
//How are you?
//hello, i Has...
//How are you Mira?
//i'm fine
namespace Controller
{
Expand Down
5 changes: 4 additions & 1 deletion Assets/Scripts/EnterPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ public class EnterPoint : MonoBehaviour
[SerializeField] private Settings _settings;
[SerializeField] private Canvas _targetCanvas;
private float _timeScale = 1;

// Hi. My Mira
/*/
* is this you?
* /*/
void Start()
{
Time.timeScale = _timeScale;
Expand Down
18 changes: 9 additions & 9 deletions Assets/Scripts/Model/Runtime/Projectiles/ArchToTileProjectile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public class ArchToTileProjectile : BaseProjectile
private readonly Vector2Int _target;
private readonly float _timeToTarget;
private readonly float _totalDistance;

private float maxHeight;

public ArchToTileProjectile(Unit unit, Vector2Int target, int damage, Vector2Int startPoint) : base(damage, startPoint)
{
_target = target;
Expand All @@ -24,17 +25,16 @@ protected override void UpdateImpl(float deltaTime, float time)
Pos = Vector2.Lerp(StartPoint, _target, t);

float localHeight = 0f;
float totalDistance = _totalDistance;



float totalDistance = 10;
float maxHeight = totalDistance * 0.6f;
float x = maxHeight * (- (t * 2 - 1) * (t * 2 - 1) + 1);
localHeight = x;

///////////////////////////////////////
// Insert you code here
///////////////////////////////////////


///////////////////////////////////////
// End of the code to insert
///////////////////////////////////////

Height = localHeight;
if (time > StartTime + _timeToTarget)
Hit(_target);
Expand Down
26 changes: 16 additions & 10 deletions Assets/Scripts/UnitBrains/Player/SecondUnitBrain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,23 @@ public class SecondUnitBrain : DefaultPlayerUnitBrain
private float _temperature = 0f;
private float _cooldownTime = 0f;
private bool _overheated;

protected override void GenerateProjectiles(Vector2Int forTarget, List<BaseProjectile> intoList)
{
float overheatTemperature = OverheatTemperature;
///////////////////////////////////////
// Homework 1.3 (1st block, 3rd module)
///////////////////////////////////////
var projectile = CreateProjectile(forTarget);
AddProjectileToList(projectile, intoList);
///////////////////////////////////////
}
if (_temperature >= overheatTemperature)
{
return;
}


for (int i = 0; i <= _temperature; i++)
{
var projectile = CreateProjectile(forTarget);
AddProjectileToList(projectile, intoList);
}
IncreaseTemperature();
}

public override Vector2Int GetNextStep()
{
Expand All @@ -48,7 +54,7 @@ public override void Update(float deltaTime, float time)
if (_overheated)
{
_cooldownTime += Time.deltaTime;
float t = _cooldownTime / (OverheatCooldown/10);
float t = _cooldownTime / OverheatCooldown;
_temperature = Mathf.Lerp(OverheatTemperature, 0, t);
if (t >= 1)
{
Expand All @@ -66,7 +72,7 @@ private int GetTemperature()

private void IncreaseTemperature()
{
_temperature += 1f;
_temperature += 1;
if (_temperature >= OverheatTemperature) _overheated = true;
}
}
Expand Down
Loading