From 8f52d3bcd0010cffec63a007756bfccdee40ac44 Mon Sep 17 00:00:00 2001 From: RedStealthDev Date: Tue, 28 Mar 2023 12:02:22 +0200 Subject: [PATCH] added enemy behaviour and bullet with line. --- Assets/AnimatorsAnims/Frog.meta | 8 + Assets/AnimatorsAnims/Frog/Frog_Run.anim | 92 ++++ Assets/AnimatorsAnims/Frog/Frog_Run.anim.meta | 8 + Assets/AnimatorsAnims/Frog/Frog_Shoot.anim | 86 ++++ .../AnimatorsAnims/Frog/Frog_Shoot.anim.meta | 8 + Assets/AnimatorsAnims/FrogCont.controller | 156 ++++++ .../AnimatorsAnims/FrogCont.controller.meta | 8 + Assets/AnimatorsAnims/Player.meta | 8 + .../AnimatorsAnims/{ => Player}/PL_Dash.anim | 0 .../{ => Player}/PL_Dash.anim.meta | 0 .../{ => Player}/PL_Falling.anim | 0 .../{ => Player}/PL_Falling.anim.meta | 0 .../AnimatorsAnims/{ => Player}/PL_GoUp.anim | 0 .../{ => Player}/PL_GoUp.anim.meta | 0 .../AnimatorsAnims/{ => Player}/PL_Idle.anim | 0 .../{ => Player}/PL_Idle.anim.meta | 0 .../AnimatorsAnims/{ => Player}/PL_Jump.anim | 0 .../{ => Player}/PL_Jump.anim.meta | 0 .../AnimatorsAnims/{ => Player}/PL_Run.anim | 0 .../{ => Player}/PL_Run.anim.meta | 0 .../{ => Player}/PL_StandIdle.anim | 0 .../{ => Player}/PL_StandIdle.anim.meta | 0 Assets/AnimatorsAnims/Store.meta | 8 + .../{ => Store}/Store_Hello.anim | 0 .../{ => Store}/Store_Hello.anim.meta | 0 .../{ => Store}/Store_Idle.anim | 0 .../{ => Store}/Store_Idle.anim.meta | 0 Assets/Materials/Grapic/Enemies.meta | 8 + Assets/Materials/Grapic/Enemies/Frog.png | Bin 0 -> 4669 bytes Assets/Materials/Grapic/Enemies/Frog.png.meta | 487 ++++++++++++++++++ Assets/Materials/Grapic/Enemies/frog tung.png | Bin 0 -> 123 bytes .../Grapic/Enemies/frog tung.png.meta | 135 +++++ Assets/Materials/Grapic/hpSlider.png | Bin 0 -> 163 bytes Assets/Materials/Grapic/hpSlider.png.meta | 179 +++++++ Assets/Misc.meta | 8 + Assets/Misc/HpBarShape.asset | 47 ++ Assets/Misc/HpBarShape.asset.meta | 8 + Assets/Prefabs/HPBar.prefab | 482 +++++++++++++++++ Assets/Prefabs/HPBar.prefab.meta | 7 + Assets/Prefabs/Tunge.prefab | 149 ++++++ Assets/Prefabs/Tunge.prefab.meta | 7 + Assets/Scenes/Main_Game.unity | 482 ++++++++++++++++- Assets/Scripts/Bullet.cs | 3 +- Assets/Scripts/Enemy_Frog.cs | 85 +++ Assets/Scripts/Enemy_Frog.cs.meta | 11 + Assets/Scripts/Enemy_stat1.cs | 11 + Assets/Scripts/Enemy_stat1.cs.meta | 11 + Assets/Scripts/Enemy_stat2.cs | 23 + Assets/Scripts/Enemy_stat2.cs.meta | 11 + Assets/Scripts/Health.cs | 36 +- Assets/Scripts/HpBar.cs | 22 + Assets/Scripts/HpBar.cs.meta | 11 + Assets/Scripts/Weapon.cs | 1 + ProjectSettings/TagManager.asset | 6 +- UserSettings/Layouts/default-2021.dwlt | 163 +++--- 55 files changed, 2692 insertions(+), 83 deletions(-) create mode 100644 Assets/AnimatorsAnims/Frog.meta create mode 100644 Assets/AnimatorsAnims/Frog/Frog_Run.anim create mode 100644 Assets/AnimatorsAnims/Frog/Frog_Run.anim.meta create mode 100644 Assets/AnimatorsAnims/Frog/Frog_Shoot.anim create mode 100644 Assets/AnimatorsAnims/Frog/Frog_Shoot.anim.meta create mode 100644 Assets/AnimatorsAnims/FrogCont.controller create mode 100644 Assets/AnimatorsAnims/FrogCont.controller.meta create mode 100644 Assets/AnimatorsAnims/Player.meta rename Assets/AnimatorsAnims/{ => Player}/PL_Dash.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Dash.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Falling.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Falling.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_GoUp.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_GoUp.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Idle.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Idle.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Jump.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Jump.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Run.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_Run.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_StandIdle.anim (100%) rename Assets/AnimatorsAnims/{ => Player}/PL_StandIdle.anim.meta (100%) create mode 100644 Assets/AnimatorsAnims/Store.meta rename Assets/AnimatorsAnims/{ => Store}/Store_Hello.anim (100%) rename Assets/AnimatorsAnims/{ => Store}/Store_Hello.anim.meta (100%) rename Assets/AnimatorsAnims/{ => Store}/Store_Idle.anim (100%) rename Assets/AnimatorsAnims/{ => Store}/Store_Idle.anim.meta (100%) create mode 100644 Assets/Materials/Grapic/Enemies.meta create mode 100644 Assets/Materials/Grapic/Enemies/Frog.png create mode 100644 Assets/Materials/Grapic/Enemies/Frog.png.meta create mode 100644 Assets/Materials/Grapic/Enemies/frog tung.png create mode 100644 Assets/Materials/Grapic/Enemies/frog tung.png.meta create mode 100644 Assets/Materials/Grapic/hpSlider.png create mode 100644 Assets/Materials/Grapic/hpSlider.png.meta create mode 100644 Assets/Misc.meta create mode 100644 Assets/Misc/HpBarShape.asset create mode 100644 Assets/Misc/HpBarShape.asset.meta create mode 100644 Assets/Prefabs/HPBar.prefab create mode 100644 Assets/Prefabs/HPBar.prefab.meta create mode 100644 Assets/Prefabs/Tunge.prefab create mode 100644 Assets/Prefabs/Tunge.prefab.meta create mode 100644 Assets/Scripts/Enemy_Frog.cs create mode 100644 Assets/Scripts/Enemy_Frog.cs.meta create mode 100644 Assets/Scripts/Enemy_stat1.cs create mode 100644 Assets/Scripts/Enemy_stat1.cs.meta create mode 100644 Assets/Scripts/Enemy_stat2.cs create mode 100644 Assets/Scripts/Enemy_stat2.cs.meta create mode 100644 Assets/Scripts/HpBar.cs create mode 100644 Assets/Scripts/HpBar.cs.meta diff --git a/Assets/AnimatorsAnims/Frog.meta b/Assets/AnimatorsAnims/Frog.meta new file mode 100644 index 0000000..01ddf4a --- /dev/null +++ b/Assets/AnimatorsAnims/Frog.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b858b2e31e80a444fa3fac49177f50a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/Frog/Frog_Run.anim b/Assets/AnimatorsAnims/Frog/Frog_Run.anim new file mode 100644 index 0000000..75d6884 --- /dev/null +++ b/Assets/AnimatorsAnims/Frog/Frog_Run.anim @@ -0,0 +1,92 @@ +%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: Frog_Run + 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: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.125 + value: {fileID: -864377333, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.25 + value: {fileID: -933593245, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.375 + value: {fileID: -1756990778, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.5 + value: {fileID: 1196033650, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.625 + value: {fileID: 1402453657, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.75 + value: {fileID: -201846207, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.875 + value: {fileID: 1601616289, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 1 + value: {fileID: -584477188, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -864377333, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -933593245, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -1756990778, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 1196033650, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 1402453657, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -201846207, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 1601616289, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -584477188, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.125 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Assets/AnimatorsAnims/Frog/Frog_Run.anim.meta b/Assets/AnimatorsAnims/Frog/Frog_Run.anim.meta new file mode 100644 index 0000000..6eaffce --- /dev/null +++ b/Assets/AnimatorsAnims/Frog/Frog_Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8adcff46610a2d4dafdaee8a5b98722 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim b/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim new file mode 100644 index 0000000..3df5806 --- /dev/null +++ b/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim @@ -0,0 +1,86 @@ +%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: Frog_Shoot + 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: 1781035205, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.25 + value: {fileID: 219563495, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.5 + value: {fileID: 2006236882, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 0.75 + value: {fileID: 1926515490, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 1 + value: {fileID: 1072686942, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 1.25 + value: {fileID: -1427017957, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - time: 1.5 + value: {fileID: 818788278, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 1781035205, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 219563495, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 2006236882, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 1926515490, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 1072686942, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: -1427017957, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + - {fileID: 818788278, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.75 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim.meta b/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim.meta new file mode 100644 index 0000000..27faade --- /dev/null +++ b/Assets/AnimatorsAnims/Frog/Frog_Shoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e634be7bd4b60aa4fa361b8d3e407e23 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/FrogCont.controller b/Assets/AnimatorsAnims/FrogCont.controller new file mode 100644 index 0000000..f2a2f76 --- /dev/null +++ b/Assets/AnimatorsAnims/FrogCont.controller @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5831013718810815287 +AnimatorStateMachine: + serializedVersion: 6 + 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: -1309457122222322265} + m_Position: {x: 230, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 11115211062637411} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5631977286367760529} + m_Position: {x: 149.5835, y: 201.70917, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 0, y: 90, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5631977286367760529} +--- !u!114 &-2027374196755022861 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: edd7653907d4dec4dbe47d591945b1ab, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1102 &-1309457122222322265 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Frog_Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: + - {fileID: -2027374196755022861} + 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: d8adcff46610a2d4dafdaee8a5b98722, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FrogCont + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5831013718810815287} + 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 &11115211062637411 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Frog_Shoot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: + - {fileID: 528694797887657747} + 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: e634be7bd4b60aa4fa361b8d3e407e23, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &528694797887657747 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c729237c60a81bf47946977fcbf61152, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1102 &5631977286367760529 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/AnimatorsAnims/FrogCont.controller.meta b/Assets/AnimatorsAnims/FrogCont.controller.meta new file mode 100644 index 0000000..ad52a5b --- /dev/null +++ b/Assets/AnimatorsAnims/FrogCont.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3eb707538699a142941bb606d702711 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/Player.meta b/Assets/AnimatorsAnims/Player.meta new file mode 100644 index 0000000..111a670 --- /dev/null +++ b/Assets/AnimatorsAnims/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bf8a6a069c63f74eaa2366bf54cdb12 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/PL_Dash.anim b/Assets/AnimatorsAnims/Player/PL_Dash.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_Dash.anim rename to Assets/AnimatorsAnims/Player/PL_Dash.anim diff --git a/Assets/AnimatorsAnims/PL_Dash.anim.meta b/Assets/AnimatorsAnims/Player/PL_Dash.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_Dash.anim.meta rename to Assets/AnimatorsAnims/Player/PL_Dash.anim.meta diff --git a/Assets/AnimatorsAnims/PL_Falling.anim b/Assets/AnimatorsAnims/Player/PL_Falling.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_Falling.anim rename to Assets/AnimatorsAnims/Player/PL_Falling.anim diff --git a/Assets/AnimatorsAnims/PL_Falling.anim.meta b/Assets/AnimatorsAnims/Player/PL_Falling.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_Falling.anim.meta rename to Assets/AnimatorsAnims/Player/PL_Falling.anim.meta diff --git a/Assets/AnimatorsAnims/PL_GoUp.anim b/Assets/AnimatorsAnims/Player/PL_GoUp.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_GoUp.anim rename to Assets/AnimatorsAnims/Player/PL_GoUp.anim diff --git a/Assets/AnimatorsAnims/PL_GoUp.anim.meta b/Assets/AnimatorsAnims/Player/PL_GoUp.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_GoUp.anim.meta rename to Assets/AnimatorsAnims/Player/PL_GoUp.anim.meta diff --git a/Assets/AnimatorsAnims/PL_Idle.anim b/Assets/AnimatorsAnims/Player/PL_Idle.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_Idle.anim rename to Assets/AnimatorsAnims/Player/PL_Idle.anim diff --git a/Assets/AnimatorsAnims/PL_Idle.anim.meta b/Assets/AnimatorsAnims/Player/PL_Idle.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_Idle.anim.meta rename to Assets/AnimatorsAnims/Player/PL_Idle.anim.meta diff --git a/Assets/AnimatorsAnims/PL_Jump.anim b/Assets/AnimatorsAnims/Player/PL_Jump.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_Jump.anim rename to Assets/AnimatorsAnims/Player/PL_Jump.anim diff --git a/Assets/AnimatorsAnims/PL_Jump.anim.meta b/Assets/AnimatorsAnims/Player/PL_Jump.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_Jump.anim.meta rename to Assets/AnimatorsAnims/Player/PL_Jump.anim.meta diff --git a/Assets/AnimatorsAnims/PL_Run.anim b/Assets/AnimatorsAnims/Player/PL_Run.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_Run.anim rename to Assets/AnimatorsAnims/Player/PL_Run.anim diff --git a/Assets/AnimatorsAnims/PL_Run.anim.meta b/Assets/AnimatorsAnims/Player/PL_Run.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_Run.anim.meta rename to Assets/AnimatorsAnims/Player/PL_Run.anim.meta diff --git a/Assets/AnimatorsAnims/PL_StandIdle.anim b/Assets/AnimatorsAnims/Player/PL_StandIdle.anim similarity index 100% rename from Assets/AnimatorsAnims/PL_StandIdle.anim rename to Assets/AnimatorsAnims/Player/PL_StandIdle.anim diff --git a/Assets/AnimatorsAnims/PL_StandIdle.anim.meta b/Assets/AnimatorsAnims/Player/PL_StandIdle.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/PL_StandIdle.anim.meta rename to Assets/AnimatorsAnims/Player/PL_StandIdle.anim.meta diff --git a/Assets/AnimatorsAnims/Store.meta b/Assets/AnimatorsAnims/Store.meta new file mode 100644 index 0000000..06c8c5c --- /dev/null +++ b/Assets/AnimatorsAnims/Store.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1395255e00280ce428af9526eedffe3d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimatorsAnims/Store_Hello.anim b/Assets/AnimatorsAnims/Store/Store_Hello.anim similarity index 100% rename from Assets/AnimatorsAnims/Store_Hello.anim rename to Assets/AnimatorsAnims/Store/Store_Hello.anim diff --git a/Assets/AnimatorsAnims/Store_Hello.anim.meta b/Assets/AnimatorsAnims/Store/Store_Hello.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/Store_Hello.anim.meta rename to Assets/AnimatorsAnims/Store/Store_Hello.anim.meta diff --git a/Assets/AnimatorsAnims/Store_Idle.anim b/Assets/AnimatorsAnims/Store/Store_Idle.anim similarity index 100% rename from Assets/AnimatorsAnims/Store_Idle.anim rename to Assets/AnimatorsAnims/Store/Store_Idle.anim diff --git a/Assets/AnimatorsAnims/Store_Idle.anim.meta b/Assets/AnimatorsAnims/Store/Store_Idle.anim.meta similarity index 100% rename from Assets/AnimatorsAnims/Store_Idle.anim.meta rename to Assets/AnimatorsAnims/Store/Store_Idle.anim.meta diff --git a/Assets/Materials/Grapic/Enemies.meta b/Assets/Materials/Grapic/Enemies.meta new file mode 100644 index 0000000..b49b033 --- /dev/null +++ b/Assets/Materials/Grapic/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1d1afba212f4874ab628fadcdfc219c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Grapic/Enemies/Frog.png b/Assets/Materials/Grapic/Enemies/Frog.png new file mode 100644 index 0000000000000000000000000000000000000000..bad6521f2509e8863c47659292c805c5b6b595e5 GIT binary patch literal 4669 zcmbVPc{tQx+n>-NvZX{a5{m4itb-;@wva^jJ=u~i%gjh+M3%CPQIfLDGWL$ks)OJ zY)!L2;m1OKa%r5jpzyxLChB}`OA4VXDp|tZ`*&I5dHr|dw-4uDFQ3X%h`t3EZ40I$ zQIWP`Zl9uM=P#QLq3N#vLviuH+Qg_8Exs|kBcE&kj*L7EyY)p%xO8Q_43`dUA7G)e z1N|tW?A=}88Jbu@))nr?|hGZN_h;5GF3m5pUn9d+L zB`V^iawhW=P$P#uCLX6ym(sSkW9Sem5z(h|0Y=&QeaqE}D+;>y9`yjp2<2sty38IP zqP%J~Aga*6*`rC@TRJG3L5QygX78~bLUpfSB$X`?O$f)fFkSr@nIs^LC)bo2YCg>G zhpM#VJXoYAc#h>QY0nylCqrnopYvI&>WYF*K*AWw@jaz@H~2U(dp9gUmIiTVT{nzo zK2+*;ZxL#A(-?Wo?8%m;3Kf3cDHn)%vIS75Fku_}AvGcMm2J!Ww%DYxL*z1tamUfM zgANlw?I=Hk8)w6fb5~PpxXBU}&Zp(KWU1=O)$eq4n`zVPN>ZbZ%Kw)T|JArI0V?M>_+6jOV>-S$Hk7!D%WoSGHR`J`-Khc6NBg|S|%K} z@H^lJFyAqYdl*h$`O{U`d+&kJ4&dGZj?{J5ZFR<&J)2st2l(Kqd7qdg zPccVWy2m6+vzm38{D5;ELwkA3&BE4SZ#d?ZtRD$=oe|C-q74KBvY8+WC0_jNQbh+& zyGo&E$qPFXMxk|R^|UuRI}}l^)m<~aXD~Qz{N4=2Ulb4tY%h%q9}KQx(*Ig)6re$~ zOae)ySTqg=f(0FnUpPr0Et8UJx^?RGQKbo3J~Feow#Z_)%irv#$-L(w-rocP$v3tY zn%lQ=TT=>^VrK4Amt>4-hVmxhvw4QGLX7@b2bl}+ppv^ez_#u!Y7g8sV0~#3Fsd78 z=vB6de=qZ-@)qtlby|s=FRzcvZ2L_W#L%@Q1!7>cA(NPq^iZl zHPtVQ52vJR*WEPsGLCUSGKM$Xfw?Q%<3k{Sx0XAlQAk(!Nbv&YT$mu0&fL!Zn(AjC zwpRW;+OC(d%y^p{tKDCrk@Kh#C@PcjQ)R5FCZ8(9{5{BgzQEVgk-E)vsVxvGzo7pj zlpn}L@}&_Fqj6+?qkXK^ry2gYSMR5$njt&ln+09G zomDvf^P4@C1Hfg2G-$?Rctm5hxK3eznjx>$#_(d`x~pI0qZnvmPtu)Y3s zp7OB)Ih6YD0bmKHFa2zFO1dj}#WAn{UJBK#SADY7g78V7XW?5Hx3n57`_0dgleK_1y>d4fWR#;IroxS<$94x*t`h>SwN1 zpC1=k3HEGHoIkvhMl9Iy85TIg=ODP=&RJ_-cFPEmr;%(Ku4%HBUq4RMPJt&*e%7Z& zwT$I%(R!n&vu8i~$~y7{+?-ZFnSFMx5^50M-4;|{=2$<~F1B}m>aG-@cdX3}e8E=t zL&SI-(w8B9mBE~iw3kEoHoiY)Xa3Qo_7@Ac$QUIl*DwM+je?xsvxXW2F%;XK zr6La=-q3v*EINNpBz0L4A~NOeSoEt0H=fDvWo7W(ixE=-8R5ZB-l#Nsv4`EfYZ-pSm#ycK9yE$zu$ap*T2xhQ5Gf#nBK5=If z1S@<`tGqJ}vMEUC6F}*I6urB!%V26B20qDsq^)eKz!h+R{b`WPV~7EBOMc}B`bk(@ z5mqIQUv_wC|4R(sXj!A%W4suHZW8pWh{Yc%OsA*rjV6aaddg`4g)7{W;z6+Uc3}7 zQXbd%P=gsO=T+8nE>!On&k!f?Cv~4OEO45dx7Zcm?(n-#=r&D3~1; zt+4CK$E$^!jA$;v(<@ARnt#z>IsMVO<=j$qi@v2&GiY3%LG1K;MZMAujDpdtb)RZJ@h z&6;~ha0at5zy4E<6PF}<=JS<$ofJqItD%eY zF-x_O5Q$aLg#LziaSkROe^ay=;vgE&XBOX%nyGRdN+(kjqy22 zM<1NBX1FJ09L!g7E^`Lwadgc9wH>BIwEOEX(W7NoWt#9et7I#v1t4r zypiJYc=&U*)j(p#=KZ%&OZoODC)NRL#)(WC$LYob@Lj(;-)+_N*`|MtXTR2165xsY z)W~ll%-k70+FsY}re;S;Jxndd!Tpb`YhDPceH7KX=H3V2^eB}65E6q7jQP1Vk&J$v zVU_j+TNN_oYfhkGJ`%l@L4^35wl)m~e-*DlOR*fW=wnpvPH*cSF;_0LaX!p%MPZ6z zg7W(&v z5aszhRPRfFi_D~ZsPr@09>0yRd0h%9aTV}urd~9Orrxn3@pUq+l8B5GlbbDQ+q-}8 zdKghQExxg>QhILFET*ebd4Aou6!W{T*NkuXkN=aVWOM|mi(DMnZh=iU=U$@KS-j%t zP)f_sId^7gnP~6v(DuQetR^vUx6%;(THnUiAD3g08YOppsA?UHSyv4%Aa!+ z&Er?w63ybWci-Wfn0<=z7Isf(UtFCf%Y5fOi#D~xr2w5Cu zIG-lPL%9mlnU^>s7F1jljfm~ggs3d1gU5TjJ@3X1w>NDzH zYQ*5xz&BS;WOXIZ4iwsS!%9)d62VqakR=AWP8p1r zp<6sZG2S9QLy~pQe4n|VKZ8f!#`BMR2abLoRAw8_;)y(Od8A{kGLr0eNvx* zPmi%<0E_KrUxhVzykqKMHiq+5y^X8Zae^(Ns02dnQm)c*RSpbH0j0JQu7AS#aN6VB zX%KyNr7p5Q2I=M?8S>fB6f8DxIW@R&m2nlhe#loL`n--Pt74EV!yu%D;BTZ2MmNoZ zajO*S?GU)y_tqQtEC>1h@nto6Blo}~$h2Kt9q*S<@i>=h`mr$TAU`xg8D6Bb`ofMW zVxZt~{EKnotv_rl@4JQFsh(l{-KaxIC9NQOINSVh9?2x0qB!1U&LBKwOMMrDFWoE3 zqYP$f1V>t^uoP}Q%D$8@$*f)7i~mQ#>xhRO!J5F!zXO7wTzbEGoW&{f zjTGcq`F*O!wNZR(vivbsshKR_U3-TZ_l-o1VxauN^hq zp!F^kY*R{h%hKRWD9W9gU#_TkGd+QrVw!b(m!e>Om zL-e1Wvz6?%%8C!HsIjDrqKK?I5~l!EAaxmRZuT5^txBIXlbS_!8Y9?Hnsu1DcIf5~Uns-Y+`xbKv_(=rk{kXux|?3*3rLeh>l zx-S1v;MILDDES)Rgqp{%fuI-!nJ(l!x;tBGKe}Z*Gu*1cLOuf}pTS+5FOxxB|G2_0 zjCnPCdHxE5n_lOcb$GK*4Aq5KeBL;2J`Hu=Bb~){y7I^ILU*A)$FjXlbm$v`P=Tal z89DC9w`>~ajDTVdex!6Z($&7$RZgEe0@Uu}LQN&)dHCaqu8lHq+$H&H3 zxECsRM1gLjF_akS5P}OANhx{*dGmTuSXmL#R>AF~Y0#QdF>=?X&P0!jCzV6+vh+N9 z@d>YPXPua|E(`pX^VEHEB7SYp=@McdON*q$*x#Z?Vk-0fs2=xvz~8D;*BagoFk7Vf ytmA$4s82NA*~n?PsX=*o&j0cX|G#a*IDj#LmpGLb{G8=qbMV{7uu>g|=l=u2JSVpR literal 0 HcmV?d00001 diff --git a/Assets/Materials/Grapic/Enemies/Frog.png.meta b/Assets/Materials/Grapic/Enemies/Frog.png.meta new file mode 100644 index 0000000..5f4f9c8 --- /dev/null +++ b/Assets/Materials/Grapic/Enemies/Frog.png.meta @@ -0,0 +1,487 @@ +fileFormatVersion: 2 +guid: b944bfcaa9d9bbb4cad064349eec9267 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 4 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Frog_0 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 78331bd0c68ea994bbcdb83af47842cb + internalID: -83726721 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_1 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9836b879e8ed3c343941ec987b2134c4 + internalID: -864377333 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_2 + rect: + serializedVersion: 2 + x: 128 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15864d1515797aa499cc3e662eca7ba2 + internalID: -933593245 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_3 + rect: + serializedVersion: 2 + x: 192 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eb2e8d4fac1a4b9409c01828a373605c + internalID: -1756990778 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_4 + rect: + serializedVersion: 2 + x: 256 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b3d11f0de89b060488ff0e37349d1265 + internalID: 1196033650 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_5 + rect: + serializedVersion: 2 + x: 320 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0715dd5aa1b3e724eb78008f5fc28d0d + internalID: 1402453657 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_6 + rect: + serializedVersion: 2 + x: 384 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6b9242c3f28784447a3a43b93f36dd1b + internalID: -201846207 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_7 + rect: + serializedVersion: 2 + x: 448 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ceab050f58e3d0642a70f080a74db4f7 + internalID: 1601616289 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_8 + rect: + serializedVersion: 2 + x: 512 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2042c99f6a94be248bc1467d8541dad4 + internalID: -584477188 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_9 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f64e8c892dab6b4dada3e00b410de18 + internalID: 1781035205 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_10 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d070bdd61919e2c46a6dd89510f19fc2 + internalID: 219563495 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_11 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a4e57484d15663b4989ba044044816bf + internalID: 2006236882 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_12 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fb13683a325d7c045bfd861b38c86c59 + internalID: 1926515490 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_13 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9cabe3a69f3be2640a4609d821069ef7 + internalID: 1072686942 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_14 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 92f7fc3d5bc80184dace07b823cf0035 + internalID: -1427017957 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Frog_15 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f739beb17fa311b4f985e81999fecf27 + internalID: 818788278 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Frog_1: -864377333 + Frog_5: 1402453657 + Frog_0: -83726721 + Frog_15: 818788278 + Frog_14: -1427017957 + Frog_10: 219563495 + Frog_13: 1072686942 + Frog_8: -584477188 + Frog_9: 1781035205 + Frog_7: 1601616289 + Frog_3: -1756990778 + Frog_11: 2006236882 + Frog_4: 1196033650 + Frog_2: -933593245 + Frog_6: -201846207 + Frog_12: 1926515490 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Grapic/Enemies/frog tung.png b/Assets/Materials/Grapic/Enemies/frog tung.png new file mode 100644 index 0000000000000000000000000000000000000000..9163f908a7de08ee816bd18c79c7e8a020213666 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|Og&v3LnNjq zCoB*#h+BW}tNipOX{)7`lV=8thp~1}W8(nt=qCv PpaBe?u6{1-oD!M<5E~(z literal 0 HcmV?d00001 diff --git a/Assets/Materials/Grapic/Enemies/frog tung.png.meta b/Assets/Materials/Grapic/Enemies/frog tung.png.meta new file mode 100644 index 0000000..3ce3ba9 --- /dev/null +++ b/Assets/Materials/Grapic/Enemies/frog tung.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: c791588a2d284be45ba4b5745f9752d0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 4 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Grapic/hpSlider.png b/Assets/Materials/Grapic/hpSlider.png new file mode 100644 index 0000000000000000000000000000000000000000..80cdffe9a1f0a5bb108cdbf33b77b0bb3aba0d9b GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z1oLEm6#}JRs zw^KIqH5hQP^8dSa#6m*YUYh;rtg`2pUzQo&H6PH4cbrQmrtK< zoyO3PZkzYTeqtgXc2>_ LtDnm{r-UW|RQxu0 literal 0 HcmV?d00001 diff --git a/Assets/Materials/Grapic/hpSlider.png.meta b/Assets/Materials/Grapic/hpSlider.png.meta new file mode 100644 index 0000000..38b0d00 --- /dev/null +++ b/Assets/Materials/Grapic/hpSlider.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: c0a96e9ecb88b374d9e3a70be71ac104 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 4 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: hpSlider_0 + rect: + serializedVersion: 2 + x: 0 + y: 8 + width: 32 + height: 8 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9add654e8366087488addee26f61e878 + internalID: 1713054267 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: hpSlider_1 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 8 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c5450c9a2a9ac2349907b3650918dc9e + internalID: -1276371597 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + hpSlider_1: -1276371597 + hpSlider_0: 1713054267 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Misc.meta b/Assets/Misc.meta new file mode 100644 index 0000000..d014d05 --- /dev/null +++ b/Assets/Misc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6f250982083c4a408f7184f96557bec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Misc/HpBarShape.asset b/Assets/Misc/HpBarShape.asset new file mode 100644 index 0000000..9a3b573 --- /dev/null +++ b/Assets/Misc/HpBarShape.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: af7181f404f1447c0a7a17b3070b952b, type: 3} + m_Name: HpBarShape + m_EditorClassIdentifier: + m_Angles: + - m_Start: -180 + m_End: 180 + m_Order: 0 + m_Sprites: [] + m_FillTexture: {fileID: 2800000, guid: b281b91a70a624a0da1c43adc1c30c7b, type: 3} + m_CornerSprites: + - m_CornerType: 0 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 1 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 2 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 3 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 4 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 5 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 6 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + - m_CornerType: 7 + m_Sprites: + - {fileID: 21300000, guid: 608e61deb05c54660bebf5a4dd2ee02d, type: 3} + m_FillOffset: 0 + m_UseSpriteBorders: 1 diff --git a/Assets/Misc/HpBarShape.asset.meta b/Assets/Misc/HpBarShape.asset.meta new file mode 100644 index 0000000..158e8cb --- /dev/null +++ b/Assets/Misc/HpBarShape.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b69c8e46332d234f87e8a2c40eeabf2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/HPBar.prefab b/Assets/Prefabs/HPBar.prefab new file mode 100644 index 0000000..5bbf239 --- /dev/null +++ b/Assets/Prefabs/HPBar.prefab @@ -0,0 +1,482 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1290149180333927503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953327889506219238} + - component: {fileID: 7644071491473213788} + - component: {fileID: 4162736361675806704} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953327889506219238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290149180333927503} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 220995252348038356} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7644071491473213788 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290149180333927503} + m_CullTransparentMesh: 1 +--- !u!114 &4162736361675806704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290149180333927503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3497962132657443874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4868686418179433813} + - component: {fileID: 1489358775194006745} + - component: {fileID: 698696776255351146} + m_Layer: 5 + m_Name: foreground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4868686418179433813 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497962132657443874} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1912279446600145028} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1489358775194006745 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497962132657443874} + m_CullTransparentMesh: 1 +--- !u!114 &698696776255351146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497962132657443874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1276371597, guid: c0a96e9ecb88b374d9e3a70be71ac104, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4001005944836979600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7498202090572204458} + - component: {fileID: 8848157160217275324} + - component: {fileID: 6646647549313009679} + - component: {fileID: 2387553255586204954} + - component: {fileID: 8111642542773480519} + m_Layer: 5 + m_Name: HPBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7498202090572204458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4001005944836979600} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 3.8798656} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1912279446600145028} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 6.5400085} + m_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8848157160217275324 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4001005944836979600} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 350189603 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6646647549313009679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4001005944836979600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 4 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 4 + m_PresetInfoIsWorld: 0 +--- !u!114 &2387553255586204954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4001005944836979600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &8111642542773480519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4001005944836979600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4a89afd83ffab84c8d0d28489b10605, type: 3} + m_Name: + m_EditorClassIdentifier: + HP: {fileID: 0} +--- !u!1 &7042749192015900131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1912279446600145028} + - component: {fileID: 7071451226688460606} + - component: {fileID: 8744076673589698879} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1912279446600145028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7042749192015900131} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6591149766116862851} + - {fileID: 220995252348038356} + - {fileID: 4868686418179433813} + m_Father: {fileID: 7498202090572204458} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 8, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7071451226688460606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7042749192015900131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 0, b: 0, a: 1} + m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1} + m_PressedColor: {r: 1, g: 0, b: 0, a: 1} + m_SelectedColor: {r: 1, g: 0, b: 0, a: 1} + m_DisabledColor: {r: 1, g: 0, b: 0, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4162736361675806704} + m_FillRect: {fileID: 1953327889506219238} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &8744076673589698879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7042749192015900131} + m_CullTransparentMesh: 1 +--- !u!1 &7384440653671484336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6591149766116862851} + - component: {fileID: 5110616913688828711} + - component: {fileID: 7158601050753244449} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6591149766116862851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384440653671484336} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1912279446600145028} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5110616913688828711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384440653671484336} + m_CullTransparentMesh: 1 +--- !u!114 &7158601050753244449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384440653671484336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1713054267, guid: c0a96e9ecb88b374d9e3a70be71ac104, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7806013017082328693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 220995252348038356} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &220995252348038356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7806013017082328693} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1953327889506219238} + m_Father: {fileID: 1912279446600145028} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.5000001, y: -0.49999997} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/HPBar.prefab.meta b/Assets/Prefabs/HPBar.prefab.meta new file mode 100644 index 0000000..66cd9c9 --- /dev/null +++ b/Assets/Prefabs/HPBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4073c57aacc64484e81291f66e3caa9a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Tunge.prefab b/Assets/Prefabs/Tunge.prefab new file mode 100644 index 0000000..4d37519 --- /dev/null +++ b/Assets/Prefabs/Tunge.prefab @@ -0,0 +1,149 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3749780568748605735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3749780568748605755} + - component: {fileID: 3749780568748605752} + - component: {fileID: 3749780568748605753} + - component: {fileID: 3749780568748605734} + - component: {fileID: -4025114051717284109} + m_Layer: 0 + m_Name: Tunge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3749780568748605755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749780568748605735} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.732931, y: -1.1646605, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3749780568748605752 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749780568748605735} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 21300000, guid: c791588a2d284be45ba4b5745f9752d0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3749780568748605753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749780568748605735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfba024dcfb32ae49b5d7587a88bb214, type: 3} + m_Name: + m_EditorClassIdentifier: + rb: {fileID: 3749780568748605734} +--- !u!50 &3749780568748605734 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749780568748605735} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &-4025114051717284109 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749780568748605735} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2, y: 2} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 2} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Tunge.prefab.meta b/Assets/Prefabs/Tunge.prefab.meta new file mode 100644 index 0000000..44e83ee --- /dev/null +++ b/Assets/Prefabs/Tunge.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 29e949bbcf1e543428691a48ca243c9c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity index 5b42e81..2283808 100644 --- a/Assets/Scenes/Main_Game.unity +++ b/Assets/Scenes/Main_Game.unity @@ -202,7 +202,7 @@ Transform: m_GameObject: {fileID: 47750003} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.1680903, y: -15.975444, z: 0} - m_LocalScale: {x: 100, y: 1, z: 1} + m_LocalScale: {x: 1000, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -381,6 +381,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8349803369667653187, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} m_PrefabInstance: {fileID: 908584568} m_PrefabAsset: {fileID: 0} +--- !u!224 &581312650 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + m_PrefabInstance: {fileID: 479286658757003219} + m_PrefabAsset: {fileID: 0} --- !u!1 &609125414 GameObject: m_ObjectHideFlags: 0 @@ -456,6 +461,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2277247808998486282, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2277247809752681474, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7369443274311820267, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7515790212324061060, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7515790212324061063, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: damage + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8349803368041049117, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8349803368903862594, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8349803369667653187, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} propertyPath: m_RootOrder value: 1 @@ -504,6 +537,14 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 8349803369667653199, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8349803369875076365, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3} --- !u!1 &1166574124 @@ -1156,6 +1197,300 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1641033686} m_CullTransparentMesh: 1 +--- !u!1 &1864363021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1864363025} + - component: {fileID: 1864363024} + - component: {fileID: 1864363023} + - component: {fileID: 1864363022} + - component: {fileID: 1864363026} + - component: {fileID: 1864363027} + - component: {fileID: 1864363028} + - component: {fileID: 1864363029} + m_Layer: 0 + m_Name: Frog + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!50 &1864363022 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 8 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &1864363023 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.625, y: 0.875} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 16, y: 16} + newSize: {x: 16, y: 16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 13.25, y: 8.25} + m_EdgeRadius: 0 +--- !u!212 &1864363024 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 16, y: 16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1864363025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -131.5, y: -0.8, z: -3.8798656} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 581312650} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1864363026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3} + m_Name: + m_EditorClassIdentifier: + PreHP: 100 +--- !u!95 &1864363027 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1864363028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d0a1d5fce928c34abc678c238b9c874, type: 3} + m_Name: + m_EditorClassIdentifier: + canMove: 0 + G: + serializedVersion: 2 + m_Bits: 8 + Tung: {fileID: 3749780568748605735, guid: 29e949bbcf1e543428691a48ca243c9c, type: 3} +--- !u!120 &1864363029 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864363021} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0e6e564677cac492f853c25544c809d4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -10 + m_Positions: [] + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + 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: 0.46341464 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1} + key1: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 1 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 --- !u!1 &2076995894 GameObject: m_ObjectHideFlags: 0 @@ -1302,3 +1637,148 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trapAnimator: {fileID: 2076995898} +--- !u!1001 &479286658757003219 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1864363025} + m_Modifications: + - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4001005944836979600, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Name + value: HPBar + objectReference: {fileID: 0} + - target: {fileID: 6646647549313009679, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Colors.m_ColorMultiplier + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_SizeDelta.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalPosition.z + value: 3.8798656 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 6.54 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8111642542773480519, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: HP + value: + objectReference: {fileID: 1864363026} + - target: {fileID: 8848157160217275324, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 96465039} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3} diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 9653c5c..6048cdf 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -7,6 +7,7 @@ public class Bullet : MonoBehaviour public Rigidbody2D rb; [System.NonSerialized]public int setDmg; private int Damage; + [System.NonSerialized]public string OwnTag; private void Start() { Damage = setDmg; @@ -14,7 +15,7 @@ public class Bullet : MonoBehaviour } private void OnTriggerEnter2D(Collider2D other) { - if(other.CompareTag("Player")) + if(other.CompareTag(OwnTag)) { return; } diff --git a/Assets/Scripts/Enemy_Frog.cs b/Assets/Scripts/Enemy_Frog.cs new file mode 100644 index 0000000..ce6c8ae --- /dev/null +++ b/Assets/Scripts/Enemy_Frog.cs @@ -0,0 +1,85 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy_Frog : MonoBehaviour +{ + public bool canMove; + Transform PL; + Rigidbody2D RB; + Animator Ani; + public LayerMask G; + public GameObject Tung; + GameObject Tunge; + LineRenderer LR; + private void Start() + { + RB = transform.GetComponent(); + Ani = transform.GetComponent(); + LR = transform.GetComponent(); + canMove = true; + } + private void Update() + { + if(Tunge != null) + { + LR.positionCount = 2; + LR.SetPosition(0, transform.position); + LR.SetPosition(1, Tunge.transform.position); + } + else + { + LR.positionCount = 0; + } + if (!canMove) + { + return; + } + if (PL == null) + { + FindPlayer(); + } + else + { + GotPlayer(); + } + } + private void FindPlayer() + { + if(Physics2D.OverlapCircle(transform.position, 50f, G)) + { + PL = Physics2D.OverlapCircle(transform.position, 50f, G).transform; + } + } + private void GotPlayer() + { + if (!Physics2D.OverlapCircle(transform.position, 50f, G)) + { + PL = null; + return; + } + if (Vector2.Distance(transform.position, PL.position) >= 20) + { + JumpToPlayer(); + return; + } + Attack(); + } + private void Attack() + { + Ani.Play("Frog_Shoot"); + canMove = false; + } + private void JumpToPlayer() + { + RB.AddForce(new Vector2((PL.position - transform.position).normalized.x * 10, 10)); + Ani.Play("Frog_Shoot"); + canMove = false; + } + public void shoot() + { + Tunge = GameObject.Instantiate(Tung, transform.position, Quaternion.AngleAxis((Mathf.Atan2((transform.position.y - PL.position.y), (transform.position.x - PL.position.x)) * Mathf.Rad2Deg) + 180, Vector3.forward)); + Tunge.GetComponent().setDmg = 5; + Tunge.GetComponent().OwnTag = transform.tag; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Enemy_Frog.cs.meta b/Assets/Scripts/Enemy_Frog.cs.meta new file mode 100644 index 0000000..0733416 --- /dev/null +++ b/Assets/Scripts/Enemy_Frog.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2d0a1d5fce928c34abc678c238b9c874 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy_stat1.cs b/Assets/Scripts/Enemy_stat1.cs new file mode 100644 index 0000000..bf83f98 --- /dev/null +++ b/Assets/Scripts/Enemy_stat1.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy_stat1 : StateMachineBehaviour +{ + override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + animator.GetComponent().canMove = true; + } +} diff --git a/Assets/Scripts/Enemy_stat1.cs.meta b/Assets/Scripts/Enemy_stat1.cs.meta new file mode 100644 index 0000000..72d25f6 --- /dev/null +++ b/Assets/Scripts/Enemy_stat1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: edd7653907d4dec4dbe47d591945b1ab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy_stat2.cs b/Assets/Scripts/Enemy_stat2.cs new file mode 100644 index 0000000..49fdae2 --- /dev/null +++ b/Assets/Scripts/Enemy_stat2.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy_stat2 : StateMachineBehaviour +{ + private bool no; + private float wait; + override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + if(no) + { + return; + } + if(wait >= 1f) + { + Enemy_Frog Fr = animator.GetComponent(); + Fr.shoot(); + no = true; + } + wait += Time.deltaTime; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Enemy_stat2.cs.meta b/Assets/Scripts/Enemy_stat2.cs.meta new file mode 100644 index 0000000..e62c8fd --- /dev/null +++ b/Assets/Scripts/Enemy_stat2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c729237c60a81bf47946977fcbf61152 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs index 6670009..bb56453 100644 --- a/Assets/Scripts/Health.cs +++ b/Assets/Scripts/Health.cs @@ -4,19 +4,41 @@ using UnityEngine; public class Health : MonoBehaviour { + public int PreHP; + public int MaxHP {get; private set;} + public int Hp {get; private set;} + private void Start() + { + MaxHP = PreHP; + Hp = MaxHP; + } public void RemoveHP(int Damage) { - + Hp -= Damage; + hpCheck(); } - // Start is called before the first frame update - void Start() + public void AddHP(int In) { - + Hp += In; + hpCheck(); } + public void AddMax(int hp) + { - // Update is called once per frame - void Update() + } + private void hpCheck() { - + if(Hp <=0) + { + if(gameObject.CompareTag("Enemy")) + { + GameObject.Destroy(gameObject); + } + Debug.Log("Dead"); + } + if(Hp > MaxHP) + { + Hp = MaxHP; + } } } diff --git a/Assets/Scripts/HpBar.cs b/Assets/Scripts/HpBar.cs new file mode 100644 index 0000000..6b09442 --- /dev/null +++ b/Assets/Scripts/HpBar.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class HpBar : MonoBehaviour +{ + public Health HP; + private Slider Fill; + private float m; + private void Start() + { + Fill = transform.Find("Slider").GetComponent(); + Fill.maxValue = HP.MaxHP; + Fill.value = HP.Hp; + } + private void FixedUpdate() + { + Fill.maxValue = HP.MaxHP; + Fill.value = Mathf.SmoothDamp(Fill.value, HP.Hp, ref m, 0.1f); + } +} diff --git a/Assets/Scripts/HpBar.cs.meta b/Assets/Scripts/HpBar.cs.meta new file mode 100644 index 0000000..1a33280 --- /dev/null +++ b/Assets/Scripts/HpBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d4a89afd83ffab84c8d0d28489b10605 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Weapon.cs b/Assets/Scripts/Weapon.cs index cdcc8a2..16aa1b7 100644 --- a/Assets/Scripts/Weapon.cs +++ b/Assets/Scripts/Weapon.cs @@ -34,6 +34,7 @@ public class Weapon : MonoBehaviour Wait += shootSpeed; GameObject bullet = GameObject.Instantiate(Bullet, shootPoint.position, transform.rotation); bullet.GetComponent().setDmg = damage; + bullet.GetComponent().OwnTag = transform.tag; } private void Update() { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2a82937..643f432 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,11 +5,12 @@ TagManager: serializedVersion: 2 tags: - Interactable + - Enemy layers: - Default - TransparentFX - Ignore Raycast - - + - Player - Water - UI - Ground @@ -42,3 +43,6 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: UI + uniqueID: 350189603 + locked: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 7d82f6e..758b5f0 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Game + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 23 + controlID: 97 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,7 +138,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303 + width: 304 height: 947 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -164,14 +164,14 @@ MonoBehaviour: - {fileID: 9} m_Position: serializedVersion: 2 - x: 303 + x: 304 y: 0 - width: 1108 + width: 1110 height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 24 + controlID: 98 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,17 +189,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1108 - height: 662 + width: 1110 + height: 661 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - - {fileID: 14} - {fileID: 17} + - {fileID: 14} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -216,9 +216,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 662 - width: 1108 - height: 285 + y: 661 + width: 1110 + height: 286 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 15} @@ -243,9 +243,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1411 + x: 1414 y: 0 - width: 509 + width: 506 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -275,10 +275,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 - y: 735 - width: 1106 - height: 264 + x: 304 + y: 734 + width: 1108 + height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -305,7 +305,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 302 + width: 303 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -316,21 +316,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 60e8fffff4f9ffff18640000466400007c640000 + m_ExpandedIDs: 28fbffffcc620000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Tunge + m_OriginalName: Tunge m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -38224 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 6} m_SearchString: @@ -360,10 +360,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 + x: 304 y: 73 - width: 1106 - height: 641 + width: 1108 + height: 640 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -620,9 +620,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -59.94009, y: -0.20920512, z: -3.8147516} + m_Target: {x: -34.55073, y: 7.391551, z: -0.45383865} speed: 2 - m_Value: {x: -59.94009, y: -0.20920512, z: -3.8147516} + m_Value: {x: -34.55073, y: 7.391551, z: -0.45383865} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -673,9 +673,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 8.648113 + m_Target: 55.383934 speed: 2 - m_Value: 8.648113 + m_Value: 55.383934 m_Ortho: m_Target: 1 speed: 2 @@ -720,10 +720,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 + x: 304 y: 73 - width: 1106 - height: 641 + width: 1108 + height: 640 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -772,23 +772,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1106 - height: 620 - m_Scale: {x: 0.8611111, y: 0.8611111} - m_Translation: {x: 553, y: 310} + width: 1108 + height: 619 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 640, y: 344.5157} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -642.19354 - y: -360 - width: 1284.3871 - height: 720 + x: -640 + y: -344.5157 + width: 1108 + height: 619 m_MinimalGUI: 1 - m_defaultScale: 0.8611111 - m_LastWindowPixelSize: {x: 1106, y: 641} + m_defaultScale: 0.8597222 + m_LastWindowPixelSize: {x: 1108, y: 640} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -814,10 +814,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 - y: 735 - width: 1106 - height: 264 + x: 304 + y: 734 + width: 1108 + height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -847,24 +847,24 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 48650000 - m_LastClickedID: 25928 - m_ExpandedIDs: 00000000de640000e0640000e2640000e4640000e6640000e8640000ea640000ec64000000ca9a3b + scrollPos: {x: 0, y: 159} + m_SelectedIDs: 96650000 + m_LastClickedID: 26006 + m_ExpandedIDs: 000000006465000066650000686500006a6500006c6500006e65000070650000726500007465000076650000786500007a6500008265000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Scripts - m_OriginalName: Scripts + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 25934 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 9} m_SearchString: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000de640000e0640000e2640000e4640000e6640000e8640000ea640000ec640000 + m_ExpandedIDs: 000000006465000066650000686500006a6500006c6500006e65000070650000726500007465000076650000786500007a650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -906,7 +906,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300000000000092720000386300001a6300009a660000 + m_ExpandedInstanceIDs: c623000092720000386300001a6300009a660000d49e0000000000002a640000cc800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -933,7 +933,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 123 + m_DirectoriesAreaWidth: 218 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -954,17 +954,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 - y: 735 - width: 1106 - height: 264 + x: 304 + y: 734 + width: 1108 + height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 25724 + m_LastSelectedObjectID: 25292 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 @@ -985,10 +985,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 + x: 304 y: 73 - width: 1106 - height: 641 + width: 1108 + height: 640 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -997,6 +997,7 @@ MonoBehaviour: m_KeySerializationHelper: - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - {fileID: 1861266083243068592, guid: b8df2c9ce7bfeff4ca2bc9f380a52794, type: 2} + - {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2} m_ValueSerializationHelper: - e00: 1.4325904 e01: 0 @@ -1030,10 +1031,26 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 0.71666664 + e01: 0 + e02: 0 + e03: 15 + e10: 0 + e11: 0.71666664 + e12: 0 + e13: 207.07922 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_AnimatorController: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + - m_Target: {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -1066,9 +1083,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1411 + x: 1414 y: 73 - width: 508 + width: 505 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1081,7 +1098,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 377 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: