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

fixing merge

Browse Source
This commit is contained in:
tonyomendoza 2023-01-15 19:25:02 -08:00
commit f1387fd7a9
5 changed files with 29631 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29524
Assets/Inventory System/Scenes/Item Icon Script.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Inventory System/Scenes/Item Icon Script.unity.meta Normal file
View File

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

2
Assets/Items/Materials/Gear/Body Armor/Bullet Proof Vest.mat
View File

@ -65,7 +65,7 @@ Material:
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 0
- _OcclusionStrength: 0.283
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1

4
Assets/Items/Prefabs/Gear/Plates.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: e85916d135215644d84361b421e17277
=======
guid: e1d498a019740714c8734af8f4a0194b
>>>>>>> 66c43bfa71304f70fba17da50afa32aef15d1365
folderAsset: yes
DefaultImporter:
externalObjects: {}

133
Assets/Scenes/Item Prefab Collection.unity
View File

@ -7629,7 +7629,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 160299755}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 32.521553, y: -21.613644, z: -21.63}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -7639,7 +7639,7 @@ Transform:
- {fileID: 1925793665}
- {fileID: 1095617858}
- {fileID: 619640145}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &160349081
@ -11302,6 +11302,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 1
@ -11347,10 +11348,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 316.71497, y: -335}
m_SizeDelta: {x: 613.42993, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &241671904
MonoBehaviour:
@ -18895,7 +18896,7 @@ Transform:
- {fileID: 320344004}
- {fileID: 1630101786}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &376275153
GameObject:
@ -29079,7 +29080,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494516372}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.677895, y: -2.7919345, z: -22.292736}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -29100,7 +29101,7 @@ Transform:
- {fileID: 911603249}
- {fileID: 1302938095}
- {fileID: 272341673}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &498469901
@ -33263,10 +33264,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 175}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 316.71497, y: -592.5}
m_SizeDelta: {x: 613.42993, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &567241873
MonoBehaviour:
@ -34187,6 +34188,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -36315,7 +36317,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2e1995b83dc84e94ab3796f192a1632b, type: 3}
m_Name:
m_EditorClassIdentifier:
items: []
hasBeenLooted: 0
prefabs: []
itemUIs: []
--- !u!65 &636519395
BoxCollider:
m_ObjectHideFlags: 0
@ -36342,7 +36346,7 @@ Transform:
m_Children:
- {fileID: 830648549}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &637594082
GameObject:
@ -36699,7 +36703,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1206005368}
m_Direction: 2
m_Value: 1
m_Size: 0.5264038
m_Size: 0.52640384
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -42146,6 +42150,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 1
@ -43060,6 +43065,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -43517,6 +43523,42 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 787657503}
m_PrefabAsset: {fileID: 0}
--- !u!1 &788123589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 788123590}
m_Layer: 0
m_Name: Item Collection
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &788123590
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788123589}
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: 160299756}
- {fileID: 2089184116}
- {fileID: 1465372049}
- {fileID: 494516373}
- {fileID: 1996431616}
- {fileID: 851022967}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &790672863
GameObject:
m_ObjectHideFlags: 0
@ -44106,6 +44148,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -47096,7 +47139,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 851022966}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.677895, y: -2.7919345, z: -22.292736}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -47109,7 +47152,7 @@ Transform:
- {fileID: 1993663217}
- {fileID: 427770988}
- {fileID: 651606064}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &854955842
@ -52745,6 +52788,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -65599,7 +65643,7 @@ Transform:
- {fileID: 1124594991}
- {fileID: 831625433}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1216902021
AudioSource:
@ -67491,6 +67535,7 @@ MonoBehaviour:
TagSlotPairings:
- itemTag: 12
slot: {fileID: 1298952973}
TagSlotGridPairings: []
raritiesList:
- rarityType: 0
color: {r: 0.6, g: 0.6, b: 0.6, a: 0}
@ -67503,6 +67548,8 @@ MonoBehaviour:
- rarityType: 4
color: {r: 1, g: 0.85098046, b: 0.40000004, a: 0}
ItemBackdropTransparency: 0.5
LootGrid: {fileID: 0}
StorageWindowPrefab: {fileID: 0}
CurrentState: 0
--- !u!4 &1247297876
Transform:
@ -67519,7 +67566,7 @@ Transform:
- {fileID: 1895235290}
- {fileID: 1120259801}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1248398545
GameObject:
@ -69842,6 +69889,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 0.8
StackItemsOnSlot: 0
@ -72034,10 +72082,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 316.71497, y: -445}
m_SizeDelta: {x: 613.42993, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1343755198
MonoBehaviour:
@ -74843,6 +74891,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -77232,6 +77281,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 0.8
StackItemsOnSlot: 0
@ -79782,7 +79832,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465372048}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.677895, y: -2.7919345, z: -22.292736}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -79793,7 +79843,7 @@ Transform:
- {fileID: 1776184616}
- {fileID: 856036754}
- {fileID: 150836196}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1465693919
@ -81815,6 +81865,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -83891,7 +83942,7 @@ Transform:
- {fileID: 1647558718}
- {fileID: 344199253}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1544520022
PrefabInstance:
@ -84670,6 +84721,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 1
@ -88048,7 +88100,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1608538311
GameObject:
@ -90306,6 +90358,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -103131,6 +103184,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 0
@ -104728,8 +104782,8 @@ RectTransform:
m_Father: {fileID: 1767032639}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 584.8999, y: 2500}
m_Pivot: {x: 0, y: 1}
@ -104749,6 +104803,7 @@ MonoBehaviour:
type: 3}
generateCells: 1
slots: []
associatedItemUI: {fileID: 0}
gridSize:
Width: 10
Height: 25
@ -107435,6 +107490,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 071df41a57defc446bfaf44a9f9aa334, type: 3}
m_Name:
m_EditorClassIdentifier:
title: {fileID: 0}
--- !u!114 &1957989398
MonoBehaviour:
m_ObjectHideFlags: 0
@ -110107,6 +110163,7 @@ MonoBehaviour:
LinkedSlots: []
groupSlots: []
grid: {fileID: 0}
changeSlotTitle: {fileID: 0}
CellInUse: 0
imageScale: 1
StackItemsOnSlot: 1
@ -110401,7 +110458,7 @@ Transform:
- {fileID: 1544727704}
- {fileID: 1288642814}
- {fileID: 189241836}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1996978221
@ -113517,10 +113574,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 275}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 316.71497, y: -137.5}
m_SizeDelta: {x: 613.42993, y: 275}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2054169366
CanvasRenderer:
@ -116240,7 +116297,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089184115}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 29.223661, y: -19.703602, z: -21.351341}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -116252,7 +116309,7 @@ Transform:
- {fileID: 2019725256}
- {fileID: 1797669008}
- {fileID: 315355958}
m_Father: {fileID: 0}
m_Father: {fileID: 788123590}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2090407906
@ -118892,7 +118949,7 @@ Transform:
- {fileID: 639048678}
- {fileID: 538739430}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2147395287
GameObject: