动效修复

This commit is contained in:
daixiawu 2025-06-19 21:07:02 +08:00
parent 7d089dbead
commit 9bbb8ae1e4
40 changed files with 5717 additions and 229 deletions

View File

@ -1,28 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-3454595526654174821
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -1191155213163811870}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1191155213163811870}
--- !u!1102 &-1191155213163811870
m_Name: Die
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 7073046936234548423}
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 &1141730395085456778
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
@ -48,25 +48,54 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
--- !u!1107 &7073046936234548423
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Die
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -3454595526654174821}
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}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1141730395085456778}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 8123698655024568731}
m_Position: {x: 235, y: 65, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1141730395085456778}
--- !u!1102 &8123698655024568731
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayDieHint
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: 1747f4fc62324ef44b1972ae96f986ba, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-7293370881743505015
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: 5736214272664341339}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5736214272664341339}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Heal
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -7293370881743505015}
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 &5736214272664341339
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayHeal
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: 6f3bd8c0b176860489879b98a1178a52, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 71b2e07ba2bb8174ca0a5baf939a922b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -253,7 +253,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 85951e6131b9f8546afcf8b68c2d204f
guid: 1747f4fc62324ef44b1972ae96f986ba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

View File

@ -0,0 +1,453 @@
%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: PlayDieHint
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 11.81, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
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.48333332
value: 1
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_Color.r
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.48333332
value: 1
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_Color.g
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.48333332
value: 1
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_Color.b
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.31666666
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_Color.a
path:
classID: 212
script: {fileID: 0}
flags: 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: 0
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2526845255
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4215373228
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2334886179
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 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:
- serializedVersion: 2
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.48333332
value: 1
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_Color.r
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.48333332
value: 1
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_Color.g
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.48333332
value: 1
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_Color.b
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.31666666
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_Color.a
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 11.81
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_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 85951e6131b9f8546afcf8b68c2d204f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,525 @@
%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: PlayHeal
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 8.57, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.18333334
value: {x: 0, y: 11.29, z: 0}
inSlope: {x: 0, y: 2.0800018, z: 0}
outSlope: {x: 0, y: 2.0800018, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 11.81, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
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.45
value: 1
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_Color.r
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.45
value: 1
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_Color.g
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.45
value: 1
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_Color.b
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.18333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_Color.a
path:
classID: 212
script: {fileID: 0}
flags: 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: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2526845255
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4215373228
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2334886179
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 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:
- serializedVersion: 2
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.45
value: 1
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_Color.r
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.45
value: 1
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_Color.g
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.45
value: 1
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_Color.b
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.18333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.45
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_Color.a
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.18333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 8.57
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.18333334
value: 11.29
inSlope: 2.0800018
outSlope: 2.0800018
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 11.81
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_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
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.18333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
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_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6f3bd8c0b176860489879b98a1178a52
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 3fe21a532361e9041b14d5f7826d5b77
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
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: 100
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -16,6 +16,7 @@ MonoBehaviour:
AttackArrowTime: 0.3
AttackBombTime: 0.5
AttackReturnAnimTime: 0.15
AttackBounceWaitAnimTime: 0.05
CounterAnimTime: 0.15
CounterReturnAnimTime: 0.15
BetweenAttackCounterAnimTime: 0.15

View File

@ -94,29 +94,141 @@ MonoBehaviour:
Exp: 0
SpriteList: []
- Resource: 19
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
VarientSprite: 1
ResourceName: "\u9A6C\u4E4B\u795E\u50CF"
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- Resource: 20
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
VarientSprite: 1
ResourceName: "\u8F66\u4E4B\u795E\u50CF"
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- Resource: 21
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
VarientSprite: 1
ResourceName: "\u540E\u4E4B\u795E\u50CF"
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- Resource: 22
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
VarientSprite: 1
ResourceName: "\u76F8\u4E4B\u795E\u50CF"
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- Resource: 23
Sprite: {fileID: 0}
VarientSprite: 0

View File

@ -16,6 +16,7 @@ MonoBehaviour:
AttackArrowTime: 0.3
AttackBombTime: 0.5
AttackReturnAnimTime: 0.15
AttackBounceWaitAnimTime: 0.05
CounterAnimTime: 0.15
CounterReturnAnimTime: 0.15
BetweenAttackCounterAnimTime: 0.15

View File

@ -94,29 +94,141 @@ MonoBehaviour:
Exp: 0
SpriteList: []
- Resource: 19
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
VarientSprite: 1
ResourceName: 809
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3}
Name: "\u8299\u5170\u6735\u9732\u795E\u50CF"
- Resource: 20
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
VarientSprite: 1
ResourceName: 810
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3}
Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF"
- Resource: 21
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
VarientSprite: 1
ResourceName: 811
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3}
Name: "\u5E15\u79CB\u8389\u795E\u50CF"
- Resource: 22
Sprite: {fileID: 0}
VarientSprite: 0
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
VarientSprite: 1
ResourceName: 812
Exp: 1
SpriteList: []
SpriteList:
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 0
ForceId: 0
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 1
ForceId: 1
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 2
ForceId: 2
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- IgnoreCivId: 0
IgnoreForceId: 0
CivId: 3
ForceId: 3
Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3}
Name: "\u54B2\u591C\u795E\u50CF"
- Resource: 23
Sprite: {fileID: 0}
VarientSprite: 0

View File

@ -5482,3 +5482,57 @@ MonoBehaviour:
EN:
JP:
KR:
- ID: 879
ZH: "Debug\r\n\u5F00\u5173"
TDZH:
EN:
JP:
KR:
- ID: 880
ZH: All Unit
TDZH:
EN:
JP:
KR:
- ID: 881
ZH: All City
TDZH:
EN:
JP:
KR:
- ID: 882
ZH: All Player
TDZH:
EN:
JP:
KR:
- ID: 883
ZH: "\u5F53\u524D\u9009\u4E2D"
TDZH:
EN:
JP:
KR:
- ID: 884
ZH: 'All Unit Panel
(Coming soon)'
TDZH:
EN:
JP:
KR:
- ID: 885
ZH: 'All City Panel
(Coming soon)'
TDZH:
EN:
JP:
KR:
- ID: 886
ZH: 'All Player Panel
(Coming soon)'
TDZH:
EN:
JP:
KR:

View File

@ -1032,6 +1032,7 @@ Transform:
- {fileID: 4159564636863943089}
- {fileID: 5740121711286652174}
- {fileID: 2668736484908105877}
- {fileID: 5794914377394050887}
m_Father: {fileID: 1494252107283779432}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5382825646497074886
@ -1267,7 +1268,7 @@ Transform:
m_GameObject: {fileID: 6764682409150102033}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 8.57, z: 0}
m_LocalPosition: {x: 0, y: 12.25, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
@ -1335,7 +1336,7 @@ Animator:
m_GameObject: {fileID: 6764682409150102033}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: feef7eb23fea24e4da70776ca1f9a1bf, type: 2}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -1360,6 +1361,127 @@ MonoBehaviour:
m_EditorClassIdentifier:
_Animator: {fileID: 5077405085439171614}
_ActionOnDisable: 0
--- !u!1 &7380484021010114014
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5794914377394050887}
- component: {fileID: 7743826317963411044}
- component: {fileID: 8736525687316211164}
- component: {fileID: 4928848108413725515}
m_Layer: 0
m_Name: Heal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5794914377394050887
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380484021010114014}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 8.57, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 2733067475856537485}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7743826317963411044
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380484021010114014}
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: -1440529387
m_SortingLayer: 6
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 3fe21a532361e9041b14d5f7826d5b77, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 14.17, y: 19.84}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &8736525687316211164
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380484021010114014}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 71b2e07ba2bb8174ca0a5baf939a922b, 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_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &4928848108413725515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7380484021010114014}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
m_Name:
m_EditorClassIdentifier:
_Animator: {fileID: 8736525687316211164}
_ActionOnDisable: 0
--- !u!1 &7937754869390280467
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -256,10 +256,13 @@ namespace RuntimeData
//播放特效专用的RenderMark
public bool VFXRenderMarkHurt = false;
public bool VFXRenderMarkDie = false;
public bool VFXRenderMarkDieHintStart = false;
public bool VFXRenderMarkDieHintEnd = false;
public bool VFXRenderMarkTreasure = false;
public bool VFXRenderMarkHeal = false;
public bool VFXRenderMarkFog = false;
public bool VFXRenderMark = false;

View File

@ -175,6 +175,7 @@ namespace RuntimeData
public bool AttackRenderMarkNeedBack;
public AttackAnimType AttackRenderMarkAttackAnimType;
public bool BounceRenderMark;
public float BounceRenderMakrWaitTime;
// 军团编号
public uint LegionId;

View File

@ -11,6 +11,7 @@ public class AnimDataAssets : ScriptableObject
public float AttackArrowTime;
public float AttackBombTime;
public float AttackReturnAnimTime;
public float AttackBounceWaitAnimTime;
public float CounterAnimTime;
public float CounterReturnAnimTime;

View File

@ -129,6 +129,22 @@ public class GridAndResourceDataAssets : ScriptableObject
return wonderInfo.Sprite;
}
public Sprite GetResourceSprite(ResourceType resource, PlayerData playerData)
{
if (!GetResourceInfo(resource, out var resourceInfo))
return null;
if (resourceInfo.VarientSprite)
{
foreach(var t in resourceInfo.SpriteList)
{
if ((t.IgnoreCivId || t.CivId == playerData.PlayerCivId)
&& (t.IgnoreForceId || t.ForceId == playerData.PlayerForceId))
return t.Sprite;
}
}
return resourceInfo.Sprite;
}
public string GetWonderName(WonderLibrary wonder,PlayerData playerData)
{
if (!GetWonderInfo(wonder, out var wonderInfo))
@ -149,6 +165,8 @@ public class GridAndResourceDataAssets : ScriptableObject
return resourceInfo.ResourceName;
}
public ResourceType GetMillLikeRelative(ResourceType resource)
{
if (resource == ResourceType.Sawmill)

View File

@ -1476,6 +1476,7 @@ namespace Logic.Action
return false;
actionParams.PlayerData.PlayerWealth -= info.Cost;
Main.UnitLogic.UnitTypeTransform(actionParams.UnitData,_actionId.UnitType);
Main.PlayerLogic.UpdateSight(actionParams.MapData,actionParams.PlayerData,actionParams.MapData.GridMap.GetAroundGridIdList(2,gridData));
actionParams.UnitData.RenderMark = true;
return true;
}
@ -1506,6 +1507,7 @@ namespace Logic.Action
else if (terrPlayerData != actionParams.PlayerData)
recoverV = 2;
actionParams.UnitData.Health += recoverV;
gridData.VFXRenderMarkHeal = true;
if (actionParams.UnitData.Health > actionParams.UnitData.GetMaxHealth())
actionParams.UnitData.Health = actionParams.UnitData.GetMaxHealth();
ret = true;

View File

@ -68,8 +68,7 @@ namespace Logic
}
else
{
Debug.Log(gridData.Id);
Debug.Log(gridData.Pos.X + " " + gridData.Pos.Y);
//这里有个情况就是在ROGridMap没有生成之前就已经对玩家的第一个city进行了一次cityupdatelevel
}
@ -188,17 +187,20 @@ namespace Logic
public void CityLevelUpActionExpand(MapData mapData, CityData cityData)
{
if (!mapData.GetGridDataByCityId(cityData.Id, out var gridData)) return;
if (!mapData.GetPlayerDataByCityId(cityData.Id, out var playerData)) return;
var aroundGridList = mapData.GridMap.GetAroundGridData(2, 2, gridData);
Main.PlayerLogic.UpdateSight(mapData,playerData,mapData.GridMap.GetAroundGridIdList(2,gridData));
var newTerritoryArea = new List<uint>();
foreach (var aroundGrid in aroundGridList)
{
if (mapData.GetPlayerDataByTerritoryGridId(aroundGrid.Id, out var playerData1)) continue;
newTerritoryArea.Add(aroundGrid.Id);
}
cityData.Territory.UpdateTerritory(newTerritoryArea);
if (!mapData.GetPlayerDataByCityId(cityData.Id, out var playerData))
return;
var playerTerritoryGridIdSet = mapData.GetPlayerTerritoryGridIdSet(playerData.Id);
foreach (var gridId in playerTerritoryGridIdSet)
@ -207,6 +209,8 @@ namespace Logic
continue;
gridData1.RenderMark = true;
}
}

View File

@ -87,8 +87,8 @@ namespace Logic
public void Update()
{
//如果锁了input
if (inputLock) return;
//如果锁了input 但是DebugMode不会锁定input
if (inputLock &&!DebugCenter.Instance.DebugMode) return;
if (Input.GetMouseButtonDown(0))
{
mouseLastDownPosition = Input.mousePosition;

View File

@ -631,7 +631,7 @@ namespace Logic
var endPos = Camera.main.ScreenToWorldPoint(moneyPanel.position);
main.MapRenderer.ProjectileManager.CreateProjectileMulti(main,mapData,startPos,endPos,ProjectileType.Coin,ProjectileMoveType.CoinParabola,Main.CityLogic.GetCityStarsPerTurn(mapData,city));
main.MapRenderer.ProjectileManager.CreateProjectileMulti(main,mapData,startPos,endPos,ProjectileType.Coin,ProjectileMoveType.CoinParabola,Main.CityLogic.GetCityStarsPerTurn(mapData,city),0.05f);
}
}
@ -646,7 +646,23 @@ namespace Logic
if (!mapData.GetCapitalCityDataByPlayerId(playerData.Id, out var city)) continue;
//处理发现tower的情况
if (gridData.Resource == ResourceType.Tower)
Main.CityLogic.CityUpdateExp(mapData,city,1);
{
//临时做法用来播放VFX,获取Main理应向MapData写入一个VFX的RenderMark的
var main = GameObject.Find("Main").GetComponent<Main>();
var v1 = Table.Instance.GridToWorld(gridData);
mapData.GetGridDataByCityId(city.Id, out var g2);
var v2 = Table.Instance.GridToWorld(g2);
Timer.Instance.TimerRegister(Main.CityLogic, () =>
{
main.MapRenderer.ROGridMap[g2.Id].SetBounceAnim();
Main.CityLogic.CityUpdateExp(mapData,city,1);
},
Table.Instance.AnimDataAssets.ProjectileCityExpMoveTime);
main.MapRenderer.ProjectileManager.CreateProjectile(main,mapData,v1,v2,ProjectileType.CityExp,ProjectileMoveType.CityExpHighParabola);
}
gridData.RenderMark = true;
if (mapData.GetUnitDataByGid(id, out var unitData))
unitData.RenderMark = true;

View File

@ -152,23 +152,31 @@ namespace Logic
unit1.OnKill(unit2,mapData);
unit2.Health -= dmg1;
//如果是近战且目标位置不是山或者有山的科技,且目标不在水里.
if (unit1.GetAttackRange() == 1 && grid2.Terrain == TerrainType.Land
&& (grid2.Feature != TerrainFeature.Mountain || player1.TechTree.CheckIfHasTech(TechType.Climbing)))
{
//立刻死亡并播放受伤动画,必须先处理死亡再处理移动不然gridToUnit的dict会出错
Main.UnitLogic.Die(mapData, unit2);
grid2.VFXRenderMarkHurt = true;
grid2.VFXRenderMarkDie = true;
unit1.AttackRenderMark = false;
//移动过去并更新视野
MoveTo(mapData, unit1, grid2,MoveType.AttackMove);
//关闭unit1的rendermakr中 攻击完需要移动回来的开关
//unit1.AttackRenderMarkNeedBack = false;
Timer.Instance.TimerRegister(unit2, () =>
{
var main = GameObject.Find("Main").GetComponent<Main>();
main.MapRenderer.ROGridMap[grid2.Id].SetBounceAnim();
grid2.VFXRenderMarkHurt = true;
grid2.VFXRenderMarkDie = true;
},0.1f);
}
else
{
@ -179,6 +187,9 @@ namespace Logic
unit2.RenderMark = true;
grid2.VFXRenderMarkHurt = true;
grid2.VFXRenderMarkDie = true;
var main = GameObject.Find("Main").GetComponent<Main>();
main.MapRenderer.ROGridMap[grid2.Id].SetBounceAnim();
},attackWait);
}
@ -198,6 +209,7 @@ namespace Logic
unit2.Health -= dmg1;
unit2.RenderMark = true;
unit2.BounceRenderMark = true;
unit2.BounceRenderMakrWaitTime = Table.Instance.AnimDataAssets.AttackBounceWaitAnimTime;
grid2.VFXRenderMarkHurt = true;
},
@ -231,7 +243,7 @@ namespace Logic
grid1.VFXRenderMarkDie = true;
},
counterAttackWait);
if (!Table.Instance.QueryUnitHasSkill(unit2.UnitType, SkillType.STATIC)) unit2.Exp++;
}
//否则,就是双方正常互相消耗血量
else
@ -242,6 +254,7 @@ namespace Logic
unit1.Health -= dmg2;
unit1.RenderMark = true;
unit1.BounceRenderMark = true;
unit1.BounceRenderMakrWaitTime = Table.Instance.AnimDataAssets.AttackBounceWaitAnimTime;
grid1.VFXRenderMarkHurt = true;
grid1.VFXRenderMarkFog = true;
},
@ -616,6 +629,9 @@ namespace Logic
public void BoatToLand(MapData mapData, UnitData unitData)
{
if (!mapData.GetPlayerDataByUnitId(unitData.Id, out var player)
||!mapData.GetGridDataByUnitId(unitData.Id,out var grid)) return;
Main.PlayerLogic.UpdateSight(mapData,player,mapData.GridMap.GetAroundGridIdList(unitData.GetSightRange(),grid));
unitData.UnitType = unitData.CarryUnitType;
unitData.GiantType = unitData.CarryGiantType;
unitData.Exp = unitData.CarryExp;

View File

@ -60,9 +60,16 @@ namespace TH1Renderer
public AnimationClip DieVFXAnim;
private bool _playDieVFX;
private bool _isPlayingDieVFX;
public AnimationClip DieHintVFXAnim;
private bool _playDieHintVFX;
private bool _isPlayingDieHintVFX;
private bool _stopDieHintVFX;
public AnimationClip TreasureVFXAnim;
private bool _playTreasureVFX;
private bool _isPlayingTreasureVFX;
public AnimationClip HealVFXAnim;
private bool _playHealVFX;
private bool _isPlayingHealVFX;
bool renderVeteran = false;
@ -105,6 +112,16 @@ namespace TH1Renderer
_gridData.VFXRenderMarkDie = false;
SetDieVFXAnim();
}
if (_gridData.VFXRenderMarkDieHintStart)
{
_gridData.VFXRenderMarkDieHintStart = false;
SetDieHintVFXAnim();
}
if (_gridData.VFXRenderMarkDieHintEnd)
{
_gridData.VFXRenderMarkDieHintEnd = false;
SetStopDieHintVFXAnim();
}
if (_gridData.VFXRenderMarkTreasure)
{
_gridData.VFXRenderMarkTreasure = false;
@ -115,6 +132,11 @@ namespace TH1Renderer
_gridData.VFXRenderMarkFog = false;
SetFogAnim(false);
}
if (_gridData.VFXRenderMarkHeal)
{
_gridData.VFXRenderMarkHeal = false;
SetHealVFXAnim();
}
_ROGrid.transform.Find("Effect/Fire").gameObject.SetActive(false);
//判断是否着火
@ -162,11 +184,27 @@ namespace TH1Renderer
_playDieVFX = false;
PlayDieVFX();
}
if (_playDieHintVFX)
{
_playDieHintVFX = false;
PlayDieHintVFX();
}
if (_stopDieHintVFX)
{
_stopDieHintVFX = false;
StopDieHintVFX();
}
if (_playTreasureVFX)
{
_playTreasureVFX = false;
PlayTreasureVFX();
}
if (_playHealVFX)
{
_playHealVFX = false;
PlayHealVFX();
}
if (_playFogEffect)
{
@ -232,7 +270,9 @@ namespace TH1Renderer
FogEffectAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayFog");
HurtVFXAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayAttack");
DieVFXAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayDie");
DieHintVFXAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayDieHint");
TreasureVFXAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayTreasure");
HealVFXAnim = Resources.Load<AnimationClip>("Animations/VFX/PlayHeal");
//UpdateBorder();fog自带updateborder
}
@ -450,10 +490,10 @@ namespace TH1Renderer
ResourceType.CityCenter => hasCity ? null : Resources.Load<Sprite>($"ArtResources/TH1Miscs/TH1Misc_Tribe"),
ResourceType.Treasure => Resources.Load<Sprite>($"ArtResources/TH1Miscs/TH1Misc_Treasure"),
ResourceType.Starfish => Resources.Load<Sprite>($"ArtResources/TH1Miscs/TH1Misc_Starfish{needGlow}"),
ResourceType.Temple => Resources.Load<Sprite>($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Temple"),
ResourceType.ForestTemple => Resources.Load<Sprite>($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_ForestTemple"),
ResourceType.MountainTemple => Resources.Load<Sprite>($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_MountainTemple"),
ResourceType.WaterTemple => Resources.Load<Sprite>($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_WaterTemple"),
ResourceType.Temple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.Temple,_playerData),//.Load<Sprite>($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Temple"),
ResourceType.ForestTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.ForestTemple,_playerData),
ResourceType.MountainTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.MountainTemple,_playerData),
ResourceType.WaterTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.WaterTemple,_playerData),
ResourceType.Farm => Resources.Load<Sprite>(
$"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Farm"),
ResourceType.Mine => Resources.Load<Sprite>(
@ -666,6 +706,50 @@ namespace TH1Renderer
}
public void SetDieHintVFXAnim()
{
if (_fog.activeSelf) return;
if (_isPlayingDieHintVFX) return;
_playDieHintVFX = true;
}
public void PlayDieHintVFX()
{
var VFX = _ROGrid.transform.Find("Effect/Die").gameObject;
VFX.SetActive(true);
var animancer = VFX.GetComponent<AnimancerComponent>();
if (DieVFXAnim != null)
{
_isPlayingDieHintVFX = true;
Debug.Log("!!!!");
animancer.Play(DieHintVFXAnim);
}
}
public void SetStopDieHintVFXAnim()
{
if (_fog.activeSelf) return;
if (!_isPlayingDieHintVFX) return;
_stopDieHintVFX = true;
}
public void StopDieHintVFX()
{
var VFX = _ROGrid.transform.Find("Effect/Die").gameObject;
var animancer = VFX.GetComponent<AnimancerComponent>();
if (DieVFXAnim != null)
{
_isPlayingDieHintVFX = false;
animancer.Stop(DieHintVFXAnim);
}
VFX.SetActive(false);
}
public void SetTreasureVFXAnim()
{
if (_fog.activeSelf) return;
@ -692,5 +776,31 @@ namespace TH1Renderer
}
public void SetHealVFXAnim()
{
if (_fog.activeSelf) return;
if (_isPlayingHealVFX) return;
_playHealVFX = true;
}
public void PlayHealVFX()
{
var VFX = _ROGrid.transform.Find("Effect/Heal").gameObject;
VFX.SetActive(true);
var animancer = VFX.GetComponent<AnimancerComponent>();
if (HealVFXAnim != null)
{
_isPlayingHealVFX = true;
animancer.Play(HealVFXAnim);
Timer.Instance.TimerRegister(VFX, () =>
{
VFX.SetActive(false);
_isPlayingHealVFX = false;
}, HealVFXAnim.length);
}
}
}
}

View File

@ -106,6 +106,17 @@ namespace TH1Renderer
public void Update()
{
//处理所有飞行道具。这个不会被暂停
ProjectileManager.Update();
//如果有centerMessage ,停掉一切动画
if (_main.UIManager.CenterMessageUI.isShowingNow)
{
return;
}
// 处理临时探索者的浮动动画
if (_temporaryExplorerActive && _temporaryExplorer != null)
{
@ -223,7 +234,7 @@ namespace TH1Renderer
//-------- 处理子节点的Update -------//
ProjectileManager.Update();
foreach (var roUnit in ROUnitMap.Values)
{
@ -247,7 +258,10 @@ namespace TH1Renderer
public void RenderUpdateGridMap()
{
foreach (var gridData in _main.MapData.GridMap.GridList)
ROGridMap[gridData.Id] = new GridRenderer(_gridPrefab,_gridRenderMap,gridData.Id,_main.MapData,_main);
{
ROGridMap[gridData.Id] =
new GridRenderer(_gridPrefab, _gridRenderMap, gridData.Id, _main.MapData, _main);
}
}
//当cityMap出现新的对象时新建对象
@ -325,6 +339,7 @@ namespace TH1Renderer
//如果是攻击目标且unit的AP>0
if (sig == MoveAttackType.Attack && unitData.AP > 0)
{
targetGridData.VFXRenderMarkDieHintStart = true;
_main.MapData.GetUnitDataByGid(targetGridData.Id, out var unitDataB);
ROUnitMap[unitDataB.Id].SetAttackHighlight(true);
}

View File

@ -95,23 +95,25 @@ namespace TH1Renderer
//如果是coin 完全单独处理
if (_projectileData.ProjectileMoveType == ProjectileMoveType.CoinParabola)
{
var middlePos = moveStartPos;
middlePos.x -= 5;
middlePos.y -= 5;
var startPos = moveStartPos;
startPos.y -= 5f;
var middlePos = startPos;
middlePos.y -= 2f;
// 增加时间
moveTime += Time.deltaTime / moveFullTime;
//前30%的时间轻微移动
if (moveTime < 0.3)
float showTime = 0.3f;
//前showTime%的时间轻微移动
if (moveTime < showTime)
{
t = Mathf.Clamp01(moveTime/0.3f);
t = Mathf.Clamp01(moveTime/showTime);
// 计算水平线性插值位置
linearPos = Vector3.Lerp(moveStartPos, middlePos, t);
linearPos = Vector3.Lerp(startPos, middlePos, t);
// 添加抛物线效果 (在y轴方向)
// 使用sin函数创建一个弧形在中间点达到最高
arcHeight = Vector3.Distance(moveStartPos, moveEndPos) * parabola_height; // 弧高为距离的20%
arcHeight = Vector3.Distance(startPos, middlePos) * parabola_height; // 弧高为距离的20%
arcOffset = Mathf.Sin(t * Mathf.PI) * arcHeight;
// 最终位置 = 线性插值位置 + 抛物线高度偏移
@ -128,7 +130,7 @@ namespace TH1Renderer
else
{
// 计算当前位置的插值因子 (0到1之间)
t = Mathf.Clamp01((moveTime - 0.3f) / 0.7f);
t = Mathf.Clamp01((moveTime - showTime) / (1f - showTime));
// 计算水平线性插值位置
linearPos = Vector3.Lerp(middlePos, moveEndPos, t);

View File

@ -43,6 +43,7 @@ namespace TH1Renderer
//------bounce相关参数--------
bool _needBounce = false, _isBounceDown = true;
Vector3 bounceUpPos, bounceDownPos;
private float _bounceWaitTime = 0f;
float bounceTime = 0f;
float bounceDownFullTime = 0.05f;
float bounceUpFullTime = 0.1f;
@ -176,7 +177,8 @@ namespace TH1Renderer
if (_unitData.BounceRenderMark)
{
_unitData.BounceRenderMark = false;
SetBounceAnim();
SetBounceAnim(_unitData.BounceRenderMakrWaitTime);
_unitData.BounceRenderMakrWaitTime = 0f;
}
if (_unitData.RenderMark)
{
@ -228,6 +230,10 @@ namespace TH1Renderer
if (_needBounce)
{
if (_bounceWaitTime > 0){
_bounceWaitTime -= Time.deltaTime;
}
else
if (_isBounceDown)
{
bounceTime += Time.deltaTime / bounceDownFullTime;
@ -618,9 +624,10 @@ namespace TH1Renderer
}
public void SetBounceAnim()
public void SetBounceAnim(float waitTime = 0f)
{
if (_needBounce) return;
_bounceWaitTime = waitTime;
_needBounce = true;
_isBounceDown = true;
bounceTime = 0f;

View File

@ -79,9 +79,9 @@ public class BottomInfoUI// : MonoBehaviour
_skillInfo = ROBottomInfoUI.transform.Find("InfoGroup/SkillInfo").gameObject;
_closeButton = ROBottomInfoUI.transform.Find("CloseButton").gameObject; // 收起按钮
_hintWindow = ROBottomInfoUI.transform.Find("HintWindow").gameObject;
_debugGrid = ROBottomInfoUI.transform.Find("DebugGrid").gameObject;
_debugUnit = ROBottomInfoUI.transform.Find("DebugUnit").gameObject;
_debugCity = ROBottomInfoUI.transform.Find("DebugCity").gameObject;
_debugGrid = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugGrid").gameObject;
_debugUnit = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugUnit").gameObject;
_debugCity = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugCity").gameObject;
_unitTitle = ROBottomInfoUI.transform.Find("InfoGroup/UnitBaseInfo/Title").gameObject;
_gridTitle = ROBottomInfoUI.transform.Find("InfoGroup/GridBaseInfo/Title").gameObject;
_cityTitle = ROBottomInfoUI.transform.Find("InfoGroup/CityBaseInfo/Title").gameObject;
@ -638,13 +638,9 @@ public class BottomInfoUI// : MonoBehaviour
public void UpdateDebugInfo()
{
if (!DebugCenter.Instance.DebugMode)
{
_debugGrid.SetActive(false);
_debugUnit.SetActive(false);
_debugCity.SetActive(false);
return;
}
if (_mapData == null)
return;
//如果是城市格子
if (UIBottomInfoIsGrid && _mapData.GetCityDataByGid(UIBottomInfoStatusObjectId,out var city))
{
@ -659,19 +655,20 @@ public class BottomInfoUI// : MonoBehaviour
_debugGrid.SetActive(true);
_debugUnit.SetActive(false);
_debugCity.SetActive(false);
_main.MapData.GridMap.GetGridDataByGid(UIBottomInfoStatusObjectId,out var gridData);
if (!_main.MapData.GridMap.GetGridDataByGid(UIBottomInfoStatusObjectId, out var gridData))
return;
_debugGrid.transform.Find("BuildingLevelValue").GetComponent<TextMeshProUGUI>().text = gridData.buildingLevel.ToString();
}
//如果是unit
else
{
else{
_debugGrid.SetActive(false);
_debugUnit.SetActive(true);
_debugCity.SetActive(false);
// 获取单位数据
_main.MapData.UnitMap.GetUnitDataByUnitId(UIBottomInfoStatusObjectId, out var unitData);
if (!_main.MapData.UnitMap.GetUnitDataByUnitId(UIBottomInfoStatusObjectId, out var unitData))
return;
// 填充单位类型信息
_debugUnit.transform.Find("UnitTypeValue").GetComponent<TextMeshProUGUI>().text = unitData.UnitType.ToString();

View File

@ -0,0 +1,136 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using Logic;
using RuntimeData;
using TMPro;
public class DebugUI
{
private Main _main;
private MapData _mapData;
public GameObject RODebugUI;
private GameObject buttonGroup;
private GameObject panelGroup;
private Dictionary<string, GameObject> panelDict;
public bool NeedShow = false;
public DebugUI(Main main, MapData mapData)
{
_main = main;
_mapData = mapData;
Transform root = _main.UIManager.ROUIManager.transform;
Transform panelRoot = root.Find("DebugPanel");
if (panelRoot == null) return;
RODebugUI = panelRoot.gameObject;
Button startButton = panelRoot.Find("ButtonStart")?.GetComponent<Button>();
if (startButton != null)
{
startButton.onClick.AddListener(() => ToggleMainPanel());
}
buttonGroup = panelRoot.Find("ButtonGroup")?.gameObject;
panelGroup = panelRoot.Find("PanelGroup")?.gameObject;
if (buttonGroup == null || panelGroup == null) return;
panelDict = new Dictionary<string, GameObject>();
string[] panelNames = { "Selected", "AllUnit", "AllCity", "AllPlayer" };
foreach (string name in panelNames)
{
Transform panel = panelGroup.transform.Find(name);
if (panel != null)
{
panelDict[name] = panel.gameObject;
}
}
BindButton("ButtonAllUnit", "AllUnit");
BindButton("ButtonAllCity", "AllCity");
BindButton("ButtonAllPlayer", "AllPlayer");
BindButton("ButtonSelected", "Selected");
buttonGroup.SetActive(false);
panelGroup.SetActive(false);
foreach (var panel in panelDict.Values)
panel.SetActive(false);
if (!DebugCenter.Instance.DebugMode)
{
RODebugUI.SetActive(false);
}
}
private void ToggleMainPanel()
{
bool newState = !buttonGroup.activeSelf;
buttonGroup.SetActive(newState);
panelGroup.SetActive(newState);
}
private void ShowOnlyPanel(string key)
{
foreach (var kv in panelDict)
{
kv.Value.SetActive(kv.Key == key);
}
if (key == "AllUnit")
{
UpdateAllUnitInfo();
}
}
private void BindButton(string buttonName, string panelName)
{
Transform btnTransform = buttonGroup.transform.Find(buttonName);
if (btnTransform == null) return;
Button button = btnTransform.GetComponent<Button>();
if (button == null) return;
button.onClick.AddListener(() => ShowOnlyPanel(panelName));
}
public void Update()
{
if (!DebugCenter.Instance.DebugMode)
return;
if(_main.UIManager.BottomInfoUI != null)
_main.UIManager.BottomInfoUI.UpdateDebugInfo();
}
public void UpdateAllUnitInfo()
{
var c = RODebugUI.transform.Find("PanelGroup/AllUnit/Scroll View/ViewPort/Content");
foreach (Transform child in c)
GameObject.Destroy(child.gameObject);
foreach (var unit in _mapData.UnitMap.UnitList)
{
GameObject textObj = new GameObject("TMP_Child");
// 设置其父对象
textObj.transform.SetParent(c, false); // false 保留局部坐标
// 添加 RectTransformUI 元素需要)
RectTransform rectTransform = textObj.AddComponent<RectTransform>();
rectTransform.anchorMin = new Vector2(0.5f, 0.5f);
rectTransform.anchorMax = new Vector2(0.5f, 0.5f);
rectTransform.anchoredPosition = Vector2.zero;
// 添加 TextMeshProUGUI 组件
TextMeshProUGUI tmp = textObj.AddComponent<TextMeshProUGUI>();
tmp.text = "UnitID = " + unit.Id;
tmp.fontSize = 36;
tmp.alignment = TextAlignmentOptions.Center;
tmp.color = Color.white;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 49b47b28ed206204dbbebac01a238805
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -29,6 +29,7 @@ public class UIManager
public TimeEndUI TimeEndUI;
public MessageUI MessageUI;
public RankingUI RankingUI;
public DebugUI DebugUI;
GameObject mainUI;
GameObject chooseTribeUI;
@ -52,7 +53,7 @@ public class UIManager
public void Init()
{
SettingUI = new SettingUI(_main, _mapData);
DebugUI = new DebugUI(_main,_mapData);
GameUI = new GameUI(_main,_mapData);
//这里要异步new和init不然new里会用到还没被new完的自己
GameUI.Init();
@ -96,6 +97,7 @@ public class UIManager
// ✅ 每帧更新新增的 UI
SettingUI.Update();
GameUI.Update();
DebugUI.Update();
}
public void EndTurn()

Binary file not shown.

File diff suppressed because one or more lines are too long