diff --git a/.idea/.idea.No Time To Rest/.idea/indexLayout.xml b/.idea/.idea.No Time To Rest/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/.idea.No Time To Rest/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.No Time To Rest/.idea/projectSettingsUpdater.xml b/.idea/.idea.No Time To Rest/.idea/projectSettingsUpdater.xml
new file mode 100644
index 0000000..64af657
--- /dev/null
+++ b/.idea/.idea.No Time To Rest/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.No Time To Rest/.idea/vcs.xml b/.idea/.idea.No Time To Rest/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/.idea.No Time To Rest/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.No Time To Rest/.idea/workspace.xml b/.idea/.idea.No Time To Rest/.idea/workspace.xml
index c720875..c7832b0 100644
--- a/.idea/.idea.No Time To Rest/.idea/workspace.xml
+++ b/.idea/.idea.No Time To Rest/.idea/workspace.xml
@@ -4,7 +4,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -16,9 +27,9 @@
-
+ {
+ "associatedIndex": 6
+}
@@ -28,7 +39,7 @@
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
- "git-widget-placeholder": "kosmogor",
+ "git-widget-placeholder": "emil",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -90,6 +101,7 @@
1741432966619
+
diff --git a/Assets/Materials/Brown_1.mat b/Assets/Materials/Brown_1.mat
new file mode 100644
index 0000000..f36df3a
--- /dev/null
+++ b/Assets/Materials/Brown_1.mat
@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Brown_1
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses:
+ - MOTIONVECTORS
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BaseMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _AddPrecomputedVelocity: 0
+ - _AlphaClip: 0
+ - _AlphaToMask: 0
+ - _Blend: 0
+ - _BlendModePreserveSpecular: 1
+ - _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _DstBlendAlpha: 0
+ - _EnvironmentReflections: 1
+ - _GlossMapScale: 0
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _Metallic: 0.702
+ - _OcclusionStrength: 1
+ - _Parallax: 0.005
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.134
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _SrcBlendAlpha: 1
+ - _Surface: 0
+ - _WorkflowMode: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 0.6226415, g: 0.42829096, b: 0, a: 1}
+ - _Color: {r: 0.62264144, g: 0.42829093, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ m_BuildTextureStacks: []
+ m_AllowLocking: 1
+--- !u!114 &9176170650838622930
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 9
diff --git a/Assets/Materials/Brown_1.mat.meta b/Assets/Materials/Brown_1.mat.meta
new file mode 100644
index 0000000..35abfd8
--- /dev/null
+++ b/Assets/Materials/Brown_1.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5ca5005c768c9c4491aaae5c45f1eac
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Emmited.meta b/Assets/Materials/Emmited.meta
new file mode 100644
index 0000000..d891ba4
--- /dev/null
+++ b/Assets/Materials/Emmited.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa51d287933b1c64abfedc219d0178fa
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Emmited/Yellow_Emit.mat b/Assets/Materials/Emmited/Yellow_Emit.mat
new file mode 100644
index 0000000..66862e0
--- /dev/null
+++ b/Assets/Materials/Emmited/Yellow_Emit.mat
@@ -0,0 +1,137 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Yellow_Emit
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _EMISSION
+ m_InvalidKeywords: []
+ m_LightmapFlags: 2
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses:
+ - MOTIONVECTORS
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BaseMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _AddPrecomputedVelocity: 0
+ - _AlphaClip: 0
+ - _AlphaToMask: 0
+ - _Blend: 0
+ - _BlendModePreserveSpecular: 1
+ - _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _DstBlendAlpha: 0
+ - _EnvironmentReflections: 1
+ - _GlossMapScale: 0
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _Metallic: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.005
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _SrcBlendAlpha: 1
+ - _Surface: 0
+ - _WorkflowMode: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
+ - _Color: {r: 1, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 1, g: 0.6300467, b: 0, a: 1}
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ m_BuildTextureStacks: []
+ m_AllowLocking: 1
+--- !u!114 &1224925544621896716
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 9
diff --git a/Assets/Materials/Emmited/Yellow_Emit.mat.meta b/Assets/Materials/Emmited/Yellow_Emit.mat.meta
new file mode 100644
index 0000000..665e479
--- /dev/null
+++ b/Assets/Materials/Emmited/Yellow_Emit.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7ced48a396ccf7045919ead8355ab8c6
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Weapons/Pistol_0.1.fbx b/Assets/Models/Weapons/Pistol_0.1.fbx
index d0e462e..f3f4a0d 100644
--- a/Assets/Models/Weapons/Pistol_0.1.fbx
+++ b/Assets/Models/Weapons/Pistol_0.1.fbx
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:78a7d091cc8f48932f27806997b6b0be17748f8f7cecef90d79c53b46e1c8906
-size 32604
+oid sha256:85492919b330e5ecb2727b2f9817d8195be28b787a8f6f8acf8783c613c4cde8
+size 31900
diff --git a/Assets/Prefabs/Bullet.prefab b/Assets/Prefabs/Bullet.prefab
index af47b91..fd28012 100644
--- a/Assets/Prefabs/Bullet.prefab
+++ b/Assets/Prefabs/Bullet.prefab
@@ -67,7 +67,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+ - {fileID: 2100000, guid: 7ced48a396ccf7045919ead8355ab8c6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -115,7 +115,7 @@ Rigidbody:
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
- m_CollisionDetection: 0
+ m_CollisionDetection: 2
--- !u!135 &8393546946202406891
SphereCollider:
m_ObjectHideFlags: 0
@@ -149,5 +149,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7a451ad0b53e8c0ca82f7ce15114c38, type: 3}
m_Name:
m_EditorClassIdentifier:
- speed: 1
+ speed: 50
damage: 20
+ timeToLive: 5
diff --git a/Assets/Prefabs/Enemies/Eye_Enemy1.prefab b/Assets/Prefabs/Enemies/Eye_Enemy1.prefab
index ec383d5..2fddd51 100644
--- a/Assets/Prefabs/Enemies/Eye_Enemy1.prefab
+++ b/Assets/Prefabs/Enemies/Eye_Enemy1.prefab
@@ -51,15 +51,19 @@ PrefabInstance:
- target: {fileID: -8039216694009765281, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
+ objectReference: {fileID: 2100000, guid: c5ca5005c768c9c4491aaae5c45f1eac, type: 2}
- target: {fileID: -1439730007547781893, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
+ objectReference: {fileID: 2100000, guid: c5ca5005c768c9c4491aaae5c45f1eac, type: 2}
- target: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
propertyPath: m_Name
value: Eye_Enemy1
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+ propertyPath: m_TagString
+ value: Enemy
+ objectReference: {fileID: 0}
- target: {fileID: 5509654439515443377, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
@@ -67,5 +71,82 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 8265353369762796437}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 4157182199899525086}
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: -3280827978807638765}
m_SourcePrefab: {fileID: 100100000, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+--- !u!1 &3602081654026665026 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 81be7b02df0db07479a8e1a9dd56f618, type: 3}
+ m_PrefabInstance: {fileID: 4412476501240889619}
+ m_PrefabAsset: {fileID: 0}
+--- !u!136 &8265353369762796437
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3602081654026665026}
+ 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: 2
+ m_Radius: 0.75
+ m_Height: 2.9
+ m_Direction: 1
+ m_Center: {x: 0, y: 1.3010732, z: 0}
+--- !u!54 &4157182199899525086
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3602081654026665026}
+ serializedVersion: 4
+ m_Mass: 1
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_CenterOfMass: {x: 0, y: 0, z: 0}
+ m_InertiaTensor: {x: 1, y: 1, z: 1}
+ m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 1
+ m_UseGravity: 1
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 112
+ m_CollisionDetection: 0
+--- !u!114 &-3280827978807638765
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3602081654026665026}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 46894d927b8e6654487b876457ca8974, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ hp: 100
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index e3d66e3..e8917e6 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -62,7 +62,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 3053641561535516023}
m_Father: {fileID: 6890030909251295590}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &1094126809165627842
@@ -147,8 +148,8 @@ MonoBehaviour:
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
- m_RenderPostProcessing: 0
- m_Antialiasing: 0
+ m_RenderPostProcessing: 1
+ m_Antialiasing: 1
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
@@ -182,6 +183,7 @@ GameObject:
- component: {fileID: 1437407097293080706}
- component: {fileID: 397169322893853401}
- component: {fileID: 1198108720433238150}
+ - component: {fileID: 4266755283058417607}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@@ -326,3 +328,103 @@ MonoBehaviour:
verSpeed: 200
verUpperBound: 90
verLowerBound: -90
+--- !u!114 &4266755283058417607
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9016311960615966999}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f3724861d6ef4a112910a3ef14207757, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ weapons:
+ - {fileID: 7482182703889749278}
+ currentWeapon: 0
+--- !u!1001 &444904299868781356
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 4506534449155536579}
+ m_Modifications:
+ - target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 2812489602185112801, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_Name
+ value: Pistol_0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+--- !u!4 &3053641561535516023 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ m_PrefabInstance: {fileID: 444904299868781356}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &7482182703889749278 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7060117665713712690, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
+ m_PrefabInstance: {fileID: 444904299868781356}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9b5e56940d7855caeb2d584265db0624, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Prefabs/Weapons/Pistol_0.1.prefab b/Assets/Prefabs/Weapons/Pistol_0.1.prefab
index ff7542e..841594e 100644
--- a/Assets/Prefabs/Weapons/Pistol_0.1.prefab
+++ b/Assets/Prefabs/Weapons/Pistol_0.1.prefab
@@ -1,6 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &2192856221140862036
+--- !u!1 &1587861691790886941
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1042172676018165636}
+ m_Layer: 0
+ m_Name: muzzle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1042172676018165636
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1587861691790886941}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+ m_LocalPosition: {x: 0.035, y: -0.0003, z: -0.0015}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 3191971078612809307}
+ m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1001 &3154368798760636848
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -22,50 +53,97 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.x
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.y
- value: 2
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.z
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.06162845
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalRotation.x
- value: -0.70441604
+ value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalRotation.y
- value: -0.70441604
+ value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalRotation.z
- value: -0.06162845
+ value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -10
+ value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -180
+ value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 90
+ value: 0
objectReference: {fileID: 0}
+ - target: {fileID: -7511558181221131132, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ propertyPath: 'm_Materials.Array.data[0]'
+ value:
+ objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
+ - target: {fileID: -7511558181221131132, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ propertyPath: 'm_Materials.Array.data[1]'
+ value:
+ objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
+ - target: {fileID: -7511558181221131132, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ propertyPath: 'm_Materials.Array.data[2]'
+ value:
+ objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
+ - target: {fileID: -7511558181221131132, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ propertyPath: 'm_Materials.Array.data[3]'
+ value:
+ objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
- target: {fileID: 919132149155446097, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_Name
value: Pistol_0.1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1042172676018165636}
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 7060117665713712690}
m_SourcePrefab: {fileID: 100100000, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+--- !u!1 &2812489602185112801 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ m_PrefabInstance: {fileID: 3154368798760636848}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &7060117665713712690
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2812489602185112801}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9b5e56940d7855caeb2d584265db0624, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ projectilePrefab: {fileID: 1562924000103655330, guid: bfe7100930f24fd52b5b66832f59cfa8, type: 3}
+ spawnPosition: {fileID: 1042172676018165636}
+ fireRate: 1
+--- !u!4 &3191971078612809307 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
+ m_PrefabInstance: {fileID: 3154368798760636848}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Weapons/Pistol_0.1.prefab.meta b/Assets/Prefabs/Weapons/Pistol_0.1.prefab.meta
index a0e39b2..764b8b3 100644
--- a/Assets/Prefabs/Weapons/Pistol_0.1.prefab.meta
+++ b/Assets/Prefabs/Weapons/Pistol_0.1.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9535c81cc2dffc94db2f5cbbc66cc790
+guid: af6264663cfc3ba499db761a90d861ca
PrefabImporter:
externalObjects: {}
userData:
diff --git a/Assets/Scenes/Composing.unity b/Assets/Scenes/Composing.unity
index 1a5133c..34683f2 100644
--- a/Assets/Scenes/Composing.unity
+++ b/Assets/Scenes/Composing.unity
@@ -124,11 +124,63 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4357511284367880818, guid: 73c9d3d3ea6065747956699e5d1f5392, type: 3}
m_PrefabInstance: {fileID: 1168105054}
m_PrefabAsset: {fileID: 0}
---- !u!4 &99598608 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 4506534449155536579, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- m_PrefabInstance: {fileID: 3997104640432974468}
- m_PrefabAsset: {fileID: 0}
+--- !u!1001 &111061984
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3602081654026665026, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_Name
+ value: Eye_Enemy1 (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3.87
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
--- !u!4 &244018640 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3}
@@ -534,6 +586,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3}
+--- !u!1001 &834035366
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3602081654026665026, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_Name
+ value: Eye_Enemy1 (3)
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -7
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3.87
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
--- !u!1 &840308436
GameObject:
m_ObjectHideFlags: 0
@@ -583,6 +692,63 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &859145714
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9016311960615966999, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
+ propertyPath: m_Name
+ value: Player
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
--- !u!4 &963998287 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3465613687167644384, guid: 0a6d9f24857a5d742b9df2df7da4a192, type: 3}
@@ -593,11 +759,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 795996269680244239, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3}
m_PrefabInstance: {fileID: 1341570327}
m_PrefabAsset: {fileID: 0}
---- !u!4 &1126042470 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- m_PrefabInstance: {fileID: 2159189467885668185}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &1168105054
PrefabInstance:
m_ObjectHideFlags: 0
@@ -655,6 +816,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 73c9d3d3ea6065747956699e5d1f5392, type: 3}
+--- !u!1001 &1259296367
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3602081654026665026, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_Name
+ value: Eye_Enemy1 (2)
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3.87
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -7
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
--- !u!1001 &1341570327
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1248,11 +1466,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
propertyPath: m_LocalPosition.x
- value: 2
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
propertyPath: m_LocalPosition.y
- value: 1
+ value: -3.87
objectReference: {fileID: 0}
- target: {fileID: 4230844338806302456, guid: 7ab59219438e4a241affd5e9441d9d9f, type: 3}
propertyPath: m_LocalPosition.z
@@ -1467,79 +1685,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0a6d9f24857a5d742b9df2df7da4a192, type: 3}
---- !u!1001 &2159189467885668185
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 99598608}
- m_Modifications:
- - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: 'm_Materials.Array.data[0]'
- value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
- - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: 'm_Materials.Array.data[1]'
- value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
- - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: 'm_Materials.Array.data[2]'
- value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
- - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: 'm_Materials.Array.data[3]'
- value:
- objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2}
- - target: {fileID: 1346574968092522757, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_Name
- value: Pistol_0.1
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalPosition.z
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.06162845
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0.70441604
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0.70441604
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.06162845
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: -10
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -180
- objectReference: {fileID: 0}
- - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 90
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3}
--- !u!1001 &2657052385640200812
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1597,74 +1742,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3}
---- !u!1001 &3997104640432974468
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1432024724141933518, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_Antialiasing
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1432024724141933518, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_RenderPostProcessing
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalPosition.y
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6890030909251295590, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 9016311960615966999, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- propertyPath: m_Name
- value: Player
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 4506534449155536579, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1126042470}
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
--- !u!1001 &6825853474636966005
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1788,7 +1865,6 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1560783769}
- - {fileID: 3997104640432974468}
- {fileID: 1555151540}
- {fileID: 840308438}
- {fileID: 1733140263}
@@ -1796,3 +1872,7 @@ SceneRoots:
- {fileID: 792221756}
- {fileID: 690075884}
- {fileID: 219120118920238392}
+ - {fileID: 834035366}
+ - {fileID: 111061984}
+ - {fileID: 1259296367}
+ - {fileID: 859145714}
diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity
index 1b79846..2d89581 100644
--- a/Assets/Scenes/TestScene.unity
+++ b/Assets/Scenes/TestScene.unity
@@ -667,30 +667,8 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 4506534449155536579, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
insertIndex: -1
addedObject: {fileID: 851709645}
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 9016311960615966999, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3997104640432974471}
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
---- !u!1 &3997104640432974470 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9016311960615966999, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3}
- m_PrefabInstance: {fileID: 3997104640432974468}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &3997104640432974471
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3997104640432974470}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f3724861d6ef4a112910a3ef14207757, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- weapons: []
- currentWeapon: 0
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Pistol.cs b/Assets/Scripts/Pistol.cs
index e02287f..d11503a 100644
--- a/Assets/Scripts/Pistol.cs
+++ b/Assets/Scripts/Pistol.cs
@@ -10,7 +10,7 @@ public class Pistol : Weapon
public override void Shoot(bool keyDown, bool keyHold) {
if (keyDown && (fireRate == 0 || currentDelay == 1 / fireRate)) {
- Instantiate(projectilePrefab, spawnPosition.position, transform.rotation);
+ Instantiate(projectilePrefab, spawnPosition.position, spawnPosition.rotation);
currentDelay = 0;
}
}