OceanSlim/projectEli
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git

Browse Source
This commit is contained in:
OceanSlim 2023-01-18 22:25:56 -05:00
commit 467e6e2b15
11 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Items/Prefabs/Consumables.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 26f808e8ee3809c43867c1c1eb226124
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Items/Prefabs/Gear/Headset.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 932332605b143de408257962fa7ff175
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Items/Prefabs/Gear/Plates.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: e85916d135215644d84361b421e17277
=======
guid: e1d498a019740714c8734af8f4a0194b
>>>>>>> 66c43bfa71304f70fba17da50afa32aef15d1365
folderAsset: yes
DefaultImporter:
externalObjects: {}

8
Assets/Items/Prefabs/Other.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 34df9cfc25be6f547a48b9abf4422566
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: b4313c97c87b0da42b32b9465a89e002
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 9b0c4bb5983488a438c06d5e35e09d2b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f0b4fd9f8be79d34ba1fb5abecbb4aca
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta
View File

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

7
Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta
View File

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

8
Assets/Save.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d61d18c239646e24ea7563da992aedaf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c310a300a0358f94f81e0eeb585d6cf4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: