From a743dc4df6a09d4be39cde5a1dc66bb42dd11bca Mon Sep 17 00:00:00 2001 From: tonyomendoza Date: Mon, 23 Jan 2023 14:02:38 -0800 Subject: [PATCH] Fixing item names in photoshoot --- .../Prefabs/Crafting Barter/Leather.prefab | 63 +++++++++++++--- .../Gun Attachments/Optics/EO Tech.prefab | 72 ++++++++++++++++++- 2 files changed, 125 insertions(+), 10 deletions(-) diff --git a/Assets/Items/Prefabs/Crafting Barter/Leather.prefab b/Assets/Items/Prefabs/Crafting Barter/Leather.prefab index cb22c6f6..c958b9a0 100644 --- a/Assets/Items/Prefabs/Crafting Barter/Leather.prefab +++ b/Assets/Items/Prefabs/Crafting Barter/Leather.prefab @@ -19,7 +19,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8057961283841219706 Transform: m_ObjectHideFlags: 0 @@ -27,7 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8053794548077495502} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.1923199, y: -7.1690373, z: -31.431664} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -94,7 +94,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 + m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 @@ -112,7 +112,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 1 m_CookingOptions: 30 - m_Mesh: {fileID: 5376803866560418028, guid: 36c780038f1cb354380f256aabf56ae9, type: 3} + m_Mesh: {fileID: 5187175948957059568, guid: 11b57d33d07140d4d823d3810eee021d, type: 3} --- !u!1001 &704655258019952174 PrefabInstance: m_ObjectHideFlags: 0 @@ -125,6 +125,11 @@ PrefabInstance: propertyPath: m_Name value: Pickup objectReference: {fileID: 0} + - target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975, type: 3} propertyPath: itemUI @@ -195,6 +200,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 41448510249244382, guid: d8382154c724fca4a8ddc89666da0975, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8382154c724fca4a8ddc89666da0975, type: 3} --- !u!4 &672216165437387137 stripped @@ -213,38 +223,68 @@ PrefabInstance: - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 75 objectReference: {fileID: 0} - target: {fileID: 2187376001558573093, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2281693476164157180, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4043893759634578520, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6098894821226018653, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7466157590830787944, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8715477175483360842, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: itemName + value: Leather + objectReference: {fileID: 0} - target: {fileID: 8715477175483360852, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_Name value: Leather UI objectReference: {fileID: 0} + - target: {fileID: 8715477175483360852, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8715477175483360853, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} propertyPath: m_LocalPosition.x @@ -350,6 +390,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8715477176133586259, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 36830ec92f96f264d8ed3b5d8ce2e92e, type: 3} --- !u!224 &3303774725375982231 stripped diff --git a/Assets/Items/Prefabs/Gun Attachments/Optics/EO Tech.prefab b/Assets/Items/Prefabs/Gun Attachments/Optics/EO Tech.prefab index c6ca2366..d15f79d4 100644 --- a/Assets/Items/Prefabs/Gun Attachments/Optics/EO Tech.prefab +++ b/Assets/Items/Prefabs/Gun Attachments/Optics/EO Tech.prefab @@ -19,7 +19,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8057961283841219706 Transform: m_ObjectHideFlags: 0 @@ -119,11 +119,66 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5461181487763132176} m_Modifications: + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 37.5 + objectReference: {fileID: 0} + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_SizeDelta.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2187376001558573093, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 4043893759634578520, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6098894821226018653, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7466157590830787944, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8715477175483360842, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: itemName + value: EO Tech + objectReference: {fileID: 0} - target: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3} propertyPath: m_Name value: Pouch_1x1 objectReference: {fileID: 0} + - target: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8715477175483360853, guid: 6503a074877a8b94db2e933a435264f5, type: 3} propertyPath: m_LocalPosition.x @@ -229,6 +284,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8715477176133586259, guid: 6503a074877a8b94db2e933a435264f5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6503a074877a8b94db2e933a435264f5, type: 3} --- !u!114 &3723028574016314450 stripped @@ -255,6 +315,11 @@ PrefabInstance: propertyPath: m_Name value: Pickup objectReference: {fileID: 0} + - target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975, type: 3} propertyPath: ItemGameObject @@ -325,6 +390,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 41448510249244382, guid: d8382154c724fca4a8ddc89666da0975, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8382154c724fca4a8ddc89666da0975, type: 3} --- !u!4 &5461181487763132176 stripped