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

fix merge

Browse Source
This commit is contained in:
OceanSlim 2023-01-30 00:15:27 -05:00
commit 8ee555dc27
30 changed files with 18 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

12
Assets/Inventory System/Scripts/Inventory/Inventory.cs
View File

@ -8,6 +8,8 @@ namespace SimpleInventorySystem
{ {
// Start is called before the first frame update // Start is called before the first frame update
public bool hasBeenLooted = false; public bool hasBeenLooted = false;
public bool itemsHaveBeenInstantiated = false;
public bool itemsHaveBeenHidden = false;
public List<GameObject> prefabs; public List<GameObject> prefabs;
[HideInInspector] public List<ItemUI> itemUIs; [HideInInspector] public List<ItemUI> itemUIs;
@ -21,7 +23,14 @@ namespace SimpleInventorySystem
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if(hasBeenLooted && itemsHaveBeenInstantiated && itemsHaveBeenHidden)
{
foreach(ItemUI item in itemUIs)
{
item.pickUp.ItemGameObject.SetActive(false);
}
itemsHaveBeenHidden = true;
}
} }
/// <summary> /// <summary>
@ -61,6 +70,7 @@ namespace SimpleInventorySystem
} }
} }
hasBeenLooted = true; hasBeenLooted = true;
itemsHaveBeenInstantiated = true;
} }
else else
{ {

6
Assets/Inventory System/Scripts/Inventory/PickUp.cs
View File

@ -80,6 +80,12 @@ namespace SimpleInventorySystem
{ {
if(keepOldPosition) if(keepOldPosition)
ItemGameObject.transform.localPosition = oldPosition; ItemGameObject.transform.localPosition = oldPosition;
else
{
ItemGameObject.transform.SetParent(null);
ItemGameObject.transform.position = InventorySystem.instance.player.transform.position;
//ItemGameObject.transform.position += new Vector3(0, 5, 0);
}
ItemGameObject.transform.localRotation = Quaternion.Euler(oldRotation); ItemGameObject.transform.localRotation = Quaternion.Euler(oldRotation);
ItemGameObject.transform.localScale = oldScale; ItemGameObject.transform.localScale = oldScale;
HadPickedUp = false; HadPickedUp = false;

1
Assets/Inventory System/Scripts/UI/ItemUI.cs
View File

@ -309,6 +309,7 @@ namespace SimpleInventorySystem
if (!fitImageInSlot) if (!fitImageInSlot)
{ {
ApplyRectTransformResize(); ApplyRectTransformResize();
transform.localRotation = Quaternion.Euler(0, 0, 0); // TODO: Fix this so it maintains rotation later
} }
} }

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:

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: