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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .vs/XYZCSharpMainProject/v18/.suo
Binary file not shown.
88 changes: 88 additions & 0 deletions .vs/XYZCSharpMainProject/v18/DocumentLayout.backup.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Artem\\XYZCSharpMainProject\\",
"Documents": [
{
"AbsoluteMoniker": "D:2:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:2:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\utilities\\extensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\utilities\\extensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:Assets\\Scripts\\EnterPoint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:1:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:1:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Extensions.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Utilities\\Extensions.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\Utilities\\Extensions.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Utilities\\Extensions.cs",
"RelativeToolTip": "Assets\\Scripts\\Utilities\\Extensions.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABcAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-07-05T10:39:47.723Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAB4AAAAAAAAAAAAjwC0AAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-06-14T16:01:29.26Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-07-05T10:02:18.178Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "EnterPoint.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\EnterPoint.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs",
"RelativeToolTip": "Assets\\Scripts\\EnterPoint.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-06-10T18:39:20.988Z",
"EditorCaption": ""
}
]
}
]
}
]
}
105 changes: 105 additions & 0 deletions .vs/XYZCSharpMainProject/v18/DocumentLayout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Artem\\XYZCSharpMainProject\\",
"Documents": [
{
"AbsoluteMoniker": "D:2:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:2:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:1:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:1:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\unitbrains\\player\\secondunitbrain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\model\\runtime\\unit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\model\\runtime\\unit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|c:\\users\\artem\\xyzcsharpmainproject\\assets\\scripts\\utilities\\extensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:assets\\scripts\\utilities\\extensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9FC7ECE3-79BE-A77D-EC35-EE5975456EDD}|Root.csproj|solutionrelative:Assets\\Scripts\\EnterPoint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 2,
"Children": [
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "Unit.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Model\\Runtime\\Unit.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\Model\\Runtime\\Unit.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Model\\Runtime\\Unit.cs",
"RelativeToolTip": "Assets\\Scripts\\Model\\Runtime\\Unit.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAGUAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-07-05T10:55:35.372Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "Extensions.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Utilities\\Extensions.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\Utilities\\Extensions.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\Utilities\\Extensions.cs",
"RelativeToolTip": "Assets\\Scripts\\Utilities\\Extensions.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABcAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-07-05T10:39:47.723Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAABUAAAAAAAAAAAAjwCEAAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-06-14T16:01:29.26Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"RelativeToolTip": "Assets\\Scripts\\UnitBrains\\Player\\SecondUnitBrain.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-07-05T10:02:18.178Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"Title": "EnterPoint.cs",
"DocumentMoniker": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs",
"RelativeDocumentMoniker": "Assets\\Scripts\\EnterPoint.cs",
"ToolTip": "C:\\Users\\Artem\\XYZCSharpMainProject\\Assets\\Scripts\\EnterPoint.cs",
"RelativeToolTip": "Assets\\Scripts\\EnterPoint.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-06-10T18:39:20.988Z",
"EditorCaption": ""
}
]
}
]
}
]
}
3 changes: 3 additions & 0 deletions Assets/Scripts/Controller/BotController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
//hello
//How are you?
//i'm fine
//my comment
//my second comment
//comment to push
namespace Controller
{
public class BotController
Expand Down
4 changes: 4 additions & 0 deletions Assets/Scripts/EnterPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ public class EnterPoint : MonoBehaviour
[SerializeField] private Canvas _targetCanvas;
private float _timeScale = 1;

//Комментарий
/*/
* многострочный комментарий
/*/
void Start()
{
Time.timeScale = _timeScale;
Expand Down
11 changes: 4 additions & 7 deletions Assets/Scripts/Model/Runtime/Projectiles/ArchToTileProjectile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,13 @@ protected override void UpdateImpl(float deltaTime, float time)

float localHeight = 0f;
float totalDistance = _totalDistance;
const float ProjectileArcFactor = 0.6f;

///////////////////////////////////////
// Insert you code here
///////////////////////////////////////
float maxHeight = totalDistance * ProjectileArcFactor;
float centeredT = t * 2 - 1;
localHeight = maxHeight * (-centeredT * centeredT + 1);


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

Height = localHeight;
if (time > StartTime + _timeToTarget)
Hit(_target);
Expand Down
60 changes: 52 additions & 8 deletions Assets/Scripts/UnitBrains/Player/SecondUnitBrain.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using System.Collections.Generic;
using Model.Runtime.Projectiles;
using Model.Runtime.Projectiles;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Utilities;
using static UnityEngine.GraphicsBuffer;

namespace UnitBrains.Player
{
Expand All @@ -12,20 +15,36 @@ public class SecondUnitBrain : DefaultPlayerUnitBrain
private float _temperature = 0f;
private float _cooldownTime = 0f;
private bool _overheated;

private List<Vector2Int> _unreachableTargets = new();

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 (_overheated) return;
int shotCount = GetTemperature() +1;
//Debug.Log("Temperature: " + GetTemperature());
for (int i = 0; i < shotCount; i++)
{
AddProjectileToList(projectile, intoList);
}
// Debug.Log("Projectile count: " + intoList.Count);
IncreaseTemperature();
///////////////////////////////////////
}

public override Vector2Int GetNextStep()
{
if (HasTargetsInRange())
return unit.Pos;

if (_unreachableTargets.Count > 0)
return unit.Pos.CalcNextStepTowards(_unreachableTargets[0]);

return base.GetNextStep();
}

Expand All @@ -34,15 +53,40 @@ protected override List<Vector2Int> SelectTargets()
///////////////////////////////////////
// Homework 1.4 (1st block, 4rd module)
///////////////////////////////////////
List<Vector2Int> result = GetReachableTargets();
while (result.Count > 1)
List<Vector2Int> result = new();
IEnumerable<Vector2Int> allTargets = GetAllTargets();
_unreachableTargets.Clear();


if (allTargets.Any())
{
result.RemoveAt(result.Count - 1);
float minDistance = float.MaxValue;
Vector2Int nearestTarget = Vector2Int.zero;

foreach (var target in allTargets)
{
float distance = DistanceToOwnBase(target);

if (distance < minDistance)
{
minDistance = distance;
nearestTarget = target;
}
}

if (IsTargetInRange(nearestTarget))
{
result.Add(nearestTarget);
}
else
{
_unreachableTargets.Add(nearestTarget);
}
}
return result;
///////////////////////////////////////
}


public override void Update(float deltaTime, float time)
{
if (_overheated)
Expand Down
Loading