dddushesss
2c2fae3b58
Merge remote-tracking branch 'origin/Alexei' into Alexei
# Conflicts:
# Assets/Resources/1/Crystal/Prefab/Crystal.prefab
# Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
# Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
# Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
# Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
# Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
# Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
# Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
# Assets/Resources/Data/ItemData.asset
# Assets/Scripts/Items/Bonus.cs.meta
# Assets/Scripts/Items/Building.cs.meta
2022-01-13 22:59:27 +03:00
..
2022-01-11 04:57:05 +03:00
2021-12-29 08:10:48 +03:00
2022-01-09 00:37:09 +03:00
2022-01-13 22:58:54 +03:00
2021-12-15 16:29:44 +03:00
2021-12-15 16:29:44 +03:00
2022-01-09 00:37:09 +03:00
2021-12-29 08:10:48 +03:00
2021-12-29 08:10:48 +03:00
2021-12-15 16:29:44 +03:00
2021-12-15 16:29:44 +03:00
2021-12-15 16:29:44 +03:00
2021-12-29 08:10:48 +03:00
2022-01-09 00:37:09 +03:00
2022-01-13 22:58:54 +03:00
2021-12-15 16:29:44 +03:00
2021-12-15 16:29:44 +03:00
2022-01-09 00:37:09 +03:00
2021-12-29 08:10:48 +03:00
2021-12-29 08:10:48 +03:00
2021-12-15 16:29:44 +03:00
2021-12-15 16:29:44 +03:00