Fix bloody guns and add armadillos to MainScene
This commit is contained in:
parent
5dfbf7344c
commit
97f29b1ad4
@ -9,7 +9,7 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1528725660408968915}
|
- component: {fileID: 1528725660408968915}
|
||||||
m_Layer: 8
|
m_Layer: 11
|
||||||
m_Name: Bobbing
|
m_Name: Bobbing
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -45,7 +45,7 @@ GameObject:
|
|||||||
- component: {fileID: 4462327694118370268}
|
- component: {fileID: 4462327694118370268}
|
||||||
- component: {fileID: 4462327694118370269}
|
- component: {fileID: 4462327694118370269}
|
||||||
- component: {fileID: 3522608540502111974}
|
- component: {fileID: 3522608540502111974}
|
||||||
m_Layer: 8
|
m_Layer: 11
|
||||||
m_Name: Revolver
|
m_Name: Revolver
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -60,7 +60,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4462327694118370270}
|
m_GameObject: {fileID: 4462327694118370270}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 1.947, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1528725660408968915}
|
- {fileID: 1528725660408968915}
|
||||||
@ -159,7 +159,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4462327695001662283}
|
- component: {fileID: 4462327695001662283}
|
||||||
- component: {fileID: 4462327695001662280}
|
- component: {fileID: 4462327695001662280}
|
||||||
m_Layer: 8
|
m_Layer: 11
|
||||||
m_Name: revolver
|
m_Name: revolver
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -238,7 +238,7 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 427857587156450783}
|
- component: {fileID: 427857587156450783}
|
||||||
m_Layer: 8
|
m_Layer: 11
|
||||||
m_Name: BulletHole
|
m_Name: BulletHole
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
@ -126,6 +126,81 @@ Transform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 982353464}
|
m_PrefabInstance: {fileID: 982353464}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &78398875
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 729497893}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Enemy (Armadillo) (4)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 9.012414
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 1.3422203
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 34
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
|
--- !u!4 &78398876 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 78398875}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!4 &100120153 stripped
|
--- !u!4 &100120153 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 1a0e05447c8cf2a4fa9b9dc697884a66,
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 1a0e05447c8cf2a4fa9b9dc697884a66,
|
||||||
@ -13625,6 +13700,81 @@ Transform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 929058067}
|
m_PrefabInstance: {fileID: 929058067}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &263599790
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 729497893}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Enemy (Armadillo) (3)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 2.7588823
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -11.0329685
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 35
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
|
--- !u!4 &263599791 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 263599790}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &280402652
|
--- !u!1001 &280402652
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -14222,9 +14372,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 1.5
|
Radius: 1.5
|
||||||
--- !u!4 &587122337
|
--- !u!4 &587122337
|
||||||
Transform:
|
Transform:
|
||||||
@ -18974,6 +19125,11 @@ Transform:
|
|||||||
- {fileID: 353686739}
|
- {fileID: 353686739}
|
||||||
- {fileID: 1457438763}
|
- {fileID: 1457438763}
|
||||||
- {fileID: 1016900976}
|
- {fileID: 1016900976}
|
||||||
|
- {fileID: 78398876}
|
||||||
|
- {fileID: 263599791}
|
||||||
|
- {fileID: 1697267265}
|
||||||
|
- {fileID: 800967889}
|
||||||
|
- {fileID: 982133696}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 8
|
m_RootOrder: 8
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -19196,6 +19352,81 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
--- !u!1001 &800967888
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 729497893}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Enemy (Armadillo) (1)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 1.5677321
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -12.181183
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 37
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
|
--- !u!4 &800967889 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 800967888}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &816864857
|
--- !u!1001 &816864857
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -19655,8 +19886,83 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Camera: {fileID: 963194227}
|
Camera: {fileID: 963194227}
|
||||||
PixelScale: 3
|
PixelScale: 2
|
||||||
PixelsPerUnit: 32
|
PixelsPerUnit: 32
|
||||||
|
--- !u!1001 &982133695
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 729497893}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Enemy (Armadillo)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: -19.404997
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -0.27378392
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 38
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
|
--- !u!4 &982133696 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 982133695}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &982353464
|
--- !u!1001 &982353464
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -107479,9 +107785,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 3
|
Radius: 3
|
||||||
--- !u!4 &1167908365
|
--- !u!4 &1167908365
|
||||||
Transform:
|
Transform:
|
||||||
@ -108288,9 +108595,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 3
|
Radius: 3
|
||||||
--- !u!4 &1619207830
|
--- !u!4 &1619207830
|
||||||
Transform:
|
Transform:
|
||||||
@ -108337,9 +108645,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 3
|
Radius: 3
|
||||||
--- !u!4 &1631336191
|
--- !u!4 &1631336191
|
||||||
Transform:
|
Transform:
|
||||||
@ -108430,6 +108739,81 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
--- !u!1001 &1697267264
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 729497893}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Enemy (Armadillo) (2)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0.16388011
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -11.118022
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 36
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
|
--- !u!4 &1697267265 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 592487110401094196, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1697267264}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &1704485383
|
--- !u!1001 &1704485383
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -108536,9 +108920,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 3
|
Radius: 3
|
||||||
--- !u!4 &1722879650
|
--- !u!4 &1722879650
|
||||||
Transform:
|
Transform:
|
||||||
@ -108654,9 +109039,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 2
|
Radius: 2
|
||||||
--- !u!4 &1772694020
|
--- !u!4 &1772694020
|
||||||
Transform:
|
Transform:
|
||||||
@ -108778,9 +109164,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
EnemyPrefabs:
|
EnemyPrefabs:
|
||||||
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
- {fileID: 592487110401094192, guid: 1a0e05447c8cf2a4fa9b9dc697884a66, type: 3}
|
||||||
|
- {fileID: 592487110401094192, guid: 72a58ef1f50bfb946ae1af6e6b9fa1c5, type: 3}
|
||||||
SpawnCooldown: 5
|
SpawnCooldown: 5
|
||||||
SpawnChance: 0.5
|
SpawnChance: 0.5
|
||||||
MaxEnemiesWhenSpawning: 5
|
MaxEnemiesWhenSpawning: 20
|
||||||
Radius: 4
|
Radius: 4
|
||||||
--- !u!4 &1822937580
|
--- !u!4 &1822937580
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -45,7 +45,7 @@ namespace Saltosion.OneWeapon.Effects {
|
|||||||
|
|
||||||
Vector2 AppliedMovement = Velocity * Time.fixedDeltaTime;
|
Vector2 AppliedMovement = Velocity * Time.fixedDeltaTime;
|
||||||
|
|
||||||
RaycastHit2D Hit = Physics2D.Raycast(transform.position, AppliedMovement, AppliedMovement.magnitude);
|
RaycastHit2D Hit = Physics2D.Raycast(transform.position, AppliedMovement, AppliedMovement.magnitude, LayerMask.NameToLayer("Bloodphobic"));
|
||||||
if (Hit.rigidbody != null && Hit.rigidbody.gameObject == Hit.collider.gameObject) {
|
if (Hit.rigidbody != null && Hit.rigidbody.gameObject == Hit.collider.gameObject) {
|
||||||
bool IsStatic = Hit.rigidbody.bodyType == RigidbodyType2D.Static;
|
bool IsStatic = Hit.rigidbody.bodyType == RigidbodyType2D.Static;
|
||||||
Velocity = Velocity.normalized * Mathf.Min(IsStatic ? 15.0f : 60.0f, Velocity.magnitude);
|
Velocity = Velocity.normalized * Mathf.Min(IsStatic ? 15.0f : 60.0f, Velocity.magnitude);
|
||||||
|
@ -18,7 +18,7 @@ TagManager:
|
|||||||
- Bodypart
|
- Bodypart
|
||||||
- Bullet
|
- Bullet
|
||||||
- Blood
|
- Blood
|
||||||
- Player Hand
|
- Bloodphobic
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
|
Loading…
Reference in New Issue
Block a user