diff --git a/Assets/Animations/Attack.anim b/Assets/Animations/Attack.anim index e49f15d..e4caff3 100644 --- a/Assets/Animations/Attack.anim +++ b/Assets/Animations/Attack.anim @@ -27130,6 +27130,13 @@ AnimationClip: floatParameter: 0 intParameter: 0 messageOptions: 0 + - time: 0.4 + functionName: OnAttackHit + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 - time: 1.0333333 functionName: OnUnequipWeapon data: handslot.r diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 1e92680..1f96f27 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -212,11 +212,11 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.AttackAction ShowTopMostFoldoutHeaderGroup: 1 attackRange: 5 - attackDamage: 10 + attackDamage: 100 attackCooldown: 0.5 attackableLayer: serializedVersion: 2 - m_Bits: 256 + m_Bits: 4294967295 attackAnimationTrigger: Attack useAnimationEvents: 1 blockDuringAnimation: 1 diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index 9a67b55..d023bee 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -226,79 +226,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5749230937810543840, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} m_PrefabInstance: {fileID: 97216554} m_PrefabAsset: {fileID: 0} ---- !u!1001 &182965999 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1988388203} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalRotation.x - value: 0.00000008146034 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 6a8d9e46e46bff3418a222db6f5786a5, type: 2} - - target: {fileID: 919132149155446097, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - propertyPath: m_Name - value: wall_straight_gate - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} --- !u!1 &306979656 GameObject: m_ObjectHideFlags: 0 @@ -2450,11 +2377,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1577315389 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 15f5826a4fa224044bdf0c1c6bc4685b, type: 3} - m_PrefabInstance: {fileID: 182965999} - m_PrefabAsset: {fileID: 0} --- !u!1 &1672828972 GameObject: m_ObjectHideFlags: 0 @@ -2815,14 +2737,6 @@ PrefabInstance: propertyPath: m_Name value: Wall (7) objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1907881863544148932, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} propertyPath: GlobalObjectIdHash value: 1634476936 @@ -2867,14 +2781,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2968,53 +2874,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 985764489} m_SourcePrefab: {fileID: 100100000, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} ---- !u!1 &1988388201 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1988388203} - - component: {fileID: 1988388202} - m_Layer: 0 - m_Name: EnemyPortal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1988388202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988388201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb91abd3aae74d941a739a48aefb74a1, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::EnemyPortal - Enemies: - - {fileID: 5176576196123937037, guid: 951b69041a2ace947afd721fefb3eaba, type: 3} ---- !u!4 &1988388203 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988388201} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.4593, y: 1.00002, z: -58.8717} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1577315389} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2098115307 PrefabInstance: m_ObjectHideFlags: 0 @@ -3089,6 +2948,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 922888705413710451, guid: 5662d0b0d0eb5f54290edd8dd0980b57, type: 3} m_PrefabInstance: {fileID: 2098115307} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1440648431994998967 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalPosition.x + value: -19.4593 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalPosition.y + value: 1.00002 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalPosition.z + value: -58.8717 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 228462577495887354, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432047510330746227, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: m_Name + value: EnemyPortal + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11e3760dda2c0164abf759c18d918893, type: 3} --- !u!1001 &2264374033617737844 PrefabInstance: m_ObjectHideFlags: 0 @@ -3227,14 +3143,6 @@ PrefabInstance: propertyPath: m_Name value: Wall objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1907881863544148932, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} propertyPath: GlobalObjectIdHash value: 379293221 @@ -3279,14 +3187,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3451,22 +3351,10 @@ PrefabInstance: propertyPath: m_Name value: Wall (1) objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 351020651857757465, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1907881863544148932, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} propertyPath: GlobalObjectIdHash value: 649830493 objectReference: {fileID: 0} - - target: {fileID: 1907881863544148932, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 1061286994 - objectReference: {fileID: 0} - target: {fileID: 5749230937810543840, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} propertyPath: m_LocalPosition.x value: 10 @@ -3507,14 +3395,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8584141298868924137, guid: 88f7f1e8a019b674498ab5fd494c1d34, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3544,62 +3424,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1068750869} m_Modifications: - - target: {fileID: 431325329827407922, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 431325329827407922, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 529351500009441178, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 529351500009441178, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 557134691980400830, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 557134691980400830, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2557322720114216881, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} propertyPath: GlobalObjectIdHash value: 2819059600 objectReference: {fileID: 0} - - target: {fileID: 2607013536690627895, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2607013536690627895, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2998551506809628252, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} propertyPath: m_Name value: Gate objectReference: {fileID: 0} - - target: {fileID: 2998551506809628252, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2998551506809628252, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3902954835252584208, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3902954835252584208, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7180212943015590733, guid: 1be692ccde46d2a4baedc2ee75fbfbdb, type: 3} propertyPath: m_LocalPosition.x value: 18 @@ -3672,4 +3504,4 @@ SceneRoots: - {fileID: 2264374033617737844} - {fileID: 1572384099} - {fileID: 1442785555} - - {fileID: 1988388203} + - {fileID: 1440648431994998967}