4bit/MVP1
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/battle troop types #16

Merged
vologdia merged 11 commits from feature/battle-troop-types into develop 2026-10-28 20:51:10 +03:00
Conversation 0 Commits 11 Files Changed 51
+427 -317
4 changed files with 427 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 20b88a6cc2 - Show all commits
.vscode/settings.json
Vendored
+1 -1
View File
@@ -67,5 +67,5 @@
"*.sln": "*.csproj",
"*.slnx": "*.csproj"
},
"dotnet.defaultSolution": "Game Project.slnx"
"dotnet.defaultSolution": "MVP1.slnx"
}
Assets/Scenes/MVP1.unity
+38 -38
View File
@@ -165,7 +165,7 @@ GameObject:
- component: {fileID: 49436387}
- component: {fileID: 49436386}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -361,7 +361,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &62072474
@@ -2208,7 +2208,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 2.7021484, y: 0}
m_AnchoredPosition: {x: 2.7022705, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &233142736
@@ -2571,7 +2571,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &243517954
@@ -2906,7 +2906,7 @@ GameObject:
- component: {fileID: 263454364}
- component: {fileID: 263454363}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (10)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3283,7 +3283,7 @@ GameObject:
- component: {fileID: 298091773}
- component: {fileID: 298091772}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 6"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4119,7 +4119,7 @@ GameObject:
- component: {fileID: 345730457}
- component: {fileID: 345730456}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 17"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4501,7 +4501,7 @@ GameObject:
- component: {fileID: 398822860}
- component: {fileID: 398822859}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 9"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -6115,7 +6115,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &504179949
@@ -6313,7 +6313,7 @@ GameObject:
- component: {fileID: 520651316}
- component: {fileID: 520651315}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 14 (1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -6664,7 +6664,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &546624116
@@ -6967,7 +6967,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &589304974
@@ -7031,7 +7031,7 @@ GameObject:
- component: {fileID: 590553515}
- component: {fileID: 590553514}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (2)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -7206,7 +7206,7 @@ GameObject:
- component: {fileID: 601037367}
- component: {fileID: 601037366}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 4"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -8699,7 +8699,7 @@ GameObject:
- component: {fileID: 688430645}
- component: {fileID: 688430644}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 5"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -10363,7 +10363,7 @@ GameObject:
- component: {fileID: 806260063}
- component: {fileID: 806260062}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (8)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -12004,7 +12004,7 @@ GameObject:
- component: {fileID: 951610824}
- component: {fileID: 951610823}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 10"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -14177,7 +14177,7 @@ GameObject:
- component: {fileID: 1178275311}
- component: {fileID: 1178275310}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (12)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -14297,7 +14297,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1203581060
@@ -14361,7 +14361,7 @@ GameObject:
- component: {fileID: 1211737251}
- component: {fileID: 1211737250}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 20"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -14454,7 +14454,7 @@ GameObject:
- component: {fileID: 1213052830}
- component: {fileID: 1213052829}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 3"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -14547,7 +14547,7 @@ GameObject:
- component: {fileID: 1223690272}
- component: {fileID: 1223690271}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 2"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -15374,7 +15374,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 34.12451, y: -18.613403}
m_AnchoredPosition: {x: 34.124634, y: -18.613464}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1295995100
@@ -16329,7 +16329,7 @@ GameObject:
- component: {fileID: 1355883263}
- component: {fileID: 1355883262}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 18"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -17564,7 +17564,7 @@ GameObject:
- component: {fileID: 1545550092}
- component: {fileID: 1545550091}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 16"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -17794,7 +17794,7 @@ GameObject:
- component: {fileID: 1573788923}
- component: {fileID: 1573788922}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 8"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -18339,7 +18339,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1659664021
@@ -18524,7 +18524,7 @@ GameObject:
- component: {fileID: 1671960191}
- component: {fileID: 1671960190}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 19"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -18777,7 +18777,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1684877104
@@ -19037,7 +19037,7 @@ GameObject:
- component: {fileID: 1806928614}
- component: {fileID: 1806928613}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 12"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -19197,7 +19197,7 @@ GameObject:
- component: {fileID: 1858629103}
- component: {fileID: 1858629102}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (11)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -19290,7 +19290,7 @@ GameObject:
- component: {fileID: 1865436604}
- component: {fileID: 1865436603}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 7"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -19715,7 +19715,7 @@ GameObject:
- component: {fileID: 1930835037}
- component: {fileID: 1930835036}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 13"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -19962,7 +19962,7 @@ GameObject:
- component: {fileID: 1943579789}
- component: {fileID: 1943579788}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 11"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -20082,7 +20082,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1957570675
@@ -20833,7 +20833,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2020678578
@@ -21951,7 +21951,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -10.000122}
m_AnchoredPosition: {x: 0, y: -10.000061}
m_SizeDelta: {x: -60, y: -480}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2098813297
@@ -22302,7 +22302,7 @@ GameObject:
- component: {fileID: 2132167322}
- component: {fileID: 2132167321}
m_Layer: 0
m_Name: Building
m_Name: "\u0417\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 15 (9)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+388 -265
View File
File diff suppressed because one or more lines are too long
Game Project.slnx
-13
View File
@@ -1,17 +1,4 @@
<Solution>
<Project Path="Bogatyri.Core.csproj" />
<Project Path="Bogatyri.Core.Unity.csproj" />
<Project Path="Assembly-CSharp.csproj" />
<Project Path="Bogatyri.Settlement.csproj" />
<Project Path="Assembly-CSharp-Editor.csproj" />
<Project Path="Bogatyri.Circle.csproj" />
<Project Path="Bogatyri.Economy.csproj" />
<Project Path="Bogatyri.Tests.csproj" />
<Project Path="Bogatyri.Army.csproj" />
<Project Path="Bogatyri.Battle.csproj" />
<Project Path="Bogatyri.World.Simulation.csproj" />
<Project Path="Bogatyri.Save.csproj" />
<Project Path="Bogatyri.Population.csproj" />
<Project Path="Bogatyri.World.csproj" />
<Project Path="Bogatyri.Chat.csproj" />
</Solution>