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

merge arlo

Browse Source
This commit is contained in:
HelarJ
2022-04-11 19:13:05 +03:00
parent fd4432fc6d f7e6a2e44b
commit 5f55b04eba
79 changed files with 7072 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/RECURSOS YOS UNITY.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
guid: 473cf055f6630d745891c533f3ac86b3
folderAsset: yes
DefaultImporter:
========
guid: 288eb0a3190dc75419059ff7b4b70aa0
PrefabImporter:
>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
externalObjects: {}
userData:
assetBundleName: