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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Logs
Assembly-CSharp.csproj
Assembly-CSharp-Editor.csproj
CsharpMainProject.sln
.vs
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .vs/CSharpMainProjectMyFork/v17/.suo
Binary file not shown.
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
55 changes: 55 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "CSharpMainProject1.sln"
}
8 changes: 5 additions & 3 deletions Assets/Scripts/Controller/BotController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
using Model.Config;
using UnityEngine;
using Utilities;
//hello
//How are you?
//i'm fine


//Коммент из гитхаба
//Второй коммент из гитхаба. Намбер 2
//Третий коммент из IDE. Намбер 3. Который надо запушить в гитхаб
namespace Controller
{
public class BotController
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/EnterPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EnterPoint : MonoBehaviour
[SerializeField] private Settings _settings;
[SerializeField] private Canvas _targetCanvas;
private float _timeScale = 1;

void Start()
{
Time.timeScale = _timeScale;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ protected override void UpdateImpl(float deltaTime, float time)
///////////////////////////////////////
// Insert you code here
///////////////////////////////////////


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

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

Height = localHeight;
if (time > StartTime + _timeToTarget)
Hit(_target);
Expand Down
34 changes: 31 additions & 3 deletions Assets/Scripts/UnitBrains/Player/SecondUnitBrain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,37 @@ protected override void GenerateProjectiles(Vector2Int forTarget, List<BaseProje
float overheatTemperature = OverheatTemperature;
///////////////////////////////////////
// Homework 1.3 (1st block, 3rd module)
///////////////////////////////////////
var projectile = CreateProjectile(forTarget);
AddProjectileToList(projectile, intoList);
///////////////////////////////////////

//Узнаём, какая сейчас температура
int currentTemp = GetTemperature();

//Если температура уже достигла порога перегрева (3) – стрелять нельзя
if (currentTemp >= overheatTemperature)
{
return; // выход из метода
}
else //Иначе производим выстрел: нагреваем оружие на 1 градус
{
IncreaseTemperature();
}

//Теперь температура выросла. Узнаём новое значение
int newTemp = GetTemperature();

//Количество снарядов должно быть равно новой температуре. Например, если стало 2 – выпускаем 2 снаряда
int shotsCount = newTemp;

//Создаём и добавляем снаряды в цикле
for (int i = 0; i < shotsCount; i++)
{
// Создаём один снаряд для указанной цели
BaseProjectile projectile = CreateProjectile(forTarget);
// Добавляем его в общий список
AddProjectileToList(projectile, intoList);
}


///////////////////////////////////////
}

Expand Down
38 changes: 38 additions & 0 deletions CSharpMainProject1.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{61D31BEA-4793-3235-5A8F-8E8A26CA8EDA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{847B7AAB-20AB-F6EF-E072-2FEF110C114F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Root", "Root.csproj", "{B2F377F4-7C9A-8894-820F-5D7A37A36C0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests.csproj", "{BB255789-DC41-E3FD-F91A-EDA59BA1C76A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{61D31BEA-4793-3235-5A8F-8E8A26CA8EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61D31BEA-4793-3235-5A8F-8E8A26CA8EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61D31BEA-4793-3235-5A8F-8E8A26CA8EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61D31BEA-4793-3235-5A8F-8E8A26CA8EDA}.Release|Any CPU.Build.0 = Release|Any CPU
{847B7AAB-20AB-F6EF-E072-2FEF110C114F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{847B7AAB-20AB-F6EF-E072-2FEF110C114F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{847B7AAB-20AB-F6EF-E072-2FEF110C114F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{847B7AAB-20AB-F6EF-E072-2FEF110C114F}.Release|Any CPU.Build.0 = Release|Any CPU
{B2F377F4-7C9A-8894-820F-5D7A37A36C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2F377F4-7C9A-8894-820F-5D7A37A36C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2F377F4-7C9A-8894-820F-5D7A37A36C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2F377F4-7C9A-8894-820F-5D7A37A36C0A}.Release|Any CPU.Build.0 = Release|Any CPU
{BB255789-DC41-E3FD-F91A-EDA59BA1C76A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB255789-DC41-E3FD-F91A-EDA59BA1C76A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB255789-DC41-E3FD-F91A-EDA59BA1C76A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB255789-DC41-E3FD-F91A-EDA59BA1C76A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading