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

Update Grenade Launcher

This commit is contained in:
Sofia 2019-08-18 21:55:34 +03:00
parent bcac587806
commit d758fbf2e6
3 changed files with 80 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Bullets/Grenade.prefab
View File

@ -56,7 +56,7 @@ Rigidbody2D:
m_Interpolate: 1
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
m_Constraints: 0
--- !u!114 &4482402865533696887
MonoBehaviour:
m_ObjectHideFlags: 0

87
Assets/Scenes/MainScene.unity
View File

@ -860,7 +860,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &203480852
GameObject:
@ -14709,7 +14709,7 @@ PrefabInstance:
- target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b,
type: 3}
@ -14976,7 +14976,7 @@ Transform:
- {fileID: 628992541}
- {fileID: 1125139377}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &402096464
PrefabInstance:
@ -20548,7 +20548,7 @@ Transform:
- {fileID: 800967889}
- {fileID: 982133696}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &729817018 stripped
Transform:
@ -21993,7 +21993,7 @@ Transform:
- {fileID: 750521286}
- {fileID: 794582329}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1056137387 stripped
Transform:
@ -110116,6 +110116,75 @@ 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}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: da2dfe8e5a4e5f64597d1fa9fcecce7e, type: 3}
--- !u!1001 &1449612057
PrefabInstance:
m_ObjectHideFlags: 0
@ -111006,7 +111075,7 @@ Transform:
- {fileID: 1822937580}
- {fileID: 1619207830}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1616078557 stripped
Transform:
@ -112009,7 +112078,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1879260857 stripped
Transform:
@ -112583,7 +112652,7 @@ Transform:
m_Children:
- {fileID: 139250670}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2086257544
GameObject:
@ -112622,7 +112691,7 @@ Transform:
- {fileID: 166998417}
- {fileID: 695076217}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2099407198
PrefabInstance:

2
Assets/Scripts/Guns/Grenade.cs
View File

@ -25,7 +25,7 @@ namespace Saltosion.OneWeapon.Guns {
Body.SetRotation(Bullet.InitialRotation);
Body.AddForce(Bullet.Direction.normalized * ShootForce, ForceMode2D.Impulse);
Body.AddTorque(Random.value * Torque - Torque / 2);
Body.AddTorque(Random.value * Torque - Torque / 2, ForceMode2D.Impulse);
Explosion.Stop();
}