This commit is contained in:
JonatanRek 2020-02-02 12:29:14 +01:00
commit 550669f384
7 changed files with 5425 additions and 130 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6ce48a95f3023a5408da0a95f6a1cda5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -51,7 +51,7 @@ MonoBehaviour:
spawnShoot: {fileID: 4234349944776735638}
particleShoot: {fileID: 9220017394946394338, guid: 6480cbf8d57433a49b5d77875ceb391c,
type: 3}
damage: 5
damage: 8
fireRate: 0.5
animator: {fileID: 0}
player: {fileID: 0}

View File

@ -0,0 +1,371 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &665147844754215242
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3154568473549858849}
- component: {fileID: 8384823408721827063}
m_Layer: 0
m_Name: Spot Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3154568473549858849
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 665147844754215242}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.089, y: -0.4358, z: 1.0126}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3983516630253985952}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!108 &8384823408721827063
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 665147844754215242}
m_Enabled: 1
serializedVersion: 10
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 80
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &5608766754133384923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 220430559123283567}
m_Layer: 0
m_Name: ShootSpawn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &220430559123283567
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608766754133384923}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.348, z: 1.406}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3983516630253985952}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7279375804173823597
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3983516630253985952}
- component: {fileID: 5631586117258678227}
- component: {fileID: 927444460630549385}
m_Layer: 0
m_Name: Weapon_3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3983516630253985952
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7279375804173823597}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1912871039014547701}
- {fileID: 220430559123283567}
- {fileID: 3154568473549858849}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5631586117258678227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7279375804173823597}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: deacf945ec0a8c64f9d87f0a522f9a03, type: 3}
m_Name:
m_EditorClassIdentifier:
weaponType: 1
weaponRange: 15
spawnShoot: {fileID: 5608766754133384923}
particleShoot: {fileID: 198560854969271870, guid: 6ce48a95f3023a5408da0a95f6a1cda5,
type: 3}
damage: 5
fireRate: 0.05
ammoCost: 1
animator: {fileID: 0}
player: {fileID: 0}
hit: 0
audioSource: {fileID: 927444460630549385}
shootSound:
- {fileID: 8300000, guid: 2d7d336b0528d7349ab91ecd773c2868, type: 3}
--- !u!82 &927444460630549385
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7279375804173823597}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 0.5
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &6913402413332405231
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3983516630253985952}
m_Modifications:
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.354
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.79
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalScale.x
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalScale.y
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalScale.z
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_Name
value: submachine_gun
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cbc33a01620116b4297cb35d378f0242, type: 3}
--- !u!4 &1912871039014547701 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
m_PrefabInstance: {fileID: 6913402413332405231}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f7f441e621e5e5f40b11b7617756a0af
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -177,7 +177,7 @@ PrefabInstance:
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
propertyPath: m_RootOrder
value: 17
value: 18
objectReference: {fileID: 0}
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
@ -246,7 +246,7 @@ PrefabInstance:
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
propertyPath: m_RootOrder
value: 19
value: 20
objectReference: {fileID: 0}
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
@ -315,7 +315,7 @@ PrefabInstance:
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
propertyPath: m_RootOrder
value: 20
value: 21
objectReference: {fileID: 0}
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
@ -472,7 +472,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6,
type: 3}
@ -571,7 +571,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -596,6 +596,98 @@ AudioSource:
type: 3}
m_PrefabInstance: {fileID: 7985979212702423926}
m_PrefabAsset: {fileID: 0}
--- !u!1 &547068339
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 547068340}
- component: {fileID: 547068341}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &547068340
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 547068339}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: -1.79}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1090758819}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &547068341
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 547068339}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
m_Shape: 0
m_Color: {r: 0.9811321, g: 0.9618972, b: 0.754361, a: 1}
m_Intensity: 1.2
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &562374830
GameObject:
m_ObjectHideFlags: 0
@ -764,7 +856,7 @@ RectTransform:
- {fileID: 1327297297}
- {fileID: 1191888897}
m_Father: {fileID: 0}
m_RootOrder: 31
m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -837,7 +929,7 @@ PrefabInstance:
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
propertyPath: m_RootOrder
value: 18
value: 19
objectReference: {fileID: 0}
- target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
type: 3}
@ -856,6 +948,75 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3}
--- !u!1001 &656584863
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.x
value: 47.557354
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.y
value: -2.454
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.z
value: -13.944
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4383041077390384848, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_Name
value: lanterd (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a9ed136ba2be534419d4299db71802df, type: 3}
--- !u!4 &675280671 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32,
@ -945,7 +1106,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -1056,7 +1217,7 @@ Transform:
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 32
m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &787940993
PrefabInstance:
@ -1113,7 +1274,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -1341,7 +1502,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -1360,100 +1521,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3}
--- !u!1001 &957927410
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.886
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_RootOrder
value: 22
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalScale.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_LocalScale.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: d02b5e657d523ea498a1c023be819ab8, type: 2}
- target: {fileID: -1504981713932161579, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_Name
value: lanterd
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a20f14621725df742ad2c1028ff4f453, type: 3}
--- !u!1001 &1011884372
PrefabInstance:
m_ObjectHideFlags: 0
@ -1523,7 +1590,7 @@ PrefabInstance:
- target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6,
type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6,
type: 3}
@ -1547,6 +1614,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3}
--- !u!4 &1090758819 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
m_PrefabInstance: {fileID: 656584863}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1129927357
GameObject:
m_ObjectHideFlags: 0
@ -1611,7 +1684,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 28
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1131703976 stripped
Transform:
@ -6492,7 +6565,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22,
type: 3}
@ -6755,7 +6828,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -6819,7 +6892,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5,
type: 3}
propertyPath: m_RootOrder
value: 16
value: 17
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5,
type: 3}
@ -7036,7 +7109,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 27
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1765588425
PrefabInstance:
@ -7083,7 +7156,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33,
type: 3}
propertyPath: m_RootOrder
value: 15
value: 16
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33,
type: 3}
@ -7187,7 +7260,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 30
m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1814508279 stripped
GameObject:
@ -7264,7 +7337,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -7338,7 +7411,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -7409,7 +7482,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 29
m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1922663893
PrefabInstance:
@ -7566,7 +7639,7 @@ PrefabInstance:
- target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc,
type: 3}
propertyPath: m_RootOrder
value: 24
value: 25
objectReference: {fileID: 0}
- target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc,
type: 3}
@ -7640,7 +7713,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -7712,7 +7785,7 @@ Transform:
m_Children:
- {fileID: 6648769901767351058}
m_Father: {fileID: 0}
m_RootOrder: 33
m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1990836492
BoxCollider:
@ -7868,7 +7941,7 @@ Transform:
m_Children:
- {fileID: 1139190780}
m_Father: {fileID: 0}
m_RootOrder: 26
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2232049265454068919
PrefabInstance:
@ -7990,7 +8063,7 @@ PrefabInstance:
- target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0,
type: 3}
propertyPath: m_RootOrder
value: 21
value: 22
objectReference: {fileID: 0}
- target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0,
type: 3}
@ -8169,7 +8242,7 @@ PrefabInstance:
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f,
type: 3}
@ -8233,7 +8306,7 @@ PrefabInstance:
- target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681,
type: 3}
propertyPath: m_RootOrder
value: 13
value: 14
objectReference: {fileID: 0}
- target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681,
type: 3}
@ -8262,6 +8335,75 @@ PrefabInstance:
objectReference: {fileID: 1345459423}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 92320a40631a69845b70cc43c23a3681, type: 3}
--- !u!1001 &5760769906989271083
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.886
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_RootOrder
value: 23
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4383041077390384848, guid: a9ed136ba2be534419d4299db71802df,
type: 3}
propertyPath: m_Name
value: lanterd
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a9ed136ba2be534419d4299db71802df, type: 3}
--- !u!1001 &6179705720582673448
PrefabInstance:
m_ObjectHideFlags: 0
@ -8582,7 +8724,7 @@ PrefabInstance:
- target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: m_RootOrder
value: 23
value: 24
objectReference: {fileID: 0}
- target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
@ -8723,6 +8865,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: weaponList.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: guiManager
@ -8731,7 +8878,7 @@ PrefabInstance:
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: mouseSensitive
value: 100
value: 50
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
@ -8743,6 +8890,12 @@ PrefabInstance:
propertyPath: runSpeed
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: weaponList.Array.data[2]
value:
objectReference: {fileID: 7279375804173823597, guid: f7f441e621e5e5f40b11b7617756a0af,
type: 3}
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: m_LocalPosition.x
@ -8781,7 +8934,7 @@ PrefabInstance:
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: m_RootOrder
value: 25
value: 26
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
@ -8850,7 +9003,7 @@ PrefabInstance:
- target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd,
type: 3}

View File

@ -12,6 +12,7 @@ public class WeaponManager : MonoBehaviour
public float damage = 0;
public float fireRate = 0.5f;
private float fireTime;
public int ammoCost = 2;
public Animator animator;
public PlayerManager player;
public bool hit = false;
@ -36,7 +37,7 @@ public class WeaponManager : MonoBehaviour
if (Input.GetMouseButtonDown(0) && fireTime <= Time.time) {
if (weaponType == WeaponType.Shoot)
{
if (particleShoot != null && player.ammo > 1)
if (particleShoot != null && player.ammo > (ammoCost - 1))
{
GameObject shoot = Instantiate(particleShoot, spawnShoot.transform.position, spawnShoot.transform.rotation);
if (shootSound.Count > 0)
@ -44,7 +45,7 @@ public class WeaponManager : MonoBehaviour
int rand = Random.Range(0, shootSound.Count);
audioSource.PlayOneShot(shootSound[rand]);
}
player.ammo -= 2;
player.ammo -= ammoCost;
Destroy(shoot, 0.3f);
fireTime = fireRate + Time.time;
}