From 2a2a11e8514ab67008c85b25b6703888f1ed8824 Mon Sep 17 00:00:00 2001 From: lspdC <961907320@qq.com> Date: Tue, 22 Mar 2022 22:15:12 +0800 Subject: [PATCH] =?UTF-8?q?3.22=20=E5=AE=8C=E6=88=90=E4=BA=86=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E9=9B=B7=E5=87=BB=E4=B8=8E=E7=8E=A9=E5=AE=B6=E7=9A=84?= =?UTF-8?q?=E7=A2=B0=E6=92=9E=E5=88=A4=E5=AE=9A=EF=BC=8C=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E7=9A=84=E5=8F=97=E5=87=BB=E5=8F=8D=E9=A6=88=20=E5=87=BB?= =?UTF-8?q?=E7=A2=8E=E7=9F=B3=E5=A4=B4=E9=82=A3=E8=BE=B9=E8=BF=98=E6=9C=89?= =?UTF-8?q?bug=EF=BC=8C=E6=98=8E=E5=A4=A9=E5=86=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Animate/Thunder/LightActing.anim | 116 +++++++ Assets/Animate/Thunder/LightActing.anim.meta | 8 + Assets/Animate/Thunder/LightAttack.anim | 252 ++++++++++++++ .../Animate/Thunder/ThunderActing.controller | 133 ++++++++ .../Thunder/ThunderActing.controller.meta | 8 + Assets/Prefabs/雷电将军.prefab | 27 ++ Assets/Scenes/乐/Sample1.unity | 309 +++++++++++++++++- Assets/Scripts/乐/HittenStone.cs | 18 + Assets/Scripts/乐/HittenStone.cs.meta | 11 + Assets/Scripts/乐/Player.cs | 45 ++- Assets/Scripts/乐/Thunder.cs | 4 +- Assets/Scripts/乐/ThunderAtk.cs | 28 +- Logs/ApiUpdaterCheck.txt | 20 ++ 13 files changed, 964 insertions(+), 15 deletions(-) create mode 100644 Assets/Animate/Thunder/LightActing.anim create mode 100644 Assets/Animate/Thunder/LightActing.anim.meta create mode 100644 Assets/Animate/Thunder/ThunderActing.controller create mode 100644 Assets/Animate/Thunder/ThunderActing.controller.meta create mode 100644 Assets/Scripts/乐/HittenStone.cs create mode 100644 Assets/Scripts/乐/HittenStone.cs.meta diff --git a/Assets/Animate/Thunder/LightActing.anim b/Assets/Animate/Thunder/LightActing.anim new file mode 100644 index 0000000..6c06e10 --- /dev/null +++ b/Assets/Animate/Thunder/LightActing.anim @@ -0,0 +1,116 @@ +%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: LightActing + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: "\u96F7\u7535\u5C06\u519B" + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 2222203872 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: "\u96F7\u7535\u5C06\u519B" + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animate/Thunder/LightActing.anim.meta b/Assets/Animate/Thunder/LightActing.anim.meta new file mode 100644 index 0000000..cfbfdf8 --- /dev/null +++ b/Assets/Animate/Thunder/LightActing.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbba3c9dd7ed0d5459ec7b4e0e8c03d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Thunder/LightAttack.anim b/Assets/Animate/Thunder/LightAttack.anim index 4d146c4..ee31d62 100644 --- a/Assets/Animate/Thunder/LightAttack.anim +++ b/Assets/Animate/Thunder/LightAttack.anim @@ -183,6 +183,118 @@ AnimationClip: path: Square classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 2.3735294 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.y + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 10.62975 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: + classID: 61 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -219,6 +331,34 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1872933342 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2368279999 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4197328169 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -692,6 +832,118 @@ AnimationClip: path: Square classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 2.3735294 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.y + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 10.62975 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 61 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: + classID: 61 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animate/Thunder/ThunderActing.controller b/Assets/Animate/Thunder/ThunderActing.controller new file mode 100644 index 0000000..09bc539 --- /dev/null +++ b/Assets/Animate/Thunder/ThunderActing.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8733484603356006138 +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: -1208732179286957411} + m_Position: {x: 330, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7987131450678580453} + m_Position: {x: 320, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -6610473901399754836} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 550, y: 110, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7987131450678580453} +--- !u!1102 &-7987131450678580453 +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: +--- !u!1101 &-6610473901399754836 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Active + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1208732179286957411} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1208732179286957411 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LightActing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cbba3c9dd7ed0d5459ec7b4e0e8c03d6, 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: ThunderActing + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Active + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8733484603356006138} + 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} diff --git a/Assets/Animate/Thunder/ThunderActing.controller.meta b/Assets/Animate/Thunder/ThunderActing.controller.meta new file mode 100644 index 0000000..d5caff5 --- /dev/null +++ b/Assets/Animate/Thunder/ThunderActing.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68b7f8ecafe74f54ab65b9cff690156c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/雷电将军.prefab b/Assets/Prefabs/雷电将军.prefab index 3b6703f..4b591ea 100644 --- a/Assets/Prefabs/雷电将军.prefab +++ b/Assets/Prefabs/雷电将军.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 8423221657279361533} - component: {fileID: 8423221657279361532} - component: {fileID: 8423221657279361522} + - component: {fileID: 7479668627245139491} m_Layer: 0 m_Name: "\u96F7\u7535\u5C06\u519B" m_TagString: Untagged @@ -67,6 +68,32 @@ MonoBehaviour: m_EditorClassIdentifier: player: {fileID: 0} controller: {fileID: 0} +--- !u!61 &7479668627245139491 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8423221657279361535} + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &8423221657652136748 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity index d6b9c35..b5a436f 100644 --- a/Assets/Scenes/乐/Sample1.unity +++ b/Assets/Scenes/乐/Sample1.unity @@ -123,6 +123,76 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &57042486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 57042487} + - component: {fileID: 57042488} + - component: {fileID: 57042489} + m_Layer: 0 + m_Name: "\u5927\u77F3\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &57042487 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57042486} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.8, y: 1.11, z: -37.21294} + m_LocalScale: {x: 2.6314447, y: 3.4532447, z: 2.6314447} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &57042488 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57042486} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &57042489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57042486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a983151d3ad3701448b5041539e419bf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &74015222 GameObject: m_ObjectHideFlags: 0 @@ -1691,6 +1761,7 @@ GameObject: - component: {fileID: 1588872235} - component: {fileID: 1588872234} - component: {fileID: 1588872236} + - component: {fileID: 1588872237} m_Layer: 0 m_Name: "\u6253\u96F7\u6F14\u51FA" m_TagString: Untagged @@ -1734,7 +1805,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 9.7, y: -1.85, z: 0} m_LocalScale: {x: 1.195425, y: 1.195425, z: 1.195425} - m_Children: [] + m_Children: + - {fileID: 5958777471039153061} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1750,6 +1822,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e919a66f3c536045980da3099738402, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!95 &1588872237 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588872233} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 68b7f8ecafe74f54ab65b9cff690156c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1658378286 GameObject: m_ObjectHideFlags: 0 @@ -1905,6 +1996,222 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &5958777469585463160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5958777469585463161} + - component: {fileID: 5958777469585463166} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5958777469585463161 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777469585463160} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -3.01, z: 0} + m_LocalScale: {x: 1.225, y: 0.62519, z: 1} + m_Children: [] + m_Father: {fileID: 5958777471039153061} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5958777469585463166 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777469585463160} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, 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!1 &5958777470401075572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5958777470401075573} + - component: {fileID: 5958777470401075578} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5958777470401075573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777470401075572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.15, z: 0} + m_LocalScale: {x: 0.1625, y: 8.0757, z: 1} + m_Children: [] + m_Father: {fileID: 5958777471039153061} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5958777470401075578 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777470401075572} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 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: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, 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!95 &5958777471039153060 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777471039153063} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3387149d1376ae44f816261b77b24511, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &5958777471039153061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5958777471039153063} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.930946, y: 1.848715, z: 0} + m_LocalScale: {x: 0.8365226, y: 0.8365226, z: 0.8365226} + m_Children: + - {fileID: 5958777469585463161} + - {fileID: 5958777470401075573} + m_Father: {fileID: 1588872235} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5958777471039153063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5958777471039153061} + - component: {fileID: 5958777471039153060} + m_Layer: 0 + m_Name: "\u96F7\u7535\u5C06\u519B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!1001 &8295477822109103333 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/乐/HittenStone.cs b/Assets/Scripts/乐/HittenStone.cs new file mode 100644 index 0000000..09f7143 --- /dev/null +++ b/Assets/Scripts/乐/HittenStone.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HittenStone : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/乐/HittenStone.cs.meta b/Assets/Scripts/乐/HittenStone.cs.meta new file mode 100644 index 0000000..ebf1696 --- /dev/null +++ b/Assets/Scripts/乐/HittenStone.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a983151d3ad3701448b5041539e419bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/Player.cs b/Assets/Scripts/乐/Player.cs index 622542b..9ac56aa 100644 --- a/Assets/Scripts/乐/Player.cs +++ b/Assets/Scripts/乐/Player.cs @@ -59,6 +59,12 @@ public class Player : PlayerControl public float flipDuration = 0.1f; + + //布尔------------------------- + bool forceFlip = false; + bool isHurting = false; + + /// /// 玩家初始化喵 /// @@ -86,7 +92,7 @@ public class Player : PlayerControl void Flip() { int lastFrameDir = isRight; - if (inputDir * lastFrameDir < 0) + if (inputDir * lastFrameDir < 0 || forceFlip == true) { isRight *= -1; //transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z); //transform.DOScale(new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z),0.1f); @@ -107,7 +113,7 @@ public class Player : PlayerControl /// 检测是否停止摇杆输入 /// void OnInputDetect() { - if (inputDir == 0) + if (inputDir == 0&&isHurting==false) Freeze(); } /// @@ -118,16 +124,13 @@ public class Player : PlayerControl } void Moving() { - m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); + if (isHurting == false) + { m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); } + } - - - - - /// override protected void OnMove(InputAction.CallbackContext ctx) { @@ -163,7 +166,7 @@ public class Player : PlayerControl //WeaponInPosition(); } - + //武器更换相关函数-------------------------------------------------- public void WeaponInPosition() { GameObject chosenOne; chosenOne = GameObject.Find(weapon.name); @@ -181,13 +184,35 @@ public class Player : PlayerControl chosenWeapon.ReturnToOri(); } } - + //武器生成--------------------------------------------------------- void WeaponInit() { WeaponInPosition(); } + //受到攻击 + public void GetHurt(int count,float time,float hitter_x) { + isHurting = true; + StopInput(time); + if ((hitter_x - transform.position.x)*isRight< 0) { + forceFlip = true; + Flip(); + forceFlip = false; + } + m_rigidbody.velocity = new Vector2(-isRight * 3, 3); + } + public void StopInput(float time) { + ToMap("Null"); + Invoke(nameof(ResetInput), time); + } + + void ResetInput() { + ToMap("Normal"); + isHurting = false; + } + + //跳跃判定（有点怪 后面可能会改） private void OnCollisionEnter2D(Collision2D collision)//当有物体碰上 { diff --git a/Assets/Scripts/乐/Thunder.cs b/Assets/Scripts/乐/Thunder.cs index 7bb2e76..97faa08 100644 --- a/Assets/Scripts/乐/Thunder.cs +++ b/Assets/Scripts/乐/Thunder.cs @@ -10,9 +10,10 @@ public class Thunder : MonoBehaviour bool haveInteracted = false; + Animator anim; void Start() { - + anim = GetComponent(); } void Update() @@ -25,6 +26,7 @@ public class Thunder : MonoBehaviour if (collision.TryGetComponent(out player)&&haveInteracted == false) { StopPlayerInput(); Debug.Log("播打雷动画"); + anim.SetTrigger("Active"); Invoke(nameof(ResetPlayerInput),interactTime); haveInteracted = true; } diff --git a/Assets/Scripts/乐/ThunderAtk.cs b/Assets/Scripts/乐/ThunderAtk.cs index e81bfbd..36c7c13 100644 --- a/Assets/Scripts/乐/ThunderAtk.cs +++ b/Assets/Scripts/乐/ThunderAtk.cs @@ -6,9 +6,14 @@ public class ThunderAtk : MonoBehaviour { public Player player; public ThunderController controller; + bool ifHit = false; + HittenStone stone; void Start() { - + player = (Player)GameObject.FindObjectOfType(typeof(Player)); + controller = (ThunderController)GameObject.FindObjectOfType(typeof(ThunderController)); + stone = (HittenStone)GameObject.FindObjectOfType(typeof(HittenStone)); + Debug.Log(stone.name); } // Update is called once per frame @@ -18,7 +23,7 @@ public class ThunderAtk : MonoBehaviour } public void LightAtk() { - Debug.Log("打雷咯"); + //Debug.Log("打雷咯"); } public void DesTroyThunder() { @@ -28,5 +33,22 @@ public class ThunderAtk : MonoBehaviour public void Next() { controller.NextLightAtk(); } - + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.TryGetComponent(out stone)) { + Debug.Log("打到石头了"); + } + + if (collision.TryGetComponent(out player)&&ifHit == false) { + ifHit = true; + + player.GetHurt(1,0.5f,transform.position.x); + Debug.Log("被雷打"); + } + + + + } + } diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index 049151c..4e3a896 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -112,3 +112,23 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms +[api-updater (non-obsolete-error-filter)] 2022/3/22 19:41:25 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 860.5428ms +moved types parse time: 54ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2022/3/22 22:05:13 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 104.7204ms +moved types parse time: 52ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms +