dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Alexei' into Prod

Browse Source
This commit is contained in:
dddushesss 2022-01-05 17:55:30 +03:00
commit 732e184c22
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Scripts/Controller/GameInit.cs
View File

@ -26,8 +26,9 @@ namespace Controller
new MusicController(); new MusicController();
MusicController.Instance.SetMusicData(data.MusicData); MusicController.Instance.SetMusicData(data.MusicData);
controllers.Add(hexGrid); controllers.Add(hexGrid);
data.WeaponsData.WeaponsList.ForEach(x => x.SetModifiedDamage(0));
ItemFabric itemFabric = new ItemFabric(data.ItemsData, SetUpItems()); ItemFabric itemFabric = new ItemFabric(data.ItemsData, SetUpItems());
controllers.Add(itemFabric); controllers.Add(itemFabric);
@ -39,7 +40,9 @@ namespace Controller
{ {
if (unit.isPlayer) if (unit.isPlayer)
{ {
player = new Unit(unit, JsonUtility.FromJson<Weapon>(data.ChosenWeapon), hexGrid); var weapon = JsonUtility.FromJson<Weapon>(data.ChosenWeapon);
weapon.SetModifiedDamage(0);
player = new Unit(unit, weapon, hexGrid);
PlayerControl playerControl = new PlayerControl(player, uiController.PlayerControlView, PlayerControl playerControl = new PlayerControl(player, uiController.PlayerControlView,
uiController.PlayerInventoryView); uiController.PlayerInventoryView);
controllers.Add(playerControl); controllers.Add(playerControl);