6 Commits

Author SHA1 Message Date
dddushesss
b298adec90 final item fixes 2022-01-05 22:36:27 +03:00
dddushesss
5f0c2b0446 Merge branch 'Prod' into Alexei
# Conflicts:
#	Assets/Resources/Data/ItemData.asset
2022-01-05 21:36:39 +03:00
dddushesss
95f941abb8 weapon fixes 2022-01-05 21:33:46 +03:00
dddushesss
2d87148a09 Merge branch 'Alexei' into Prod
# Conflicts:
#	Assets/Scenes/NewMainMenu.unity
#	Assets/Scripts/Units/Unit.cs
2022-01-05 17:44:03 +03:00
dddushesss
c87a906d97 items finished 2022-01-05 15:43:08 +03:00
dddushesss
7421638a8d item base class. tower. some fixes. inventory canvas 2022-01-04 20:57:06 +03:00