diff --git a/Blender_Jan_Kevin/ProjektPMC.blend b/Blender_Jan_Kevin/ProjektPMC.blend index 88a0721..db967f7 100644 Binary files a/Blender_Jan_Kevin/ProjektPMC.blend and b/Blender_Jan_Kevin/ProjektPMC.blend differ diff --git a/Blender_Jan_Kevin/ProjektPMC.blend1 b/Blender_Jan_Kevin/ProjektPMC.blend1 index af283bc..88a0721 100644 Binary files a/Blender_Jan_Kevin/ProjektPMC.blend1 and b/Blender_Jan_Kevin/ProjektPMC.blend1 differ diff --git a/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab b/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab index 68e2aa5..ffb996c 100644 --- a/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab +++ b/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 3286218375903244322} - component: {fileID: 7689678004430099734} + - component: {fileID: 878037186990386657} m_Layer: 0 m_Name: Bullet m_TagString: Untagged @@ -61,6 +62,21 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &878037186990386657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939049122039926632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf678ed456c71c949b0b1a2b01e9f32b, type: 3} + m_Name: + m_EditorClassIdentifier: + child: {fileID: 1549001692297207422} + dataBullet: {fileID: 11400000, guid: cafd241bae342f446ae8141cc5d72daf, type: 2} + rb: {fileID: 7689678004430099734} --- !u!1 &1549001692297207422 GameObject: m_ObjectHideFlags: 0 @@ -70,9 +86,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2485312180149050413} - - component: {fileID: 8748796222335991794} m_Layer: 0 - m_Name: BulletPhysics + m_Name: PivotPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -93,21 +108,6 @@ Transform: m_Children: [] m_Father: {fileID: 3286218375903244322} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8748796222335991794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549001692297207422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf678ed456c71c949b0b1a2b01e9f32b, type: 3} - m_Name: - m_EditorClassIdentifier: - parent: {fileID: 939049122039926632} - dataBullet: {fileID: 11400000, guid: cafd241bae342f446ae8141cc5d72daf, type: 2} - rb: {fileID: 0} --- !u!1 &4152829191026619603 GameObject: m_ObjectHideFlags: 0 diff --git a/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab new file mode 100644 index 0000000..39f47b2 --- /dev/null +++ b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3929927056536112425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2326864918050230340} + m_Layer: 0 + m_Name: BulletSpawnpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2326864918050230340 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929927056536112425} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6798321073873421098} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7971593296632072563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1313371464610265781} + - component: {fileID: 2214754609224341856} + - component: {fileID: 8161286121965110771} + - component: {fileID: 3410127534591597247} + m_Layer: 0 + m_Name: GunMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1313371464610265781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7971593296632072563} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6798321073873421098} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2214754609224341856 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7971593296632072563} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8161286121965110771 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7971593296632072563} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &3410127534591597247 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7971593296632072563} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8363807481264483936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6798321073873421098} + - component: {fileID: 1169450665700565} + m_Layer: 0 + m_Name: Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6798321073873421098 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8363807481264483936} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.26252207, z: -0, w: 0.96492606} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1313371464610265781} + - {fileID: 2326864918050230340} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 30.44, z: 0} +--- !u!114 &1169450665700565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8363807481264483936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f0262bbe3025ed14984b9ca540206237, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnpoint: {fileID: 3929927056536112425} + bullet: {fileID: 939049122039926632, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} diff --git a/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab.meta b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab.meta new file mode 100644 index 0000000..39668c2 --- /dev/null +++ b/Plunderblock/Assets/PrefabsKevin/Gun/Gun.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4d3459d3c81134641b756c0c5205d59e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plunderblock/Assets/Scenes/KevinScene.unity b/Plunderblock/Assets/Scenes/KevinScene.unity index cb7455d..f8bc8ef 100644 --- a/Plunderblock/Assets/Scenes/KevinScene.unity +++ b/Plunderblock/Assets/Scenes/KevinScene.unity @@ -129,47 +129,47 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1768683489} m_Modifications: - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalPosition.x - value: 6.427336 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalPosition.y - value: 2.4611318 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalPosition.z - value: -6.166448 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalRotation.w - value: -0.31750855 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalRotation.x - value: -0.09981125 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalRotation.y - value: 0.94145095 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalRotation.z - value: -0.053816654 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 9.481 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 216.529 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -8.968 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} propertyPath: m_Name @@ -827,6 +827,52 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1768683487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1768683489} + - component: {fileID: 1768683488} + m_Layer: 0 + m_Name: Spider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1768683488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768683487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a156f4aad04544419b7b8a3c0a2294d, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 16 +--- !u!4 &1768683489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768683487} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.93804026, z: -0, w: -0.34652635} + m_LocalPosition: {x: 5.83, y: 2.04, z: -4.24} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2023401353} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 220.55, z: 0} --- !u!1 &1843618953 GameObject: m_ObjectHideFlags: 0 @@ -1054,6 +1100,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2019160119} m_CullTransparentMesh: 1 +--- !u!4 &2023401353 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b9bfba4548a66f142aef785aaad262eb, type: 3} + m_PrefabInstance: {fileID: 571304931} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1062,4 +1113,4 @@ SceneRoots: - {fileID: 1843618955} - {fileID: 1644435821} - {fileID: 1706923861} - - {fileID: 571304931} + - {fileID: 1768683489} diff --git a/Plunderblock/Assets/Scenes/KevinSceneGun.unity b/Plunderblock/Assets/Scenes/KevinSceneGun.unity index 932fa3b..fb9ef6f 100644 --- a/Plunderblock/Assets/Scenes/KevinSceneGun.unity +++ b/Plunderblock/Assets/Scenes/KevinSceneGun.unity @@ -123,157 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &430367785 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 430367789} - - component: {fileID: 430367788} - - component: {fileID: 430367787} - - component: {fileID: 430367786} - m_Layer: 0 - m_Name: GunMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &430367786 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430367785} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &430367787 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430367785} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &430367788 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430367785} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &430367789 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430367785} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1840023902} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1380387582 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1380387583} - - component: {fileID: 1380387584} - m_Layer: 0 - m_Name: WeaponScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1380387583 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380387582} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1840023902} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1380387584 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1380387582} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f0262bbe3025ed14984b9ca540206237, type: 3} - m_Name: - m_EditorClassIdentifier: - parent: {fileID: 1840023901} - bullet: {fileID: 939049122039926632, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} --- !u!1 &1827603663 GameObject: m_ObjectHideFlags: 0 @@ -368,39 +217,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1840023901 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1840023902} - m_Layer: 0 - m_Name: Gun - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1840023902 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1840023901} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.26252207, z: -0, w: 0.96492606} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 430367789} - - {fileID: 1380387583} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 30.44, z: 0} --- !u!1 &2061567904 GameObject: m_ObjectHideFlags: 0 @@ -493,6 +309,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2143748980832870478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.96492606 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalRotation.y + value: 0.26252207 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 30.44 + objectReference: {fileID: 0} + - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} + propertyPath: m_Name + value: Gun + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} --- !u!1001 &3184073952171808938 PrefabInstance: m_ObjectHideFlags: 0 @@ -557,4 +430,4 @@ SceneRoots: - {fileID: 2061567907} - {fileID: 1827603665} - {fileID: 3184073952171808938} - - {fileID: 1840023902} + - {fileID: 2143748980832870478} diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs b/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs index caa3fb8..0d9a168 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs @@ -4,26 +4,36 @@ using UnityEngine; public class BulletMoving : MonoBehaviour { - public GameObject parent; + public GameObject child; public DataBullet dataBullet; + + public float lifetime = 3f; [SerializeField] private Rigidbody rb; private Vector3 direction = new Vector3(0f,0f,0f); + private float time = 0f; - private + + private void die(float lifetime){ + if(time > lifetime){ + GameObject.Destroy(this.gameObject); + } + } // Start is called before the first frame update void Start() { - rb = parent.GetComponent(); - direction = transform.position - parent.transform.position; + rb = this.GetComponent(); + direction = child.transform.position - transform.position; } // Update is called once per frame void Update() { rb.velocity = direction * dataBullet.speed; + die(lifetime); + time += Time.deltaTime; } } diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/DataBullet.asset b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/DataBullet.asset index b8c5c7a..7c88b2a 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/DataBullet.asset +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/DataBullet.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: DataBullet m_EditorClassIdentifier: damage: 10 - speed: 10 + speed: 20 ammo: 4 diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs b/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs new file mode 100644 index 0000000..866a7bb --- /dev/null +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Spin : MonoBehaviour +{ + private float time = 0; + + public float speed; + + public void spinY(float add){ + transform.rotation = Quaternion.Euler(0f,220f + add,0f); + } + + void Start() + { + + } + + // Update is called once per frame + void Update() + { + time += Time.deltaTime + speed * Time.deltaTime; + spinY(time); + } +} diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs.meta b/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs.meta new file mode 100644 index 0000000..15bbcfc --- /dev/null +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/Spin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a156f4aad04544419b7b8a3c0a2294d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/WeaponScript.cs b/Plunderblock/Assets/Scripts/ScriptsKevin/WeaponScript.cs index 343fbb2..6fe2156 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/WeaponScript.cs +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/WeaponScript.cs @@ -5,13 +5,13 @@ using UnityEngine; public class WeaponScript : MonoBehaviour { - public GameObject parent; + public GameObject spawnpoint; public GameObject bullet; - public void shoot(){ + private void shoot(){ if(Input.GetKeyDown(KeyCode.Mouse0)){ - Instantiate(bullet,transform.position,parent.transform.rotation); + Instantiate(bullet,spawnpoint.transform.position,transform.rotation); }