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

Fixed bug with Storage Window: click through

Browse Source
This commit is contained in:
tonyomendoza 2023-02-13 14:15:10 -08:00
parent 4c8a95dadc
commit f1453a6f99
31 changed files with 709 additions and 498 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/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:

503
Assets/Inventory System/Prefabs/UI Windows/Storage Window.prefab
View File

File diff suppressed because it is too large Load Diff

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

@ -292,6 +292,7 @@ namespace SimpleInventorySystem
public GameObject StorageWindowPrefab;
public Transform DefaultItemSpawn;
[HideInInspector] public bool IsDraggingItem;
public List<GameObject> hResults;
public enum States { Undefined, Loot, PickUp };
public States CurrentState = States.Undefined;
@ -414,7 +415,7 @@ namespace SimpleInventorySystem
}
}
hoverResults = GetPointerOverUIObject();
hResults= hoverResults = GetPointerOverUIObject();
}
private List<GameObject> GetPointerOverUIObject()
@ -456,8 +457,14 @@ namespace SimpleInventorySystem
}
foreach(GameObject go in hoverResults)
{
if(go.GetComponent<BlockRaycast>() != null)
{
Debug.Log("BlockRaycast");
return false;
}
if(go.GetComponent<ItemUI>() != null)
{
Debug.Log(hoverResults);
if (go.GetComponent<ItemUI>() == item)
return true;
else

18
Assets/Inventory System/Scripts/UI/BlockRaycast.cs Normal file
View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class BlockRaycast : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Inventory System/Scripts/UI/BlockRaycast.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f47e497dfc27e9947bc9e6a360f5d2dd
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@ -215,14 +215,6 @@ namespace SimpleInventorySystem
return slot;
}
public void OnBeginDrag(PointerEventData eventData)
{
}
public void OnDrag(PointerEventData eventData)
{
}
public void OnEndDrag(PointerEventData eventData)
{
//rectTransform.localPosition = new Vector3(0, 0);
@ -706,10 +698,14 @@ namespace SimpleInventorySystem
{
if (Input.GetMouseButtonDown(0) && !isDragging && InventorySystem.instance.DraggedItem == null && !slot.DroppedOnFrame)
{
Debug.Log("Grab and drag");
GrabAndDragItem();
}
if (Input.GetMouseButtonDown(1) && !InventorySystem.instance.IsDraggingItem)
else if (Input.GetMouseButtonDown(2))
{
ShowStorageWindow();
}
else if (Input.GetMouseButtonDown(1) && !InventorySystem.instance.IsDraggingItem)
{
InventorySystem.instance.OpenContextMenu(this);
}
@ -764,13 +760,6 @@ namespace SimpleInventorySystem
}
}
}
else
{
if (PointerIsHoveredOver && Input.GetMouseButtonDown(2))
{
ShowStorageWindow();
}
}
}
public void ShowStorageWindow()

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:

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

@ -2430,7 +2430,7 @@ Transform:
m_Children:
- {fileID: 1827148514}
m_Father: {fileID: 896911593}
m_RootOrder: 45
m_RootOrder: 46
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &147581201
PrefabInstance:
@ -2540,7 +2540,7 @@ Transform:
m_Children:
- {fileID: 577706698}
m_Father: {fileID: 1543407502}
m_RootOrder: 60
m_RootOrder: 64
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &152712156 stripped
Rigidbody:
@ -5171,18 +5171,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 421f12c4cc2c4614f9e0616ef942cf44, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &236675543 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4462357582487606, guid: e3c3fc737aaecec47998dbddc1dc85f6,
type: 3}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
--- !u!54 &236675544 stripped
--- !u!54 &236675544
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 54694976647650114, guid: e3c3fc737aaecec47998dbddc1dc85f6,
type: 3}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080500731}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &239185982
GameObject:
m_ObjectHideFlags: 0
@ -10147,7 +10152,7 @@ Transform:
m_Children:
- {fileID: 825909253}
m_Father: {fileID: 896911593}
m_RootOrder: 48
m_RootOrder: 49
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &478349765
PrefabInstance:
@ -10437,12 +10442,23 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 485058209}
m_PrefabAsset: {fileID: 0}
--- !u!54 &493699447 stripped
--- !u!54 &493699447
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 54694976647650114, guid: e3c3fc737aaecec47998dbddc1dc85f6,
type: 3}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1260416192}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &502088768
PrefabInstance:
m_ObjectHideFlags: 0
@ -10628,7 +10644,7 @@ Transform:
m_Children:
- {fileID: 1858303648}
m_Father: {fileID: 896911593}
m_RootOrder: 56
m_RootOrder: 57
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &511873482 stripped
Transform:
@ -14403,7 +14419,7 @@ Transform:
m_Children:
- {fileID: 1868654628}
m_Father: {fileID: 896911593}
m_RootOrder: 55
m_RootOrder: 56
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &723908773
PrefabInstance:
@ -17434,6 +17450,20 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3}
--- !u!4 &752842958
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1429423539}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1235512995}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &760591746
PrefabInstance:
m_ObjectHideFlags: 0
@ -19612,6 +19642,38 @@ Transform:
m_Father: {fileID: 1543407502}
m_RootOrder: 48
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &848824643
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 848824644}
m_Layer: 0
m_Name: Backpack (Missing Prefab)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &848824644
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 848824643}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1575759681}
- {fileID: 1260416193}
m_Father: {fileID: 1543407502}
m_RootOrder: 60
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &849794424
PrefabInstance:
m_ObjectHideFlags: 0
@ -21130,7 +21192,7 @@ Transform:
m_Children:
- {fileID: 1723763466}
m_Father: {fileID: 896911593}
m_RootOrder: 49
m_RootOrder: 50
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &871110459
PrefabInstance:
@ -22159,6 +22221,7 @@ Transform:
- {fileID: 1937331975}
- {fileID: 1458130169}
- {fileID: 2100709406}
- {fileID: 1235512995}
- {fileID: 146975374}
- {fileID: 2144425236}
- {fileID: 1238533176}
@ -22174,12 +22237,11 @@ Transform:
- {fileID: 914884887}
- {fileID: 1968508996}
- {fileID: 1972564566}
- {fileID: 1181260133}
- {fileID: 1551725618}
- {fileID: 451266285}
- {fileID: 1453301001}
- {fileID: 1117495336}
- {fileID: 236675543}
- {fileID: 1181260133}
- {fileID: 789072850}
- {fileID: 1891920042}
- {fileID: 333145655}
@ -22803,7 +22865,7 @@ Transform:
m_Children:
- {fileID: 1006786797}
m_Father: {fileID: 896911593}
m_RootOrder: 57
m_RootOrder: 58
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &915529562
PrefabInstance:
@ -26823,6 +26885,37 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50f24670ae4142c46b36d06fea8a88d8, type: 3}
--- !u!1 &1080500731
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1080500732}
- component: {fileID: 236675544}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1080500732
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080500731}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1235512995}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1083955393
PrefabInstance:
m_ObjectHideFlags: 0
@ -30941,7 +31034,7 @@ Transform:
m_Children:
- {fileID: 1466038347}
m_Father: {fileID: 896911593}
m_RootOrder: 52
m_RootOrder: 53
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1152892792 stripped
Transform:
@ -31749,7 +31842,7 @@ Transform:
m_Children:
- {fileID: 525123086}
m_Father: {fileID: 896911593}
m_RootOrder: 60
m_RootOrder: 65
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1187474055
PrefabInstance:
@ -32320,7 +32413,7 @@ Transform:
m_Children:
- {fileID: 1766696291}
m_Father: {fileID: 896911593}
m_RootOrder: 51
m_RootOrder: 52
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1208310747
GameObject:
@ -32949,6 +33042,38 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1234393278}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1235512994
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1235512995}
m_Layer: 0
m_Name: Backpack (Missing Prefab)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1235512995
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235512994}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 752842958}
- {fileID: 1080500732}
m_Father: {fileID: 896911593}
m_RootOrder: 45
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1236457452
PrefabInstance:
m_ObjectHideFlags: 0
@ -33116,7 +33241,7 @@ Transform:
m_Children:
- {fileID: 790323254}
m_Father: {fileID: 896911593}
m_RootOrder: 47
m_RootOrder: 48
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1239567271
PrefabInstance:
@ -33364,6 +33489,37 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: afbc9b9e8f21b404cbdd2f3b19fb7620, type: 3}
--- !u!1 &1260416192
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1260416193}
- component: {fileID: 493699447}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1260416193
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1260416192}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 848824644}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1263612017
PrefabInstance:
m_ObjectHideFlags: 0
@ -37631,6 +37787,22 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1429109133}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1429423539
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 752842957}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 752842958}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &1447027985
PrefabInstance:
m_ObjectHideFlags: 0
@ -40222,11 +40394,11 @@ Transform:
- {fileID: 1040389512}
- {fileID: 630456241}
- {fileID: 867708039}
- {fileID: 150068387}
- {fileID: 848824644}
- {fileID: 1464582468}
- {fileID: 224145751}
- {fileID: 1128457984}
- {fileID: 1575759681}
- {fileID: 150068387}
- {fileID: 1367057314}
- {fileID: 2121566407}
- {fileID: 1646753860}
@ -42215,12 +42387,20 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3c3fc737aaecec47998dbddc1dc85f6, type: 3}
--- !u!4 &1575759681 stripped
--- !u!4 &1575759681
Transform:
m_CorrespondingSourceObject: {fileID: 4462357582487606, guid: e3c3fc737aaecec47998dbddc1dc85f6,
type: 3}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1598470842}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 848824644}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1580578181
PrefabInstance:
m_ObjectHideFlags: 0
@ -42739,6 +42919,22 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 849794424}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1598470842
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 1575759680}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1575759681}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1602372552
Transform:
m_ObjectHideFlags: 0
@ -49129,7 +49325,7 @@ Transform:
m_Children:
- {fileID: 1208310748}
m_Father: {fileID: 896911593}
m_RootOrder: 54
m_RootOrder: 55
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1924286665
GameObject:
@ -49841,7 +50037,7 @@ Transform:
m_Children:
- {fileID: 1193367205}
m_Father: {fileID: 896911593}
m_RootOrder: 50
m_RootOrder: 51
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1950903344
PrefabInstance:
@ -50397,7 +50593,7 @@ Transform:
m_Children:
- {fileID: 1753173232}
m_Father: {fileID: 896911593}
m_RootOrder: 58
m_RootOrder: 59
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1971328865
PrefabInstance:
@ -50503,7 +50699,7 @@ Transform:
m_Children:
- {fileID: 857731646}
m_Father: {fileID: 896911593}
m_RootOrder: 59
m_RootOrder: 60
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1974746329
GameObject:
@ -55829,7 +56025,7 @@ Transform:
m_Children:
- {fileID: 881077467}
m_Father: {fileID: 896911593}
m_RootOrder: 53
m_RootOrder: 54
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2140522442
PrefabInstance:
@ -56002,7 +56198,7 @@ Transform:
m_Children:
- {fileID: 1756650106}
m_Father: {fileID: 896911593}
m_RootOrder: 46
m_RootOrder: 47
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2144888369
PrefabInstance:
@ -56283,6 +56479,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56493,6 +56694,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56513,6 +56719,31 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56616,12 +56847,12 @@ PrefabInstance:
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -56643,6 +56874,31 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56666,17 +56922,17 @@ PrefabInstance:
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -2500
objectReference: {fileID: 0}
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -56703,6 +56959,26 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56933,6 +57209,26 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56958,6 +57254,56 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
@ -56978,6 +57324,31 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y

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: