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/Scenes/Shumpei/GameScene.unity.meta
View File

@@ -1,5 +1,10 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Shumpei/GameScene.unity.meta
guid: 8fd0e18070efeda42bb8ab22afe4a9fb
========
guid: 92d10f5f84c81c84084b9b952b477e74
folderAsset: yes
>>>>>>>> origin/slimeAI:Assets/RPG Monster Duo PBR Polyart.meta
DefaultImporter:
externalObjects: {}
userData:

5
Assets/Scenes/Shumpei/MenuScene.unity.meta
View File

@@ -1,5 +1,10 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Shumpei/MenuScene.unity.meta
guid: e45278868e3d39f45929cb5142b6c572
========
guid: 7132a8e595d20114aa50d2f143f253d0
folderAsset: yes
>>>>>>>> origin/slimeAI:Assets/Project Files/Animations/Arlo.meta
DefaultImporter:
externalObjects: {}
userData: