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

adjusted a few settings and played around with the photoshoot scene a little

Browse Source
This commit is contained in:
OceanSlim 2023-01-14 11:47:24 -05:00
parent 6f2ea44cba
commit fdc6a8405a
13 changed files with 520 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Inventory System/Assets/Icons/1x1 Brown Pouch_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
Assets/Inventory System/Assets/Icons/1x1 Green Pouch_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
Assets/Inventory System/Assets/Icons/Mini Backpack_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 52 KiB

BIN
Assets/Inventory System/Assets/Icons/Mini Bag_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 71 KiB

4
Assets/Inventory System/Prefabs/Item UI/Draft Items/Ammo_Sniper.prefab
View File

@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8715477175483360842
MonoBehaviour:
@ -252,7 +252,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 75b84ff785f2c024781198f0790f959a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

2
Assets/Inventory System/Prefabs/Item UI/Draft Items/Helmet.prefab
View File

@ -116,7 +116,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: cb5ccc4ed6e7f2e4990a99858e55f470, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

27
Assets/Inventory System/Prefabs/Item UI/Mini_Bag_4x3.prefab
View File

@ -56,25 +56,22 @@ MonoBehaviour:
m_EditorClassIdentifier:
itemName: Mini Bag
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 7083487241733903762}
emptyGridContainer: {fileID: 2291742169139417640}
canvas: {fileID: 0}
rarity: 1
ItemTag: 12
StackLimit: 1
width: 4
height: 3
ItemTag: 12
containerUIPrefab: {fileID: 4961555904879958529, guid: 7e4d12da73fa8884991a2dd8a33d8260,
type: 3}
backdropImage: {fileID: 7083487241733903762}
emptyGridContainer: {fileID: 2291742169139417640}
interactable: 1
overrideSortingCanvas: {fileID: 0}
Equipped: 0
ContainedItems: []
ParentContainer: {fileID: 0}
container: {fileID: 0}
containerUIPrefab: {fileID: 4961555904879958529, guid: 7e4d12da73fa8884991a2dd8a33d8260,
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
oldImageSizeDelta: {x: 0, y: 0}
oldSizeDelta: {x: 0, y: 0}
rarity: 1
interactable: 1
overrideSortingCanvas: {fileID: 0}
StackLimit: 1
canvas: {fileID: 0}
PickedUpOnFrame: 0
ContextWindows: []
IsLinkedSlotClone: 0
@ -120,7 +117,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: cb5ccc4ed6e7f2e4990a99858e55f470, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

27
Assets/Inventory System/Prefabs/Item UI/Pouch_1x1.prefab
View File

@ -56,25 +56,22 @@ MonoBehaviour:
m_EditorClassIdentifier:
itemName: Pouch 1x1
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 8623007654356922553}
emptyGridContainer: {fileID: 1491862847934857702}
canvas: {fileID: 0}
rarity: 0
ItemTag: 13
StackLimit: 1
width: 1
height: 1
ItemTag: 13
containerUIPrefab: {fileID: 4961555904879958529, guid: f3425cbf277fef64da5cb7046be46b55,
type: 3}
backdropImage: {fileID: 8623007654356922553}
emptyGridContainer: {fileID: 1491862847934857702}
interactable: 1
overrideSortingCanvas: {fileID: 0}
Equipped: 0
ContainedItems: []
ParentContainer: {fileID: 0}
container: {fileID: 0}
containerUIPrefab: {fileID: 4961555904879958529, guid: f3425cbf277fef64da5cb7046be46b55,
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
oldImageSizeDelta: {x: 0, y: 0}
oldSizeDelta: {x: 0, y: 0}
rarity: 0
interactable: 1
overrideSortingCanvas: {fileID: 0}
StackLimit: 1
canvas: {fileID: 0}
PickedUpOnFrame: 0
ContextWindows: []
IsLinkedSlotClone: 0
@ -120,7 +117,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 75b84ff785f2c024781198f0790f959a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

2
Assets/Inventory System/Prefabs/UI Elements/Empty Grid/Empty_Grid_1x1.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1453453923570898490
CanvasRenderer:

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

@ -11347,10 +11347,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &241671904
MonoBehaviour:
@ -33263,10 +33263,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &567241873
MonoBehaviour:
@ -36699,7 +36699,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1206005368}
m_Direction: 2
m_Value: 1
m_Size: 0.52640384
m_Size: 0.5264038
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -52887,7 +52887,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1406011021}
m_Direction: 2
m_Value: 1
m_Size: 0.29797193
m_Size: 0.2979719
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -71527,7 +71527,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1258994301}
m_HandleRect: {fileID: 1258994300}
m_Direction: 0
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -72034,10 +72034,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1343755198
MonoBehaviour:
@ -113517,10 +113517,10 @@ RectTransform:
m_Father: {fileID: 1679641652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 275}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2054169366
CanvasRenderer:

164
Assets/Scenes/NeoFPS Test.unity
View File

@ -16008,6 +16008,36 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2921903096632469068, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4433758807852461450, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_LocalPosition.x
@ -16068,6 +16098,96 @@ PrefabInstance:
propertyPath: m_Name
value: Sample Item
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5027360250391124467, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5312124948139735887, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6878925001354159873, guid: 4ff633add8243844da9ec2c97a151e3c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4ff633add8243844da9ec2c97a151e3c, type: 3}
--- !u!1001 &1034226260
@ -40101,27 +40221,27 @@ PrefabInstance:
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 316.71497
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 613.42993
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326604746266596, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -592.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326604942899899, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -40496,27 +40616,27 @@ PrefabInstance:
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 316.71497
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 613.42993
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -137.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605790841685, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -40601,12 +40721,12 @@ PrefabInstance:
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -40666,27 +40786,27 @@ PrefabInstance:
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 316.71497
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 613.42993
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -335
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -41091,27 +41211,27 @@ PrefabInstance:
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 316.71497
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_SizeDelta.x
value: 613.42993
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -445
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}

510
Assets/Scenes/Photoshoot Stage.unity
View File

File diff suppressed because it is too large Load Diff

2
Graphics.settings
View File

@ -6,5 +6,5 @@
"m_Quality": 0,
"m_VSync": 0,
"m_FrameRateCap": -1,
"m_VerticalFOV": 44.9910888671875
"m_VerticalFOV": 45.00894546508789
}