helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

merge door to staging

Browse Source
This commit is contained in:
HelarJ
2022-03-28 16:54:50 +03:00
parent 99d412b258 fb14e165d4
commit 53bd10a13c
1331 changed files with 410263 additions and 5190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Resources/Helar/Item.prefab.meta
View File

@@ -1,6 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta
guid: b609e3c6adb2d2b4196415d93e789ddd
PrefabImporter:
========
guid: f6d31dc9e750063448915a12546cf689
DefaultImporter:
>>>>>>>> origin/DoorInteration:Assets/Scenes/JonasB/Dungeon.unity.meta
externalObjects: {}
userData:
assetBundleName: