diff --git a/RPG/Assets/Animations/Player.controller b/RPG/Assets/Animations/Player.controller deleted file mode 100644 index 30cbe00..0000000 --- a/RPG/Assets/Animations/Player.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107585502310294650} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &1102762673259445930 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_Idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 72e75614c5c0ee84fa6ca251b0446d95, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107585502310294650 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102762673259445930} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102762673259445930} diff --git a/RPG/Assets/Animations/Player.controller.meta b/RPG/Assets/Animations/Player.controller.meta deleted file mode 100644 index 06c7812..0000000 --- a/RPG/Assets/Animations/Player.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3d13dd6ec386bac41b31d541996e7b2e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/Animations/Player_Idle.anim b/RPG/Assets/Animations/Player_Idle.anim deleted file mode 100644 index 94c674d..0000000 --- a/RPG/Assets/Animations/Player_Idle.anim +++ /dev/null @@ -1,95 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_Idle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3} - - time: 0.083333336 - value: {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3} - - time: 0.16666667 - value: {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3} - - time: 0.33333334 - value: {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3} - - time: 0.41666666 - value: {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3} - - time: 0.5833333 - value: {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3} - - time: 0.6666667 - value: {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - m_SampleRate: 12 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3} - - {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3} - - {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3} - - {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3} - - {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3} - - {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3} - - {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3} - - {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3} - - {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3} - - {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.8333333 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/RPG/Assets/Animations/Player_idle.anim.meta b/RPG/Assets/Animations/Player_idle.anim.meta deleted file mode 100644 index 5e43980..0000000 --- a/RPG/Assets/Animations/Player_idle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 72e75614c5c0ee84fa6ca251b0446d95 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/Prefabs/Player.prefab.meta b/RPG/Assets/MP3.meta similarity index 57% rename from RPG/Assets/Prefabs/Player.prefab.meta rename to RPG/Assets/MP3.meta index d222701..eb86474 100644 --- a/RPG/Assets/Prefabs/Player.prefab.meta +++ b/RPG/Assets/MP3.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: b775ee847150e754580ab2ba977a7cdf -PrefabImporter: +guid: 173caa3c801edc843b2a9570c660e596 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3 b/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3 new file mode 100644 index 0000000..0a18089 Binary files /dev/null and b/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3 differ diff --git a/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3.meta b/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3.meta new file mode 100644 index 0000000..561d399 --- /dev/null +++ b/RPG/Assets/MP3/2019-06-12_-_Homework_-_David_Fesliyan.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0de3049a60ce68a41bf8cbdfef256346 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3 b/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3 new file mode 100644 index 0000000..0729780 Binary files /dev/null and b/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3 differ diff --git a/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3.meta b/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3.meta new file mode 100644 index 0000000..99c1996 --- /dev/null +++ b/RPG/Assets/MP3/2019-06-18_-_Lazy_Day_-_www.FesliyanStudios.com_-_David_Renda.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 023062c8f0a84314db0440404866e1b5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Prefabs/Player.prefab b/RPG/Assets/Prefabs/Player.prefab deleted file mode 100644 index 51988ae..0000000 --- a/RPG/Assets/Prefabs/Player.prefab +++ /dev/null @@ -1,201 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1991335222145836323 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2666099993442899523} - - component: {fileID: 783430623250358917} - - component: {fileID: 3599188608928752076} - - component: {fileID: 843947306393242286} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2666099993442899523 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991335222145836323} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.5, y: -2.8, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_Children: - - {fileID: 4911436068105550623} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &783430623250358917 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991335222145836323} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2daded3814e565c4f901c5b1aaee1ecb, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 3599188608928752076} - unitName: Player - unitLevel: 999 - damage: 10 - damage2: 0 - maxHP: 25 - currentHP: 25 ---- !u!95 &3599188608928752076 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991335222145836323} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 481b0ce1225dd744eb2765eccc53808b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &843947306393242286 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991335222145836323} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.28, y: 1.28} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &2178229977575004885 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4911436068105550623} - - component: {fileID: 5408152275487066065} - m_Layer: 0 - m_Name: knight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4911436068105550623 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2178229977575004885} - 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: [] - m_Father: {fileID: 2666099993442899523} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5408152275487066065 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2178229977575004885} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.28, y: 1.28} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/RPG/Assets/Scenes/Main.unity b/RPG/Assets/Scenes/Main.unity index 36a958e..bc510ae 100644 --- a/RPG/Assets/Scenes/Main.unity +++ b/RPG/Assets/Scenes/Main.unity @@ -578,7 +578,7 @@ Transform: - {fileID: 1353910776} - {fileID: 92325227} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &256439784 GameObject: @@ -944,6 +944,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347080742} m_CullTransparentMesh: 0 +--- !u!1 &393333472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 393333474} + - component: {fileID: 393333473} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &393333473 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393333472} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 0de3049a60ce68a41bf8cbdfef256346, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.6 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &393333474 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393333472} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.563074, y: 9.953174, z: -2.3335457} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &509309062 GameObject: m_ObjectHideFlags: 0 @@ -2646,7 +2773,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1210983994 GameObject: diff --git a/RPG/Assets/Scenes/Menu.unity b/RPG/Assets/Scenes/Menu.unity index b1f4081..c06ad6c 100644 --- a/RPG/Assets/Scenes/Menu.unity +++ b/RPG/Assets/Scenes/Menu.unity @@ -1694,6 +1694,133 @@ RectTransform: m_AnchoredPosition: {x: -8, y: 62.9} m_SizeDelta: {x: 559.5, y: 440.7} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1719047410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1719047412} + - component: {fileID: 1719047411} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1719047411 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719047410} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 023062c8f0a84314db0440404866e1b5, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1719047412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719047410} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.563074, y: 9.953174, z: -2.3335457} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1844318456 GameObject: m_ObjectHideFlags: 0 diff --git a/RPG/Assets/Scripts/BattleSystem.cs b/RPG/Assets/Scripts/BattleSystem.cs index 741f332..bd777ae 100644 --- a/RPG/Assets/Scripts/BattleSystem.cs +++ b/RPG/Assets/Scripts/BattleSystem.cs @@ -58,8 +58,11 @@ public class BattleSystem : MonoBehaviour //Damage enemy bool isDead = enemyUnit.TakeDamage(playerUnit.damage); enemyHUD.SetHP(enemyUnit.currentHP); + animator.SetBool("Attacking", true); yield return new WaitForSeconds(1.0f); dialogueText.text = "The attack is successful!"; + animator.SetBool("Attacking", false); + state = BattleState.ENEMYTURN; yield return new WaitForSeconds(2f); @@ -85,7 +88,7 @@ public class BattleSystem : MonoBehaviour yield return new WaitForSeconds(1.5f); dialogueText.text = enemyUnit.unitName + " attacks!"; - + yield return new WaitForSeconds(2f); bool isDead = playerUnit.TakeDamage(enemyUnit.damage); diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller index 5f121b8..87f176d 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller +++ b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller @@ -15,12 +15,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Hit - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -34,32 +28,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1101317367111138856 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Hit - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102401007289545622} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101868950029529848 +--- !u!1101 &1101449112006842384 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -68,7 +37,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Hit + m_ConditionEvent: Attacking m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102310623440575442} @@ -78,13 +47,13 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5625 + m_ExitTime: 0.6875 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101968885006135666 +--- !u!1101 &1101470502379958286 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -96,7 +65,7 @@ AnimatorStateTransition: m_ConditionEvent: Attacking m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102040162299280804} + m_DstState: {fileID: 1102169725461993464} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -109,58 +78,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101974529586639592 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Attacking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102310623440575442} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.6875 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1102040162299280804 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_Run - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101974529586639592} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 39b16292b24fac949b75d62f37ef2433, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102110848281027924 AnimatorState: serializedVersion: 5 @@ -223,7 +140,8 @@ AnimatorState: m_Name: Player_Run_Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 1101449112006842384} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -250,8 +168,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 1101968885006135666} - - {fileID: 1101317367111138856} + - {fileID: 1101470502379958286} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -277,8 +194,7 @@ AnimatorState: m_Name: Player_Hurt m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101868950029529848} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -332,12 +248,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1102310623440575442} m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102040162299280804} - m_Position: {x: 204, y: 84, z: 0} - serializedVersion: 1 m_State: {fileID: 1102169725461993464} - m_Position: {x: 468, y: 132, z: 0} + m_Position: {x: 204, y: 84, z: 0} - serializedVersion: 1 m_State: {fileID: 1102131811358484924} m_Position: {x: 444, y: 192, z: 0} diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim index 41ecf02..68a13b9 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim +++ b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim @@ -60,7 +60,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0