continuing bug fixes for Inventory.cs, before directory fix
This commit is contained in:
commit
c248c35dfd
12
Assets/Inventory System/2D Assets/Icons/$temp.meta
Normal file
12
Assets/Inventory System/2D Assets/Icons/$temp.meta
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta
|
||||||
|
guid: 84e7ae53e32c42d44b04a8512ca3969f
|
||||||
|
========
|
||||||
|
guid: 5c741c4d068619344a3e34e1a352d64b
|
||||||
|
folderAsset: yes
|
||||||
|
>>>>>>>> 8ee555dc27d275b48d49de54bbfa341586366f5d:Assets/Inventory System/2D Assets/Icons/$temp.meta
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -10747,6 +10747,37 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 384f5b790160f7647bf5e04ac739cc01, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 384f5b790160f7647bf5e04ac739cc01, type: 3}
|
||||||
|
--- !u!1 &533301131
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 1368908863}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 533301132}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Carrier 1 (Missing Prefab)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &533301132
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 1368908863}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 533301131}
|
||||||
|
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: 1368908864}
|
||||||
|
m_Father: {fileID: 1543407502}
|
||||||
|
m_RootOrder: 54
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &535137659
|
--- !u!1001 &535137659
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -56261,12 +56292,12 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -56359,17 +56390,17 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -2500
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Scenes/Test Scene Tony.unity.meta
|
||||||
guid: 84e7ae53e32c42d44b04a8512ca3969f
|
guid: 84e7ae53e32c42d44b04a8512ca3969f
|
||||||
|
========
|
||||||
|
guid: 5c741c4d068619344a3e34e1a352d64b
|
||||||
|
folderAsset: yes
|
||||||
|
>>>>>>>> 8ee555dc27d275b48d49de54bbfa341586366f5d:Assets/Inventory System/2D Assets/Icons/$temp.meta
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
Loading…
Reference in New Issue
Block a user