Added randomized reload time

This commit is contained in:
Gregory Campbell
2020-07-11 15:00:26 -04:00
parent c1efe59c11
commit 6faf425d06
3 changed files with 208 additions and 244 deletions
+205 -241
View File
@@ -400,87 +400,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &750352902
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 750352904}
- component: {fileID: 750352903}
m_Layer: 0
m_Name: Life (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &750352903
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 750352902}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1476903531
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.64, y: 0.64}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &750352904
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 750352902}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.25, y: 4.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1098479927 --- !u!1001 &1098479927
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -658,87 +577,144 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1112197962} m_PrefabInstance: {fileID: 1112197962}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1285277664 --- !u!1001 &1269493684
GameObject: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} serializedVersion: 2
m_PrefabInstance: {fileID: 0} m_Modification:
m_PrefabAsset: {fileID: 0} m_TransformParent: {fileID: 0}
serializedVersion: 6 m_Modifications:
m_Component: - target: {fileID: 8840464674455634544, guid: e2348ffe25741cf409503f26d4f38070,
- component: {fileID: 1285277666} type: 3}
- component: {fileID: 1285277665} propertyPath: m_Name
m_Layer: 0 value: Life (1)
m_Name: Life objectReference: {fileID: 0}
m_TagString: Untagged - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_Icon: {fileID: 0} type: 3}
m_NavMeshLayer: 0 propertyPath: m_LocalPosition.x
m_StaticEditorFlags: 0 value: -7.25
m_IsActive: 1 objectReference: {fileID: 0}
--- !u!212 &1285277665 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
SpriteRenderer: type: 3}
propertyPath: m_LocalPosition.y
value: 4.5
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e2348ffe25741cf409503f26d4f38070, type: 3}
--- !u!1001 &1388018927
PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} serializedVersion: 2
m_PrefabInstance: {fileID: 0} m_Modification:
m_PrefabAsset: {fileID: 0} m_TransformParent: {fileID: 0}
m_GameObject: {fileID: 1285277664} m_Modifications:
m_Enabled: 1 - target: {fileID: 8840464674455634544, guid: e2348ffe25741cf409503f26d4f38070,
m_CastShadows: 0 type: 3}
m_ReceiveShadows: 0 propertyPath: m_Name
m_DynamicOccludee: 1 value: Life (2)
m_MotionVectors: 1 objectReference: {fileID: 0}
m_LightProbeUsage: 1 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_ReflectionProbeUsage: 1 type: 3}
m_RayTracingMode: 0 propertyPath: m_LocalPosition.x
m_RenderingLayerMask: 1 value: -6.25
m_RendererPriority: 0 objectReference: {fileID: 0}
m_Materials: - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} type: 3}
m_StaticBatchInfo: propertyPath: m_LocalPosition.y
firstSubMesh: 0 value: 4.5
subMeshCount: 0 objectReference: {fileID: 0}
m_StaticBatchRoot: {fileID: 0} - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_ProbeAnchor: {fileID: 0} type: 3}
m_LightProbeVolumeOverride: {fileID: 0} propertyPath: m_LocalPosition.z
m_ScaleInLightmap: 1 value: 0
m_ReceiveGI: 1 objectReference: {fileID: 0}
m_PreserveUVs: 0 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_IgnoreNormalsForChartDetection: 0 type: 3}
m_ImportantGI: 0 propertyPath: m_LocalRotation.x
m_StitchLightmapSeams: 1 value: 0
m_SelectedEditorRenderState: 0 objectReference: {fileID: 0}
m_MinimumChartSize: 4 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_AutoUVMaxDistance: 0.5 type: 3}
m_AutoUVMaxAngle: 89 propertyPath: m_LocalRotation.y
m_LightmapParameters: {fileID: 0} value: 0
m_SortingLayerID: -1476903531 objectReference: {fileID: 0}
m_SortingLayer: 3 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_SortingOrder: 0 type: 3}
m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3} propertyPath: m_LocalRotation.z
m_Color: {r: 1, g: 1, b: 1, a: 1} value: 0
m_FlipX: 0 objectReference: {fileID: 0}
m_FlipY: 0 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_DrawMode: 0 type: 3}
m_Size: {x: 0.64, y: 0.64} propertyPath: m_LocalRotation.w
m_AdaptiveModeThreshold: 0.5 value: 1
m_SpriteTileMode: 0 objectReference: {fileID: 0}
m_WasSpriteAssigned: 1 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_MaskInteraction: 0 type: 3}
m_SpriteSortPoint: 0 propertyPath: m_RootOrder
--- !u!4 &1285277666 value: 9
Transform: objectReference: {fileID: 0}
m_ObjectHideFlags: 0 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_CorrespondingSourceObject: {fileID: 0} type: 3}
m_PrefabInstance: {fileID: 0} propertyPath: m_LocalEulerAnglesHint.x
m_PrefabAsset: {fileID: 0} value: 0
m_GameObject: {fileID: 1285277664} objectReference: {fileID: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_LocalPosition: {x: -8.25, y: 4.5, z: 0} type: 3}
m_LocalScale: {x: 1, y: 1, z: 1} propertyPath: m_LocalEulerAnglesHint.y
m_Children: [] value: 0
m_Father: {fileID: 0} objectReference: {fileID: 0}
m_RootOrder: 7 - target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e2348ffe25741cf409503f26d4f38070, type: 3}
--- !u!1 &1572597971 --- !u!1 &1572597971
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -962,87 +938,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1881096764} m_PrefabInstance: {fileID: 1881096764}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1969484886
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1969484888}
- component: {fileID: 1969484887}
m_Layer: 0
m_Name: Life (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &1969484887
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1969484886}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1476903531
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.64, y: 0.64}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1969484888
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1969484886}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.25, y: 4.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1990476329 --- !u!1 &1990476329
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1257,3 +1152,72 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 018764c970fb1a94ebd1652dc39c39e2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 018764c970fb1a94ebd1652dc39c39e2, type: 3}
--- !u!1001 &8840464673322730896
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8840464674455634544, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_Name
value: Life
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalPosition.x
value: -8.25
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.5
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8840464674455634546, guid: e2348ffe25741cf409503f26d4f38070,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e2348ffe25741cf409503f26d4f38070, type: 3}
+2 -3
View File
@@ -11,7 +11,7 @@ public class PlayerScript : MonoBehaviour
private int life = 3; private int life = 3;
private float translation; private float translation;
private float rotation; private float rotation;
private float nextFire = 0.5f; private float nextFire = 0.0f;
private float myTime = 0.0f; private float myTime = 0.0f;
private GameObject reloaded; private GameObject reloaded;
private Rigidbody2D rb; private Rigidbody2D rb;
@@ -35,9 +35,8 @@ public class PlayerScript : MonoBehaviour
if(Input.GetButton("Fire1") && myTime > nextFire) if(Input.GetButton("Fire1") && myTime > nextFire)
{ {
nextFire = myTime + 0.5f;
GunFire(); GunFire();
nextFire = nextFire - myTime; nextFire = Random.Range(0.0f, 2.0f);
myTime = 0.0f; myTime = 0.0f;
} }
+1
View File
@@ -7,6 +7,7 @@ TagManager:
- Bullet - Bullet
- Enemy - Enemy
- Obstacle - Obstacle
- Life
layers: layers:
- Default - Default
- TransparentFX - TransparentFX