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

merge minigame to staging

Browse Source
This commit is contained in:
HelarJ
2022-03-28 16:52:34 +03:00
parent 72401758e2 06fde8ab2e
commit 99d412b258
29 changed files with 7505 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Project Files/Scripts/Helar/Items.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta
guid: c509c0c7d8d7f2942a05792798d31fc0
folderAsset: yes
DefaultImporter:
========
guid: 1e00d72d45b494a4ea598ff34d46a589
PrefabImporter:
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
externalObjects: {}
userData:
assetBundleName: