NeonTea/BloodAndGore
2
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Remove Grenade Launcher from scene and update gun droppers

Browse Source
This commit is contained in:
Sofia 2019-08-22 20:20:28 +03:00
parent 8422a747b1
commit 45b6cf5d9f
4 changed files with 19 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Destructibles/Barrel.prefab
View File

@ -124,6 +124,8 @@ MonoBehaviour:
- {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3}
- {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3}
- {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3}
- {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3}
- {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3}
SpriteChanger: {fileID: 0} SpriteChanger: {fileID: 0}
DebugExpelGun: 0 DebugExpelGun: 0
--- !u!1 &2707968752687241717 --- !u!1 &2707968752687241717

2
Assets/Prefabs/Destructibles/Crate.prefab
View File

@ -124,6 +124,8 @@ MonoBehaviour:
- {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3}
- {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3}
- {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3}
- {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3}
- {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3}
SpriteChanger: {fileID: 0} SpriteChanger: {fileID: 0}
DebugExpelGun: 0 DebugExpelGun: 0
--- !u!1 &2707968752687241717 --- !u!1 &2707968752687241717

2
Assets/Prefabs/Destructibles/Vending Machine.prefab
View File

@ -159,6 +159,8 @@ MonoBehaviour:
- {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3}
- {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3} - {fileID: 2523517584660005062, guid: 15e91d59183ba524bb3bc46b402b722d, type: 3}
- {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3} - {fileID: 4462327694118370270, guid: 32eb78b5f736d064e80ea3e74749ba29, type: 3}
- {fileID: 4462327694118370270, guid: aba907a7b31d616488d9cab508e73a3f, type: 3}
- {fileID: 4462327694118370270, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3}
SpriteChanger: {fileID: 4165805474229086665} SpriteChanger: {fileID: 4165805474229086665}
DebugExpelGun: 0 DebugExpelGun: 0
--- !u!50 &11699643827672084 --- !u!50 &11699643827672084

110
Assets/Scenes/MainScene.unity
View File

@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0 m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1 m_UseShadowmask: 0
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
serializedVersion: 2 serializedVersion: 2
@ -1402,7 +1402,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &203480852 --- !u!1 &203480852
GameObject: GameObject:
@ -15435,7 +15435,7 @@ PrefabInstance:
- target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3} type: 3}
@ -15702,7 +15702,7 @@ Transform:
- {fileID: 628992541} - {fileID: 628992541}
- {fileID: 1125139377} - {fileID: 1125139377}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &402096464 --- !u!1001 &402096464
PrefabInstance: PrefabInstance:
@ -16492,7 +16492,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 13 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &557699463 stripped --- !u!4 &557699463 stripped
Transform: Transform:
@ -21906,7 +21906,7 @@ Transform:
- {fileID: 562795619} - {fileID: 562795619}
- {fileID: 107939636} - {fileID: 107939636}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &729817018 stripped --- !u!4 &729817018 stripped
Transform: Transform:
@ -23647,7 +23647,7 @@ Transform:
- {fileID: 750521286} - {fileID: 750521286}
- {fileID: 794582329} - {fileID: 794582329}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1056137387 stripped --- !u!4 &1056137387 stripped
Transform: Transform:
@ -112167,90 +112167,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1704485383} m_PrefabInstance: {fileID: 1704485383}
m_PrefabAsset: {fileID: 0} 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 --- !u!1001 &1449612057
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113193,7 +113109,7 @@ Transform:
- {fileID: 1822937580} - {fileID: 1822937580}
- {fileID: 1619207830} - {fileID: 1619207830}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1616078557 stripped --- !u!4 &1616078557 stripped
Transform: Transform:
@ -114460,7 +114376,7 @@ Transform:
- {fileID: 1684548384} - {fileID: 1684548384}
- {fileID: 162941294} - {fileID: 162941294}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 12 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1852192920 --- !u!1001 &1852192920
PrefabInstance: PrefabInstance:
@ -114653,7 +114569,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1879260857 stripped --- !u!4 &1879260857 stripped
Transform: Transform:
@ -115319,7 +115235,7 @@ Transform:
m_Children: m_Children:
- {fileID: 139250670} - {fileID: 139250670}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2086257544 --- !u!1 &2086257544
GameObject: GameObject:
@ -115359,7 +115275,7 @@ Transform:
- {fileID: 695076217} - {fileID: 695076217}
- {fileID: 1530237516} - {fileID: 1530237516}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2099407198 --- !u!1001 &2099407198
PrefabInstance: PrefabInstance:
@ -115538,7 +115454,7 @@ Transform:
- {fileID: 63561978} - {fileID: 63561978}
- {fileID: 632288131} - {fileID: 632288131}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &2130862024 stripped --- !u!4 &2130862024 stripped
Transform: Transform: