From 45b6cf5d9fa2dff0f0fa31713b4aa3d63cc722d7 Mon Sep 17 00:00:00 2001 From: teascade Date: Thu, 22 Aug 2019 20:20:28 +0300 Subject: [PATCH] Remove Grenade Launcher from scene and update gun droppers --- Assets/Prefabs/Destructibles/Barrel.prefab | 2 + Assets/Prefabs/Destructibles/Crate.prefab | 2 + .../Destructibles/Vending Machine.prefab | 2 + Assets/Scenes/MainScene.unity | 110 +++--------------- 4 files changed, 19 insertions(+), 97 deletions(-) diff --git a/Assets/Prefabs/Destructibles/Barrel.prefab b/Assets/Prefabs/Destructibles/Barrel.prefab index 01f6f91..3d69b66 100644 --- a/Assets/Prefabs/Destructibles/Barrel.prefab +++ b/Assets/Prefabs/Destructibles/Barrel.prefab @@ -124,6 +124,8 @@ MonoBehaviour: - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} + - {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3} + - {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3} SpriteChanger: {fileID: 0} DebugExpelGun: 0 --- !u!1 &2707968752687241717 diff --git a/Assets/Prefabs/Destructibles/Crate.prefab b/Assets/Prefabs/Destructibles/Crate.prefab index 3ec0fb3..b7b9413 100644 --- a/Assets/Prefabs/Destructibles/Crate.prefab +++ b/Assets/Prefabs/Destructibles/Crate.prefab @@ -124,6 +124,8 @@ MonoBehaviour: - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} + - {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3} + - {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3} SpriteChanger: {fileID: 0} DebugExpelGun: 0 --- !u!1 &2707968752687241717 diff --git a/Assets/Prefabs/Destructibles/Vending Machine.prefab b/Assets/Prefabs/Destructibles/Vending Machine.prefab index b17a97a..d22f85b 100644 --- a/Assets/Prefabs/Destructibles/Vending Machine.prefab +++ b/Assets/Prefabs/Destructibles/Vending Machine.prefab @@ -159,6 +159,8 @@ MonoBehaviour: - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} + - {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3} + - {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3} SpriteChanger: {fileID: 4165805474229086665} DebugExpelGun: 0 --- !u!50 &11699643827672084 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index ac8c445..8a97246 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -1402,7 +1402,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &203480852 GameObject: @@ -15435,7 +15435,7 @@ PrefabInstance: - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} @@ -15702,7 +15702,7 @@ Transform: - {fileID: 628992541} - {fileID: 1125139377} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &402096464 PrefabInstance: @@ -16492,7 +16492,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &557699463 stripped Transform: @@ -21906,7 +21906,7 @@ Transform: - {fileID: 562795619} - {fileID: 107939636} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &729817018 stripped Transform: @@ -23647,7 +23647,7 @@ Transform: - {fileID: 750521286} - {fileID: 794582329} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1056137387 stripped Transform: @@ -112167,90 +112167,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1704485383} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1448380485 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_Name - value: Grenade Launcher - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalPosition.x - value: -22.089926 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalPosition.y - value: 8.416012 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327694118370271, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4462327695001662280, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4462327695001662280, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4462327695001662280, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3} --- !u!1001 &1449612057 PrefabInstance: m_ObjectHideFlags: 0 @@ -113193,7 +113109,7 @@ Transform: - {fileID: 1822937580} - {fileID: 1619207830} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1616078557 stripped Transform: @@ -114460,7 +114376,7 @@ Transform: - {fileID: 1684548384} - {fileID: 162941294} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1852192920 PrefabInstance: @@ -114653,7 +114569,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1879260857 stripped Transform: @@ -115319,7 +115235,7 @@ Transform: m_Children: - {fileID: 139250670} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2086257544 GameObject: @@ -115359,7 +115275,7 @@ Transform: - {fileID: 695076217} - {fileID: 1530237516} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2099407198 PrefabInstance: @@ -115538,7 +115454,7 @@ Transform: - {fileID: 63561978} - {fileID: 632288131} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2130862024 stripped Transform: