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

Inventory fix and fixed item stacking bug

Browse Source
This commit is contained in:
tonyomendoza 2023-02-03 17:42:50 -08:00
parent 3c0efeb34b
commit cf203a4d8f
38 changed files with 1018 additions and 769 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +0,0 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta
guid: 4a48de047d26dda409ce792a321bdff5
========
guid: 5c741c4d068619344a3e34e1a352d64b
folderAsset: yes
>>>>>>>> 8ee555dc27d275b48d49de54bbfa341586366f5d:Assets/Inventory System/2D Assets/Icons/$temp.meta
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

177
Assets/Inventory System/Prefabs/Inventory System.prefab
View File

@ -74,6 +74,131 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &614559559
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 614559560}
- component: {fileID: 614559563}
- component: {fileID: 614559562}
- component: {fileID: 614559561}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &614559560
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 614559559}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.41, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1284900580}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &614559563
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 614559559}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &614559562
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 614559559}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!64 &614559561
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 614559559}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1284900579
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1284900580}
m_Layer: 0
m_Name: DefaultItemSpawn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1284900580
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1284900579}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1000, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 614559560}
m_Father: {fileID: 2770326605790841686}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1877044252
GameObject:
m_ObjectHideFlags: 0
@ -1383,8 +1508,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2770326606057774213}
m_HandleRect: {fileID: 2770326606057774212}
m_Direction: 0
m_Value: 1
m_Size: 1
m_Value: 0
m_Size: 0.9999999
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -2766,7 +2891,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000091552734, y: 0}
m_AnchoredPosition: {x: 0.00390625, y: 0}
m_SizeDelta: {x: 0, y: 2250}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2770326604978625766
@ -9648,6 +9773,7 @@ Transform:
- {fileID: 2770326605623600441}
- {fileID: 2770326605036912737}
- {fileID: 2770326605913857790}
- {fileID: 1284900580}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9739,6 +9865,7 @@ MonoBehaviour:
LootGrid: {fileID: 2770326605807543574}
StorageWindowPrefab: {fileID: 4417106255924003221, guid: da7a26b146274ee4783989b1ee055931,
type: 3}
DefaultItemSpawn: {fileID: 1284900580}
CurrentState: 0
--- !u!114 &2770326605790841688
MonoBehaviour:
@ -10088,9 +10215,9 @@ MonoBehaviour:
Height: 25
testItem: {fileID: 0}
testItems:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 8715477175483360852, guid: f601e41e76489904ebf41a942395a9a0, type: 3}
- {fileID: 8715477175483360852, guid: 17bbaf0f809d55f4ba2a91afe9dac977, type: 3}
- {fileID: 8715477175483360852, guid: eeb31bd611bbd4c4da5ca0d5a9a1c206, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
@ -12931,7 +13058,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: 0}
m_AnchoredPosition: {x: 0.00024414062, y: 0.000066894456}
m_SizeDelta: {x: 0, y: 1500}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2770326606141421693
@ -15043,6 +15170,8 @@ GameObject:
- component: {fileID: 2770326606332454990}
- component: {fileID: 2109804768}
- component: {fileID: 2109804769}
- component: {fileID: 3587485433467777161}
- component: {fileID: 967279368619340376}
m_Layer: 5
m_Name: Tactical Rig Group Slot Manager
m_TagString: Untagged
@ -15119,6 +15248,40 @@ MonoBehaviour:
combinedLimit: 1
slot: {fileID: 0}
--- !u!114 &2109804769
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2770326606332454988}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3}
m_Name:
m_EditorClassIdentifier:
textMeshProUGUI: {fileID: 2770326604711117547}
value:
--- !u!114 &3587485433467777161
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2770326606332454988}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6349c95e0055a64db6010b6bfaa9971, type: 3}
m_Name:
m_EditorClassIdentifier:
StackSlotLimit: 12
limitStackSlots:
- {fileID: 2770326605039798047}
- {fileID: 2770326605069652577}
- {fileID: 2770326605604029970}
- {fileID: 2770326606725301637}
combinedLimit: 1
slot: {fileID: 0}
--- !u!114 &967279368619340376
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

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:

3
Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/3_Day_Pack_5x6.prefab
View File

@ -56,6 +56,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemName: 3 Day Pack
displayName:
image: {fileID: 8715477176133586257}
rarity: 3
ItemTag: 12
@ -122,7 +123,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8e70d9fe64157c34496e86ff2518d6a5, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

1
Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack Fix UI.prefab
View File

@ -56,6 +56,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemName: Backpack Fix
displayName:
image: {fileID: 8715477176133586257}
rarity: 1
ItemTag: 9

13
Assets/Inventory System/Prefabs/Item UI/Gear/Backpacks/Backpack_4x5.prefab
View File

@ -56,6 +56,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemName: Backpack
displayName:
image: {fileID: 8715477176133586257}
rarity: 2
ItemTag: 12
@ -122,7 +123,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 18ce130e947d42945a9a1c1dbe0820a8, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -1068,6 +1069,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8715477175483360853}
m_Modifications:
- target: {fileID: 3008269927508781641, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 3008269927508781641, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Type
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7352792399522662056, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Name

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/Other.meta
View File

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

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

@ -36,7 +36,8 @@ namespace SimpleInventorySystem
{
if (prefabs[i] == null)
{
prefabs.Remove(prefabs[i]);
//prefabs.Remove(prefabs[i]);
continue;
}
else
{
@ -46,6 +47,7 @@ namespace SimpleInventorySystem
gObj.SetActive(true);
gObj.transform.position = Vector3.zero;
gObj.transform.SetParent(InventorySystem.instance.DefaultItemSpawn, false);
if(gObj.GetComponent<Rigidbody>() != null)
gObj.GetComponent<Rigidbody>().useGravity = false;
if(item != null)
{
@ -62,6 +64,7 @@ namespace SimpleInventorySystem
Invoke(nameof(HideGameObjects), .1f);
}
}
Debug.Log(itemUIs.Count);
hasBeenLooted = true;
itemsHaveBeenInstantiated = true;
}
@ -96,6 +99,7 @@ namespace SimpleInventorySystem
{
//items.Add(item.pickUp.ItemGameObject);
itemUIs.Add(item);
//item.Inventory = this;
}
}
}

16
Assets/Inventory System/Scripts/Inventory/InventorySystem.cs
View File

@ -150,7 +150,11 @@ namespace SimpleInventorySystem
private GameObject toolbarEvents;
public StandaloneInputModule StandaloneInputModule;
public Vector2 MouseInCanvasPosition;
public ItemUI DraggedItem;
private ItemUI draggedItem;
public ItemUI DraggedItem {
set { draggedItem = value; IsDraggingItem = true; }
get { return draggedItem; }
}
public ContextMenuManagerUI ContextMenuUI;
public static List<GameObject> hoverResults;
public Player_IS player;
@ -162,6 +166,7 @@ namespace SimpleInventorySystem
private Inventory LastLootedInventory;
public GameObject StorageWindowPrefab;
public Transform DefaultItemSpawn;
[HideInInspector] public bool IsDraggingItem;
public enum States { Undefined, Loot, PickUp };
public States CurrentState = States.Undefined;
@ -259,6 +264,10 @@ namespace SimpleInventorySystem
// Update is called once per frame
void Update()
{
if(DraggedItem == null)
{
IsDraggingItem = false;
}
CheckForRequiredComponents();
rotationKeyInput.Update();
@ -345,6 +354,11 @@ namespace SimpleInventorySystem
{
if (InventoryMenuUI.activeInHierarchy)
{
if(DraggedItem != null)
{
Debug.Log("Return to Slot");
DraggedItem.ReturnToSlot(true);
}
CloseInventory();
}
else

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

@ -38,7 +38,6 @@ namespace SimpleInventorySystem
[HideInInspector] public bool PickedUpOnFrame;
[HideInInspector] public List<GameObject> ContextWindows = new List<GameObject>();
[HideInInspector] public StorageWindowUI StorageWindow;
[HideInInspector] public bool IsLinkedSlotClone;
[HideInInspector] public LimitStackSlotCapacity limitStackSlotCapacity;
internal void ResetTransform()
@ -429,9 +428,9 @@ namespace SimpleInventorySystem
// TODO: Make sure it was dropped somewhere, if not, return it to the original parent
public void ReturnToSlot()
public void ReturnToSlot(bool forceDrop = false)
{
if (previousSlot != null && !isDragging)
if (previousSlot != null && (!isDragging || forceDrop))
{
//Debug.Log("RETURNED: " + previousSlot.gameObject.name);
previousSlot.DropOntoSlot(this.gameObject);
@ -635,14 +634,14 @@ namespace SimpleInventorySystem
return;
}
if (PointerIsHoveredOver && InventorySystem.instance.DraggedItem == null)
if (PointerIsHoveredOver && !InventorySystem.instance.IsDraggingItem)
{
if (Input.GetMouseButtonDown(0) && !isDragging && InventorySystem.instance.DraggedItem == null && !slot.DroppedOnFrame)
{
GrabAndDragItem();
}
if (Input.GetMouseButtonDown(1) && InventorySystem.instance.DraggedItem == null)
if (Input.GetMouseButtonDown(1) && !InventorySystem.instance.IsDraggingItem)
{
InventorySystem.instance.OpenContextMenu(this);
}
@ -660,6 +659,11 @@ namespace SimpleInventorySystem
image.maskable = false;
}
if(Count <= 0)
{
Destroy(gameObject);
}
if (InventorySystem.instance.PressedKeyRotation(true))
{
//Debug.Log("Rotate");
@ -728,10 +732,20 @@ namespace SimpleInventorySystem
container = Instantiate(containerUIPrefab, this.transform, false);// StorageWindow.StorageContainer.transform, false);
//itemUI.container.name = itemUI.container.name + " " + inCount;
container.GetComponentInChildren<GridUI>().SetAssociatedItemUI(this);
container.SetActive(true);
//container.SetActive(true); // TODO: modify this
StartCoroutine(coroutineA());
}
}
IEnumerator coroutineA()
{
// wait for 1 second
Debug.Log("coroutineA created");
yield return new WaitForEndOfFrame();
container.SetActive(false);
Debug.Log("coroutineA running again");
}
public void DropItemAway()
{
if (pickUp == null)

2
Assets/Inventory System/Scripts/UI/LinkedSlotUI.cs
View File

@ -14,7 +14,7 @@ namespace SimpleInventorySystem
{
if(linkedSlot != null)
{
linkedSlot.LinkedSlots.Add(GetComponent<SlotUI>());
//linkedSlot.LinkedSlots.Add(GetComponent<SlotUI>());
}
}

84
Assets/Inventory System/Scripts/UI/SlotUI.cs
View File

@ -8,7 +8,7 @@ using static SimpleInventorySystem.GridUI;
namespace SimpleInventorySystem
{
public class SlotUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
public class SlotUI : MonoBehaviour
{
[Header("Slot Attributes")]
public int width;
@ -28,7 +28,6 @@ namespace SimpleInventorySystem
[HideInInspector] public LimitStackSlot limitStackSlot;
[HideInInspector] public LimitStackSlotManager limitStackSlotManager;
[HideInInspector] public bool DroppedOnFrame;
[HideInInspector] public List<SlotUI> LinkedSlots = new List<SlotUI>();
[HideInInspector] public List<GroupSlotUI> groupSlots;
[HideInInspector] public GridUI grid;
[HideInInspector] public GridUI.Cell cell;
@ -52,7 +51,6 @@ namespace SimpleInventorySystem
}
}
private AppendUI appendUI;
private LinkedSlotUI linkedSlotUI;
private bool droppedStackOntoEmptySlot;
private RenderItemUIProperty renderProp;
private SlotUI BelongsToItemInSlot;
@ -65,26 +63,11 @@ namespace SimpleInventorySystem
return itemUI;
}
/*public void OnDrop(PointerEventData eventData)
{
//
//("OnDrop");
if (eventData.pointerDrag != null && AllowedDraggable(eventData.pointerDrag))
{
DropOntoSlot(eventData.pointerDrag);
}
}*/
public bool AllowedDraggable(GameObject gameObject)
{
return gameObject.GetComponent<ItemUI>() != null;
}
public bool IsLinkedSlot()
{
return linkedSlotUI != null;
}
public bool DropOntoSlot(GameObject item, bool dropStack = true)
{
ItemUI itemDrop = item.GetComponent<ItemUI>();
@ -109,18 +92,11 @@ namespace SimpleInventorySystem
return false;
}
if (IsLinkedSlot())
{
/*GameObject newItemDrop = Instantiate(item);
itemDrop = newItemDrop.GetComponent<ItemUI>();
itemDrop.IsLinkedSlotClone = true;*/
}
List<Cell> occupiedCells = new List<Cell>();
/// STACKING
/// This section concerns item stacks, not slot stacking
if (!itemDrop.IsLinkedSlotClone && ((HasStack() && itemUI != null /*&& itemUI.itemPrefab == itemDrop.itemPrefab*/ && itemUI.itemName == GetItemUI().itemName) || !dropStack))
if (itemDrop.Stackable && ((HasStack() && itemUI != null /*&& itemUI.itemPrefab == itemDrop.itemPrefab*/ && itemUI.itemName == GetItemUI().itemName) || !dropStack))
{
// Debug.Log("Handling Stack");
int maxStackDrop = 1;
@ -217,19 +193,6 @@ namespace SimpleInventorySystem
droppedStackOntoEmptySlot = true;
}
if (!IsLinkedSlot())
{
foreach (SlotUI ls in LinkedSlots)
{
if (ls == this)
{
Debug.LogWarning("No self-referencing for this array ;)");
continue;
}
//ls.DropOntoSlot(item);
}
}
if (grid != null)
{
grid.HideSlotsOfItem(itemDrop);
@ -312,26 +275,6 @@ namespace SimpleInventorySystem
void Awake()
{
/*if (image == null)
{
Image[] images = GetComponentsInChildren<Image>(); // This will retrieve the first instance of an image in the FIRST child with the component
//// Debug.Log(images.Length);
if (images.Length > 0)
{
if (images[0].transform == transform)
{
if (images.Length > 1)
{
image = images[1];
}
}
else
{
image = images[0];
}
}
}*/
if (grid == null)
grid = GetComponentInParent<GridUI>();
@ -346,11 +289,6 @@ namespace SimpleInventorySystem
appendUI = aui;
}
if (TryGetComponent(out LinkedSlotUI lui))
{
linkedSlotUI = lui;
}
if (TryGetComponent(out RenderItemUIProperty rp))
{
renderProp = GetComponent<RenderItemUIProperty>();
@ -464,11 +402,6 @@ namespace SimpleInventorySystem
changeSlotTitle.ResetTitle();
}
foreach (SlotUI linked in LinkedSlots)
{
linked.RemoveDragDropItem();
}
stackedItems.Pop();
foreach (GroupSlotUI groupSlot in groupSlots)
@ -626,27 +559,14 @@ namespace SimpleInventorySystem
if (image != null)
{
image.color = new Color(image.color.r, image.color.g, image.color.b, 0f);
//image.enabled = false;
//image.color = new Color(image.color.r, image.color.g, image.color.b, 1);
}
}
internal void ShowImage()
{
if (image != null)
{
//image.color = new Color(image.color.r, image.color.g, image.color.b, 0);
image.color = new Color(image.color.r, image.color.g, image.color.b, 1);
}
}
public void OnPointerExit(PointerEventData eventData)
{
//PointerIsHoveredOver = false;
}
public void OnPointerEnter(PointerEventData eventData)
{
//PointerIsHoveredOver = true;
}
}
}

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

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

304
Assets/Items/$Prefabs/Gear/Backpacks/Backpack.prefab
View File

@ -247,67 +247,67 @@ PrefabInstance:
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 127581919932183997, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 159294275234309650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -337.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 328655878977632977, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 362980589364241711, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
@ -317,7 +317,7 @@ PrefabInstance:
- target: {fileID: 882107820144530321, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1241846233738321834, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
@ -327,107 +327,107 @@ PrefabInstance:
- target: {fileID: 1424056847127044300, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1834756652405782998, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1930088794759807003, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1992784847994984949, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -337.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2856212309935039976, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006696236295644689, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3046934977049863139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
@ -437,447 +437,447 @@ PrefabInstance:
- target: {fileID: 3108560828573021401, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3164440690105433203, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3171684479716594717, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464254841873879562, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3621423599583932870, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3936372102868567468, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3996233418386516623, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4512482539635232786, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4593119091038515760, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -337.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4674645694694766872, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5063532210437731738, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5160592004694781363, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5379659357770706979, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5380366945832432973, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5886233313200545388, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5927441967740511719, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6140796700324891194, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6223046812930372048, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6281430991116462634, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6333356779975721821, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6594101894817247317, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6967171236593706139, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7310583360244635637, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 37.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8609817844733639491, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8715477175483360852, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
@ -1002,52 +1002,52 @@ PrefabInstance:
- target: {fileID: 8920228674350630669, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8933256783519562048, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 262.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -337.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9089739429477204650, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9101404934045820233, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9156684595052604190, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9181530421356106989, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
@ -1057,32 +1057,32 @@ PrefabInstance:
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 187.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -112.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9190946835846871854, guid: c3d1700a646119d44882c1b7f9aeb6f7,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c3d1700a646119d44882c1b7f9aeb6f7, type: 3}

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:

935
Assets/Scenes/Test Scene Tony.unity
View File

File diff suppressed because it is too large Load Diff

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: