diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab
index 5aa74e9e605d300e907f35025883b2745e3384ef..701bf99ea0dba6c185649aae84f46cbbc9c8b22f 100644
--- a/Assets/Prefabs/Player/Player.prefab
+++ b/Assets/Prefabs/Player/Player.prefab
@@ -29,9 +29,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7243053704608395773}
- - {fileID: 6504836008570981786}
m_Father: {fileID: 2919655767763995908}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2919655767750040694
SkinnedMeshRenderer:
@@ -127,8 +126,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 7101622832953997244}
- - {fileID: 5692892031156706452}
- {fileID: 2919655767763995930}
- {fileID: 2382018822008496428}
- {fileID: 8707842788588381506}
@@ -622,56 +619,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b24baab581bbd8d4794492f9203d78a4, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &4080519311286529278
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6504836008570981786}
- - component: {fileID: 4482145598804610889}
- m_Layer: 0
- m_Name: WeaponHolder
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &6504836008570981786
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4080519311286529278}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 298098870173302905}
- - {fileID: 1527306572586226409}
- - {fileID: 2024530128869929763}
- - {fileID: 1780381779313113873}
- - {fileID: 672110485705029207}
- m_Father: {fileID: 2919655767763995930}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4482145598804610889
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4080519311286529278}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 22ad43701c81f264abc2261069bd3bed, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- changeWeaponCooldown: 0.1
- selectedWeapon: 0
--- !u!1 &4663548478296606707
GameObject:
m_ObjectHideFlags: 0
@@ -702,7 +649,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2919655767763995908}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &6402246503608891515
ParticleSystem:
@@ -5506,7 +5453,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2919655767763995908}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &5323044704781666892
ParticleSystem:
@@ -10290,492 +10237,6 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
---- !u!1001 &2919655767388732192
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6504836008570981786}
- m_Modifications:
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_RootOrder
- value: 4
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalScale.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.40252683
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.30680853
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0.74257565
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0.000000014901163
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.000000029802322
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672629591, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_Name
- value: DefaultWeaponEffect
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
---- !u!4 &672110485705029207 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- m_PrefabInstance: {fileID: 2919655767388732192}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &2919655767801973692
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6504836008570981786}
- m_Modifications:
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.6974816
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.51031584
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalScale.z
- value: -2.7495081
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.5520003
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.386
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0.19999981
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalRotation.w
- value: -0.72989106
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0.3670249
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.503397
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.28132415
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 54.986
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -67.046
- objectReference: {fileID: 0}
- - target: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -355.887
- objectReference: {fileID: 0}
- - target: {fileID: 6122667496871242782, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- propertyPath: m_Name
- value: Shotgun
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
---- !u!4 &2024530128869929763 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
- m_PrefabInstance: {fileID: 2919655767801973692}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &2919655767837037321
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6504836008570981786}
- m_Modifications:
- - target: {fileID: 136823498175365382, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_Name
- value: Magic_Sword
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.051170297
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.018918023
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.030803366
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.6829999
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.416
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.055999994
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.51075506
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.6974858
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0.37705165
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.33237788
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 27.506
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -106.864
- objectReference: {fileID: 0}
- - target: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -102.629
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
---- !u!4 &1527306572586226409 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 4446924544439468512, guid: 1931910b2abb13846a697db119d75b7d, type: 3}
- m_PrefabInstance: {fileID: 2919655767837037321}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &2919655768948659733
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6504836008570981786}
- m_Modifications:
- - target: {fileID: 1734256616995119857, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_Name
- value: Arrow_and_Bow
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalScale.x
- value: 4.2630067
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.76383364
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.992976
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.055999875
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.259
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalPosition.z
- value: 1.2210008
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalRotation.w
- value: -0.03417894
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.9772396
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0.07521031
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.19539174
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 185.52
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 22.241
- objectReference: {fileID: 0}
- - target: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 7.716003
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: aa6ad6b124387be41994f558e847929f, type: 3}
---- !u!4 &298098870173302905 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3217747322628396652, guid: aa6ad6b124387be41994f558e847929f, type: 3}
- m_PrefabInstance: {fileID: 2919655768948659733}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &2919655769238140143
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6504836008570981786}
- m_Modifications:
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_RootOrder
- value: 3
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.40252635
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.26910257
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.18048069
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.5468354
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.44829792
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.44829786
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.5468354
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366706142, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_Name
- value: DefaultWeapon
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
---- !u!4 &1780381779313113873 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- m_PrefabInstance: {fileID: 2919655769238140143}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &5962648187764504642
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 2919655767763995908}
- m_Modifications:
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.40252635
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.26910257
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.18048069
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.5468355
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.44829792
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.4482979
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.5468355
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3472729103366706142, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- propertyPath: m_Name
- value: DefaultWeapon
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
---- !u!4 &7101622832953997244 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3472729103366541310, guid: 8ebe7a510907e4440a22485e3dfb9943, type: 3}
- m_PrefabInstance: {fileID: 5962648187764504642}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &7986664158611116515
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 2919655767763995908}
- m_Modifications:
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalScale.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.40252584
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.30680856
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0.7425759
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2438527259672629591, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- propertyPath: m_Name
- value: DefaultWeaponEffect
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
---- !u!4 &5692892031156706452 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2438527259672530295, guid: 26b39247874858f4b810f01ae22bdd1b, type: 3}
- m_PrefabInstance: {fileID: 7986664158611116515}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &8144377965125707309
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Renderer Pipelines/Built-in.unitypackage.meta b/Assets/Renderer Pipelines/Built-in.unitypackage.meta
deleted file mode 100644
index 7990bbb8373b8c8b31de5b8e0dcad5553ebf8f60..0000000000000000000000000000000000000000
--- a/Assets/Renderer Pipelines/Built-in.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ead0ac616d1b6844d82a074b95ea0b6d
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Renderer Pipelines/URP.unitypackage.meta b/Assets/Renderer Pipelines/URP.unitypackage.meta
deleted file mode 100644
index 02f263c5da616022e3a85f79f799bf132cd17556..0000000000000000000000000000000000000000
--- a/Assets/Renderer Pipelines/URP.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ac05c7750e8302847ab89f169721e80d
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Level 01.unity b/Assets/Scenes/Level 01.unity
index e2dd97294f19d145b6ed77f0231e7bed8aec9837..8b943eedce1d2a9c941cf644e379853f37cfe848 100644
--- a/Assets/Scenes/Level 01.unity
+++ b/Assets/Scenes/Level 01.unity
@@ -384,6 +384,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
+--- !u!4 &99023072 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2919655767763995908, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
+ m_PrefabInstance: {fileID: 99023071}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &147906651
PrefabInstance:
m_ObjectHideFlags: 0
@@ -792,13 +797,24 @@ PrefabInstance:
- target: {fileID: 8772706896189260099, guid: b628ca1a7721f0c41896de9bcdd4a54e, type: 3}
propertyPath: target
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 99023072}
- target: {fileID: 8772706896189260127, guid: b628ca1a7721f0c41896de9bcdd4a54e, type: 3}
propertyPath: m_Name
value: MainCameraV1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b628ca1a7721f0c41896de9bcdd4a54e, type: 3}
+--- !u!114 &771860462 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1896666209, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
+ m_PrefabInstance: {fileID: 99023071}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 544f2064df03e95419b4a5147c506b08, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!114 &1155061857 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1570421101653830803, guid: bc01259bd094e64408f6f61a71952593, type: 3}
@@ -820,7 +836,7 @@ PrefabInstance:
- target: {fileID: 232090797, guid: bc01259bd094e64408f6f61a71952593, type: 3}
propertyPath: playerHealth
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 771860462}
- target: {fileID: 232090797, guid: bc01259bd094e64408f6f61a71952593, type: 3}
propertyPath: gameOverEvent
value:
diff --git a/Assets/Scenes/Level 04.unity b/Assets/Scenes/Level 04.unity
index c7ee9c721fa7d2c1bb7440c70c4c6935d0f35b24..c6396d738489b89fae32c9c05355ac7ba6e24535 100644
--- a/Assets/Scenes/Level 04.unity
+++ b/Assets/Scenes/Level 04.unity
@@ -407,27 +407,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
---- !u!1 &303539009 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 1780381779313469233, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
- m_PrefabInstance: {fileID: 99023071}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &303539012
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 303539009}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 27c63be2a8918c741863160b9d9da122, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- baseDamagePerShot: 20
- damagePerShot: 20
- timeBetweenBullets: 0.15
- range: 100
--- !u!1001 &349932311
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Enemy/EnemyAttack.cs b/Assets/Scripts/Enemy/EnemyAttack.cs
index aaeb04d4200a9936edf46f5d75009c2950d77caf..140fec8c5c47cbf0fb98d460759e73a1a775dfbb 100644
--- a/Assets/Scripts/Enemy/EnemyAttack.cs
+++ b/Assets/Scripts/Enemy/EnemyAttack.cs
@@ -92,7 +92,11 @@ public class EnemyAttack : MonoBehaviour
public void onPlayerDead(Component sender, object data)
{
- anim.SetTrigger("PlayerDead");
+ if (anim)
+ {
+ anim.SetTrigger("PlayerDead");
+ }
+
}