diff --git a/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001.controller b/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001_controller.controller similarity index 98% rename from Assets/ManagedResources/Effects/Animation/AoBing_MZ_001.controller rename to Assets/ManagedResources/Effects/Animation/AoBing_MZ_001_controller.controller index 47b289f375..f7bb668992 100644 --- a/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001.controller +++ b/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AoBing_MZ_001 + m_Name: AoBing_MZ_001_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001.controller.meta b/Assets/ManagedResources/Effects/Animation/AoBing_MZ_001_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/AoBing_MZ_001.controller.meta rename to Assets/ManagedResources/Effects/Animation/AoBing_MZ_001_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001.controller b/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001_controller.controller similarity index 98% rename from Assets/ManagedResources/Effects/Animation/RanDeng_effect_001.controller rename to Assets/ManagedResources/Effects/Animation/RanDeng_effect_001_controller.controller index 5251142d92..3b39aef811 100644 --- a/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001.controller +++ b/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RanDeng_effect_001 + m_Name: RanDeng_effect_001_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001.controller.meta b/Assets/ManagedResources/Effects/Animation/RanDeng_effect_001_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/RanDeng_effect_001.controller.meta rename to Assets/ManagedResources/Effects/Animation/RanDeng_effect_001_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/Target_Zhua.controller b/Assets/ManagedResources/Effects/Animation/Target_Zhua.controller deleted file mode 100644 index b7c274cec2..0000000000 --- a/Assets/ManagedResources/Effects/Animation/Target_Zhua.controller +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Target_Zhua - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 110742734} - 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 &110222066 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Target_Zhua - 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_Motion: {fileID: 7400000, guid: a81dc126285114744af6cf4755dac355, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: ---- !u!1107 &110742734 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 110222066} - 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: 110222066} diff --git a/Assets/ManagedResources/Effects/Animation/Target_Zhua_controller.controller b/Assets/ManagedResources/Effects/Animation/Target_Zhua_controller.controller new file mode 100644 index 0000000000..60aa91c0a6 --- /dev/null +++ b/Assets/ManagedResources/Effects/Animation/Target_Zhua_controller.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Target_Zhua_controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 110742734} + 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 &110222066 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Target_Zhua + 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: a81dc126285114744af6cf4755dac355, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &110742734 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 110222066} + 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: 110222066} diff --git a/Assets/ManagedResources/Effects/Animation/Target_Zhua.controller.meta b/Assets/ManagedResources/Effects/Animation/Target_Zhua_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/Target_Zhua.controller.meta rename to Assets/ManagedResources/Effects/Animation/Target_Zhua_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/guangshu_effect_001.controller b/Assets/ManagedResources/Effects/Animation/guangshu_effect_001_controller.controller similarity index 98% rename from Assets/ManagedResources/Effects/Animation/guangshu_effect_001.controller rename to Assets/ManagedResources/Effects/Animation/guangshu_effect_001_controller.controller index 19d6f40d7e..65786a7ee8 100644 --- a/Assets/ManagedResources/Effects/Animation/guangshu_effect_001.controller +++ b/Assets/ManagedResources/Effects/Animation/guangshu_effect_001_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: guangshu_effect_001 + m_Name: guangshu_effect_001_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/guangshu_effect_001.controller.meta b/Assets/ManagedResources/Effects/Animation/guangshu_effect_001_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/guangshu_effect_001.controller.meta rename to Assets/ManagedResources/Effects/Animation/guangshu_effect_001_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/guangshu_effect_002.controller b/Assets/ManagedResources/Effects/Animation/guangshu_effect_002_controller.controller similarity index 98% rename from Assets/ManagedResources/Effects/Animation/guangshu_effect_002.controller rename to Assets/ManagedResources/Effects/Animation/guangshu_effect_002_controller.controller index eacf49ee61..00a611772a 100644 --- a/Assets/ManagedResources/Effects/Animation/guangshu_effect_002.controller +++ b/Assets/ManagedResources/Effects/Animation/guangshu_effect_002_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: guangshu_effect_002 + m_Name: guangshu_effect_002_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/guangshu_effect_002.controller.meta b/Assets/ManagedResources/Effects/Animation/guangshu_effect_002_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/guangshu_effect_002.controller.meta rename to Assets/ManagedResources/Effects/Animation/guangshu_effect_002_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001.mat b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001_mat.mat similarity index 99% rename from Assets/ManagedResources/Effects/Materials/RanDeng_effect_001.mat rename to Assets/ManagedResources/Effects/Materials/RanDeng_effect_001_mat.mat index d1edf8caf5..bf06758b3f 100644 --- a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001.mat +++ b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RanDeng_effect_001 + m_Name: RanDeng_effect_001_mat m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001.mat.meta b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_001_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/Effects/Materials/RanDeng_effect_001.mat.meta rename to Assets/ManagedResources/Effects/Materials/RanDeng_effect_001_mat.mat.meta diff --git a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02.mat b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02_mat.mat similarity index 99% rename from Assets/ManagedResources/Effects/Materials/RanDeng_effect_02.mat rename to Assets/ManagedResources/Effects/Materials/RanDeng_effect_02_mat.mat index a8c97a64d2..befa429437 100644 --- a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02.mat +++ b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RanDeng_effect_02 + m_Name: RanDeng_effect_02_mat m_Shader: {fileID: 4800000, guid: 5a335d9deda6b7441bcb6311537b7dec, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02.mat.meta b/Assets/ManagedResources/Effects/Materials/RanDeng_effect_02_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/Effects/Materials/RanDeng_effect_02.mat.meta rename to Assets/ManagedResources/Effects/Materials/RanDeng_effect_02_mat.mat.meta diff --git a/Assets/ManagedResources/Effects/Textures/EFF_guangdian02.png b/Assets/ManagedResources/Effects/Textures/EFF_guangdian02_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/EFF_guangdian02.png rename to Assets/ManagedResources/Effects/Textures/EFF_guangdian02_png.png diff --git a/Assets/ManagedResources/Effects/Textures/EFF_guangdian02.png.meta b/Assets/ManagedResources/Effects/Textures/EFF_guangdian02_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/EFF_guangdian02.png.meta rename to Assets/ManagedResources/Effects/Textures/EFF_guangdian02_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/Glow185_jinse.png b/Assets/ManagedResources/Effects/Textures/Glow185_jinse_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/Glow185_jinse.png rename to Assets/ManagedResources/Effects/Textures/Glow185_jinse_png.png diff --git a/Assets/ManagedResources/Effects/Textures/Glow185_jinse.png.meta b/Assets/ManagedResources/Effects/Textures/Glow185_jinse_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/Glow185_jinse.png.meta rename to Assets/ManagedResources/Effects/Textures/Glow185_jinse_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/H_tirl_94_03.tga b/Assets/ManagedResources/Effects/Textures/H_tirl_94_03_tga.tga similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_tirl_94_03.tga rename to Assets/ManagedResources/Effects/Textures/H_tirl_94_03_tga.tga diff --git a/Assets/ManagedResources/Effects/Textures/H_tirl_94_03.tga.meta b/Assets/ManagedResources/Effects/Textures/H_tirl_94_03_tga.tga.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_tirl_94_03.tga.meta rename to Assets/ManagedResources/Effects/Textures/H_tirl_94_03_tga.tga.meta diff --git a/Assets/ManagedResources/Effects/Textures/Ring107.png b/Assets/ManagedResources/Effects/Textures/Ring107_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/Ring107.png rename to Assets/ManagedResources/Effects/Textures/Ring107_png.png diff --git a/Assets/ManagedResources/Effects/Textures/Ring107.png.meta b/Assets/ManagedResources/Effects/Textures/Ring107_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/Ring107.png.meta rename to Assets/ManagedResources/Effects/Textures/Ring107_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/anyingzhua@2x.png b/Assets/ManagedResources/Effects/Textures/anyingzhua@2x_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/anyingzhua@2x.png rename to Assets/ManagedResources/Effects/Textures/anyingzhua@2x_png.png diff --git a/Assets/ManagedResources/Effects/Textures/anyingzhua@2x.png.meta b/Assets/ManagedResources/Effects/Textures/anyingzhua@2x_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/anyingzhua@2x.png.meta rename to Assets/ManagedResources/Effects/Textures/anyingzhua@2x_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/fs_012.png b/Assets/ManagedResources/Effects/Textures/fs_012_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/fs_012.png rename to Assets/ManagedResources/Effects/Textures/fs_012_png.png diff --git a/Assets/ManagedResources/Effects/Textures/fs_012.png.meta b/Assets/ManagedResources/Effects/Textures/fs_012_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/fs_012.png.meta rename to Assets/ManagedResources/Effects/Textures/fs_012_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01.png b/Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01.png rename to Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01_png.png diff --git a/Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01.png.meta b/Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01.png.meta rename to Assets/ManagedResources/Effects/Textures/m_37_yl_t_jinse_01_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/tuan_mao.png b/Assets/ManagedResources/Effects/Textures/tuan_mao_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/tuan_mao.png rename to Assets/ManagedResources/Effects/Textures/tuan_mao_png.png diff --git a/Assets/ManagedResources/Effects/Textures/tuan_mao.png.meta b/Assets/ManagedResources/Effects/Textures/tuan_mao_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/tuan_mao.png.meta rename to Assets/ManagedResources/Effects/Textures/tuan_mao_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/zhenzhuangguang188.png b/Assets/ManagedResources/Effects/Textures/zhenzhuangguang188_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/zhenzhuangguang188.png rename to Assets/ManagedResources/Effects/Textures/zhenzhuangguang188_png.png diff --git a/Assets/ManagedResources/Effects/Textures/zhenzhuangguang188.png.meta b/Assets/ManagedResources/Effects/Textures/zhenzhuangguang188_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/zhenzhuangguang188.png.meta rename to Assets/ManagedResources/Effects/Textures/zhenzhuangguang188_png.png.meta diff --git a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab index 6d6a8a58f6..5df937409e 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab @@ -28687,7 +28687,7 @@ Transform: - {fileID: 6962157353255356870} - {fileID: 5593705696710175552} - {fileID: 8139567273748367280} - m_Father: {fileID: 2574442092586807069} + m_Father: {fileID: 3704291190270300980} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7166437807572352366 @@ -33463,26 +33463,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2574442092586807069} + - component: {fileID: 3704291190270300980} m_Layer: 0 - m_Name: AoBing_Attack_yanwu + m_Name: Effect_c_ab_00014_t3_attack01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2574442092586807069 -Transform: +--- !u!224 &3704291190270300980 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8838165153533098875} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3, y: -69, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4504177882761184077} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3, y: -69} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack02.prefab b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack02.prefab index 53c22194e9..20216fd2e6 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack02.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack02.prefab @@ -85,16 +85,16 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6661461996610368579} + - component: {fileID: 8584584536202349821} m_Layer: 0 - m_Name: AoBing_Attack_shandain + m_Name: Effect_c_ab_00014_t3_attack02 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6661461996610368579 -Transform: +--- !u!224 &8584584536202349821 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -108,6 +108,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4276248212160653007 GameObject: m_ObjectHideFlags: 0 @@ -142,7 +147,7 @@ Transform: - {fileID: 2797007563813053400} - {fileID: 2774249871850497886} - {fileID: 6079847116453071182} - m_Father: {fileID: 6661461996610368579} + m_Father: {fileID: 8584584536202349821} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5238681369953310649 diff --git a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack03.prefab b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack03.prefab index d9ecfc985b..88146ef41b 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack03.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack03.prefab @@ -10024,8 +10024,8 @@ Transform: - {fileID: 1195550666937318031} - {fileID: 7723615848114167190} - {fileID: 3997846982844529740} - m_Father: {fileID: 6996304894658439119} - m_RootOrder: 0 + m_Father: {fileID: 7288792016939843111} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &5463321811205518598 Animator: @@ -29272,26 +29272,157 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6996304894658439119} + - component: {fileID: 7288792016939843111} m_Layer: 0 - m_Name: AoBing_MZ + m_Name: Effect_c_ab_00014_t3_attack03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6996304894658439119 -Transform: +--- !u!224 &7288792016939843111 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7642139322913271382} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3633150657602868728} - {fileID: 7923539640168633278} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &4992549566474770693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7288792016939843111} + m_Modifications: + - target: {fileID: 3359423834863360022, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_Name + value: Effect_c_ab_00014_t3_attack02 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 971590a673ab1c64fb1ac042ee39be7e, type: 3} +--- !u!224 &3633150657602868728 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8584584536202349821, guid: 971590a673ab1c64fb1ac042ee39be7e, + type: 3} + m_PrefabInstance: {fileID: 4992549566474770693} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/PublicArtRes/Textures/fsg_009.tga b/Assets/ManagedResources/PublicArtRes/Textures/fsg_009_tga.tga similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/fsg_009.tga rename to Assets/ManagedResources/PublicArtRes/Textures/fsg_009_tga.tga diff --git a/Assets/ManagedResources/PublicArtRes/Textures/fsg_009.tga.meta b/Assets/ManagedResources/PublicArtRes/Textures/fsg_009_tga.tga.meta similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/fsg_009.tga.meta rename to Assets/ManagedResources/PublicArtRes/Textures/fsg_009_tga.tga.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua index a35a592b93..75002d069c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua @@ -33,6 +33,7 @@ function Skill:Init(role, effectData, type, targets, isAdd, isRage) --type 0 异 self.teamSkillType = isTeamSkill and floor(effectData[1] / 100) or 0 self.id = effectData[1] -- 技能ID self.hitTime = effectData[2] -- 效果命中需要的时间 + LogGreen("skill init") self.continueTime = effectData[3] -- 命中后伤害持续时间 self.attackCount = effectData[4] -- 伤害持续时间内伤害次数 @@ -100,9 +101,8 @@ local function DoEffect(caster, target, eff, duration, skill) ) end end -local function takeEffect(caster, target, effects, effectIndex, duration, skill) - +function Skill:takeEffect(caster, target, effects, effectIndex, duration, skill) for k=1, #effects do -- 如果不是第一个效果对列的第一个效果则判断是否命中 if k ~= 1 and effectIndex == 1 then @@ -179,7 +179,8 @@ function Skill:Cast(func) if i == 1 then self.targetIsHit[arr[j]] = BattleUtil.CheckIsHit(self.owner, arr[j]) end - takeEffect(self.owner, arr[j], effects, i, self.hitTime, self) + LogGreen(self.hitTime) + self:takeEffect(self.owner, arr[j], effects, i, self.hitTime, self) -- if i == 1 then -- self.targetIsHit[arr[j]] = BattleUtil.CheckIsHit(self.owner, arr[j]) -- takeEffect(self.owner, arr[j], effects, self.hitTime, self) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua index 1c7407669a..ae0e97c87e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua @@ -379,7 +379,7 @@ function SkillSetView:ApplyData() nCombat.KeyFrame = nKeyFrame BattleManager.SetSkillCombat(ncId, nCombat) for i=2, #self.role.skill do - self.role.skill[i][2] = nKeyFrame/1000 + self.role.skill[2] = nKeyFrame/1000 end local scId = SkillLogicConfig[sSkillId].SkillDisplay @@ -390,7 +390,7 @@ function SkillSetView:ApplyData() sCombat.KeyFrame = sKeyFrame BattleManager.SetSkillCombat(scId, sCombat) for i=2, #self.role.superSkill do - self.role.superSkill[i][2] = sKeyFrame/1000 + self.role.superSkill[2] = sKeyFrame/1000 end PopupTipPanel.ShowTip(Language[10241]) diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index 92ba3f7551..3764e14e62 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ diff --git a/data_execl/base_data/SkillLogicConfig.xlsx b/data_execl/base_data/SkillLogicConfig.xlsx index 133bd0c047..5d03f20de3 100644 Binary files a/data_execl/base_data/SkillLogicConfig.xlsx and b/data_execl/base_data/SkillLogicConfig.xlsx differ