Merge remote-tracking branch 'origin/item'
# Conflicts: # Assets/Scenes/PlayScene.unity # Assets/Scripts/EffectManager.cs # Assets/Scripts/Item/Addons/SmallLens.cs # Assets/Scripts/Item/IPlayerInteraction.cs # Assets/Scripts/Item/InventoryManager.cs # Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
2.54 KB
502 Bytes
213 Bytes
222 Bytes
509 Bytes
198 Bytes
493 Bytes
278 Bytes
268 Bytes
458 Bytes
234 Bytes
551 Bytes
224 Bytes
470 Bytes
266 Bytes
513 Bytes
246 Bytes
3.49 KB
4.45 KB
83 Bytes
537 Bytes
157 Bytes
171 Bytes
145 Bytes
508 Bytes
3.11 KB
92 Bytes
906 Bytes
1.06 KB
1.09 KB
1.22 KB
1.1 KB
1.23 KB
1.26 KB
1.1 KB