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

backup

Browse Source
This commit is contained in:
OceanSlim 2023-01-30 21:24:07 -05:00
parent c248c35dfd
commit 5840a317b0
33 changed files with 248 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Inventory System/2D Assets/Icons/$temp.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta <<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta
guid: 84e7ae53e32c42d44b04a8512ca3969f guid: 4a48de047d26dda409ce792a321bdff5
======== ========
guid: 5c741c4d068619344a3e34e1a352d64b guid: 5c741c4d068619344a3e34e1a352d64b
folderAsset: yes folderAsset: yes

8
Assets/Inventory System/Prefabs/Item UI/Consumables.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gear/Plates.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Medicine.meta Normal file
View File

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

8
Assets/Inventory System/Prefabs/Item UI/Other.meta Normal file
View File

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

2
Assets/Inventory System/Prefabs/UI Elements/Border.prefab
View File

@ -73,4 +73,4 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 0.2 m_PixelsPerUnitMultiplier: 0.5

2
Assets/Inventory System/Prefabs/UI Elements/StackCount.prefab
View File

@ -128,7 +128,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 1 m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1 m_useMaxVisibleDescender: 1
m_pageToDisplay: 1 m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 3, w: 1} m_margin: {x: 0, y: 0, z: 4, w: 2}
m_isUsingLegacyAnimationComponent: 0 m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0 m_isVolumetricText: 0
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0

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

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

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

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

11
Assets/Items/Prefabs/Gear/Plate Carriers/Precision Plate Carrier.prefab
View File

@ -450,6 +450,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8715477175483360842, guid: 004fc0e3f060e8942ab8379feb15c21c,
type: 3}
propertyPath: emptyGridContainer
value:
objectReference: {fileID: 2663550850753990593}
- target: {fileID: 8715477175483360852, guid: 004fc0e3f060e8942ab8379feb15c21c, - target: {fileID: 8715477175483360852, guid: 004fc0e3f060e8942ab8379feb15c21c,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -610,6 +615,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3} m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!224 &2663550850753990593 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 299101071701878437, guid: 004fc0e3f060e8942ab8379feb15c21c,
type: 3}
m_PrefabInstance: {fileID: 2364473049272232292}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7854409540325217258 --- !u!1001 &7854409540325217258
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

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

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

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

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

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

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

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

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

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

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

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

8
Assets/Save.meta Normal file
View File

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

19
Assets/Scenes/Test Scene Chris.unity
View File

@ -18985,6 +18985,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hasBeenLooted: 0 hasBeenLooted: 0
itemsHaveBeenInstantiated: 0
itemsHaveBeenHidden: 0
prefabs: [] prefabs: []
itemUIs: [] itemUIs: []
--- !u!82 &1216902021 --- !u!82 &1216902021
@ -29800,7 +29802,24 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hasBeenLooted: 0 hasBeenLooted: 0
itemsHaveBeenInstantiated: 0
itemsHaveBeenHidden: 0
prefabs: prefabs:
- {fileID: 1118060305950738, guid: d80239d41a076084ea046b27e60cbdc2, type: 3}
- {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3}
- {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3}
- {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3}
- {fileID: 8053794548077495502, guid: f0fbb4c62750a814c8baa4eeceba5d63, type: 3}
- {fileID: 8053794548077495502, guid: e9b8f0343c36d26428676aabf242e7a8, type: 3}
- {fileID: 1150301423181574, guid: 20873817cc3f7fe4288964d76bdb466a, type: 3}
- {fileID: 1916028363477544, guid: fa9977b69f980364989f85633bee4aa6, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}

2
Assets/Scenes/Test Scene Tony.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta <<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta
guid: 84e7ae53e32c42d44b04a8512ca3969f guid: e60e217ed02bf7347862d7d2e99ee286
======== ========
guid: 5c741c4d068619344a3e34e1a352d64b guid: 5c741c4d068619344a3e34e1a352d64b
folderAsset: yes folderAsset: yes

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

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