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

Merge remote-tracking branch 'origin/PauseMenu' into staging2

Browse Source 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/TagManager.asset
This commit is contained in:
HelarJ
2022-04-11 19:10:18 +03:00
parent 029c6cf7ba ba8883786b
commit fd4432fc6d
36 changed files with 40092 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9586
Assets/Scenes/Shumpei/GameScene.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/Shumpei/GameScene.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8fd0e18070efeda42bb8ab22afe4a9fb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

23410
Assets/Scenes/Shumpei/MenuScene.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/Shumpei/MenuScene.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e45278868e3d39f45929cb5142b6c572
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6578
Assets/Scenes/Shumpei/SampleScene.unity
View File

File diff suppressed because it is too large Load Diff