Skip to content

W
WidowmakerSimulator
Commit d26f8bbc authored by 15박보승's avatar 15박보승
Browse files
Options

Playercontroller에서 무기관련 로직 WeaponBehaviour로 분리/검 스킬 구현

parent c184c282
Hide whitespace changes
Inline Side-by-side
Showing with 901 additions and 430 deletions
Grapplers/Assets/Prefabs/AirplaneEnemy.prefab 0 → 100644
View file @ d26f8bbc
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &808483076966640903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 808483076966640907}
- component: {fileID: 808483076966640906}
- component: {fileID: 808483076966640901}
- component: {fileID: 808483076966640900}
- component: {fileID: 808483076966640905}
- component: {fileID: 808483076966640904}
m_Layer: 10
m_Name: AirplaneEnemy
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &808483076966640907
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.01939517, y: 1.97188, z: 15.06}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 808483077530519107}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &808483076966640906
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &808483076966640901
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!136 &808483076966640900
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!54 &808483076966640905
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
serializedVersion: 2
m_Mass: 1
m_Drag: 5
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &808483076966640904
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808483076966640903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c85a502201043ea4585ced1c522431cb, type: 3}
m_Name:
m_EditorClassIdentifier:
maxHealth: 50
curHealth: 0
attackDamage: 0
detectRange: 50
moveSpeed: 0
playerMask:
serializedVersion: 2
m_Bits: 256
projectilePrefab: {fileID: 6757045588236739288, guid: f5523fdf30a86e84ea4d7fd5aa020ca2,
type: 3}
bloodEffect: {fileID: 808483077530519105}
shotSpeed: 0
shotTimeInterval: 5
--- !u!1001 &5714664667939351444
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 808483076966640907}
m_Modifications:
- target: {fileID: 4933374738297728470, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_Name
value: BloodEffect
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59619ab33246ea34496792e427cf9d6e, type: 3}
--- !u!4 &808483077530519107 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
m_PrefabInstance: {fileID: 5714664667939351444}
m_PrefabAsset: {fileID: 0}
--- !u!198 &808483077530519105 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 4933374738297728469, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
m_PrefabInstance: {fileID: 5714664667939351444}
m_PrefabAsset: {fileID: 0}
Grapplers/Assets/Prefabs/AirplaneEnemy.prefab.meta 0 → 100644
View file @ d26f8bbc
fileFormatVersion: 2
guid: 60f985c4e15827746af49ee480a2d6f9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Grapplers/Assets/Prefabs/Missile.prefab
View file @ d26f8bbc
...@@ -111,7 +111,7 @@ MonoBehaviour: ...@@ -111,7 +111,7 @@ MonoBehaviour:
curHealth: 0 curHealth: 0
attackDamage: 5 attackDamage: 5
detectRange: 0 detectRange: 0
moveSpeed: 0.1 moveSpeed: 0.5
playerMask: playerMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 256 m_Bits: 256
......
Grapplers/Assets/Scenes/SampleScene.unity
View file @ d26f8bbc
...@@ -154,7 +154,7 @@ Transform: ...@@ -154,7 +154,7 @@ Transform:
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &48712144 --- !u!135 &48712144
SphereCollider: SphereCollider:
...@@ -342,7 +342,7 @@ MonoBehaviour: ...@@ -342,7 +342,7 @@ MonoBehaviour:
lr: {fileID: 48712148} lr: {fileID: 48712148}
player: {fileID: 1171556388} player: {fileID: 1171556388}
rb: {fileID: 0} rb: {fileID: 0}
maxDistance: 200 maxDistance: 400
--- !u!1 &60348332 --- !u!1 &60348332
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -409,7 +409,7 @@ MeshRenderer: ...@@ -409,7 +409,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -452,6 +452,75 @@ Transform: ...@@ -452,6 +452,75 @@ Transform:
m_Father: {fileID: 235153515} m_Father: {fileID: 235153515}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &210062639
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_Name
value: AirplaneEnemy (4)
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: 55.16812
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 66.40001
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: 125.04494
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &235153514 --- !u!1 &235153514
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -490,7 +559,7 @@ Transform: ...@@ -490,7 +559,7 @@ Transform:
- {fileID: 245057451} - {fileID: 245057451}
- {fileID: 1077217540} - {fileID: 1077217540}
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!114 &235153516 --- !u!114 &235153516
MonoBehaviour: MonoBehaviour:
...@@ -573,7 +642,7 @@ MeshRenderer: ...@@ -573,7 +642,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -849,132 +918,6 @@ CanvasRenderer: ...@@ -849,132 +918,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 369112310} m_GameObject: {fileID: 369112310}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &398288500
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 398288505}
- component: {fileID: 398288504}
- component: {fileID: 398288503}
- component: {fileID: 398288502}
- component: {fileID: 398288501}
- component: {fileID: 398288506}
m_Layer: 0
m_Name: Capsule
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &398288501
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e179ac458e6d7c94284ef49322fa5428, type: 3}
m_Name:
m_EditorClassIdentifier:
ConnectedRigidbody: {fileID: 519663055}
distance: 5
damper: 5
--- !u!136 &398288502
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &398288503
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &398288504
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &398288505
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.5226097, y: 17.720718, z: -0.579216}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &398288506
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398288500}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!1 &413298772 --- !u!1 &413298772
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1163,7 +1106,7 @@ MeshRenderer: ...@@ -1163,7 +1106,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -1206,6 +1149,75 @@ Transform: ...@@ -1206,6 +1149,75 @@ Transform:
m_Father: {fileID: 235153515} m_Father: {fileID: 235153515}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &554041981
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_Name
value: AirplaneEnemy (5)
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: 105
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 47
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: 159
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &705507993 --- !u!1 &705507993
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1347,7 +1359,7 @@ MeshRenderer: ...@@ -1347,7 +1359,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -1388,7 +1400,7 @@ Transform: ...@@ -1388,7 +1400,7 @@ Transform:
m_LocalScale: {x: 20, y: 10, z: 20} m_LocalScale: {x: 20, y: 10, z: 20}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &825443686 --- !u!54 &825443686
Rigidbody: Rigidbody:
...@@ -1406,143 +1418,75 @@ Rigidbody: ...@@ -1406,143 +1418,75 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 126 m_Constraints: 126
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!1 &850429685 --- !u!1001 &857750151
GameObject: PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 850429689}
- component: {fileID: 850429688}
- component: {fileID: 850429687}
- component: {fileID: 850429686}
- component: {fileID: 850429691}
- component: {fileID: 850429690}
m_Layer: 10
m_Name: Cylinder
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!136 &850429686
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!23 &850429687
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &850429688
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &850429689
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.01939517, y: 1.97188, z: 15.06}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1345154481}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &850429690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c85a502201043ea4585ced1c522431cb, type: 3}
m_Name:
m_EditorClassIdentifier:
maxHealth: 50
curHealth: 0
attackDamage: 0
detectRange: 100
moveSpeed: 0
playerMask:
serializedVersion: 2
m_Bits: 256
projectilePrefab: {fileID: 6757045588236739288, guid: f5523fdf30a86e84ea4d7fd5aa020ca2,
type: 3}
bloodEffect: {fileID: 1345154483}
shotSpeed: 0
shotTimeInterval: 1
--- !u!54 &850429691
Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850429685}
serializedVersion: 2 serializedVersion: 2
m_Mass: 1 m_Modification:
m_Drag: 5 m_TransformParent: {fileID: 0}
m_AngularDrag: 0.05 m_Modifications:
m_UseGravity: 0 - target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
m_IsKinematic: 0 type: 3}
m_Interpolate: 0 propertyPath: m_Name
m_Constraints: 0 value: AirplaneEnemy
m_CollisionDetection: 0 objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: -26.668118
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 12.4
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: 28.955063
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &887314838 --- !u!1 &887314838
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1655,7 +1599,7 @@ Transform: ...@@ -1655,7 +1599,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: 5
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
--- !u!114 &963194229 --- !u!114 &963194229
MonoBehaviour: MonoBehaviour:
...@@ -1741,7 +1685,7 @@ MeshRenderer: ...@@ -1741,7 +1685,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -1833,7 +1777,7 @@ MeshRenderer: ...@@ -1833,7 +1777,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -1907,7 +1851,7 @@ Transform: ...@@ -1907,7 +1851,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: 10 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!199 &1086498342 --- !u!199 &1086498342
ParticleSystemRenderer: ParticleSystemRenderer:
...@@ -6642,6 +6586,75 @@ MonoBehaviour: ...@@ -6642,6 +6586,75 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 11492ba4fa2cc8f46a9b9e3e1e3796e4, type: 3} m_Script: {fileID: 11500000, guid: 11492ba4fa2cc8f46a9b9e3e1e3796e4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1001 &1132568717
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_Name
value: AirplaneEnemy (1)
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: -76.5
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 31.8
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: -5
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &1171556382 --- !u!1 &1171556382
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6774,7 +6787,7 @@ Transform: ...@@ -6774,7 +6787,7 @@ Transform:
- {fileID: 887314839} - {fileID: 887314839}
- {fileID: 1266258514} - {fileID: 1266258514}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1171556389 --- !u!114 &1171556389
MonoBehaviour: MonoBehaviour:
...@@ -6794,12 +6807,16 @@ MonoBehaviour: ...@@ -6794,12 +6807,16 @@ MonoBehaviour:
groundMask: groundMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 1 m_Bits: 1
bulletMaxDistance: 50 knifeDamage: 50
gunDamage: 1
gunRange: 50
bulletEffect: {fileID: 1266258516} bulletEffect: {fileID: 1266258516}
knifeRange: 3
knifeEffect: {fileID: 0}
enemyMask: enemyMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 1024 m_Bits: 1024
bulletBlockMask: blockMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 55 m_Bits: 55
--- !u!136 &1171556390 --- !u!136 &1171556390
...@@ -11569,18 +11586,6 @@ ParticleSystem: ...@@ -11569,18 +11586,6 @@ ParticleSystem:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
vectorLabel1_3: W vectorLabel1_3: W
--- !u!4 &1345154481 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
m_PrefabInstance: {fileID: 4933374739104284774}
m_PrefabAsset: {fileID: 0}
--- !u!198 &1345154483 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 4933374738297728469, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
m_PrefabInstance: {fileID: 4933374739104284774}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1353089528 --- !u!1 &1353089528
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -11647,7 +11652,7 @@ MeshRenderer: ...@@ -11647,7 +11652,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -11756,6 +11761,75 @@ Transform: ...@@ -11756,6 +11761,75 @@ Transform:
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}
--- !u!1001 &1457301417
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_Name
value: AirplaneEnemy (3)
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: -26.668118
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 165.9
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: -8
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &1813027452 --- !u!1 &1813027452
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -12020,7 +12094,7 @@ Transform: ...@@ -12020,7 +12094,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: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1873763589 --- !u!1 &1873763589
GameObject: GameObject:
...@@ -12133,6 +12207,75 @@ CanvasRenderer: ...@@ -12133,6 +12207,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1922787020} m_GameObject: {fileID: 1922787020}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &1971853533
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 808483076966640903, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_Name
value: AirplaneEnemy (2)
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.x
value: -76.5
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.y
value: 185.3
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalPosition.z
value: -41.955063
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
--- !u!1 &1972759490 --- !u!1 &1972759490
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -12289,7 +12432,7 @@ MeshRenderer: ...@@ -12289,7 +12432,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: 66c0dd529e8ced84baf9d6069df25e25, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -12398,7 +12541,7 @@ MeshRenderer: ...@@ -12398,7 +12541,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -12507,7 +12650,7 @@ MeshRenderer: ...@@ -12507,7 +12650,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: b4409bc82ca6b894d96281afa63aa758, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -12550,72 +12693,3 @@ Transform: ...@@ -12550,72 +12693,3 @@ Transform:
m_Father: {fileID: 235153515} m_Father: {fileID: 235153515}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &4933374739104284774
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 850429689}
m_Modifications:
- target: {fileID: 4933374738297728470, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_Name
value: BloodEffect
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4933374738297728471, guid: 59619ab33246ea34496792e427cf9d6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59619ab33246ea34496792e427cf9d6e, type: 3}
Grapplers/Assets/Scripts/Enemy/AirplaneEnemy.cs
View file @ d26f8bbc
...@@ -4,8 +4,6 @@ using UnityEngine; ...@@ -4,8 +4,6 @@ using UnityEngine;
public class AirplaneEnemy : Enemy public class AirplaneEnemy : Enemy
{ {
private float shotTimer = 5;
protected override void InitializeStateMachine() protected override void InitializeStateMachine()
{ {
State idle = new State("idle"); State idle = new State("idle");
......
Grapplers/Assets/Scripts/Enemy/Enemy.cs
View file @ d26f8bbc
...@@ -38,6 +38,8 @@ public abstract class Enemy : MonoBehaviour ...@@ -38,6 +38,8 @@ public abstract class Enemy : MonoBehaviour
private float shotTimeInterval; private float shotTimeInterval;
private float shotTimer; private float shotTimer;
public bool IsDead { get { return curHealth <= 0; } }
#if UNITY_EDITOR #if UNITY_EDITOR
private void OnDrawGizmos() private void OnDrawGizmos()
{ {
......
Grapplers/Assets/Scripts/Enemy/Missile.cs
View file @ d26f8bbc
...@@ -19,7 +19,6 @@ public class Missile : Enemy ...@@ -19,7 +19,6 @@ public class Missile : Enemy
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
Debug.Log(other);
if (other.tag.Contains("Enemy")) if (other.tag.Contains("Enemy"))
return; return;
other.GetComponent<PlayerController>()?.GetDamaged(attackDamage); other.GetComponent<PlayerController>()?.GetDamaged(attackDamage);
......
Grapplers/Assets/Scripts/GameManager.cs
View file @ d26f8bbc
...@@ -13,7 +13,6 @@ public class GameManager : SingletonBehaviour<GameManager> ...@@ -13,7 +13,6 @@ public class GameManager : SingletonBehaviour<GameManager>
} }
set set
{ {
Debug.Log(value);
_maxHeight = value; _maxHeight = value;
OnMaxHeightChanged?.Invoke(value); OnMaxHeightChanged?.Invoke(value);
} }
......
Grapplers/Assets/Scripts/PlayerController.cs
View file @ d26f8bbc
...@@ -22,8 +22,7 @@ public class PlayerController : MonoBehaviour ...@@ -22,8 +22,7 @@ public class PlayerController : MonoBehaviour
[SerializeField] [SerializeField]
private Transform groundChecker; private Transform groundChecker;
[SerializeField] public LayerMask groundMask;
private LayerMask groundMask;
private bool IsGrounded private bool IsGrounded
{ {
get { get {
...@@ -31,15 +30,6 @@ public class PlayerController : MonoBehaviour ...@@ -31,15 +30,6 @@ public class PlayerController : MonoBehaviour
} }
} }
[SerializeField]
private float bulletMaxDistance;
[SerializeField]
private ParticleSystem bulletEffect;
[SerializeField]
private LayerMask enemyMask;
[SerializeField]
private LayerMask bulletBlockMask;
public int MaxHealth { get; private set; } public int MaxHealth { get; private set; }
private int _health; private int _health;
public int Health { public int Health {
...@@ -83,35 +73,6 @@ public class PlayerController : MonoBehaviour ...@@ -83,35 +73,6 @@ public class PlayerController : MonoBehaviour
float vertical = Input.GetAxis("Vertical"); float vertical = Input.GetAxis("Vertical");
float horizontal = Input.GetAxis("Horizontal"); float horizontal = Input.GetAxis("Horizontal");
RaycastHit[] enemyHits = Physics.SphereCastAll(Camera.main.ScreenPointToRay(Input.mousePosition), 3, bulletMaxDistance, enemyMask);
List<Enemy> hitEnemies = new List<Enemy>();
List<Vector3> hitEnemyPositions = new List<Vector3>();
foreach (var enemyHit in enemyHits)
{
Ray ray = new Ray(Camera.main.transform.position, (enemyHit.point - Camera.main.transform.position).normalized);
if (!Physics.Raycast(ray, Vector3.Distance(Camera.main.transform.position, enemyHit.point), bulletBlockMask))
{
hitEnemies.Add(enemyHit.collider.GetComponent<Enemy>());
hitEnemyPositions.Add(enemyHit.transform.position);
}
}
IngameUIManager.inst.UpdateTargetLockedUIs(hitEnemyPositions.ToArray());
if (Input.GetMouseButton(0))
{
bulletEffect.transform.rotation = Camera.main.transform.rotation;
bulletEffect.Play();
foreach (var enemy in hitEnemies)
{
enemy?.GetDamaged(1);
}
}
if (Input.GetMouseButtonDown(1)) if (Input.GetMouseButtonDown(1))
{ {
if (!hook.gameObject.activeSelf) if (!hook.gameObject.activeSelf)
...@@ -172,26 +133,4 @@ public class PlayerController : MonoBehaviour ...@@ -172,26 +133,4 @@ public class PlayerController : MonoBehaviour
{ {
Health = Mathf.Max(0, Health - damage); Health = Mathf.Max(0, Health - damage);
} }
}
} \ No newline at end of file
public interface IWeapon
{
void UseWeapon();
}
public class Gun : IWeapon
{
public void UseWeapon()
{
throw new System.NotImplementedException();
}
}
public class Weapon : IWeapon
{
public void UseWeapon()
{
throw new System.NotImplementedException();
}
}
Grapplers/Assets/Scripts/WeaponBehaviour.cs 0 → 100644
View file @ d26f8bbc
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class WeaponBehaviour : MonoBehaviour
{
[SerializeField]
private int knifeDamage = 50;
[SerializeField]
private int gunDamage = 1;
[SerializeField]
private float gunRange = 50;
[SerializeField]
private ParticleSystem bulletEffect;
[SerializeField]
private float knifeRange;
[SerializeField]
private ParticleSystem knifeEffect;
[SerializeField]
private LayerMask enemyMask, blockMask;
private IWeapon weapon;
private void Start()
{
weapon = new Gun(gunDamage,gunRange, bulletEffect);
weapon = new Knife(knifeDamage, knifeRange, bulletEffect, transform);
}
private void Update()
{
weapon.UpdateWeapon();
Enemy[] hitEnemies = weapon.WeaponLockOn(enemyMask, blockMask);
weapon.UseWeapon(hitEnemies);
if (Input.GetKeyDown(KeyCode.Tab))
{
SwapWeapon();
}
if (Input.GetKeyDown(KeyCode.LeftShift))
{
weapon.UseSkill();
}
}
private void SwapWeapon()
{
if (weapon.GetType() == typeof(Gun))
weapon = new Knife(knifeDamage, knifeRange, bulletEffect, transform);
else
weapon = new Gun(gunDamage, gunRange, bulletEffect);
}
}
public interface IWeapon
{
void UseWeapon(Enemy[] hitEnemies);
void UseSkill();
Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask);
void UpdateWeapon();
}
public class Gun : IWeapon
{
protected int weaponDamage;
protected float weaponRange;
private ParticleSystem effect;
private const float gunShotInterval = 0.02f;
private float timer;
public Gun(int dmg, float range, ParticleSystem effect)
{
weaponDamage = dmg;
weaponRange = range;
this.effect = effect;
}
public void UseWeapon(Enemy[] hitEnemies)
{
if (timer > 0)
return;
if (Input.GetMouseButton(0))
{
effect.transform.rotation = Camera.main.transform.rotation;
effect.Play();
foreach (var enemy in hitEnemies)
{
enemy?.GetDamaged(weaponDamage);
}
timer = gunShotInterval;
}
}
public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)
{
RaycastHit[] enemyHits = Physics.SphereCastAll(Camera.main.ScreenPointToRay(Input.mousePosition), 3, weaponRange, enemyMask);
List<Enemy> hitEnemies = new List<Enemy>();
List<Vector3> hitEnemyPositions = new List<Vector3>();
foreach (var enemyHit in enemyHits)
{
Ray ray = new Ray(Camera.main.transform.position, (enemyHit.point - Camera.main.transform.position).normalized);
if (!Physics.Raycast(ray, Vector3.Distance(Camera.main.transform.position, enemyHit.point), blockMask))
{
hitEnemies.Add(enemyHit.collider.GetComponent<Enemy>());
hitEnemyPositions.Add(enemyHit.transform.position);
}
}
IngameUIManager.inst.UpdateTargetLockedUIs(hitEnemyPositions.ToArray());
return hitEnemies.ToArray();
}
public void UseSkill()
{
}
public void UpdateWeapon()
{
timer -= Time.deltaTime;
}
}
public class Knife : IWeapon
{
protected int weaponDamage;
protected float weaponRange;
ParticleSystem effect;
Transform player;
private const float skillTimeInterval = 5;
private float skillTimer = 0;
public Knife(int dmg, float range, ParticleSystem effect, Transform player)
{
weaponDamage = dmg;
weaponRange = range;
this.effect = effect;
this.player = player;
}
public void UseWeapon(Enemy[] hitEnemies)
{
if (Input.GetMouseButtonDown(0))
{
effect.transform.rotation = Camera.main.transform.rotation;
effect.Play();
foreach (var enemy in hitEnemies)
{
enemy.GetDamaged(weaponDamage);
if (enemy.IsDead)
skillTimer = 0;
}
}
}
public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)
{
RaycastHit[] enemyHits = Physics.SphereCastAll(Camera.main.ScreenPointToRay(Input.mousePosition), 3, weaponRange, enemyMask);
List<Enemy> hitEnemies = new List<Enemy>();
List<Vector3> hitEnemyPositions = new List<Vector3>();
foreach (var enemyHit in enemyHits)
{
Ray ray = new Ray(Camera.main.transform.position, (enemyHit.point - Camera.main.transform.position).normalized);
if (!Physics.Raycast(ray, Vector3.Distance(Camera.main.transform.position, enemyHit.point), blockMask))
{
hitEnemies.Add(enemyHit.collider.GetComponent<Enemy>());
hitEnemyPositions.Add(enemyHit.transform.position);
}
}
IngameUIManager.inst.UpdateTargetLockedUIs(hitEnemyPositions.ToArray());
return hitEnemies.ToArray();
}
public void UseSkill()
{
if (skillTimer > 0)
return;
GameManager.inst.StartCoroutine(SkillRoutine());
skillTimer = skillTimeInterval;
}
public void UpdateWeapon()
{
skillTimer -= Time.deltaTime;
}
private IEnumerator SkillRoutine()
{
Vector3 oriPos = player.position;
Ray ray = new Ray(player.position, Camera.main.transform.forward);
RaycastHit hit;
Physics.Raycast(ray, out hit, 30, player.GetComponent<PlayerController>().groundMask);
Vector3 dest = hit.collider != null ? hit.point - Camera.main.transform.forward * 0.5f : player.position + Camera.main.transform.forward * 30;
const float skillTime = 0.2f;
foreach (var enemyHit in Physics.RaycastAll(ray, 30, 1 << LayerMask.NameToLayer("Enemy")))
{
enemyHit.collider.GetComponent<Enemy>()?.GetDamaged(weaponDamage);
}
player.GetComponent<MeshRenderer>().enabled = false;
for (float t = 0; t < skillTime; t += Time.fixedDeltaTime)
{
player.position = Vector3.Lerp(oriPos, dest, t / skillTime);
yield return new WaitForFixedUpdate();
}
player.GetComponent<Rigidbody>().velocity = Vector3.zero;
player.GetComponent<MeshRenderer>().enabled = true;
}
}
Grapplers/Assets/Scripts/WeaponBehaviour.cs.meta 0 → 100644
View file @ d26f8bbc
fileFormatVersion: 2
guid: d8563877a588e844da7d4f831005a6b4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment