diff --git a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller index 70f9323d6..0b3be944d 100644 --- a/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller +++ b/Assets/ResWork/Suriyun/Monster Pack Fire/Animations/Minotos/Mintos_Animations_Check.controller @@ -330,10 +330,13 @@ AnimatorStateMachine: m_Position: {x: 120, y: -100, z: 0} - serializedVersion: 1 m_State: {fileID: -9125726702485892676} - m_Position: {x: 240, y: -30, z: 0} + m_Position: {x: 350, y: -30, z: 0} - serializedVersion: 1 m_State: {fileID: -5008760562705058780} m_Position: {x: 120, y: -150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7966245744437680645} + m_Position: {x: 120, y: -30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -363,3 +366,29 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1102 &7966245744437680645 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: boss_skill2start + m_Speed: 2.5 + 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: b307983573f1e8c4390a148f7b0a66cf, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab index 37d31875f..26489504f 100644 --- a/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab +++ b/Assets/Res_Addr/Effect/Effect_MinotosSkill2.prefab @@ -30,7 +30,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3353246840108208868} + - {fileID: 3526034056038274930} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4138789461419179069 @@ -48,7 +48,7 @@ MonoBehaviour: NoUseParticleTime: 1 OffTime: 1 e_EffectLocation: 0 ---- !u!1001 &1696138399892205959 +--- !u!1001 &3522356505824894824 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -56,97 +56,133 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4279857972633504} m_Modifications: - - target: {fileID: 1724101358703626232, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} - propertyPath: TrailModule.colorOverTrail.maxColor.g - value: 0.991647 + - target: {fileID: 1797740254408388, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} + propertyPath: m_Name + value: Magic circle 3 loop objectReference: {fileID: 0} - - target: {fileID: 1724101358703626232, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} - propertyPath: TrailModule.colorOverTrail.maxColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 0.6 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 0.6 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 0.6 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, - type: 3} + - target: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4672897209852123454, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + - target: {fileID: 199033685162395270, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} - propertyPath: m_Name - value: FX_Buff + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199124184487478850, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199171655284676484, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199271120012169122, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199321676704059516, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199601160688333446, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 5409510084231057802, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} - - {fileID: 5317708295199703885, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} - - {fileID: 7509673848271308604, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6c119b9b00b04394f86df4e4e63dcbc2, type: 3} ---- !u!4 &3353246840108208868 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4107499323353244515, guid: 6c119b9b00b04394f86df4e4e63dcbc2, + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1399107829540328, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3015905058126413781} + m_SourcePrefab: {fileID: 100100000, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} +--- !u!1 &3523245301304670848 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1399107829540328, guid: 3f122a074538fc646b8821db82fbbbb8, type: 3} - m_PrefabInstance: {fileID: 1696138399892205959} + m_PrefabInstance: {fileID: 3522356505824894824} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3015905058126413781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3523245301304670848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!4 &3526034056038274930 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4241773017548826, guid: 3f122a074538fc646b8821db82fbbbb8, + type: 3} + m_PrefabInstance: {fileID: 3522356505824894824} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab b/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab new file mode 100644 index 000000000..12f7b79c6 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1380238739168988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4504870314295858} + - component: {fileID: 5721183518784682466} + m_Layer: 0 + m_Name: Effect_MinotosSkill2Charging + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4504870314295858 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380238739168988} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3902571181234616908} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5721183518784682466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1380238739168988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} + m_Name: + m_EditorClassIdentifier: + NoUseParticleTime: 1 + OffTime: 3 + e_EffectLocation: 2 +--- !u!1001 &4956788836196461339 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4504870314295858} + m_Modifications: + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8435668252943946532, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + propertyPath: m_Name + value: FX_FireLevelUp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fffcb729a3db4c4197c45283dbdcaa2, type: 3} +--- !u!4 &3902571181234616908 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8278384670382936407, guid: 1fffcb729a3db4c4197c45283dbdcaa2, + type: 3} + m_PrefabInstance: {fileID: 4956788836196461339} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab.meta b/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab.meta new file mode 100644 index 000000000..c15b1235a --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_MinotosSkill2Charging.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c8a55b5cc68a1124da12efe7de5f61a7 +timeCreated: 1587080156 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs b/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs index 1b6e0c426..3ae1a47a0 100644 --- a/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs +++ b/Assets/Script/Character/Mob/Boss/Boss_Minotos.cs @@ -28,9 +28,6 @@ public class Boss_Minotos : BossMobActor CoolTime_Skill1 = 1f; CoolTime_Skill2 = 2f; - - //CoolTime_Skill1 = 1000f; - //CoolTime_Skill2 = 2000f; } protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime) @@ -64,6 +61,10 @@ public class Boss_Minotos : BossMobActor IEnumerator Co_Skill2() { Change_MobStatus(eMobStatus.Skill); + AnimationPlay("boss_skill2start"); + InGameInfo.Ins.Show_Effect("Effect_MinotosSkill2Charging", this); + yield return new WaitForSeconds(1.0f); + AnimationPlay("boss_skill2"); Buff_or_Debuff(eCC.MOVSPD_Up, Skill2LifeTime, Skill2MoveSpeed); Buff_or_Debuff(eCC.ATKSPD_Up, Skill2LifeTime, Skill2AttackSpeed);